diff options
38 files changed, 6999 insertions, 9912 deletions
@@ -40,6 +40,37 @@ We've extracted all of the mobile apps from this repository into the ## Releases +* v1.8.2 (3rd May 2016) + - Security: + - Fix vulnerability in image upload that allowed external + command execution. + - New features + - Twitter social login. #1377 + - PNG image upload support. #1302 #1361 + - Front end improvements: + - Switch list item heading from h4 to h3. #1348 + - Preserve category when clicking elsewhere on map. + - Optimize store logo PNGs. + - Admin improvements + - Default new category creation to confirmed. #1266 + - Use better link to reports on admin body page. + - Bugfixes: + - Show right body user form value for fixed reports. #1369 + - Cope with a '/' in body name slug. #574 + - Ignore empty entries in the image upload IDs. + - Use transparent border in tips/change_location. #1380 + - Development improvements: + - Allow cobrands to control front page number colours. + - Refactor email handling to use Email::MIME alone. #1366 + - Improve testing on Mac OS X. + - Prevent dev sites auto-creating session. + - Display used send method in debug line. + - Remove unused cobrands. #1383 + - Finally combine remaining base/fixmystreet templates. + - Don't warn on bad photo hashes. + - Skip fetched updates if they're out of date range. #1390 + - Store Open311 error in report on failure. #1391 + * v1.8.1 (23rd March 2016) - Front end improvements: - Remember user's last anonymous state. #150 diff --git a/bin/site-specific-install.sh b/bin/site-specific-install.sh index d20a15ea2..8cca28650 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:-v1.8.1} +VERSION=${VERSION_OVERRIDE:-v1.8.2} 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 f0fcc789b..a58f8d855 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: 2016-03-02 13:09+0000\n" +"POT-Creation-Date: 2016-05-03 10:41+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <team@fixmystreet.com>\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:616 perllib/FixMyStreet/Script/Reports.pm:189 +#: perllib/FixMyStreet/DB/Result/Problem.pm:618 perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr "" @@ -78,7 +78,7 @@ msgstr "" msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:683 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "%s ref: %s" msgstr "" @@ -97,10 +97,6 @@ msgstr "" msgid "%s ward, %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:552 -msgid "%s, reported at %s" -msgstr "" - #: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "" @@ -150,7 +146,7 @@ msgstr "" msgid "(not sent to council)" msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "(optional)" msgstr "" @@ -162,11 +158,11 @@ msgstr "" msgid "(sent to both)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 perllib/FixMyStreet/DB/Result/Problem.pm:410 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 perllib/FixMyStreet/DB/Result/Problem.pm:416 +#: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "" @@ -195,19 +191,15 @@ msgstr "" msgid "<strong>No</strong> Let me confirm my update by email" msgstr "" -#: templates/web/base/auth/general.html:87 templates/web/zurich/auth/general.html:51 +#: templates/web/base/auth/general.html:97 templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "" -#: templates/web/base/auth/general.html:70 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:80 templates/web/base/report/new/form_user_loggedout_password.html:3 templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "" -#: templates/web/base/about/about-en-gb.html:1 templates/web/base/about/about-en-gb.html:3 -msgid "About us" -msgstr "" - -#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:8 templates/web/base/report/update/form_update.html:34 templates/web/base/report/update/form_update.html:35 +#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:8 templates/web/base/report/update/form_update.html:36 templates/web/base/report/update/form_update.html:37 msgid "Action Scheduled" msgstr "" @@ -234,7 +226,7 @@ msgstr "" msgid "Add user" msgstr "" -#: templates/web/base/my/my.html:56 +#: templates/web/base/my/my.html:54 msgid "Added %s" msgstr "" @@ -254,7 +246,7 @@ msgstr "" msgid "Alert %d disabled (created %s)" msgstr "" -#: templates/web/base/report/update/form_name.html:20 +#: templates/web/base/report/update/form_name.html:21 msgid "Alert me to future updates" msgstr "" @@ -266,7 +258,7 @@ msgstr "" msgid "All Reports as CSV" msgstr "" -#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 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/footer.html:32 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 msgid "All reports" msgstr "" @@ -350,7 +342,7 @@ msgstr "" msgid "Ban email address" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 perllib/FixMyStreet/Cobrand/Zurich.pm:392 templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1273 perllib/FixMyStreet/Cobrand/Zurich.pm:392 templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" msgstr "" @@ -374,7 +366,7 @@ msgstr "" msgid "Can't see the map? <em>Skip this step</em>" msgstr "" -#: templates/web/base/admin/body.html:68 templates/web/base/admin/index.html:54 templates/web/base/report/new/category.html:10 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:68 templates/web/base/admin/index.html:54 templates/web/base/report/new/category.html:7 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 msgid "Category" msgstr "" @@ -382,7 +374,7 @@ msgstr "" msgid "Category fix rate for problems > 4 weeks old" msgstr "" -#: templates/web/base/admin/body.html:138 templates/web/base/admin/category_edit.html:23 templates/web/base/admin/report_edit.html:56 templates/web/zurich/admin/body.html:43 templates/web/zurich/admin/report_edit-sdm.html:70 templates/web/zurich/admin/report_edit.html:98 +#: templates/web/base/admin/body.html:137 templates/web/base/admin/category_edit.html:23 templates/web/base/admin/report_edit.html:56 templates/web/zurich/admin/body.html:43 templates/web/zurich/admin/report_edit-sdm.html:70 templates/web/zurich/admin/report_edit.html:98 msgid "Category:" msgstr "" @@ -394,19 +386,19 @@ msgstr "" msgid "Change password" msgstr "" -#: templates/web/base/admin/body.html:160 +#: templates/web/base/admin/body.html:158 msgid "" "Check <strong>confirmed</strong> to indicate that this contact has been confirmed as correct.\n" " If you are not sure of the origin or validity of the contact, leave this unchecked." msgstr "" -#: templates/web/base/admin/body.html:171 +#: templates/web/base/admin/body.html:169 msgid "" "Check <strong>deleted</strong> to remove the category from use. \n" " It will not appear as an available category in the drop-down menu on the report-a-problem page." msgstr "" -#: templates/web/base/admin/body.html:191 +#: templates/web/base/admin/body.html:189 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -417,7 +409,7 @@ msgid "" " at a specific address." msgstr "" -#: templates/web/base/admin/body.html:130 +#: templates/web/base/admin/body.html:129 msgid "" "Choose a <strong>category</strong> 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." @@ -451,11 +443,11 @@ msgstr "" msgid "Click the link in our confirmation email to sign in." msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:196 perllib/FixMyStreet/Cobrand/Zurich.pm:969 templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:15 templates/web/base/admin/report_blocks.html:25 templates/web/base/dashboard/index.html:142 templates/web/base/dashboard/index.html:144 templates/web/base/report/banner.html:15 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/Zurich.pm:196 perllib/FixMyStreet/Cobrand/Zurich.pm:969 templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:15 templates/web/base/admin/report_blocks.html:25 templates/web/base/dashboard/index.html:140 templates/web/base/dashboard/index.html:142 templates/web/base/report/banner.html:15 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 msgid "Closed" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:779 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Closed by council" msgstr "" @@ -479,7 +471,7 @@ msgstr "" msgid "Cobrand:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 templates/web/base/admin/config_page.html:1 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "" @@ -503,7 +495,7 @@ msgstr "" msgid "Confirmation" msgstr "" -#: templates/web/base/admin/body.html:166 templates/web/base/admin/body.html:79 templates/web/base/admin/category_edit.html:37 templates/web/base/admin/category_edit.html:92 templates/web/zurich/admin/stats.html:40 +#: templates/web/base/admin/body.html:164 templates/web/base/admin/body.html:79 templates/web/base/admin/category_edit.html:37 templates/web/base/admin/category_edit.html:92 templates/web/zurich/admin/stats.html:40 msgid "Confirmed" msgstr "" @@ -516,7 +508,7 @@ msgid "Confirmed:" msgstr "" #. ("%s is the site name") -#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 +#: templates/web/base/about/_sidebar.html:6 msgid "Contact %s" msgstr "" @@ -532,7 +524,7 @@ msgstr "" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 perllib/FixMyStreet/App/Controller/Admin.pm:1457 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1417 perllib/FixMyStreet/App/Controller/Admin.pm:1445 msgid "Could not find user" msgstr "" @@ -548,7 +540,7 @@ msgstr "" msgid "Council contacts for %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:681 +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "Council ref: %s" msgstr "" @@ -564,7 +556,7 @@ msgstr "" msgid "Create a report" msgstr "" -#: templates/web/base/admin/body.html:208 templates/web/zurich/admin/body.html:59 +#: templates/web/base/admin/body.html:206 templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "" @@ -600,19 +592,19 @@ msgstr "" msgid "Dealt with by subdivision within 5 working days" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:877 templates/web/zurich/admin/template_edit.html:33 +#: perllib/FixMyStreet/App/Controller/Admin.pm:865 templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" -#: templates/web/base/admin/bodies.html:27 templates/web/base/admin/body.html:177 templates/web/base/admin/body.html:81 templates/web/base/admin/category_edit.html:42 templates/web/base/admin/category_edit.html:93 +#: templates/web/base/admin/bodies.html:27 templates/web/base/admin/body.html:175 templates/web/base/admin/body.html:81 templates/web/base/admin/category_edit.html:42 templates/web/base/admin/category_edit.html:93 msgid "Deleted" msgstr "" -#: templates/web/base/report/new/form_report.html:45 templates/web/zurich/admin/index-dm.html:22 templates/web/zurich/admin/index-sdm.html:20 templates/web/zurich/admin/reports.html:12 +#: templates/web/base/report/new/form_report.html:47 templates/web/zurich/admin/index-dm.html:22 templates/web/zurich/admin/index-sdm.html:20 templates/web/zurich/admin/reports.html:12 msgid "Description" msgstr "" -#: templates/web/base/js/translation_strings.html:34 templates/web/zurich/report/new/fill_in_details_form.html:68 +#: templates/web/base/js/translation_strings.html:34 templates/web/zurich/report/new/fill_in_details_form.html:70 msgid "Details" msgstr "" @@ -633,7 +625,7 @@ msgid "Diligency prize league table" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:48 templates/web/base/report/new/form_user_loggedout.html:18 templates/web/base/report/new/oauth_email_form.html:18 templates/web/base/report/update-form.html:29 templates/web/base/report/update/form_user_loggedout.html:17 +#: templates/web/base/auth/general.html:58 templates/web/base/report/new/form_user_loggedout.html:28 templates/web/base/report/new/oauth_email_form.html:18 templates/web/base/report/update-form.html:29 templates/web/base/report/update/form_user_loggedout.html:27 msgid "Do you have a %s password?" msgstr "" @@ -649,7 +641,7 @@ msgstr "" msgid "Drag and drop photos here or <u>click to upload</u>" msgstr "" -#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:14 templates/web/base/report/update/form_update.html:34 templates/web/base/report/update/form_update.html:36 +#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:14 templates/web/base/report/update/form_update.html:36 templates/web/base/report/update/form_update.html:38 msgid "Duplicate" msgstr "" @@ -665,7 +657,7 @@ msgstr "" msgid "Edit" msgstr "" -#: templates/web/base/admin/body.html:220 templates/web/zurich/admin/body.html:71 +#: templates/web/base/admin/body.html:218 templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "" @@ -685,15 +677,15 @@ msgstr "" msgid "Editor" msgstr "" -#: templates/web/base/admin/bodies.html:23 templates/web/base/admin/category_edit.html:91 templates/web/base/admin/flagged.html:38 templates/web/base/admin/users.html:16 templates/web/base/auth/general.html:39 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:23 templates/web/base/admin/category_edit.html:91 templates/web/base/admin/flagged.html:38 templates/web/base/admin/users.html:16 templates/web/base/auth/general.html:49 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:1405 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 msgid "Email added to abuse list" msgstr "" -#: templates/web/base/admin/body.html:155 +#: templates/web/base/admin/body.html:153 msgid "Email address:" msgstr "" @@ -705,15 +697,11 @@ msgstr "" msgid "Email alert deleted" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1390 msgid "Email already in abuse list" msgstr "" -#: templates/web/base/around/_updates.html:5 -msgid "Email me new local problems" -msgstr "" - -#: templates/web/base/admin/category_edit.html:31 templates/web/base/admin/report_edit.html:62 templates/web/base/admin/update_edit.html:33 templates/web/base/admin/user-form.html:20 templates/web/base/alert/updates.html:13 templates/web/zurich/admin/body.html:47 +#: templates/web/base/admin/category_edit.html:31 templates/web/base/admin/report_edit.html:62 templates/web/base/admin/update_edit.html:33 templates/web/base/admin/user-form.html:20 templates/web/zurich/admin/body.html:47 msgid "Email:" msgstr "" @@ -721,26 +709,6 @@ msgstr "" msgid "Email: %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 -msgid "Empty flat or maisonette" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 -msgid "Empty house or bungalow" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 -msgid "Empty office or other commercial" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 -msgid "Empty pub or bar" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 -msgid "Empty public building - school, hospital, etc." -msgstr "" - #: templates/web/base/admin/body-form.html:162 templates/web/base/admin/body-form.html:163 msgid "" "Enable <strong>Open311 update-sending</strong> if the endpoint will send and receive\n" @@ -780,15 +748,11 @@ msgstr "" msgid "Enter a nearby street name and area" msgstr "" -#: perllib/FixMyStreet/Cobrand/ZeroTB.pm:7 -msgid "Enter a nearby street name and area, postal code or district in Delhi" -msgstr "" - -#: templates/web/base/auth/general.html:99 templates/web/base/report/new/form_user_loggedout_by_email.html:38 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:109 templates/web/base/report/new/form_user_loggedout_by_email.html:38 templates/web/base/report/update/form_user_loggedout_by_email.html:13 templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "" -#: templates/web/base/index-steps.html:26 +#: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "" @@ -808,7 +772,7 @@ msgstr "" msgid "Examples:" msgstr "" -#: templates/web/base/report/new/form_report.html:49 +#: templates/web/base/report/new/form_report.html:51 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "" @@ -840,11 +804,7 @@ msgstr "" msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." msgstr "" -#: templates/web/base/header.html:26 -msgid "FixMyStreet" -msgstr "" - -#: templates/web/base/admin/index.html:54 templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:24 templates/web/base/admin/report_blocks.html:9 templates/web/base/dashboard/index.html:142 templates/web/base/dashboard/index.html:144 templates/web/base/report/banner.html:12 templates/web/base/report/update/form_update.html:34 templates/web/base/report/update/form_update.html:38 +#: templates/web/base/admin/index.html:54 templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:24 templates/web/base/admin/report_blocks.html:9 templates/web/base/dashboard/index.html:140 templates/web/base/dashboard/index.html:142 templates/web/base/report/banner.html:12 templates/web/base/report/update/form_update.html:36 templates/web/base/report/update/form_update.html:40 msgid "Fixed" msgstr "" @@ -868,7 +828,7 @@ msgstr "" msgid "Flag user" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 templates/web/base/admin/users.html:19 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "" @@ -888,7 +848,7 @@ msgstr "" msgid "Flagged:" msgstr "" -#: templates/web/base/reports/_ward-list.html:3 templates/web/fixmystreet/reports/_ward-list.html:4 +#: templates/web/base/reports/_ward-list.html:4 msgid "Follow a ward link to view only reports within that ward." msgstr "" @@ -916,15 +876,15 @@ msgstr "" msgid "GeoRSS on Google Maps" msgstr "" -#: templates/web/base/report/display_tools.html:11 templates/web/fixmystreet/around/_updates.html:3 +#: templates/web/base/around/_updates.html:3 templates/web/base/report/display_tools.html:11 msgid "Get updates" msgstr "" -#: templates/web/fixmystreet/reports/_rss.html:3 templates/web/fixmystreet/reports/_rss.html:9 +#: templates/web/base/reports/_rss.html:3 templates/web/base/reports/_rss.html:9 msgid "Get updates of %s problems" msgstr "" -#: templates/web/fixmystreet/reports/_rss.html:11 templates/web/fixmystreet/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:11 templates/web/base/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "" @@ -936,7 +896,7 @@ msgstr "" msgid "Glad to hear it’s been fixed!" msgstr "" -#: templates/web/base/alert/index.html:34 templates/web/base/around/postcode_form.html:16 templates/web/base/reports/_list-filters.html:28 templates/web/zurich/admin/stats.html:26 +#: templates/web/base/alert/index.html:34 templates/web/base/around/postcode_form.html:13 templates/web/base/reports/_list-filters.html:28 templates/web/zurich/admin/stats.html:26 msgid "Go" msgstr "" @@ -960,7 +920,7 @@ msgstr "" msgid "Have you ever reported a problem to a council before, or is this your first time?" msgstr "" -#: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:38 templates/web/zurich/about/faq-de-ch.html:1 templates/web/zurich/footer.html:22 templates/web/zurich/nav_over_content.html:8 +#: templates/web/base/footer.html:38 templates/web/zurich/about/faq-de-ch.html:1 templates/web/zurich/footer.html:22 templates/web/zurich/nav_over_content.html:8 msgid "Help" msgstr "" @@ -968,7 +928,7 @@ msgstr "" msgid "Here are the types of local problem alerts for ‘%s’." msgstr "" -#: templates/web/base/header.html:32 templates/web/fixmystreet/header.html:63 templates/web/zurich/footer.html:12 +#: templates/web/base/header.html:63 templates/web/zurich/footer.html:12 msgid "Hi %s" msgstr "" @@ -976,11 +936,11 @@ msgstr "" msgid "Hidden" msgstr "" -#: templates/web/base/around/display_location.html:65 +#: templates/web/base/around/display_location.html:64 msgid "Hide old" msgstr "" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:59 msgid "Hide pins" msgstr "" @@ -1000,10 +960,6 @@ msgstr "" msgid "How to send successful reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:752 -msgid "I am afraid you cannot confirm unconfirmed reports." -msgstr "" - #: templates/web/base/tokens/confirm_problem.html:23 templates/web/base/tokens/confirm_problem.html:27 msgid "I just reported a problem on @fixmystreet" msgstr "" @@ -1012,7 +968,7 @@ msgstr "" msgid "I just updated a problem on @fixmystreet" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88 msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "" @@ -1026,7 +982,7 @@ msgid "" " For basic installations, you don't need to join bodies in this way." msgstr "" -#: templates/web/base/admin/body.html:133 +#: templates/web/base/admin/body.html:132 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." @@ -1046,7 +1002,7 @@ msgid "" "(please note it will not be sent to the council)." msgstr "" -#: templates/web/base/admin/body.html:149 +#: templates/web/base/admin/body.html:147 msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." msgstr "" @@ -1078,7 +1034,7 @@ msgstr "" msgid "Illegal feed selection" msgstr "" -#: templates/web/base/dashboard/index.html:142 templates/web/base/dashboard/index.html:144 templates/web/base/report/update/form_update.html:34 templates/web/base/report/update/form_update.html:36 +#: templates/web/base/dashboard/index.html:140 templates/web/base/dashboard/index.html:142 templates/web/base/report/update/form_update.html:36 templates/web/base/report/update/form_update.html:38 msgid "In Progress" msgstr "" @@ -1122,7 +1078,7 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 msgid "Invalid end date" msgstr "" @@ -1130,11 +1086,11 @@ msgstr "" msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 msgid "Invalid start date" msgstr "" -#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:5 templates/web/base/dashboard/index.html:142 templates/web/base/dashboard/index.html:143 templates/web/base/report/update/form_update.html:34 templates/web/base/report/update/form_update.html:35 +#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:5 templates/web/base/dashboard/index.html:140 templates/web/base/dashboard/index.html:141 templates/web/base/report/update/form_update.html:36 templates/web/base/report/update/form_update.html:37 msgid "Investigating" msgstr "" @@ -1154,7 +1110,7 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:80 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 "" @@ -1182,7 +1138,7 @@ msgstr "" 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/fixmystreet/alert/updates.html:1 +#: 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 msgid "Local RSS feeds and email alerts" msgstr "" @@ -1190,11 +1146,11 @@ msgstr "" msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "" -#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:35 +#: templates/web/base/footer.html:35 msgid "Local alerts" msgstr "" -#: templates/web/base/index-steps.html:25 +#: templates/web/base/index-steps.html:5 msgid "Locate the problem on a map of the area" msgstr "" @@ -1246,7 +1202,7 @@ msgstr "" msgid "Month" msgstr "" -#: templates/web/base/admin/bodies.html:21 templates/web/base/admin/body-form.html:18 templates/web/base/admin/flagged.html:16 templates/web/base/admin/flagged.html:37 templates/web/base/admin/list_updates.html:7 templates/web/base/admin/reports.html:13 templates/web/base/admin/users.html:15 templates/web/base/auth/general.html:89 templates/web/base/report/new/form_user_loggedin.html:9 templates/web/base/report/new/form_user_loggedout_by_email.html:7 templates/web/base/report/update/form_name.html:4 templates/web/base/reports/index.html:20 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:82 +#: templates/web/base/admin/bodies.html:21 templates/web/base/admin/body-form.html:18 templates/web/base/admin/flagged.html:16 templates/web/base/admin/flagged.html:37 templates/web/base/admin/list_updates.html:7 templates/web/base/admin/reports.html:13 templates/web/base/admin/users.html:15 templates/web/base/auth/general.html:99 templates/web/base/report/new/form_user_loggedin.html:9 templates/web/base/report/new/form_user_loggedout_by_email.html:7 templates/web/base/report/update/form_name.html:5 templates/web/base/reports/index.html:20 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:84 msgid "Name" msgstr "" @@ -1266,7 +1222,7 @@ msgstr "" msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:455 perllib/FixMyStreet/Cobrand/Default.pm:495 +#: perllib/FixMyStreet/Cobrand/Default.pm:454 perllib/FixMyStreet/Cobrand/Default.pm:494 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" @@ -1288,7 +1244,7 @@ msgstr "" msgid "New body added" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:387 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 msgid "New category contact added" msgstr "" @@ -1340,7 +1296,7 @@ msgstr "" msgid "Next" msgstr "" -#: templates/web/base/admin/body.html:80 templates/web/base/admin/body.html:82 templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 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:59 templates/web/base/admin/report_edit.html:75 templates/web/base/admin/update_edit.html:25 templates/web/base/questionnaire/creator_fixed.html:16 templates/web/base/questionnaire/index.html:101 templates/web/base/questionnaire/index.html:53 +#: templates/web/base/admin/body.html:80 templates/web/base/admin/body.html:82 templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 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:59 templates/web/base/admin/report_edit.html:75 templates/web/base/admin/update_edit.html:25 templates/web/base/questionnaire/creator_fixed.html:16 templates/web/base/questionnaire/index.html:102 templates/web/base/questionnaire/index.html:53 msgid "No" msgstr "" @@ -1398,7 +1354,7 @@ msgid "" " activity across their body), the ability to hide reports or set special report statuses." msgstr "" -#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:13 templates/web/base/report/update/form_update.html:34 templates/web/base/report/update/form_update.html:37 +#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:13 templates/web/base/report/update/form_update.html:36 templates/web/base/report/update/form_update.html:39 msgid "Not Responsible" msgstr "" @@ -1426,7 +1382,7 @@ 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 "" -#: templates/web/base/admin/body.html:186 templates/web/base/admin/category_edit.html:52 templates/web/zurich/admin/body.html:53 +#: templates/web/base/admin/body.html:184 templates/web/base/admin/category_edit.html:52 templates/web/zurich/admin/body.html:53 msgid "Note:" msgstr "" @@ -1438,11 +1394,11 @@ msgstr "" msgid "Notes from SDM to DM" msgstr "" -#: templates/web/base/report/new/form_user_loggedout.html:14 templates/web/base/report/new/form_user_loggedout.html:2 templates/web/base/report/new/oauth_email_form.html:17 +#: templates/web/base/report/new/form_user_loggedout.html:2 templates/web/base/report/new/form_user_loggedout.html:24 templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "" -#: templates/web/base/report/update-form.html:28 templates/web/base/report/update/form_user_loggedout.html:13 templates/web/base/report/update/form_user_loggedout.html:2 +#: templates/web/base/report/update-form.html:28 templates/web/base/report/update/form_user_loggedout.html:2 templates/web/base/report/update/form_user_loggedout.html:23 msgid "Now to submit your update…" msgstr "" @@ -1470,7 +1426,7 @@ msgstr "" msgid "One-line summary" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:176 perllib/FixMyStreet/Cobrand/Zurich.pm:909 templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:23 templates/web/base/admin/report_blocks.html:4 templates/web/base/admin/update_edit.html:28 templates/web/base/dashboard/index.html:142 templates/web/base/report/update/form_update.html:34 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:7 templates/web/zurich/admin/update_edit.html:18 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:176 perllib/FixMyStreet/Cobrand/Zurich.pm:909 templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:23 templates/web/base/admin/report_blocks.html:4 templates/web/base/admin/update_edit.html:28 templates/web/base/dashboard/index.html:140 templates/web/base/report/update/form_update.html:36 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 "" @@ -1502,7 +1458,7 @@ msgstr "" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1055 perllib/FixMyStreet/App/Controller/Report/New.pm:668 perllib/FixMyStreet/App/Controller/Report/New.pm:669 perllib/FixMyStreet/DB/Result/Problem.pm:558 perllib/FixMyStreet/DB/Result/Problem.pm:568 perllib/FixMyStreet/DB/Result/Problem.pm:578 perllib/FixMyStreet/DB/Result/Problem.pm:590 perllib/FixMyStreet/Script/Reports.pm:175 perllib/FixMyStreet/Script/Reports.pm:190 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1044 perllib/FixMyStreet/App/Controller/Report/New.pm:658 perllib/FixMyStreet/App/Controller/Report/New.pm:659 perllib/FixMyStreet/DB/Result/Problem.pm:562 perllib/FixMyStreet/DB/Result/Problem.pm:572 perllib/FixMyStreet/DB/Result/Problem.pm:582 perllib/FixMyStreet/DB/Result/Problem.pm:594 perllib/FixMyStreet/Script/Reports.pm:175 perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" msgstr "" @@ -1522,11 +1478,11 @@ msgstr "" msgid "Partial" msgstr "" -#: templates/web/base/auth/general.html:92 templates/web/base/report/new/form_user_loggedout_by_email.html:31 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:102 templates/web/base/report/new/form_user_loggedout_by_email.html:31 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 msgid "Password (optional)" msgstr "" -#: templates/web/base/auth/change_password.html:25 templates/web/base/auth/general.html:72 +#: templates/web/base/auth/change_password.html:25 templates/web/base/auth/general.html:82 msgid "Password:" msgstr "" @@ -1534,7 +1490,7 @@ msgstr "" msgid "Permalink" msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:90 msgid "Phone number" msgstr "" @@ -1546,7 +1502,7 @@ msgstr "" msgid "Phone:" msgstr "" -#: templates/web/base/questionnaire/index.html:75 templates/web/base/report/new/form_report.html:23 templates/web/base/report/update/form_update.html:6 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:45 +#: templates/web/base/questionnaire/index.html:75 templates/web/base/questionnaire/index.html:89 templates/web/base/questionnaire/index.html:91 templates/web/base/report/new/form_report.html:23 templates/web/base/report/new/form_report.html:38 templates/web/base/report/new/form_report.html:40 templates/web/base/report/update/form_update.html:20 templates/web/base/report/update/form_update.html:22 templates/web/base/report/update/form_update.html:6 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:45 templates/web/zurich/report/new/fill_in_details_form.html:61 templates/web/zurich/report/new/fill_in_details_form.html:63 msgid "Photo" msgstr "" @@ -1566,7 +1522,7 @@ msgstr "" msgid "Place pin on map" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:949 perllib/FixMyStreet/Cobrand/Zurich.pm:955 templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:6 templates/web/base/dashboard/index.html:142 templates/web/base/dashboard/index.html:143 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:9 templates/web/zurich/admin/index-dm.html:9 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:949 perllib/FixMyStreet/Cobrand/Zurich.pm:955 templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:6 templates/web/base/dashboard/index.html:140 templates/web/base/dashboard/index.html:141 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:9 templates/web/zurich/admin/index-dm.html:9 msgid "Planned" msgstr "" @@ -1578,11 +1534,11 @@ msgstr "" msgid "Please check the passwords and try again" msgstr "" -#: templates/web/base/auth/general.html:27 templates/web/base/auth/general.html:33 templates/web/zurich/auth/general.html:3 templates/web/zurich/auth/general.html:9 +#: templates/web/base/auth/general.html:37 templates/web/base/auth/general.html:43 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:343 perllib/FixMyStreet/App/Controller/Report/New.pm:878 perllib/FixMyStreet/App/Controller/Report/New.pm:943 perllib/FixMyStreet/DB/Result/Problem.pm:412 templates/web/base/js/translation_strings.html:9 +#: perllib/FixMyStreet/App/Controller/Admin.pm:343 perllib/FixMyStreet/App/Controller/Report/New.pm:856 perllib/FixMyStreet/App/Controller/Report/New.pm:921 perllib/FixMyStreet/DB/Result/Problem.pm:412 templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" msgstr "" @@ -1590,7 +1546,7 @@ msgstr "" msgid "Please choose a property type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:378 +#: perllib/FixMyStreet/App/Controller/Admin.pm:376 msgid "Please correct the errors below" msgstr "" @@ -1609,7 +1565,7 @@ msgstr "" msgid "Please enter a message" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 perllib/FixMyStreet/App/Controller/Admin.pm:1146 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1079 perllib/FixMyStreet/App/Controller/Admin.pm:1134 msgid "Please enter a name" msgstr "" @@ -1621,7 +1577,7 @@ msgstr "" msgid "Please enter a subject" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 perllib/FixMyStreet/App/Controller/Admin.pm:1142 perllib/FixMyStreet/App/Controller/Admin.pm:345 perllib/FixMyStreet/DB/Result/User.pm:133 templates/web/base/js/translation_strings.html:12 templates/web/base/js/translation_strings.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1075 perllib/FixMyStreet/App/Controller/Admin.pm:1130 perllib/FixMyStreet/App/Controller/Admin.pm:345 perllib/FixMyStreet/DB/Result/User.pm:143 templates/web/base/js/translation_strings.html:12 templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" msgstr "" @@ -1633,11 +1589,11 @@ msgstr "" msgid "Please enter some details" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:113 perllib/FixMyStreet/DB/Result/User.pm:130 templates/web/base/auth/general.html:27 templates/web/base/auth/general.html:32 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:113 perllib/FixMyStreet/DB/Result/User.pm:140 templates/web/base/auth/general.html:37 templates/web/base/auth/general.html:42 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 msgid "Please enter your email" msgstr "" -#: templates/web/base/report/new/form_user_loggedout_email.html:7 templates/web/zurich/report/new/fill_in_details_form.html:80 +#: templates/web/base/report/new/form_user_loggedout_email.html:7 templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "Please enter your email address" msgstr "" @@ -1649,7 +1605,7 @@ msgstr "" 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:112 perllib/FixMyStreet/DB/Result/Comment.pm:122 perllib/FixMyStreet/DB/Result/Problem.pm:406 perllib/FixMyStreet/DB/Result/User.pm:126 templates/web/base/js/translation_strings.html:6 +#: perllib/FixMyStreet/App/Controller/Contact.pm:112 perllib/FixMyStreet/DB/Result/Comment.pm:122 perllib/FixMyStreet/DB/Result/Problem.pm:406 perllib/FixMyStreet/DB/Result/User.pm:136 templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "" @@ -1673,7 +1629,7 @@ msgstr "" msgid "Please fill in details of the problem below." msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:72 +#: templates/web/zurich/report/new/fill_in_details_form.html:74 msgid "Please fill in details of the problem." msgstr "" @@ -1681,7 +1637,7 @@ msgstr "" msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" @@ -1705,15 +1661,15 @@ msgstr "" msgid "Please note:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please provide some explanation as to why you're reopening this report" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250 msgid "Please provide some text as well as a photo" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 perllib/FixMyStreet/App/Controller/Questionnaire.pm:249 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 perllib/FixMyStreet/App/Controller/Questionnaire.pm:236 msgid "Please say whether you've ever reported a problem to your council before" msgstr "" @@ -1729,19 +1685,19 @@ msgstr "" msgid "Please select the type of alert you want" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232 msgid "Please state whether or not the problem has been fixed" msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 perllib/FixMyStreet/App/Model/PhotoSet.pm:145 perllib/FixMyStreet/App/Model/PhotoSet.pm:147 templates/web/base/js/translation_strings.html:53 -msgid "Please upload a JPEG image only" +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:121 perllib/FixMyStreet/App/Model/PhotoSet.pm:150 perllib/FixMyStreet/App/Model/PhotoSet.pm:152 templates/web/base/js/translation_strings.html:53 +msgid "Please upload an image only" msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 msgid "Please write a message" msgstr "" -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Please write your update here" msgstr "" @@ -1769,7 +1725,7 @@ msgstr "" msgid "Previous" msgstr "" -#: templates/web/fixmystreet/footer.html:41 +#: templates/web/base/footer.html:41 msgid "Privacy" msgstr "" @@ -1777,7 +1733,7 @@ msgstr "" msgid "Privacy and cookies" msgstr "" -#: templates/web/base/admin/body.html:202 templates/web/base/admin/body.html:85 templates/web/base/admin/category_edit.html:45 templates/web/base/admin/report_edit.html:77 +#: templates/web/base/admin/body.html:200 templates/web/base/admin/body.html:85 templates/web/base/admin/category_edit.html:45 templates/web/base/admin/report_edit.html:77 msgid "Private" msgstr "" @@ -1801,7 +1757,7 @@ msgstr "" msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1046 msgid "Problem marked as open." msgstr "" @@ -1813,10 +1769,6 @@ msgstr "" msgid "Problems" msgstr "" -#: templates/web/base/around/_updates.html:1 -msgid "Problems in this area" -msgstr "" - #: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "" @@ -1833,11 +1785,11 @@ msgstr "" msgid "Problems within %.1fkm of this location" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:663 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 perllib/FixMyStreet/Cobrand/UK.pm:208 +#: perllib/FixMyStreet/Cobrand/Default.pm:663 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 perllib/FixMyStreet/Cobrand/UK.pm:222 +#: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "" @@ -1854,15 +1806,11 @@ msgstr "" msgid "Property address:" msgstr "" -#: templates/web/base/report/new/category.html:8 -msgid "Property type:" -msgstr "" - #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "" -#: templates/web/base/auth/general.html:95 +#: templates/web/base/auth/general.html:105 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 "" @@ -1890,11 +1838,11 @@ msgstr "" msgid "Questionnaire %d sent for problem %d" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 msgid "Questionnaire filled in by problem reporter" msgstr "" -#: templates/web/base/alert/_list.html:22 templates/web/base/around/display_location.html:1 templates/web/base/around/display_location.html:3 templates/web/base/report/display_tools.html:34 templates/web/base/reports/_rss.html:1 templates/web/fixmystreet/alert/updates.html:9 +#: templates/web/base/alert/_list.html:22 templates/web/base/alert/updates.html:9 templates/web/base/around/display_location.html:1 templates/web/base/around/display_location.html:3 templates/web/base/report/display_tools.html:34 msgid "RSS feed" msgstr "" @@ -1918,15 +1866,11 @@ msgstr "" msgid "RSS feed of nearby problems" msgstr "" -#: templates/web/base/reports/_rss.html:1 -msgid "RSS feed of problems in this %s" -msgstr "" - -#: perllib/FixMyStreet/Cobrand/Default.pm:664 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 perllib/FixMyStreet/Cobrand/UK.pm:215 +#: perllib/FixMyStreet/Cobrand/Default.pm:664 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 perllib/FixMyStreet/Cobrand/UK.pm:221 +#: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "" @@ -1934,11 +1878,11 @@ msgstr "" msgid "RSS feed of recent local problems" msgstr "" -#: templates/web/base/report/display_tools.html:34 templates/web/fixmystreet/alert/updates.html:9 +#: templates/web/base/alert/updates.html:9 templates/web/base/report/display_tools.html:34 msgid "RSS feed of updates to this problem" msgstr "" -#: templates/web/base/alert/updates.html:9 templates/web/base/report/display_tools.html:36 templates/web/fixmystreet/alert/updates.html:14 +#: templates/web/base/alert/updates.html:14 templates/web/base/report/display_tools.html:36 msgid "Receive email when updates are left on this problem." msgstr "" @@ -1971,11 +1915,11 @@ msgstr "" msgid "Reply to user:" msgstr "" -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/header_logo.html:2 msgid "Report" msgstr "" -#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:26 templates/web/fixmystreet/header_logo.html:2 templates/web/zurich/footer.html:18 templates/web/zurich/nav_over_content.html:4 +#: templates/web/base/footer.html:26 templates/web/base/header_logo.html:2 templates/web/zurich/footer.html:18 templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "" @@ -1983,7 +1927,7 @@ msgstr "" msgid "Report abuse" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:291 +#: perllib/FixMyStreet/App/Controller/Rss.pm:297 msgid "Report on %s" msgstr "" @@ -1995,7 +1939,7 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 templates/web/base/contact/index.html:57 +#: perllib/FixMyStreet/DB/Result/Problem.pm:577 templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "" @@ -2003,7 +1947,7 @@ msgstr "" msgid "Reported before" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:596 templates/web/base/contact/index.html:59 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "" @@ -2015,27 +1959,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:569 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 msgid "Reported in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:591 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 msgid "Reported in the %s category by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported via %s anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported via %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:561 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 msgid "Reported via %s in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 msgid "Reported via %s in the %s category by %s at %s" msgstr "" @@ -2051,7 +1995,7 @@ msgstr "" msgid "Reporting a problem" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 perllib/FixMyStreet/Cobrand/Zurich.pm:384 templates/web/zurich/header.html:60 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1274 perllib/FixMyStreet/Cobrand/Zurich.pm:384 templates/web/zurich/header.html:60 msgid "Reports" msgstr "" @@ -2087,11 +2031,11 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 perllib/FixMyStreet/App/Controller/Admin.pm:1508 templates/web/base/admin/report_edit.html:90 templates/web/base/admin/update_edit.html:64 templates/web/zurich/admin/report_edit.html:116 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 perllib/FixMyStreet/App/Controller/Admin.pm:1496 templates/web/base/admin/report_edit.html:90 templates/web/base/admin/update_edit.html:64 templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 templates/web/base/admin/report_edit.html:91 templates/web/base/admin/update_edit.html:65 templates/web/zurich/admin/report_edit.html:117 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 templates/web/base/admin/report_edit.html:91 templates/web/base/admin/update_edit.html:65 templates/web/zurich/admin/report_edit.html:117 msgid "Rotate Right" msgstr "" @@ -2103,7 +2047,7 @@ msgstr "" msgid "Satellite" msgstr "" -#: templates/web/base/admin/body.html:208 templates/web/base/admin/category_edit.html:84 templates/web/zurich/admin/body.html:59 templates/web/zurich/admin/template_edit.html:29 +#: templates/web/base/admin/body.html:206 templates/web/base/admin/category_edit.html:84 templates/web/zurich/admin/body.html:59 templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" msgstr "" @@ -2151,7 +2095,7 @@ msgstr "" msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:696 +#: perllib/FixMyStreet/DB/Result/Problem.pm:698 msgid "Sent to %s %s later" msgstr "" @@ -2167,19 +2111,19 @@ msgstr "" msgid "Share" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:23 templates/web/base/report/new/form_user_loggedout_by_email.html:22 templates/web/base/report/update/form_name.html:15 +#: templates/web/base/report/new/form_user_loggedin.html:23 templates/web/base/report/new/form_user_loggedout_by_email.html:22 templates/web/base/report/update/form_name.html:16 msgid "Show my name publicly" msgstr "" -#: templates/web/base/around/display_location.html:67 +#: templates/web/base/around/display_location.html:66 msgid "Show old" msgstr "" -#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:57 msgid "Show pins" msgstr "" -#: templates/web/base/auth/general.html:100 templates/web/base/auth/general.html:3 templates/web/base/auth/general.html:76 templates/web/zurich/auth/general.html:18 templates/web/zurich/auth/general.html:35 +#: templates/web/base/auth/general.html:110 templates/web/base/auth/general.html:3 templates/web/base/auth/general.html:86 templates/web/zurich/auth/general.html:18 templates/web/zurich/auth/general.html:35 msgid "Sign in" msgstr "" @@ -2234,19 +2178,15 @@ msgstr "" msgid "Sorry, we could not parse that location. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:138 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 -msgid "Sorry, you can not log in with Facebook. Please try again later." -msgstr "" - #: templates/web/base/admin/stats.html:64 msgid "Start Date:" msgstr "" -#: templates/web/base/admin/body.html:69 templates/web/base/admin/flagged.html:18 templates/web/base/admin/list_updates.html:11 templates/web/base/admin/reports.html:15 templates/web/base/report/update/form_update.html:32 +#: templates/web/base/admin/body.html:69 templates/web/base/admin/flagged.html:18 templates/web/base/admin/list_updates.html:11 templates/web/base/admin/reports.html:15 templates/web/base/report/update/form_update.html:34 msgid "State" msgstr "" @@ -2254,7 +2194,7 @@ msgstr "" msgid "State:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 perllib/FixMyStreet/Cobrand/Zurich.pm:387 templates/web/base/admin/stats.html:1 templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 perllib/FixMyStreet/Cobrand/Zurich.pm:387 templates/web/base/admin/stats.html:1 templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 msgid "Stats" msgstr "" @@ -2286,7 +2226,7 @@ msgstr "" msgid "Subject:" msgstr "" -#: templates/web/base/questionnaire/creator_fixed.html:19 templates/web/base/report/new/form_user_loggedin.html:36 templates/web/base/report/new/form_user_loggedout_by_email.html:39 templates/web/base/report/new/form_user_loggedout_password.html:11 templates/web/zurich/report/new/fill_in_details_form.html:96 +#: templates/web/base/questionnaire/creator_fixed.html:19 templates/web/base/report/new/form_user_loggedin.html:34 templates/web/base/report/new/form_user_loggedout_by_email.html:39 templates/web/base/report/new/form_user_loggedout_password.html:11 templates/web/zurich/report/new/fill_in_details_form.html:98 msgid "Submit" msgstr "" @@ -2302,7 +2242,7 @@ msgstr "" msgid "Submitted" msgstr "" -#: templates/web/base/alert/updates.html:17 templates/web/base/report/display_tools.html:41 templates/web/fixmystreet/alert/updates.html:23 +#: templates/web/base/alert/updates.html:23 templates/web/base/report/display_tools.html:41 msgid "Subscribe" msgstr "" @@ -2310,7 +2250,7 @@ msgstr "" msgid "Subscribe me to an email alert" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 perllib/FixMyStreet/Cobrand/Zurich.pm:383 templates/web/base/admin/bodies.html:25 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:13 templates/web/zurich/header.html:57 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 perllib/FixMyStreet/Cobrand/Zurich.pm:383 templates/web/base/admin/bodies.html:25 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:13 templates/web/zurich/header.html:57 msgid "Summary" msgstr "" @@ -2318,7 +2258,7 @@ msgstr "" msgid "Summary reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 msgid "Survey" msgstr "" @@ -2370,7 +2310,7 @@ msgstr "" msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:157 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" @@ -2378,7 +2318,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:126 +#: perllib/FixMyStreet/App/Controller/Location.pm:127 msgid "That location does not appear to be in the UK; please try again." msgstr "" @@ -2386,11 +2326,11 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:724 +#: perllib/FixMyStreet/App/Controller/Admin.pm:722 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:716 +#: perllib/FixMyStreet/App/Controller/Admin.pm:714 msgid "That problem will now be resent." msgstr "" @@ -2402,7 +2342,7 @@ msgstr "" msgid "That report has been removed from FixMyStreet." msgstr "" -#: templates/web/base/admin/body.html:144 +#: templates/web/base/admin/body.html:142 msgid "" "The <strong>email address</strong> is the destination to which reports about this category will be sent. \n" " Other categories for this body may have the same email address." @@ -2526,7 +2466,7 @@ msgstr "" msgid "There was a problem showing this page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 perllib/FixMyStreet/App/Controller/Report/Update.pm:138 templates/web/base/auth/general.html:43 templates/web/zurich/auth/general.html:28 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:753 perllib/FixMyStreet/App/Controller/Report/Update.pm:138 templates/web/base/auth/general.html:53 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 "" @@ -2584,7 +2524,7 @@ msgstr "" 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:920 perllib/FixMyStreet/App/Controller/Report/New.pm:990 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 perllib/FixMyStreet/Cobrand/UK.pm:44 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:898 perllib/FixMyStreet/App/Controller/Report/New.pm:935 perllib/FixMyStreet/App/Controller/Report/New.pm:977 perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "" @@ -2596,11 +2536,11 @@ msgstr "" msgid "This is a summary of all reports on this site." msgstr "" -#: templates/web/base/report/update/form_update.html:52 +#: templates/web/base/report/update/form_update.html:54 msgid "This problem has been fixed" msgstr "" -#: templates/web/base/report/update/form_update.html:46 +#: templates/web/base/report/update/form_update.html:48 msgid "This problem has not been fixed" msgstr "" @@ -2632,7 +2572,7 @@ msgstr "" msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 templates/web/base/admin/timeline.html:1 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -2668,7 +2608,7 @@ msgstr "" msgid "Try emailing us directly:" msgstr "" -#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:12 templates/web/base/report/update/form_update.html:34 templates/web/base/report/update/form_update.html:37 +#: templates/web/base/admin/report_blocks.html:1 templates/web/base/admin/report_blocks.html:12 templates/web/base/report/update/form_update.html:36 templates/web/base/report/update/form_update.html:39 msgid "Unable to fix" msgstr "" @@ -2680,7 +2620,7 @@ msgstr "" msgid "Unknown" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:173 +#: perllib/FixMyStreet/App/Controller/Rss.pm:174 msgid "Unknown alert type" msgstr "" @@ -2692,7 +2632,7 @@ msgstr "" msgid "Unknown problem ID" msgstr "" -#: templates/web/base/report/update/form_update.html:25 +#: templates/web/base/report/update/form_update.html:27 msgid "Update" msgstr "" @@ -2740,7 +2680,7 @@ msgstr "" msgid "Updated" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 perllib/FixMyStreet/App/Controller/Admin.pm:1108 perllib/FixMyStreet/App/Controller/Admin.pm:1156 perllib/FixMyStreet/App/Controller/Admin.pm:821 perllib/FixMyStreet/Cobrand/Zurich.pm:771 perllib/FixMyStreet/Cobrand/Zurich.pm:796 perllib/FixMyStreet/Cobrand/Zurich.pm:866 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 perllib/FixMyStreet/App/Controller/Admin.pm:1096 perllib/FixMyStreet/App/Controller/Admin.pm:1144 perllib/FixMyStreet/App/Controller/Admin.pm:809 perllib/FixMyStreet/Cobrand/Zurich.pm:771 perllib/FixMyStreet/Cobrand/Zurich.pm:796 perllib/FixMyStreet/Cobrand/Zurich.pm:866 msgid "Updated!" msgstr "" @@ -2761,7 +2701,7 @@ msgstr "" msgid "Updates to this problem, %s" msgstr "" -#: templates/web/base/admin/body.html:182 +#: templates/web/base/admin/body.html:180 msgid "Use the <strong>note</strong> to record details that are only displayed in the admin. Notes are not shown publicly, and are not sent to the body." msgstr "" @@ -2769,11 +2709,11 @@ msgstr "" msgid "Used map" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1421 msgid "User flagged" msgstr "" @@ -2781,11 +2721,11 @@ msgstr "" msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 perllib/FixMyStreet/Cobrand/Zurich.pm:399 templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:69 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 perllib/FixMyStreet/Cobrand/Zurich.pm:399 templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:69 msgid "Users" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:382 perllib/FixMyStreet/App/Controller/Admin.pm:412 perllib/FixMyStreet/App/Controller/Admin.pm:429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:380 perllib/FixMyStreet/App/Controller/Admin.pm:410 perllib/FixMyStreet/App/Controller/Admin.pm:427 msgid "Values updated" msgstr "" @@ -2821,7 +2761,7 @@ msgstr "" msgid "We never show your email" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:31 templates/web/base/report/new/form_user_loggedout_by_email.html:28 +#: templates/web/base/report/new/form_user_loggedin.html:30 templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "" @@ -2829,7 +2769,7 @@ msgstr "" 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 "" -#: templates/web/base/index-steps.html:31 +#: templates/web/base/index-steps.html:11 msgid "We send it to the council on your behalf" msgstr "" @@ -2865,10 +2805,6 @@ msgstr "" msgid "Whoa there Testino! Three photos are enough." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 -msgid "Whole block of empty flats" -msgstr "" - #: templates/web/base/tokens/confirm_alert.html:7 msgid "Why stop there? <a href=\"/alert\">Set up more alerts</a> for free." msgstr "" @@ -2885,7 +2821,7 @@ msgstr "" msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "" -#: templates/web/base/questionnaire/index.html:96 +#: templates/web/base/questionnaire/index.html:97 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "" @@ -2901,7 +2837,7 @@ msgstr "" msgid "Year" msgstr "" -#: templates/web/base/admin/bodies.html:66 templates/web/base/admin/body.html:80 templates/web/base/admin/body.html:82 templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 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:58 templates/web/base/admin/report_edit.html:75 templates/web/base/admin/update_edit.html:24 templates/web/base/admin/users.html:31 templates/web/base/questionnaire/creator_fixed.html:14 templates/web/base/questionnaire/index.html:51 templates/web/base/questionnaire/index.html:99 +#: templates/web/base/admin/bodies.html:66 templates/web/base/admin/body.html:80 templates/web/base/admin/body.html:82 templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 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:58 templates/web/base/admin/report_edit.html:75 templates/web/base/admin/update_edit.html:24 templates/web/base/admin/users.html:31 templates/web/base/questionnaire/creator_fixed.html:14 templates/web/base/questionnaire/index.html:100 templates/web/base/questionnaire/index.html:51 msgid "Yes" msgstr "" @@ -3003,11 +2939,11 @@ msgstr "" msgid "Your Reports" msgstr "" -#: templates/web/base/alert/_list.html:89 templates/web/base/contact/index.html:83 templates/web/base/report/display_tools.html:38 templates/web/base/report/display_tools.html:40 templates/web/base/report/new/form_user_loggedin.html:3 templates/web/base/report/new/form_user_loggedout_email.html:1 templates/web/base/report/update/form_user_loggedout_email.html:1 templates/web/fixmystreet/alert/updates.html:19 templates/web/fixmystreet/alert/updates.html:22 templates/web/zurich/report/new/fill_in_details_form.html:76 +#: templates/web/base/alert/_list.html:89 templates/web/base/alert/updates.html:19 templates/web/base/alert/updates.html:22 templates/web/base/contact/index.html:83 templates/web/base/report/display_tools.html:38 templates/web/base/report/display_tools.html:40 templates/web/base/report/new/form_user_loggedin.html:3 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:78 msgid "Your email" msgstr "" -#: templates/web/base/auth/general.html:45 templates/web/base/report/update/form_user_loggedout_email.html:7 templates/web/zurich/auth/general.html:30 templates/web/zurich/auth/general.html:58 +#: templates/web/base/auth/general.html:55 templates/web/base/report/update/form_user_loggedout_email.html:7 templates/web/zurich/auth/general.html:30 templates/web/zurich/auth/general.html:58 msgid "Your email address" msgstr "" @@ -3015,11 +2951,11 @@ msgstr "" msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "" -#: templates/web/base/auth/general.html:90 templates/web/base/contact/index.html:76 templates/web/base/report/new/form_user_loggedin.html:18 templates/web/base/report/new/form_user_loggedout_by_email.html:17 templates/web/base/report/update/form_name.html:11 templates/web/zurich/auth/general.html:61 templates/web/zurich/report/new/fill_in_details_form.html:86 +#: templates/web/base/auth/general.html:100 templates/web/base/contact/index.html:76 templates/web/base/report/new/form_user_loggedin.html:18 templates/web/base/report/new/form_user_loggedout_by_email.html:17 templates/web/base/report/update/form_name.html:12 templates/web/zurich/auth/general.html:61 templates/web/zurich/report/new/fill_in_details_form.html:88 msgid "Your name" msgstr "" -#: templates/web/base/auth/general.html:75 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:85 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 "" @@ -3027,7 +2963,7 @@ msgstr "" msgid "Your password has been changed" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:27 templates/web/base/report/new/form_user_loggedout_by_email.html:26 templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/base/report/new/form_user_loggedin.html:27 templates/web/base/report/new/form_user_loggedout_by_email.html:26 templates/web/zurich/report/new/fill_in_details_form.html:94 msgid "Your phone number" msgstr "" @@ -3035,11 +2971,11 @@ msgstr "" msgid "Your report" msgstr "" -#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 +#: templates/web/base/footer.html:29 msgid "Your reports" msgstr "" -#: templates/web/base/my/my.html:41 +#: templates/web/base/my/my.html:39 msgid "Your updates" msgstr "" @@ -3063,7 +2999,7 @@ msgstr "" msgid "didn't use map" msgstr "" -#: templates/web/base/alert/index.html:33 templates/web/base/around/postcode_form.html:15 +#: templates/web/base/alert/index.html:33 templates/web/base/around/postcode_form.html:12 msgid "e.g. ‘%s’ or ‘%s’" msgstr "" @@ -3151,7 +3087,7 @@ msgstr "" msgid "reopened" msgstr "" -#: templates/web/base/header.html:33 templates/web/fixmystreet/header.html:64 templates/web/zurich/footer.html:13 +#: templates/web/base/header.html:64 templates/web/zurich/footer.html:13 msgid "sign out" msgstr "" @@ -3226,7 +3162,7 @@ msgid_plural "<big>%s</big> updates on reports" msgstr[0] "" msgstr[1] "" -#: templates/web/emptyhomes/report/new/councils_text_none.html:3 +#: templates/web/base/report/new/councils_text_none.html:3 #, perl-format msgid "We do not yet have details for the council that covers this location." msgid_plural "We do not yet have details for the councils that cover this location." diff --git a/locale/ar.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/ar.UTF-8/LC_MESSAGES/FixMyStreet.po index a727fd0bf..6af9a22a6 100644 --- a/locale/ar.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/ar.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -6,16 +6,16 @@ # Translators: # Abdullah Aldebas <demo@adebas.net>, 2015 # AR C2 <e2f458fd4s512@outlook.com>, 2015 -# Khaled Saleem Baleesh <Kbaleesh@gmail.com>, 2015 +# Khaled Saleem Baleesh <Kbaleesh@gmail.com>, 2015-2016 # Omar Duhaiby <3omarz@gmail.com>, 2015 # Turki Alhajjaji <thugrh@gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2016-03-02 13:09+0000\n" -"PO-Revision-Date: 2015-11-25 14:17+0000\n" -"Last-Translator: AR C2 <e2f458fd4s512@outlook.com>\n" +"POT-Creation-Date: 2016-05-03 10:41+0100\n" +"PO-Revision-Date: 2016-04-13 19:08+0000\n" +"Last-Translator: Khaled Saleem Baleesh <Kbaleesh@gmail.com>\n" "Language-Team: Arabic (http://www.transifex.com/mysociety/fixmystreet/language/ar/)\n" "Language: ar\n" "MIME-Version: 1.0\n" @@ -23,7 +23,7 @@ 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:616 +#: perllib/FixMyStreet/DB/Result/Problem.pm:618 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr "Ùˆ" @@ -56,9 +56,8 @@ msgid "%s admin:" msgstr "مسؤول %s:" #: templates/web/base/status/stats.html:26 -#, fuzzy msgid "%s bodies" -msgstr "الهيئات" +msgstr "%s الهيئات" #: templates/web/base/status/stats.html:24 msgid "%s confirmed alerts, %s unconfirmed" @@ -67,7 +66,7 @@ msgstr "%s تنبيهات مؤكدة ØŒ %s غير مؤكدة" #: templates/web/base/status/stats.html:27 #: templates/web/zurich/admin/index.html:6 msgid "%s council contacts – %s confirmed, %s unconfirmed" -msgstr "%s معلومات الاتصال – %s مؤكدة, %s غير مؤكدة" +msgstr "%s معلومات اتصال المجلس – %s مؤكدة, %s غير مؤكدة" #. ("%s is the site name") #: templates/web/base/alert/index.html:7 @@ -77,7 +76,7 @@ msgid "" "problems within a certain distance of a particular location." msgstr "" "%s لديه مجموعة متنوعة من مواجز RSS وتنبيهات البريد الإلكتروني\n" -"لمشكلات Ù…Øلية، تشمل تنبيهات لكل المشكلات الواقعة بدائرة معينة، أو كل\n" +"للمشكلات المØلية، تشمل تنبيهات لكل المشكلات الواقعة بدائرة معينة، أو كل\n" "المشكلات الواقعة ضمن مساÙØ© معينة من موقع معين." #. ("%s is the site name") @@ -87,8 +86,8 @@ msgid "" "alerts for all problems within a particular ward or council, or all problems\n" "within a certain distance of a particular location." msgstr "" -"%s لديه مجموعة متنوعة من مواجز RSS وتنبيهات البريد الإلكتروني لمشكلات Ù…Øلية، تشمل\n" -"تنبيهات لكل المشكلات الواقعة بدائرة معينة أو مجلس معين، أو كل المشكلات\n" +"%s لديه مجموعة متنوعة من مواجز RSS وتنبيهات البريد الإلكتروني للمشكلات المØلية، تشمل\n" +"تنبيهات لكل المشكلات الواقعة بدائرة أو مجلس معين، أو كل المشكلات\n" "الواقعة ضمن مساÙØ© معينة من موقع معين." #: templates/web/base/status/stats.html:23 @@ -99,9 +98,9 @@ msgstr "%s تØديثات مباشرة" msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "%s الأسئلة المرسلة – %s المجابة (%s%%)" -#: perllib/FixMyStreet/DB/Result/Problem.pm:683 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "%s ref: %s" -msgstr "مرجع %s: %s" +msgstr "مرجع: %s" #. ("%s is the site name") #: templates/web/base/alert/_list.html:73 @@ -124,10 +123,6 @@ msgstr "" msgid "%s ward, %s" msgstr "دائرة %sØŒ %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:552 -msgid "%s, reported at %s" -msgstr "%s, تم التقرير إلى %s" - #: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "%sØŒ ضمن دائرة %s" @@ -182,7 +177,7 @@ msgstr "( مثل الكتابة على الجدران ØŒ رمي النÙايات msgid "(not sent to council)" msgstr "(لم ترسل الى الجهة المسئولة)" -#: templates/web/zurich/report/new/fill_in_details_form.html:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "(optional)" msgstr "(إختياري)" @@ -194,12 +189,11 @@ msgstr "(عام)" msgid "(sent to both)" msgstr "(أرسل لكليهما)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "--إختر تصنيÙ--" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- إختر نوع العقار--" @@ -234,26 +228,21 @@ msgstr "<strong>لا</strong> دعني أؤكّد بلاغي بالبريد" msgid "<strong>No</strong> Let me confirm my update by email" msgstr "<strong>لا</strong> دعني أؤكّد تØديثي بالبريد" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:97 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>لا</strong> دعني أسجّل دخولي بالبريد" -#: templates/web/base/auth/general.html:70 +#: templates/web/base/auth/general.html:80 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>نعم</strong> لدي كلمة المرور" -#: templates/web/base/about/about-en-gb.html:1 -#: templates/web/base/about/about-en-gb.html:3 -msgid "About us" -msgstr "نبذة عنا" - #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Action Scheduled" msgstr "نشاط تم جدولته" @@ -287,7 +276,7 @@ msgstr "أض٠تصنيÙاً" msgid "Add user" msgstr "إضاÙØ© مستخدم" -#: templates/web/base/my/my.html:56 +#: templates/web/base/my/my.html:54 msgid "Added %s" msgstr "Ø£Ùضي٠%s" @@ -307,7 +296,7 @@ msgstr "تØذير %d أنشيء لـ %sØŒ نوع %sØŒ معاملات %s \\ %s" msgid "Alert %d disabled (created %s)" msgstr "التØذير %d ألغي تÙعيله (أنشيء %s)" -#: templates/web/base/report/update/form_name.html:20 +#: templates/web/base/report/update/form_name.html:21 msgid "Alert me to future updates" msgstr "نبهني بأØدث المستجدات" @@ -320,7 +309,7 @@ msgstr "كل التقرير" msgid "All Reports as CSV" msgstr "جميع التقارير بتنسيق CSV" -#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 +#: templates/web/base/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:20 @@ -364,7 +353,7 @@ msgstr "هل انت مطور ØŸ" #: templates/web/base/js/translation_strings.html:52 msgid "Are you sure you want to cancel this upload?" -msgstr "" +msgstr "هل أنت متأكد أنك تريد إلغاء الرÙع؟" #: templates/web/base/admin/body-form.html:69 #: templates/web/base/admin/body.html:16 @@ -419,7 +408,7 @@ msgstr "الخلÙ" msgid "Ban email address" msgstr "Øظر البريد الإلكتروني" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1273 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -450,7 +439,7 @@ msgstr "لا يمكنك رؤية الخريطة؟ <em>تجاوز هذه الخط #: templates/web/base/admin/body.html:68 #: templates/web/base/admin/index.html:54 -#: templates/web/base/report/new/category.html:10 +#: templates/web/base/report/new/category.html:7 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 @@ -465,7 +454,7 @@ msgstr "تصنيÙ" msgid "Category fix rate for problems > 4 weeks old" msgstr "معدل إصلاØات الÙئة للمشكلات التي مضى عليها أكثر من 4 أسابيع" -#: templates/web/base/admin/body.html:138 +#: templates/web/base/admin/body.html:137 #: templates/web/base/admin/category_edit.html:23 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/admin/body.html:43 @@ -485,7 +474,7 @@ msgstr "تصنيÙ: %s" msgid "Change password" msgstr "تغيير كلمة المرور" -#: templates/web/base/admin/body.html:160 +#: templates/web/base/admin/body.html:158 msgid "" "Check <strong>confirmed</strong> to indicate that this contact has been confirmed as correct.\n" " If you are not sure of the origin or validity of the contact, leave this unchecked." @@ -493,7 +482,7 @@ msgstr "" "Øدد <strong>تم تأكيده</strong> للإشارة أن عنوان الإتصال هذا قد تم تأكيده.\n" "إذا لم تكن متأكدأ من مصدر أو صلاØية عنوان الإتصال, اترك هذ الخيار بل تØديد." -#: templates/web/base/admin/body.html:171 +#: templates/web/base/admin/body.html:169 msgid "" "Check <strong>deleted</strong> to remove the category from use. \n" " It will not appear as an available category in the drop-down menu on the report-a-problem page." @@ -501,7 +490,7 @@ msgstr "" "Øدد <strong>Ù…ØذوÙ</strong> Ù„Øذ٠هذا التصنيÙ.\n" "هذ التصني٠لن يكون متوÙرا ÙÙŠ القائمة المنسدلة ÙÙŠ صÙØØ© إبلاغ-عن-مشكلة." -#: templates/web/base/admin/body.html:191 +#: templates/web/base/admin/body.html:189 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -517,7 +506,7 @@ msgstr "" "لتعرض كبلاغ. ÙÙŠ المملكة المتØدة، نستخدمها للخدمات مثل طلب Øاوية Ù†Ùايات\n" "إضاÙية لعنوان Ù…Øدد." -#: templates/web/base/admin/body.html:130 +#: templates/web/base/admin/body.html:129 msgid "" "Choose a <strong>category</strong> 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." @@ -560,8 +549,8 @@ msgstr "انقر Ùوق الارتباط المرÙÙ‚ ÙÙŠ رسالة البري #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:15 #: templates/web/base/admin/report_blocks.html:25 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 @@ -570,7 +559,7 @@ msgstr "انقر Ùوق الارتباط المرÙÙ‚ ÙÙŠ رسالة البري msgid "Closed" msgstr "مغلق" -#: perllib/FixMyStreet/DB/Result/Problem.pm:779 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Closed by council" msgstr "مغلق من الجهة المسئولة" @@ -596,7 +585,7 @@ msgstr "بيانات العلامة التجارية المشتركة:" msgid "Cobrand:" msgstr "علامة تجارية مشتركة:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "إعدادت" @@ -615,9 +604,8 @@ msgstr "أكد الØساب" #: templates/web/base/report/new/form_user_loggedout_password.html:21 #: templates/web/base/report/update/form_user_loggedout_password.html:20 -#, fuzzy msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." -msgstr "الرجاء التأكيد عبر البريد الإلكتروني أدناه، كما يرجى تقديم كلمة مرور جديدة عند هذه النقطة. بعد التأكيد، سيتم تØديث كلمة المرور." +msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:1 #: templates/web/base/tokens/confirm_problem.html:1 @@ -627,7 +615,7 @@ msgstr "الرجاء التأكيد عبر البريد الإلكتروني Ø£Ø msgid "Confirmation" msgstr "تأكيد" -#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:164 #: templates/web/base/admin/body.html:79 #: templates/web/base/admin/category_edit.html:37 #: templates/web/base/admin/category_edit.html:92 @@ -646,7 +634,7 @@ msgid "Confirmed:" msgstr "مؤكد:" #. ("%s is the site name") -#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 +#: templates/web/base/about/_sidebar.html:6 msgid "Contact %s" msgstr "اتصل بـ %s" @@ -665,8 +653,8 @@ msgstr "اتصل بÙريق العمل" msgid "Coordinates:" msgstr "الإØداثيات:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1417 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1445 msgid "Could not find user" msgstr "لم يتمكن من إيجاد المستخدم" @@ -684,7 +672,7 @@ msgstr "المجلس" msgid "Council contacts for %s" msgstr "جهات اتصال المجلس لـ %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:681 +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "Council ref: %s" msgstr "مرجع المجلس: %s" @@ -703,7 +691,7 @@ msgstr "العدد" msgid "Create a report" msgstr "انشئ بلاغ" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "انشء تصنيÙ" @@ -747,20 +735,20 @@ msgstr "صÙØØ© المستخدم" msgid "Dealt with by subdivision within 5 working days" msgstr "تم التعامل بواسطة القسم الÙرعي ÙÙŠ غضون 5 أيام عمل" -#: perllib/FixMyStreet/App/Controller/Admin.pm:877 +#: perllib/FixMyStreet/App/Controller/Admin.pm:865 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "Øذ٠القالب" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:175 #: templates/web/base/admin/body.html:81 #: templates/web/base/admin/category_edit.html:42 #: templates/web/base/admin/category_edit.html:93 msgid "Deleted" msgstr "Ù…ØذوÙ" -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:47 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -768,7 +756,7 @@ msgid "Description" msgstr "الوصÙ" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:68 +#: templates/web/zurich/report/new/fill_in_details_form.html:70 msgid "Details" msgstr "التÙاصيل" @@ -793,11 +781,11 @@ msgid "Diligency prize league table" msgstr "جدول رابطة جائزة العناية بالدقة" #. ("%s is the site name") -#: templates/web/base/auth/general.html:48 -#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/auth/general.html:58 +#: templates/web/base/report/new/form_user_loggedout.html:28 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout.html:17 +#: templates/web/base/report/update/form_user_loggedout.html:27 msgid "Do you have a %s password?" msgstr "هل لديك كلمة مرور %sØŸ" @@ -811,12 +799,12 @@ msgstr "هل تØب النماذج؟" #: templates/web/base/js/translation_strings.html:51 msgid "Drag and drop photos here or <u>click to upload</u>" -msgstr "" +msgstr "اسØب الصور واسقطها هنا أو <u>انقر للرÙع</u>" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "Duplicate" msgstr "مكرر" @@ -839,7 +827,7 @@ msgstr "" msgid "Edit" msgstr "تعديل" -#: templates/web/base/admin/body.html:220 +#: templates/web/base/admin/body.html:218 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "تعديل تÙاصيل الجهة المسئولة" @@ -869,7 +857,7 @@ msgstr "المØرر" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:39 +#: templates/web/base/auth/general.html:49 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -877,11 +865,11 @@ msgstr "المØرر" msgid "Email" msgstr "البريد الإلكتروني" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 msgid "Email added to abuse list" msgstr "البريد أضي٠إلى لائØØ© المسيئين" -#: templates/web/base/admin/body.html:155 +#: templates/web/base/admin/body.html:153 msgid "Email address:" msgstr "عنوان البريد الإلكتروني:" @@ -893,19 +881,14 @@ msgstr "تم إنشاء الإخطار بالبريد" msgid "Email alert deleted" msgstr "تم Øذ٠الإخطار بالبريد" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1390 msgid "Email already in abuse list" msgstr "البريد موجودا سابقا ÙÙŠ لائØØ© المسيئين" -#: templates/web/base/around/_updates.html:5 -msgid "Email me new local problems" -msgstr "راسلني عن المشاكل المØلية الجديدة" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 -#: templates/web/base/alert/updates.html:13 #: templates/web/zurich/admin/body.html:47 msgid "Email:" msgstr "البريد الإلكتروني:" @@ -914,26 +897,6 @@ msgstr "البريد الإلكتروني:" msgid "Email: %s" msgstr "البريد الإلكتروني: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 -msgid "Empty flat or maisonette" -msgstr "شقة أو ÙˆØدة سكنية Ùارغة" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 -msgid "Empty house or bungalow" -msgstr "منزل أو بنغَل Ùارغ" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 -msgid "Empty office or other commercial" -msgstr "مكتب أو عقار تجاري مهجور" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 -msgid "Empty pub or bar" -msgstr "Øانة مهجورة" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 -msgid "Empty public building - school, hospital, etc." -msgstr "مبنى عام مهجور - مدرسة، مستشÙى، إلخ." - #: templates/web/base/admin/body-form.html:162 #: templates/web/base/admin/body-form.html:163 msgid "" @@ -984,18 +947,14 @@ msgstr "أدخل أقرب صندوق بريد، أو اسم الشارع ÙˆØ§Ù„Ø msgid "Enter a nearby street name and area" msgstr "أدخل أقرب اسم شارع ÙˆØÙŠ" -#: perllib/FixMyStreet/Cobrand/ZeroTB.pm:7 -msgid "Enter a nearby street name and area, postal code or district in Delhi" -msgstr "أدخل أقرب اسم شارع ÙˆØÙŠ أو صندوق بريد أو منطقة ÙÙŠ دلهي" - -#: templates/web/base/auth/general.html:99 +#: templates/web/base/auth/general.html:109 #: templates/web/base/report/new/form_user_loggedout_by_email.html:38 #: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "أدخل كلمة المرور:" -#: templates/web/base/index-steps.html:26 +#: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "أدخل تÙاصيل البلاغ" @@ -1021,7 +980,7 @@ msgstr "مثال لصندوق البريد %s" msgid "Examples:" msgstr "أمثلة:" -#: templates/web/base/report/new/form_report.html:49 +#: templates/web/base/report/new/form_report.html:51 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "Ø£Ø´Ø±Ø Ù…Ø§ الخطأ، وبالضبط أين هو، وكم من المدة وهو هناك..." @@ -1058,19 +1017,15 @@ msgstr "أول مرة" msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." msgstr "يمكن Ø¥ØµÙ„Ø§Ø Ø°Ù„Ùƒ عن طريق اختيار <strong>منطقة التغطية</strong> ÙÙŠ نموذج <em>تØرير تÙاصيل الهيئة</em> بالأسÙÙ„." -#: templates/web/base/header.html:26 -msgid "FixMyStreet" -msgstr "Ø£ØµÙ„Ø Ø´Ø§Ø±Ø¹ÙŠ" - #: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:38 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:40 msgid "Fixed" msgstr "تم الإصلاØ" @@ -1097,7 +1052,7 @@ msgstr "مشار كمØذوÙ" msgid "Flag user" msgstr "مستخدم مشار إليه" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "مشار إليهم" @@ -1119,8 +1074,7 @@ msgstr "المستخدمين المشار إليهم غير Ù…Øظورين بأ٠msgid "Flagged:" msgstr "مشار إليه:" -#: templates/web/base/reports/_ward-list.html:3 -#: templates/web/fixmystreet/reports/_ward-list.html:4 +#: templates/web/base/reports/_ward-list.html:4 msgid "Follow a ward link to view only reports within that ward." msgstr "اتبع ارتباط الدائرة لعرض التقارير الواقعة ضمن تلك الدائرة Ùقط." @@ -1151,18 +1105,18 @@ msgstr "الأسئلة الشائعة" msgid "GeoRSS on Google Maps" msgstr "موجز GeoRSS على خرائط Google" +#: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:11 -#: templates/web/fixmystreet/around/_updates.html:3 msgid "Get updates" msgstr "اØصل على التØديثات" -#: templates/web/fixmystreet/reports/_rss.html:3 -#: templates/web/fixmystreet/reports/_rss.html:9 +#: templates/web/base/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:9 msgid "Get updates of %s problems" msgstr "اØصل على التØديثات لـ %s من المشاكل" -#: templates/web/fixmystreet/reports/_rss.html:11 -#: templates/web/fixmystreet/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:11 +#: templates/web/base/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "اØصل على التØديثات للمشاكل ÙÙŠ هذه %s" @@ -1175,7 +1129,7 @@ msgid "Glad to hear it’s been fixed!" msgstr "سعيد لسماع أنها أصلØت!" #: templates/web/base/alert/index.html:34 -#: templates/web/base/around/postcode_form.html:16 +#: templates/web/base/around/postcode_form.html:13 #: templates/web/base/reports/_list-filters.html:28 #: templates/web/zurich/admin/stats.html:26 msgid "Go" @@ -1201,7 +1155,7 @@ msgstr "هل أصلØت هذه المشكلة؟" msgid "Have you ever reported a problem to a council before, or is this your first time?" msgstr "هل أبلغت عن مشكلة لأØد المجالس من قبل، أم هذه هي المرة الأولى؟" -#: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:38 +#: templates/web/base/footer.html:38 #: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 @@ -1212,8 +1166,7 @@ msgstr "المساعدة" msgid "Here are the types of local problem alerts for ‘%s’." msgstr "هذه أنواع التØذيرات للمشاكل المØلية ‘%s’." -#: templates/web/base/header.html:32 templates/web/fixmystreet/header.html:63 -#: templates/web/zurich/footer.html:12 +#: templates/web/base/header.html:63 templates/web/zurich/footer.html:12 msgid "Hi %s" msgstr "مرØبا %s" @@ -1229,11 +1182,11 @@ msgstr "مرØبا %s" msgid "Hidden" msgstr "مخÙÙŠ" -#: templates/web/base/around/display_location.html:65 +#: templates/web/base/around/display_location.html:64 msgid "Hide old" msgstr "أخÙÙŠ القديم" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:59 msgid "Hide pins" msgstr "أخÙÙŠ المثبتة" @@ -1253,10 +1206,6 @@ msgstr "كي٠تبلغ عن مشكلة" msgid "How to send successful reports" msgstr "كي٠ترسل بلاغات ناجØØ©" -#: perllib/FixMyStreet/App/Controller/Admin.pm:752 -msgid "I am afraid you cannot confirm unconfirmed reports." -msgstr "آس٠لايمكنك تأكيد البلاغات الغير مؤكدة." - #: templates/web/base/tokens/confirm_problem.html:23 #: templates/web/base/tokens/confirm_problem.html:27 msgid "I just reported a problem on @fixmystreet" @@ -1267,7 +1216,7 @@ msgstr "لقد أبلغت الآن عن مشكلة على @fixmystreet" msgid "I just updated a problem on @fixmystreet" msgstr "لقد Øدثت الآن مشكلة على @fixmystreet" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88 msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "نعتذر لك لم نستطع تØديد مشكلتك ÙÙŠ قاعدة البيانات.\n" @@ -1291,7 +1240,7 @@ msgstr "" "الرجاء تØديد <strong>عنصر رئيسي</strong> إذا كانت هذه الهيئة Ù†Ùسها جزءًا من هيئة أخرى.\n" " Ùيما يتعلق بالأنظمة الأساسية المثبتة، Ùإنك لا تØتاج إلى ضم الهيئات بهذه الطريقة." -#: templates/web/base/admin/body.html:133 +#: templates/web/base/admin/body.html:132 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." @@ -1316,7 +1265,7 @@ msgstr "" "إذا كنت ترغب ÙÙŠ ترك تØديث عام عن المشكلة، Ùالرجاء إدخاله هنا\n" "(الرجاء ملاØظة أنه لن ÙŠÙرسل إلى المجلس)." -#: templates/web/base/admin/body.html:149 +#: templates/web/base/admin/body.html:147 msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." msgstr "إذا كنت تستخدم <strong>أسلوب إرسال غير البريد الإلكتروني</strong>ØŒ Ùأدخل معر٠الخدمة (Open311) أو المعر٠المقابل له هنا." @@ -1359,10 +1308,10 @@ msgstr "معر٠غير صالØ" msgid "Illegal feed selection" msgstr "اختيار موجز غير صالØ" +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "In Progress" msgstr "قيد التقدم" @@ -1413,7 +1362,7 @@ msgstr "Ø¥Øالة داخلية" msgid "Invalid agency_responsible value %s" msgstr "قيمة agency_responsible غير صالØØ© %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 msgid "Invalid end date" msgstr "تاريخ نهاية غير صالØ" @@ -1421,16 +1370,16 @@ msgstr "تاريخ نهاية غير صالØ" msgid "Invalid format %s specified." msgstr "التنسيق المØدد %s غير صالØ." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 msgid "Invalid start date" msgstr "تاريخ البداية غير صالØ" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:5 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Investigating" msgstr "جار٠التØقق" @@ -1452,7 +1401,7 @@ msgstr "الصلاØية القضائية غير معروÙØ©" msgid "Jurisdiction unknown" msgstr "الصلاØية القضائية غير معروÙØ©" -#: templates/web/base/auth/general.html:80 +#: 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 @@ -1490,7 +1439,6 @@ msgstr "جار٠التØميل..." #: 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/fixmystreet/alert/updates.html:1 msgid "Local RSS feeds and email alerts" msgstr "مواجز RSS وتنبيهات البريد الإلكتروني المØلية" @@ -1499,11 +1447,11 @@ msgstr "مواجز RSS وتنبيهات البريد الإلكتروني الم msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "مواجز RSS وتنبيهات البريد الإلكتروني المØلية لـ ’%s‘" -#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:35 +#: templates/web/base/footer.html:35 msgid "Local alerts" msgstr "التنبيهات المØلية" -#: templates/web/base/index-steps.html:25 +#: templates/web/base/index-steps.html:5 msgid "Locate the problem on a map of the area" msgstr "تØديد موقع المشكلة على خريطة المنطقة" @@ -1563,14 +1511,14 @@ msgstr "الشهر" #: templates/web/base/admin/list_updates.html:7 #: templates/web/base/admin/reports.html:13 #: templates/web/base/admin/users.html:15 -#: templates/web/base/auth/general.html:89 +#: templates/web/base/auth/general.html:99 #: templates/web/base/report/new/form_user_loggedin.html:9 #: templates/web/base/report/new/form_user_loggedout_by_email.html:7 -#: templates/web/base/report/update/form_name.html:4 +#: templates/web/base/report/update/form_name.html:5 #: templates/web/base/reports/index.html:20 #: 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:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "Name" msgstr "الاسم" @@ -1594,8 +1542,8 @@ msgstr "أقرب طريق مسمى للدبوس الموضوع على الخري msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "أقرب رمز بريدي للدبوس الموضوع على الخريطة (يتم إنشاؤه تلقائيًا): %s (على بعد %s متر)" -#: perllib/FixMyStreet/Cobrand/Default.pm:455 -#: perllib/FixMyStreet/Cobrand/Default.pm:495 +#: perllib/FixMyStreet/Cobrand/Default.pm:454 +#: perllib/FixMyStreet/Cobrand/Default.pm:494 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "أقرب شارع مسمى للدبوس الموضوع على الخريطة (يتم إنشاؤه تلقائيًا باستخدام خرائط Bing): %s" @@ -1617,7 +1565,7 @@ msgstr "المشكلات <br>الجديدة" msgid "New body added" msgstr "تمت إضاÙØ© هيئة جديدة" -#: perllib/FixMyStreet/App/Controller/Admin.pm:387 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 msgid "New category contact added" msgstr "تمت إضاÙØ© جهة اتصال جديدة للÙئة" @@ -1682,7 +1630,7 @@ msgstr "التالي" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 -#: templates/web/base/questionnaire/index.html:101 +#: templates/web/base/questionnaire/index.html:102 #: templates/web/base/questionnaire/index.html:53 msgid "No" msgstr "لا" @@ -1753,8 +1701,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Not Responsible" msgstr "غير مسؤول" @@ -1787,7 +1735,7 @@ 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 "لاØظ أنه عند تضمين التقارير غير المؤكدة Ùإننا نستخدم تاريخ إنشاء التقرير والذي قد لا يكون ÙÙŠ Ù†Ùس شهر تأكيد التقرير، لذلك قد تتغير الأرقام قليلاً." -#: templates/web/base/admin/body.html:186 +#: templates/web/base/admin/body.html:184 #: templates/web/base/admin/category_edit.html:52 #: templates/web/zurich/admin/body.html:53 msgid "Note:" @@ -1801,15 +1749,15 @@ msgstr "ملاØظة: <strong>%s</strong>" msgid "Notes from SDM to DM" msgstr "ملاØظات من رئيس المنطقة الÙرعية لرئيس المنطقة:" -#: templates/web/base/report/new/form_user_loggedout.html:14 #: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/form_user_loggedout.html:24 #: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "الآن Øان وقت تقديم التقرير…" #: templates/web/base/report/update-form.html:28 -#: templates/web/base/report/update/form_user_loggedout.html:13 #: templates/web/base/report/update/form_user_loggedout.html:2 +#: templates/web/base/report/update/form_user_loggedout.html:23 msgid "Now to submit your update…" msgstr "الآن Øان وقت تقديم التØديث…" @@ -1843,8 +1791,8 @@ msgstr "ملخص من سطر واØد" #: templates/web/base/admin/report_blocks.html:23 #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/report/update/form_update.html:36 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1879,13 +1827,13 @@ msgstr "أو المشكلات المبلغ عنها إلى:" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "أو يمكنك الاشتراك للØصول على تنبيه تبعًا للإدارة أو المجلس الذي تتبعه:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1055 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 -#: perllib/FixMyStreet/DB/Result/Problem.pm:558 -#: perllib/FixMyStreet/DB/Result/Problem.pm:568 -#: perllib/FixMyStreet/DB/Result/Problem.pm:578 -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1044 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:659 +#: perllib/FixMyStreet/DB/Result/Problem.pm:562 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 +#: perllib/FixMyStreet/DB/Result/Problem.pm:582 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 #: perllib/FixMyStreet/Script/Reports.pm:175 #: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" @@ -1910,7 +1858,7 @@ msgstr "العنصر الرئيسي" msgid "Partial" msgstr "جزئي" -#: templates/web/base/auth/general.html:92 +#: templates/web/base/auth/general.html:102 #: templates/web/base/report/new/form_user_loggedout_by_email.html:31 #: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 @@ -1919,7 +1867,7 @@ msgid "Password (optional)" msgstr "كلمة المرور (اختياري)" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:72 +#: templates/web/base/auth/general.html:82 msgid "Password:" msgstr "كلمة المرور:" @@ -1927,7 +1875,7 @@ msgstr "كلمة المرور:" msgid "Permalink" msgstr "الارتباط الثابت" -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:90 msgid "Phone number" msgstr "رقم الهاتÙ" @@ -1943,13 +1891,21 @@ msgid "Phone:" msgstr "الهاتÙ:" #: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/questionnaire/index.html:89 +#: templates/web/base/questionnaire/index.html:91 #: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/new/form_report.html:38 +#: templates/web/base/report/new/form_report.html:40 +#: templates/web/base/report/update/form_update.html:20 +#: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:6 #: 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:45 +#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/zurich/report/new/fill_in_details_form.html:63 msgid "Photo" msgstr "الصورة" @@ -1973,8 +1929,8 @@ msgstr "وضع دبوس على الخريطة" #: perllib/FixMyStreet/Cobrand/Zurich.pm:955 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:6 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 @@ -1990,16 +1946,16 @@ msgstr "الرجاء التØلي بالأدب والاختصار والتركي msgid "Please check the passwords and try again" msgstr "الرجاء التØقق من كلمات المرور وإعادة المØاولة" -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:33 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:43 #: 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:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:856 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:921 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -2009,7 +1965,7 @@ msgstr "الرجاء اختيار Ùئة" msgid "Please choose a property type" msgstr "الرجاء اختيار نوع العقار" -#: perllib/FixMyStreet/App/Controller/Admin.pm:378 +#: perllib/FixMyStreet/App/Controller/Admin.pm:376 msgid "Please correct the errors below" msgstr "الرجاء تصØÙŠØ Ø§Ù„Ø£Ø®Ø·Ø§Ø¡ التالية" @@ -2033,9 +1989,8 @@ msgstr "الرجاء عدم إساءة الاستعمال؛ Ùإساءة Ø§Ø³ØªØ msgid "Please enter a message" msgstr "الرجاء إدخال رسالة" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Admin.pm:1079 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 msgid "Please enter a name" msgstr "الرجاء إدخال اسمك" @@ -2051,10 +2006,10 @@ msgstr "الرجاء إدخال كلمة مرور" msgid "Please enter a subject" msgstr "الرجاء إدخال موضوع" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1075 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1130 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:133 +#: perllib/FixMyStreet/DB/Result/User.pm:143 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2071,9 +2026,9 @@ msgid "Please enter some details" msgstr "الرجاء إدخال بعض التÙاصيل" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:130 -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:32 +#: perllib/FixMyStreet/DB/Result/User.pm:140 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:42 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2082,7 +2037,7 @@ msgid "Please enter your email" msgstr "الرجاء إدخال البريد الإلكتروني" #: templates/web/base/report/new/form_user_loggedout_email.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:80 +#: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "Please enter your email address" msgstr "الرجاء إدخال عنوان بريدك الإلكتروني" @@ -2098,7 +2053,7 @@ msgstr "الرجاء إدخال الاسم الكامل؛ Ùالمجالس تØØ #: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:126 +#: perllib/FixMyStreet/DB/Result/User.pm:136 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "الرجاء إدخال اسمك" @@ -2125,7 +2080,7 @@ msgstr "الرجاء ألا تتردد ÙÙŠ <a href=\"%s\">تسجيل الدخو msgid "Please fill in details of the problem below." msgstr "الرجاء تعبئة تÙاصيل المشكلة بالأسÙÙ„." -#: templates/web/zurich/report/new/fill_in_details_form.html:72 +#: templates/web/zurich/report/new/fill_in_details_form.html:74 msgid "Please fill in details of the problem." msgstr "الرجاء تعبئة تÙاصيل المشكلة." @@ -2134,7 +2089,7 @@ msgstr "الرجاء تعبئة تÙاصيل المشكلة." msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "الرجاء تعبئة النموذج التالي بتÙاصيل المشكلة، وأدخل وصÙًا للموقع يكون دقيقًا قدر الإمكان ÙÙŠ مربع التÙاصيل." -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "الرجاء الإشارة إلى ما إذا كنت تريد المشاركة ÙÙŠ استبيان آخر أم لا" @@ -2143,9 +2098,8 @@ msgid "Please note that updates are not sent to the council." msgstr "الرجاء ملاØظة أن التØديثات لا يتم إرسالها إلى المجلس." #: templates/web/base/report/new/oauth_email_form.html:4 -#, fuzzy msgid "Please note your report has <strong>not yet been sent</strong>." -msgstr "الرجاء ملاØظة أن التقرير <strong>لم يتم إرساله</strong>. اختر Ùئة وأض٠مزيدًا من المعلومات بالأسÙÙ„ØŒ ثم قدّم التقرير." +msgstr "يرجى ملاØظة أن تقريرك <strong>لم يتم إرساله بعد</strong>." #: templates/web/base/report/new/fill_in_details_form.html:20 #: templates/web/zurich/report/new/fill_in_details_form.html:11 @@ -2154,23 +2108,23 @@ msgstr "الرجاء ملاØظة أن التقرير <strong>لم يتم إرس #: templates/web/base/report/display.html:26 msgid "Please note your update has <strong>not yet been posted</strong>." -msgstr "" +msgstr "يرجى ملاØظة أن تØديثك <strong>لم يتم نشره بعد</strong>." #: templates/web/base/report/new/notes.html:1 #: templates/web/zurich/report/new/notes.html:1 msgid "Please note:" msgstr "الرجاء ملاØظة:" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please provide some explanation as to why you're reopening this report" msgstr "الرجاء ØªÙˆØ¶ÙŠØ Ø£Ø³Ø¨Ø§Ø¨ تقديم هذا التقرير" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250 msgid "Please provide some text as well as a photo" msgstr "الرجاء إضاÙØ© بعض التوضيØات وصورة" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236 msgid "Please say whether you've ever reported a problem to your council before" msgstr "الرجاء ذكر ما إذا كنت قد أبلغت عن مشكلة إلى المجلس من قبل أم لا" @@ -2186,22 +2140,23 @@ msgstr "الرجاء تØديد الموجز الذي تريده" msgid "Please select the type of alert you want" msgstr "الرجاء تØديد نوع التنبيه الذي تريده" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232 msgid "Please state whether or not the problem has been fixed" msgstr "الرجاء تØديد ما إذا كانت المشكلة قد تم Øلها أم لا" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:121 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 #: templates/web/base/js/translation_strings.html:53 -msgid "Please upload a JPEG image only" +#, fuzzy +msgid "Please upload an image only" msgstr "الرجاء تØميل صورة JPEG Ùقط" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 msgid "Please write a message" msgstr "الرجاء كتابة رسالة" -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Please write your update here" msgstr "الرجاء كتابة التØديث هنا" @@ -2232,7 +2187,7 @@ msgstr "مشغّل بواسطة <a class=\"platform-logo\" href=\"http://fixmyst msgid "Previous" msgstr "السابق" -#: templates/web/fixmystreet/footer.html:41 +#: templates/web/base/footer.html:41 msgid "Privacy" msgstr "الخصوصية" @@ -2242,7 +2197,7 @@ msgstr "الخصوصية" msgid "Privacy and cookies" msgstr "الخصوصية وملÙات تعري٠الارتباط" -#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:200 #: templates/web/base/admin/body.html:85 #: templates/web/base/admin/category_edit.html:45 #: templates/web/base/admin/report_edit.html:77 @@ -2271,7 +2226,7 @@ msgstr "تم إرسال المشكلة %s إلى المجلس %s" msgid "Problem breakdown by state" msgstr "تصني٠المشكلة Øسب الØالة" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1046 msgid "Problem marked as open." msgstr "تم وضع علامة \"Ù…ÙتوØ\" على المشكلة." @@ -2283,10 +2238,6 @@ msgstr "يتم تغيير Øالة المشكلة Øسب نتائج الاستط msgid "Problems" msgstr "المشكلات" -#: templates/web/base/around/_updates.html:1 -msgid "Problems in this area" -msgstr "المشكلات ÙÙŠ هذه المنطقة" - #: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "المشكلات القريبة" @@ -2304,13 +2255,11 @@ msgid "Problems within %.1fkm of this location" msgstr "المشكلات الموجودة ضمن %.1f كم من هذا الموقع" #: perllib/FixMyStreet/Cobrand/Default.pm:663 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 #: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "المشكلات ضمن Øدود %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "المشكلات ضمن Øدود دائرة %s" @@ -2329,15 +2278,11 @@ msgstr "المشكلات ضمن Øدود:" msgid "Property address:" msgstr "عنوان الملكية:" -#: templates/web/base/report/new/category.html:8 -msgid "Property type:" -msgstr "نوع العقار:" - #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "قدّم تØديثًا" -#: templates/web/base/auth/general.html:95 +#: templates/web/base/auth/general.html:105 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 "تقديم الاسم وكلمة المرور اختياري، ولكن Ùعل ذلك ÙŠØªÙŠØ Ù„Ùƒ الإبلاغ عن المشكلات وإضاÙØ© التØديثات وإدارة التقارير بسهولة أكبر." @@ -2371,16 +2316,15 @@ msgstr "تمت الإجابة عن الاستبيان %d للمشكلة %dØŒ Ù…Ù msgid "Questionnaire %d sent for problem %d" msgstr "تم إرسال الاستبيان %d للمشكلة %d" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 msgid "Questionnaire filled in by problem reporter" msgstr "تمت تعبئة الاستبيان بواسطة المبلّغ عن المشكلة" #: templates/web/base/alert/_list.html:22 +#: templates/web/base/alert/updates.html:9 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display_tools.html:34 -#: templates/web/base/reports/_rss.html:1 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed" msgstr "موجز RSS" @@ -2408,18 +2352,12 @@ msgstr "موجز RSS لـ %sØŒ ضمن Øدود دائرة %s" msgid "RSS feed of nearby problems" msgstr "موجز RSS للمشكلات القريبة" -#: templates/web/base/reports/_rss.html:1 -msgid "RSS feed of problems in this %s" -msgstr "موجز RSS للمشكلات الموجودة ضمن %s" - #: perllib/FixMyStreet/Cobrand/Default.pm:664 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 #: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "موجز RSS للمشكلات الموجودة ضمن Øدود %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 #: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "موجز RSS للمشكلات الموجودة ضمن Øدود دائرة %s" @@ -2429,14 +2367,13 @@ msgstr "موجز RSS للمشكلات الموجودة ضمن Øدود Ø¯Ø§Ø¦Ø±Ø msgid "RSS feed of recent local problems" msgstr "موجز RSS للمشكلات المØلية الØديثة" +#: templates/web/base/alert/updates.html:9 #: templates/web/base/report/display_tools.html:34 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed of updates to this problem" msgstr "موجز RSS للتØديثات على هذه المشكلة" -#: templates/web/base/alert/updates.html:9 +#: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:36 -#: templates/web/fixmystreet/alert/updates.html:14 msgid "Receive email when updates are left on this problem." msgstr "استلام بريد إلكتروني عند ترك تØديثات لهذه المشكلة." @@ -2472,12 +2409,11 @@ msgstr "إزالة الصورة (لا يمكن التراجع عن هذا الإ msgid "Reply to user:" msgstr "رد على المستخدم:" -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/header_logo.html:2 msgid "Report" msgstr "إبلاغ" -#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:26 -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/footer.html:26 templates/web/base/header_logo.html:2 #: templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2487,7 +2423,7 @@ msgstr "الإبلاغ عن مشكلة" msgid "Report abuse" msgstr "الإبلاغ عن إساءة" -#: perllib/FixMyStreet/App/Controller/Rss.pm:291 +#: perllib/FixMyStreet/App/Controller/Rss.pm:297 msgid "Report on %s" msgstr "الإبلاغ على %s" @@ -2502,7 +2438,7 @@ msgstr "الإبلاغ عن المشكلة" msgid "Report, view, or discuss local problems" msgstr "الإبلاغ عن المشكلات المØلية أو عرضها أو مناقشتها" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:577 #: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "تم الإبلاغ عنها بدون تØديد الهوية ÙÙŠ %s" @@ -2512,7 +2448,7 @@ msgstr "تم الإبلاغ عنها بدون تØديد الهوية ÙÙŠ %s" msgid "Reported before" msgstr "تم الإبلاغ عنها من قبل" -#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 #: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "تم الإبلاغ عنها بواسطة %s ÙÙŠ %s" @@ -2526,27 +2462,27 @@ msgstr "تم الإبلاغ عنها بواسطة:" msgid "Reported in the %s category" msgstr "تم الإبلاغ عنها ÙÙŠ الÙئة %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:569 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 msgid "Reported in the %s category anonymously at %s" msgstr "تم الإبلاغ عنها ÙÙŠ الÙئة %s بدون تØديد الهوية ÙÙŠ %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:591 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 msgid "Reported in the %s category by %s at %s" msgstr "تم البلاغ ÙÙŠ التصني٠%s بواسطة %s ÙÙŠ %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported via %s anonymously at %s" msgstr "تم الإبلاغ عنها بواسطة %s بدون تØديد الهوية ÙÙŠ %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported via %s by %s at %s" msgstr "تم الإبلاغ عنها عبر %s بواسطة %s ÙÙŠ %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:561 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 msgid "Reported via %s in the %s category anonymously at %s" msgstr "تم الإبلاغ عنها عبر %s ÙÙŠ الÙئة %s بدون تØديد الهوية ÙÙŠ %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 msgid "Reported via %s in the %s category by %s at %s" msgstr "تم الإبلاغ عنها عبر %s ÙÙŠ الÙئة %s بواسطة %s ÙÙŠ %s" @@ -2567,7 +2503,7 @@ msgstr "تم الإبلاغ:" msgid "Reporting a problem" msgstr "الإبلاغ عن مشكلة" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1274 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" @@ -2610,15 +2546,15 @@ msgstr "مشغل الطرق لهذا الطريق المسمى (يتم Ø§Ø´ØªÙ‚Ø msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "مشغل الطرق لهذا الطريق المسمى (من OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1496 #: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "تدوير لليسار" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 #: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 @@ -2633,7 +2569,7 @@ msgstr "سيؤدي تدوير هذه الصورة إلى تجاهل التغيي msgid "Satellite" msgstr "القمر الصناعي" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/base/admin/category_edit.html:84 #: templates/web/zurich/admin/body.html:59 #: templates/web/zurich/admin/template_edit.html:29 @@ -2689,7 +2625,7 @@ msgstr "Øدد نوع التنبيه الذي تريده وانقر Ùوق Ø§Ù„Ø msgid "Sent report back" msgstr "تمت إعادة إرسال التقرير" -#: perllib/FixMyStreet/DB/Result/Problem.pm:696 +#: perllib/FixMyStreet/DB/Result/Problem.pm:698 msgid "Sent to %s %s later" msgstr "تم الإرسال إلى %s %s لاØقًا" @@ -2708,21 +2644,21 @@ msgstr "مشاركة" #: templates/web/base/report/new/form_user_loggedin.html:23 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22 -#: templates/web/base/report/update/form_name.html:15 +#: templates/web/base/report/update/form_name.html:16 msgid "Show my name publicly" msgstr "إظهار اسمي للعامة" -#: templates/web/base/around/display_location.html:67 +#: templates/web/base/around/display_location.html:66 msgid "Show old" msgstr "إظهار القديم" -#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:57 msgid "Show pins" msgstr "إظهار الدبابيس" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/general.html:110 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:76 +#: templates/web/base/auth/general.html:86 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2783,9 +2719,8 @@ msgstr "عذرًا، لم نستطع العثور على هذا الموقع." #: templates/web/base/auth/general.html:9 #: templates/web/base/report/display.html:21 #: templates/web/base/report/new/fill_in_details_form.html:23 -#, fuzzy msgid "Sorry, we could not log you in. Please fill in the form below." -msgstr "عذرًا، لم نستطع تØليل ذلك الموقع. الرجاء إعادة المØاولة." +msgstr "عذرا، لم نتمكن من تسجيل دخولك. يرجى ملئ النموذج بالأسÙÙ„." #: perllib/FixMyStreet/Geocode/Bing.pm:35 #: perllib/FixMyStreet/Geocode/Google.pm:45 @@ -2793,15 +2728,10 @@ msgstr "عذرًا، لم نستطع تØليل ذلك الموقع. Ø§Ù„Ø±Ø¬Ø§Ø msgid "Sorry, we could not parse that location. Please try again." msgstr "عذرًا، لم نستطع تØليل ذلك الموقع. الرجاء إعادة المØاولة." -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:138 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "عذرًا، لم نستطع ØÙظ الصورة (الصور)ØŒ الرجاء إعادة المØاولة." -#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 -#, fuzzy -msgid "Sorry, you can not log in with Facebook. Please try again later." -msgstr "Øدثت مشكلة أثناء عرض هذه الصÙØØ©. الرجاء إعادة المØاولة لاØقًا." - #: templates/web/base/admin/stats.html:64 msgid "Start Date:" msgstr "تاريخ البداية:" @@ -2810,7 +2740,7 @@ msgstr "تاريخ البداية:" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/report/update/form_update.html:32 +#: templates/web/base/report/update/form_update.html:34 msgid "State" msgstr "الØالة" @@ -2823,7 +2753,7 @@ msgstr "الØالة" msgid "State:" msgstr "الØالة:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2863,10 +2793,10 @@ msgid "Subject:" msgstr "الموضوع:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/base/report/new/form_user_loggedout_by_email.html:39 #: templates/web/base/report/new/form_user_loggedout_password.html:11 -#: templates/web/zurich/report/new/fill_in_details_form.html:96 +#: templates/web/zurich/report/new/fill_in_details_form.html:98 msgid "Submit" msgstr "تقديم" @@ -2894,9 +2824,8 @@ msgstr "تقديم الاستبيان" msgid "Submitted" msgstr "تم اضاÙتها" -#: templates/web/base/alert/updates.html:17 +#: templates/web/base/alert/updates.html:23 #: templates/web/base/report/display_tools.html:41 -#: templates/web/fixmystreet/alert/updates.html:23 msgid "Subscribe" msgstr "اشتراك" @@ -2904,7 +2833,7 @@ msgstr "اشتراك" msgid "Subscribe me to an email alert" msgstr "اشتراك ÙÙŠ تنبيه البريد الإلكتروني" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -2923,7 +2852,7 @@ msgstr "ملخص" msgid "Summary reports" msgstr "ملخص التقارير" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 msgid "Survey" msgstr "استطلاع" @@ -2980,7 +2909,7 @@ msgstr "شكرًا لك على تØميل الصورة. Ù†ØÙ† Ù†Øتاج الآ msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "شكرًا لك، يسعدنا معرÙØ© أن المشكلة قد ØÙلت! هل يمكنا أن نسألك عما إذا كنت قد أبلغت عن مشكلة للمجلس من قبل؟" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:157 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "يبدو أنه لم يتم تØميل هذه الصورة بصورة سليمة (%s)ØŒ الرجاء إعادة المØاولة." @@ -2988,7 +2917,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:126 +#: perllib/FixMyStreet/App/Controller/Location.pm:127 msgid "That location does not appear to be in the UK; please try again." msgstr "لا يبدو أن هذا الموقع يقع ÙÙŠ المملكة المتØدة؛ الرجاء إعادة المØاولة." @@ -2998,11 +2927,11 @@ msgstr "لا يبدو أن هذا الموقع يقع ÙÙŠ المملكة الم msgid "That postcode was not recognised, sorry." msgstr "لم يتم التعر٠على هذا الرمز البريدي، عذرًا." -#: perllib/FixMyStreet/App/Controller/Admin.pm:724 +#: perllib/FixMyStreet/App/Controller/Admin.pm:722 msgid "That problem has been marked as sent." msgstr "تم وضع علامة على هذه المشكلة بأنها Ø£Ùرسلت." -#: perllib/FixMyStreet/App/Controller/Admin.pm:716 +#: perllib/FixMyStreet/App/Controller/Admin.pm:714 msgid "That problem will now be resent." msgstr "ستتم إعادة إرسال هذه المشكلة الآن." @@ -3014,7 +2943,7 @@ msgstr "لا يمكن عرض هذا التقرير على %s." msgid "That report has been removed from FixMyStreet." msgstr "تمت إزالة هذا التقرير من FixMyStreet." -#: templates/web/base/admin/body.html:144 +#: templates/web/base/admin/body.html:142 msgid "" "The <strong>email address</strong> is the destination to which reports about this category will be sent. \n" " Other categories for this body may have the same email address." @@ -3166,9 +3095,9 @@ msgstr "Øدثت مشكلة أثناء عرض صÙØØ© \"كل التقارير\" msgid "There was a problem showing this page. Please try again later." msgstr "Øدثت مشكلة أثناء عرض هذه الصÙØØ©. الرجاء إعادة المØاولة لاØقًا." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:753 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 -#: templates/web/base/auth/general.html:43 +#: templates/web/base/auth/general.html:53 #: 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 "Øدثت مشكلة ÙÙŠ توليÙØ© البريد الإلكتروني/كلمة المرور. إذا كنت لا تستطيع تذكر كلمة المرور، أو كنت لا تمتلك كلمة مرور، Ùالرجاء تعبئة قسم ‘تسجيل الدخول بواسطة البريد الإلكتروني’ ÙÙŠ النموذج." @@ -3239,9 +3168,9 @@ msgstr "Ø£Ùرسلت رسالة البريد الإلكتروني إلى كلا 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:920 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:898 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:935 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:977 #: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "هذه المعلومات مطلوبة" @@ -3254,11 +3183,11 @@ msgstr "هذا موقع مطور، وقد تتعطل الأمور ÙÙŠ أي وق msgid "This is a summary of all reports on this site." msgstr "هذا ملخص لكل التقارير الموجودة على هذا الموقع." -#: templates/web/base/report/update/form_update.html:52 +#: templates/web/base/report/update/form_update.html:54 msgid "This problem has been fixed" msgstr "تم Ø¥ØµÙ„Ø§Ø Ù‡Ø°Ù‡ المشكلة" -#: templates/web/base/report/update/form_update.html:46 +#: templates/web/base/report/update/form_update.html:48 msgid "This problem has not been fixed" msgstr "لم يتم Ø¥ØµÙ„Ø§Ø Ù‡Ø°Ù‡ المشكلة" @@ -3295,7 +3224,7 @@ msgstr "تØتوي صÙØØ© الويب هذه على صورة للمشكلة، Ø msgid "Time spent (in minutes):" msgstr "الوقت المستغرق (بالدقائق):" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "المخطط الزمني" @@ -3340,8 +3269,8 @@ msgstr "جرّب إرسال البريد الإلكتروني إلينا Ù…Ø¨Ø§Ø #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Unable to fix" msgstr "يتعذر الإصلاØ" @@ -3358,7 +3287,7 @@ msgstr "غير مؤكد" msgid "Unknown" msgstr "غير معروÙ" -#: perllib/FixMyStreet/App/Controller/Rss.pm:173 +#: perllib/FixMyStreet/App/Controller/Rss.pm:174 msgid "Unknown alert type" msgstr "نوع تنبيه غير معروÙ" @@ -3373,7 +3302,7 @@ msgstr "خطأ غير معروÙ" msgid "Unknown problem ID" msgstr "معر٠المشكلة غير معروÙ" -#: templates/web/base/report/update/form_update.html:25 +#: templates/web/base/report/update/form_update.html:27 msgid "Update" msgstr "تØديث" @@ -3425,10 +3354,10 @@ msgstr "Øالات التØديث" msgid "Updated" msgstr "تم التØديث" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 -#: perllib/FixMyStreet/App/Controller/Admin.pm:821 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1096 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1144 +#: perllib/FixMyStreet/App/Controller/Admin.pm:809 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3455,7 +3384,7 @@ msgstr "التØديثات على {{title}}" msgid "Updates to this problem, %s" msgstr "التØديثات على هذه المشكلة، %s" -#: templates/web/base/admin/body.html:182 +#: templates/web/base/admin/body.html:180 msgid "Use the <strong>note</strong> to record details that are only displayed in the admin. Notes are not shown publicly, and are not sent to the body." msgstr "استخدم <strong>الملاØظة</strong> لتسجيل التÙاصيل التي لا تÙعرض إلا ÙÙŠ الإدارة. لا تÙعرض الملاØظات بصورة عامة، ولا تÙرسل إلى الهيئة." @@ -3464,11 +3393,11 @@ msgstr "استخدم <strong>الملاØظة</strong> لتسجيل التÙاص msgid "Used map" msgstr "تم استخدام الخريطة" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 msgid "User flag removed" msgstr "تمت إزالة إشارة المستخدم" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1421 msgid "User flagged" msgstr "تم وضع إشارة للمستخدم" @@ -3476,16 +3405,16 @@ msgstr "تم وضع إشارة للمستخدم" msgid "User search finds matches in users' names and email addresses." msgstr "عثر البØØ« الذي Ù†Ùذه المستخدم على مطابقات ÙÙŠ أسماء المستخدمين وعناوين البريد الإلكتروني." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "المستخدمون" -#: perllib/FixMyStreet/App/Controller/Admin.pm:382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:412 -#: perllib/FixMyStreet/App/Controller/Admin.pm:429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:380 +#: perllib/FixMyStreet/App/Controller/Admin.pm:410 +#: perllib/FixMyStreet/App/Controller/Admin.pm:427 msgid "Values updated" msgstr "تم تØديث القيم" @@ -3522,16 +3451,15 @@ msgstr "عثرنا على أكثر من مطابقة لهذا الموقع. Ù†Ø #: templates/web/base/auth/general.html:6 #: templates/web/base/report/display.html:27 #: templates/web/base/report/new/oauth_email_form.html:5 -#, fuzzy msgid "We need your email address, please give it below." -msgstr "لا نظهر عنوان البريد الإلكتروني أو رقم الهات٠مطلقًا." +msgstr "Ù†Øتاج إلى بريدك الإلكتروني، يرجى كتابته بالأسÙÙ„." #: templates/web/base/report/new/form_user_loggedout_email.html:2 #: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "لن نظهر البريد الإلكتروني مطلقًا" -#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedin.html:30 #: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "لا نظهر عنوان البريد الإلكتروني أو رقم الهات٠مطلقًا." @@ -3540,7 +3468,7 @@ msgstr "لا نظهر عنوان البريد الإلكتروني أو رقم Ø 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Ø› ولكن لا توجد لدينا أي تÙاصيل اتصال لهم. إذا كنت تعر٠عنوان اتصال مناسبًا، Ùالرجاء التواصل معنا." -#: templates/web/base/index-steps.html:31 +#: templates/web/base/index-steps.html:11 msgid "We send it to the council on your behalf" msgstr "Ù†ØÙ† نرسل ذلك إلى المجلس نيابةً عنك" @@ -3578,10 +3506,6 @@ msgstr "عند الإرسال" msgid "Whoa there Testino! Three photos are enough." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 -msgid "Whole block of empty flats" -msgstr "مجموعة كاملة من الشقق الÙارغة" - #: templates/web/base/tokens/confirm_alert.html:7 msgid "Why stop there? <a href=\"/alert\">Set up more alerts</a> for free." msgstr "لماذا تتوق٠هنا؟ يمكنك <a href=\"/alert\">إعداد مزيد من التنبيهات</a> مجانًا." @@ -3601,7 +3525,7 @@ msgstr "مع عمليات البØØ« عن الطلبات، يمكن أيضًا Ø msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "هل تريد المساهمة ÙÙŠ FixMyStreetØŸ التعليمات البرمجية الخاصة بنا Ù…ÙتوØØ© المصدر <a href=\"http://fixmystreet.org\">ومتاØØ© على fixmystreet.org</a>." -#: templates/web/base/questionnaire/index.html:96 +#: templates/web/base/questionnaire/index.html:97 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "هل تريد المشاركة ÙÙŠ استبيان آخر خلال 4 أسابيع Ùنذكرك بالتØقق من الØالة؟" @@ -3631,8 +3555,8 @@ msgstr "السنة" #: templates/web/base/admin/update_edit.html:24 #: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 +#: templates/web/base/questionnaire/index.html:100 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "نعم" @@ -3702,9 +3626,8 @@ msgstr "لقد أرÙقت صورًا بهذا التقرير من قبل. Ù„Ø§Ø #: templates/web/base/questionnaire/index.html:83 #: templates/web/base/report/update/form_update.html:14 -#, fuzzy msgid "You have already attached photos to this update. Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)." -msgstr "لقد أرÙقت صورًا بهذا التقرير من قبل. لاØظ أنه يمكنك إرÙاق 3 صور ÙƒØد أقصى بهذا التقرير (إذا Øاولت تØميل المزيد من الصور، Ùسيتم Øذ٠الصور القديمة)." +msgstr "لقد أرÙقت صورًا لهذا التØديث من قبل. لاØظ أنه يمكنك إرÙاق 3 صور ÙƒØد أقصى بهذا التØديث (إذا Øاولت تØميل المزيد من الصور، Ùسيتم Øذ٠أقدم صورة)." #: templates/web/base/auth/sign_out.html:4 #: templates/web/zurich/auth/sign_out.html:3 @@ -3753,19 +3676,19 @@ msgid "Your Reports" msgstr "التقارير" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/alert/updates.html:19 +#: templates/web/base/alert/updates.html:22 #: templates/web/base/contact/index.html:83 #: templates/web/base/report/display_tools.html:38 #: templates/web/base/report/display_tools.html:40 #: templates/web/base/report/new/form_user_loggedin.html:3 #: templates/web/base/report/new/form_user_loggedout_email.html:1 #: templates/web/base/report/update/form_user_loggedout_email.html:1 -#: templates/web/fixmystreet/alert/updates.html:19 -#: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/zurich/report/new/fill_in_details_form.html:76 +#: templates/web/zurich/report/new/fill_in_details_form.html:78 msgid "Your email" msgstr "البريد الإلكتروني" -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/general.html:55 #: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 @@ -3776,17 +3699,17 @@ msgstr "عنوان البريد الإلكتروني" msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "لن يتم استخدام معلوماتك إلا ÙˆÙقًا <a href=\"/privacy\">لسياسة الخصوصية</a> الخاصة بنا" -#: templates/web/base/auth/general.html:90 +#: templates/web/base/auth/general.html:100 #: templates/web/base/contact/index.html:76 #: templates/web/base/report/new/form_user_loggedin.html:18 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17 -#: templates/web/base/report/update/form_name.html:11 +#: templates/web/base/report/update/form_name.html:12 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:86 +#: templates/web/zurich/report/new/fill_in_details_form.html:88 msgid "Your name" msgstr "الاسم" -#: templates/web/base/auth/general.html:75 +#: templates/web/base/auth/general.html:85 #: 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 @@ -3799,20 +3722,19 @@ msgstr "تم تغيير كلمة المرور" #: templates/web/base/report/new/form_user_loggedin.html:27 #: templates/web/base/report/new/form_user_loggedout_by_email.html:26 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:94 msgid "Your phone number" msgstr "رقم الهاتÙ" #: templates/web/base/questionnaire/index.html:14 -#, fuzzy msgid "Your report" -msgstr "التقارير" +msgstr "تقريرك" -#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 +#: templates/web/base/footer.html:29 msgid "Your reports" msgstr "التقارير" -#: templates/web/base/my/my.html:41 +#: templates/web/base/my/my.html:39 msgid "Your updates" msgstr "التØديثات" @@ -3838,7 +3760,7 @@ msgid "didn't use map" msgstr "لم يتم استخدام الخريطة" #: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/around/postcode_form.html:12 msgid "e.g. ‘%s’ or ‘%s’" msgstr "على سبيل المثال، ’%s‘ أو ’%s‘" @@ -3944,8 +3866,7 @@ msgstr "مناطق أخرى:" msgid "reopened" msgstr "تمت إعادة الÙتØ" -#: templates/web/base/header.html:33 templates/web/fixmystreet/header.html:64 -#: templates/web/zurich/footer.html:13 +#: templates/web/base/header.html:64 templates/web/zurich/footer.html:13 msgid "sign out" msgstr "تسجيل الخروج" @@ -4043,7 +3964,7 @@ msgstr[3] "<big>%s</big> من التØديثات على التقارير" msgstr[4] "<big>%s</big> من التØديثات على التقارير" msgstr[5] "<big>%s</big> من التØديثات على التقارير" -#: templates/web/emptyhomes/report/new/councils_text_none.html:3 +#: templates/web/base/report/new/councils_text_none.html:3 #, perl-format msgid "We do not yet have details for the council that covers this location." msgid_plural "We do not yet have details for the councils that cover this location." @@ -4109,86 +4030,50 @@ msgstr[3] "<strong>لا</strong> توجد لدينا تÙاصيل عن Ø§Ù„Ù…Ø¬Ø msgstr[4] "<strong>لا</strong> توجد لدينا تÙاصيل عن المجالس التي تغطي هذا الموقع Øتى الآن." msgstr[5] "<strong>لا</strong> توجد لدينا تÙاصيل عن المجالس التي تغطي هذا الموقع Øتى الآن." -#~ msgid "(we never show your email address or phone number)" -#~ msgstr "(لن نقوم بعرض بريدك الإلكتروني او رقم هاتÙÙƒ المØمول)" - -#~ msgid "(we never show your email)" -#~ msgstr "(لن نقوم بعرض بريدك الإلكتروني)" - -#~ msgid "<strong>No</strong>, let me confirm my report by email:" -#~ msgstr "<strong>لا</strong> دعني أؤكّد بلاغي عبر البريد:" - -#~ msgid "<strong>No</strong>, let me confirm my update by email:" -#~ msgstr "<strong>لا</strong> دعني أؤكّد تØديثي عبر البريد:" - -#~ msgid "Email me updates" -#~ msgstr "راسلني عن التØديثات" - -#~ msgid "Enter a new password:" -#~ msgstr "أدخل كلمة مرور جديدة:" - -#~ msgid "I'm afraid we couldn't validate that token. If you've copied the URL from an email, please check that you copied it exactly.\n" -#~ msgstr "عذرًا، لم نستطع تدقيق هذا الرمز. إذا كنت قد نسخت عنوان URL من رسالة بريد إلكتروني، Ùالرجاء التØقق من أنك نسخته بصورة صØÙŠØØ© تمامًا.\n" - -#~ msgid "If you use web-based email or have 'junk mail' filters, you may wish to check your bulk/spam mail folders: sometimes, our messages are marked that way." -#~ msgstr "إذا كنت تستخدم البريد الإلكتروني عن طريق المتصÙØ Ø£Ùˆ لديك Ù…Ø±Ø´Ø Ù„Ù„Ø§Ø±Ø³Ø§Ø¦Ù„ الغير هامة، ربما تود تÙقد مجلد الرسائل الغير هامة: بعض الأØيان، رسائلنا يشار إليها بذلك." - -#~ msgid "Message:" -#~ msgstr "الرسالة:" - -#~ msgid "More problems nearby" -#~ msgstr "مزيد من المشكلات القريبة" - -#~ msgid "Nearly Done! Now check your email..." -#~ msgstr "أوشكنا على الانتهاء! راجع البريد الإلكتروني الآن..." - -#~ msgid "Offensive? Unsuitable? Tell us" -#~ msgstr "عدواني؟ غير لائق؟ أخبرنا" - -#~ msgid "Photo:" -#~ msgstr "الصورة:" +#~ msgid "%s, reported at %s" +#~ msgstr "%sØŒ Ø£Ùبلغ ÙÙŠ %s" -#~ msgid "Please check your email" -#~ msgstr "الرجاء التØقق من البريد الإلكتروني" +#~ msgid "About us" +#~ msgstr "نبذة عنا" -#~ msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" -#~ msgstr "الرجاء ملاØظة أن التØديثات لا يتم إرسالها إلى المجلس. Ùإذا تركت اسمك Ùسيظهر للعامة. سيتم استخدام معلوماتك ÙˆÙقًا لـ <a href=\"/faq#privacy\">سياسة الخصوصية</a> الخاصة بنا Ùقط" +#~ msgid "Email me new local problems" +#~ msgstr "راسلني عن المشاكل المØلية الجديدة" -#~ msgid "This may be because the link is too old or already used, or the address was not copied correctly." -#~ msgstr "قد يكون سبب ذلك أن الارتباط قديم جدًا أو اÙستخدÙÙ… بالÙعل، أو أن العنوان لم ÙŠÙنسخ بصورة صØÙŠØØ©." +#~ msgid "Empty flat or maisonette" +#~ msgstr "شقة أو ÙˆØدة سكنية Ùارغة" -#~ msgid "This problem has been closed" -#~ msgstr "تم إغلاق هذه المشكلة" +#~ msgid "Empty house or bungalow" +#~ msgstr "منزل أو بنغَل Ùارغ" -#~ msgid "This problem is in progress" -#~ msgstr "معالجة المشكلة قيد التقدم" +#~ msgid "Empty office or other commercial" +#~ msgstr "مكتب أو عقار تجاري مهجور" -#~ msgid "This problem is old and of unknown status." -#~ msgstr "هذه المشكلة قديمة ÙˆØالتها غير معروÙØ©." +#~ msgid "Empty pub or bar" +#~ msgstr "Øانة مهجورة" -#~ msgid "Update:" -#~ msgstr "التØديث:" +#~ msgid "Empty public building - school, hospital, etc." +#~ msgstr "مبنى عام مهجور - مدرسة، مستشÙى، إلخ." -#~ msgid "We have not been able to confirm your account - sorry." -#~ msgstr "تعذر علينا تأكيد الØساب - عذرًا." +#~ msgid "Enter a nearby street name and area, postal code or district in Delhi" +#~ msgstr "أدخل أقرب اسم شارع ÙˆØÙŠ أو صندوق بريد أو منطقة ÙÙŠ دلهي" -#~ msgid "We have sent you an email containing a link to confirm your account." -#~ msgstr "لقد أرسلنا إليك رسالة بريد إلكتروني تØتوي على ارتباط لتأكيد الØساب." +#~ msgid "FixMyStreet" +#~ msgstr "Ø£ØµÙ„Ø Ø´Ø§Ø±Ø¹ÙŠ" -#~ msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:" -#~ msgstr "نود أن نعلم رأيك ÙÙŠ هذا الموقع. تÙضل بتعبئة النموذج أو إرسال بريد إلكتروني إلى <a href='mailto:%s'>%s</a>:" +#~ msgid "I am afraid you cannot confirm unconfirmed reports." +#~ msgstr "آس٠لايمكنك تأكيد البلاغات الغير مؤكدة." -#~ msgid "You have already attached a photo to this report, attaching another one will replace it." -#~ msgstr "لقد أرÙقت صورة بهذا التقرير من قبل، وسيؤدي إرÙاق صورة أخرى إلى استبدال الصورة الأولى." +#~ msgid "Problems in this area" +#~ msgstr "المشكلات ÙÙŠ هذه المنطقة" -#~ msgid "You have already attached a photo to this update, attaching another one will replace it." -#~ msgstr "لقد أرÙقت صورة بهذا التØديث من قبل، وسيؤدي إرÙاق صورة أخرى إلى استبدال الصورة الأولى." +#~ msgid "Property type:" +#~ msgstr "نوع العقار:" -#~ msgid "Your email:" -#~ msgstr "البريد الإلكتروني:" +#~ msgid "RSS feed of problems in this %s" +#~ msgstr "موجز RSS للمشكلات الموجودة ضمن %s" -#~ msgid "Your name:" -#~ msgstr "الاسم:" +#~ msgid "Sorry, you can not log in with Facebook. Please try again later." +#~ msgstr "عذرا، لا يمكنك تسجيل الدخول بالÙيسبوك. Øاول مرة أخرى لاØقا." -#~ msgid "Your email:" -#~ msgstr "البريد الإلكتروني:" +#~ msgid "Whole block of empty flats" +#~ msgstr "مجموعة كاملة من الشقق الÙارغة" diff --git a/locale/bg_BG.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/bg_BG.UTF-8/LC_MESSAGES/FixMyStreet.po index 19ebd0aa8..626a8de22 100644 --- a/locale/bg_BG.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/bg_BG.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2016-03-02 13:09+0000\n" -"PO-Revision-Date: 2015-10-23 16:34+0000\n" +"POT-Creation-Date: 2016-05-03 10:41+0100\n" +"PO-Revision-Date: 2016-03-23 12:43+0000\n" "Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/mysociety/fixmystreet/language/bg_BG/)\n" "Language: bg_BG\n" @@ -20,7 +20,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/DB/Result/Problem.pm:618 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr "и" @@ -53,9 +53,8 @@ msgid "%s admin:" msgstr "" #: templates/web/base/status/stats.html:26 -#, fuzzy msgid "%s bodies" -msgstr "Райони" +msgstr "" #: templates/web/base/status/stats.html:24 msgid "%s confirmed alerts, %s unconfirmed" @@ -90,7 +89,7 @@ msgstr "%s обновÑване в реално време" msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "%s изпратени анкети – %s отговорени (%s%%)" -#: perllib/FixMyStreet/DB/Result/Problem.pm:683 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "%s ref: %s" msgstr "%s номер: %s" @@ -109,10 +108,6 @@ msgstr "" msgid "%s ward, %s" msgstr "%s квартал, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:552 -msgid "%s, reported at %s" -msgstr "%s, Ñъобщено на %s" - #: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "%s, в %s квартал" @@ -167,7 +162,7 @@ msgstr "(като графити, дупки по улицата, Ñчупено msgid "(not sent to council)" msgstr "(не е изпратен към общината)" -#: templates/web/zurich/report/new/fill_in_details_form.html:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "(optional)" msgstr "(незадължително)" @@ -179,12 +174,11 @@ msgstr "" msgid "(sent to both)" msgstr "(изпратен към двата района)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Изберете ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Изберете подходÑщ тип --" @@ -216,26 +210,21 @@ msgstr "<strong>Ðе</strong> Ðека Ð¿Ð¾Ñ‚Ð²ÑŠÑ€Ð´Ñ Ñигнала чрез msgid "<strong>No</strong> Let me confirm my update by email" msgstr "<strong>Ðе</strong> Ðека Ð¿Ð¾Ñ‚Ð²ÑŠÑ€Ð´Ñ Ð°ÐºÑ‚ÑƒÐ°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ñта чрез имейл" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:97 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>Ðе</strong> Ðека да влÑза в ÑиÑтемата чрез имейл" -#: templates/web/base/auth/general.html:70 +#: templates/web/base/auth/general.html:80 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Да</strong> Имам парола" -#: templates/web/base/about/about-en-gb.html:1 -#: templates/web/base/about/about-en-gb.html:3 -msgid "About us" -msgstr "За наÑ" - #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Action Scheduled" msgstr "Сигналът Ñе обработва" @@ -269,7 +258,7 @@ msgstr "ДобавÑне на нова категориÑ" msgid "Add user" msgstr "Добавете потребител" -#: templates/web/base/my/my.html:56 +#: templates/web/base/my/my.html:54 msgid "Added %s" msgstr "Добавено %s" @@ -289,7 +278,7 @@ msgstr "Създадено извеÑтие %d за %s, тип %s, Ñ Ð¿Ð°Ñ€Ð°Ð¼ msgid "Alert %d disabled (created %s)" msgstr "ИзвеÑтието %d е изключено (Ñъздадено на %s)" -#: templates/web/base/report/update/form_name.html:20 +#: templates/web/base/report/update/form_name.html:21 msgid "Alert me to future updates" msgstr "ИзвеÑÑ‚Ñвай ме за бъдещи актуализиации" @@ -302,7 +291,7 @@ msgstr "Вички Ñигнали" msgid "All Reports as CSV" msgstr "" -#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 +#: templates/web/base/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:20 @@ -401,7 +390,7 @@ msgstr "Ðазад" msgid "Ban email address" msgstr "Забрана на имейл адреÑа" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1273 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -432,7 +421,7 @@ msgstr "Ðе виждате картата? <em>ПропуÑнете тази Ñ #: templates/web/base/admin/body.html:68 #: templates/web/base/admin/index.html:54 -#: templates/web/base/report/new/category.html:10 +#: templates/web/base/report/new/category.html:7 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 @@ -447,7 +436,7 @@ msgstr "КатегориÑ" msgid "Category fix rate for problems > 4 weeks old" msgstr "Сигнали подадени преди повече от 4 Ñедмици" -#: templates/web/base/admin/body.html:138 +#: templates/web/base/admin/body.html:137 #: templates/web/base/admin/category_edit.html:23 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/admin/body.html:43 @@ -467,7 +456,7 @@ msgstr "КатегориÑ: %s" msgid "Change password" msgstr "ПромÑна на парола" -#: templates/web/base/admin/body.html:160 +#: templates/web/base/admin/body.html:158 msgid "" "Check <strong>confirmed</strong> to indicate that this contact has been confirmed as correct.\n" " If you are not sure of the origin or validity of the contact, leave this unchecked." @@ -475,7 +464,7 @@ msgstr "" "Изберете <strong>потвърден</strong> за да отбележите, че този контакт е бил потвърден и коректен. \n" "Ðко не Ñте Ñигурни за първоизточника или валидноÑтта на контакта, оÑтавете полето немаркирано." -#: templates/web/base/admin/body.html:171 +#: templates/web/base/admin/body.html:169 msgid "" "Check <strong>deleted</strong> to remove the category from use. \n" " It will not appear as an available category in the drop-down menu on the report-a-problem page." @@ -483,7 +472,7 @@ msgstr "" "Маркирайте <strong>изтриване</strong>, за да премахнете категориÑта.\n" "Ð’ този Ñлучай Ñ‚Ñ Ð½Ñма да бъде доÑтъпна в ÑпиÑъка Ñ ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ð¸ на Ñтраницата за подаване на нов Ñигнал." -#: templates/web/base/admin/body.html:191 +#: templates/web/base/admin/body.html:189 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -499,7 +488,7 @@ msgstr "" "<br>\n" "Тази Ð¾Ð¿Ñ†Ð¸Ñ Ðµ подходÑща за Ñигнали, които вÑички биха могли да подават, но които не предÑтавлÑват Ð¸Ð½Ñ‚ÐµÑ€ÐµÑ Ð·Ð° оÑтаналите. Ðапример да Ñи изиÑка допълнителен контейнер за боклук за даден адреÑ." -#: templates/web/base/admin/body.html:130 +#: templates/web/base/admin/body.html:129 msgid "" "Choose a <strong>category</strong> 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." @@ -540,8 +529,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:15 #: templates/web/base/admin/report_blocks.html:25 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 @@ -550,7 +539,7 @@ msgstr "" msgid "Closed" msgstr "Затворен" -#: perllib/FixMyStreet/DB/Result/Problem.pm:779 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Closed by council" msgstr "Затворен от общината" @@ -576,7 +565,7 @@ msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° меÑтната имплементциÑ:" msgid "Cobrand:" msgstr "МеÑтна имплементциÑ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "КонфигурациÑ" @@ -595,9 +584,8 @@ msgstr "Потвърждаване на акаунта" #: templates/web/base/report/new/form_user_loggedout_password.html:21 #: templates/web/base/report/update/form_user_loggedout_password.html:20 -#, fuzzy msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." -msgstr "Потвърдете Ñигнала, въвеждайки имейла Ñи по-долу и въведете нова парола. Когато потвърдите имейла, паролата Ви ще Ñе Ñмени автоматично." +msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:1 #: templates/web/base/tokens/confirm_problem.html:1 @@ -607,7 +595,7 @@ msgstr "Потвърдете Ñигнала, въвеждайки имейла Ñ msgid "Confirmation" msgstr "Потвърждение" -#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:164 #: templates/web/base/admin/body.html:79 #: templates/web/base/admin/category_edit.html:37 #: templates/web/base/admin/category_edit.html:92 @@ -626,7 +614,7 @@ msgid "Confirmed:" msgstr "Потвърдени:" #. ("%s is the site name") -#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 +#: templates/web/base/about/_sidebar.html:6 msgid "Contact %s" msgstr "" @@ -645,8 +633,8 @@ msgstr "Връзка Ñ Ñ‚Ð¸Ð¼Ð°" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1417 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1445 msgid "Could not find user" msgstr "ПотребителÑÑ‚ не е намерен" @@ -664,7 +652,7 @@ msgstr "Община" msgid "Council contacts for %s" msgstr "Контакти на общината за %s " -#: perllib/FixMyStreet/DB/Result/Problem.pm:681 +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "Council ref: %s" msgstr "входÑщ номер в общината: %s" @@ -683,7 +671,7 @@ msgstr "Брой" msgid "Create a report" msgstr "Подай Ñигнал" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "Създай категориÑ" @@ -727,20 +715,20 @@ msgstr "Табло" msgid "Dealt with by subdivision within 5 working days" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:877 +#: perllib/FixMyStreet/App/Controller/Admin.pm:865 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:175 #: templates/web/base/admin/body.html:81 #: templates/web/base/admin/category_edit.html:42 #: templates/web/base/admin/category_edit.html:93 msgid "Deleted" msgstr "Изтрит" -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:47 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -748,7 +736,7 @@ msgid "Description" msgstr "ОпиÑание" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:68 +#: templates/web/zurich/report/new/fill_in_details_form.html:70 msgid "Details" msgstr "ИнформациÑ" @@ -773,11 +761,11 @@ msgid "Diligency prize league table" msgstr "Таблица Ñ Ñ€Ð°Ð¹Ð¾Ð½Ð¸Ñ‚Ðµ в СофиÑ" #. ("%s is the site name") -#: templates/web/base/auth/general.html:48 -#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/auth/general.html:58 +#: templates/web/base/report/new/form_user_loggedout.html:28 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout.html:17 +#: templates/web/base/report/update/form_user_loggedout.html:27 msgid "Do you have a %s password?" msgstr "" @@ -795,8 +783,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "Duplicate" msgstr "Вече ÑъщеÑтвува" @@ -820,7 +808,7 @@ msgstr "" msgid "Edit" msgstr "Редактиране" -#: templates/web/base/admin/body.html:220 +#: templates/web/base/admin/body.html:218 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "Редактиране на информациÑта за района" @@ -850,7 +838,7 @@ msgstr "Редактирано от" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:39 +#: templates/web/base/auth/general.html:49 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -858,11 +846,11 @@ msgstr "Редактирано от" msgid "Email" msgstr "Имейл" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 msgid "Email added to abuse list" msgstr "Имейлът е добавен в ÑпиÑъка ÑÑŠÑ Ð·Ð»Ð¾ÑƒÐ¿Ð¾Ñ‚Ñ€ÐµÐ±Ð¸" -#: templates/web/base/admin/body.html:155 +#: templates/web/base/admin/body.html:153 msgid "Email address:" msgstr "Имейл адреÑ:" @@ -874,19 +862,14 @@ msgstr "" msgid "Email alert deleted" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1390 msgid "Email already in abuse list" msgstr "Имейлът е в ÑпиÑъка ÑÑŠÑ Ð·Ð»Ð¾ÑƒÐ¿Ð¾Ñ‚Ñ€ÐµÐ±Ð¸" -#: templates/web/base/around/_updates.html:5 -msgid "Email me new local problems" -msgstr "Съобщавай ми новите Ñигнали" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 -#: templates/web/base/alert/updates.html:13 #: templates/web/zurich/admin/body.html:47 msgid "Email:" msgstr "Имейл:" @@ -895,26 +878,6 @@ msgstr "Имейл:" msgid "Email: %s" msgstr "Имейл: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 -msgid "Empty flat or maisonette" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 -msgid "Empty house or bungalow" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 -msgid "Empty office or other commercial" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 -msgid "Empty pub or bar" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 -msgid "Empty public building - school, hospital, etc." -msgstr "" - #: templates/web/base/admin/body-form.html:162 #: templates/web/base/admin/body-form.html:163 msgid "" @@ -958,18 +921,14 @@ msgstr "Въведете пощенÑки код или име на улица Ð msgid "Enter a nearby street name and area" msgstr "Въведете име на улица в близоÑÑ‚ до ваÑ" -#: perllib/FixMyStreet/Cobrand/ZeroTB.pm:7 -msgid "Enter a nearby street name and area, postal code or district in Delhi" -msgstr "" - -#: templates/web/base/auth/general.html:99 +#: templates/web/base/auth/general.html:109 #: templates/web/base/report/new/form_user_loggedout_by_email.html:38 #: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Въведете парола" -#: templates/web/base/index-steps.html:26 +#: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "Въведете Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° проблема" @@ -995,7 +954,7 @@ msgstr "Примерен пощенÑки Ð°Ð´Ñ€ÐµÑ %s" msgid "Examples:" msgstr "Примери:" -#: templates/web/base/report/new/form_report.html:49 +#: templates/web/base/report/new/form_report.html:51 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "" @@ -1032,19 +991,15 @@ msgstr "За първи път" msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." msgstr "" -#: templates/web/base/header.html:26 -msgid "FixMyStreet" -msgstr "ПоправиСофиÑ" - #: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:38 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:40 msgid "Fixed" msgstr "Поправено" @@ -1071,7 +1026,7 @@ msgstr "Означен като \"изтрит\"" msgid "Flag user" msgstr "Означаване на потребител" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "Означен" @@ -1093,8 +1048,7 @@ msgstr "Означените потребители нÑмат реÑтрикцРmsgid "Flagged:" msgstr "Означен:" -#: templates/web/base/reports/_ward-list.html:3 -#: templates/web/fixmystreet/reports/_ward-list.html:4 +#: templates/web/base/reports/_ward-list.html:4 msgid "Follow a ward link to view only reports within that ward." msgstr "ПоÑледвайте линка за района, за да видите Ñигнали Ñамо за този район." @@ -1125,18 +1079,18 @@ msgstr "ЧеÑто задавани въпроÑи" msgid "GeoRSS on Google Maps" msgstr "" +#: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:11 -#: templates/web/fixmystreet/around/_updates.html:3 msgid "Get updates" msgstr "ИзтеглÑне на актуализациите" -#: templates/web/fixmystreet/reports/_rss.html:3 -#: templates/web/fixmystreet/reports/_rss.html:9 +#: templates/web/base/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:9 msgid "Get updates of %s problems" msgstr "ИзтеглÑне на актуализациите на %s Ñигналите " -#: templates/web/fixmystreet/reports/_rss.html:11 -#: templates/web/fixmystreet/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:11 +#: templates/web/base/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "ИзтеглÑне на актуализациите за Ñигналите в %s" @@ -1149,7 +1103,7 @@ msgid "Glad to hear it’s been fixed!" msgstr "" #: templates/web/base/alert/index.html:34 -#: templates/web/base/around/postcode_form.html:16 +#: templates/web/base/around/postcode_form.html:13 #: templates/web/base/reports/_list-filters.html:28 #: templates/web/zurich/admin/stats.html:26 msgid "Go" @@ -1177,7 +1131,7 @@ msgstr "" "Подавали ли Ñте Ñигнал за нередноÑÑ‚ към общината преди или Ñега \n" "подавате за първи път?" -#: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:38 +#: templates/web/base/footer.html:38 #: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 @@ -1188,8 +1142,7 @@ msgstr "Помощ" msgid "Here are the types of local problem alerts for ‘%s’." msgstr "Това Ñа типовете извеÑÑ‚Ð¸Ñ Ð·Ð° нови Ñигнали за ‘%s’." -#: templates/web/base/header.html:32 templates/web/fixmystreet/header.html:63 -#: templates/web/zurich/footer.html:12 +#: templates/web/base/header.html:63 templates/web/zurich/footer.html:12 msgid "Hi %s" msgstr "Здравей %s" @@ -1205,11 +1158,11 @@ msgstr "Здравей %s" msgid "Hidden" msgstr "Скрити" -#: templates/web/base/around/display_location.html:65 +#: templates/web/base/around/display_location.html:64 msgid "Hide old" msgstr "Скрий Ñтарите" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:59 msgid "Hide pins" msgstr "Скрий кабърчетата" @@ -1229,10 +1182,6 @@ msgstr "Как да Ñигнализирате за проблем" msgid "How to send successful reports" msgstr "Как да подавате Ñигнали уÑпешно" -#: perllib/FixMyStreet/App/Controller/Admin.pm:752 -msgid "I am afraid you cannot confirm unconfirmed reports." -msgstr "Ðе можете да потвърдите непотвърден през имейла Ñигнал" - #: templates/web/base/tokens/confirm_problem.html:23 #: templates/web/base/tokens/confirm_problem.html:27 msgid "I just reported a problem on @fixmystreet" @@ -1243,7 +1192,7 @@ msgstr "" msgid "I just updated a problem on @fixmystreet" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88 msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "ВашиÑÑ‚ Ñигнал не беше намерен.\n" @@ -1265,7 +1214,7 @@ msgid "" " For basic installations, you don't need to join bodies in this way." msgstr "" -#: templates/web/base/admin/body.html:133 +#: templates/web/base/admin/body.html:132 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." @@ -1286,7 +1235,7 @@ msgid "" "(please note it will not be sent to the council)." msgstr "" -#: templates/web/base/admin/body.html:149 +#: templates/web/base/admin/body.html:147 msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." msgstr "" @@ -1321,10 +1270,10 @@ msgstr "ÐеÑъщеÑтвуващ номер" msgid "Illegal feed selection" msgstr "" +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "In Progress" msgstr "Ð’ Ð¿Ñ€Ð¾Ñ†ÐµÑ Ð½Ð° обработка" @@ -1375,7 +1324,7 @@ msgstr "Вътрешен номер" msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 msgid "Invalid end date" msgstr "ÐевÑрна дата" @@ -1383,16 +1332,16 @@ msgstr "ÐевÑрна дата" msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 msgid "Invalid start date" msgstr "ÐевÑрна дата" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:5 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Investigating" msgstr "Сигналът Ñе разглежда" @@ -1414,7 +1363,7 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:80 +#: 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 @@ -1452,7 +1401,6 @@ msgstr "Зареждане..." #: 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/fixmystreet/alert/updates.html:1 msgid "Local RSS feeds and email alerts" msgstr "RSS и имейл извеÑÑ‚Ð¸Ñ Ð·Ð° Ñигнали" @@ -1461,11 +1409,11 @@ msgstr "RSS и имейл извеÑÑ‚Ð¸Ñ Ð·Ð° Ñигнали" msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "RSS и имейл извеÑÑ‚Ð¸Ñ Ð·Ð° Ñигнали за ‘%s’" -#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:35 +#: templates/web/base/footer.html:35 msgid "Local alerts" msgstr "ИзвеÑтиÑ" -#: templates/web/base/index-steps.html:25 +#: templates/web/base/index-steps.html:5 msgid "Locate the problem on a map of the area" msgstr "Локализирайте проблема на картата" @@ -1525,14 +1473,14 @@ msgstr "МеÑец" #: templates/web/base/admin/list_updates.html:7 #: templates/web/base/admin/reports.html:13 #: templates/web/base/admin/users.html:15 -#: templates/web/base/auth/general.html:89 +#: templates/web/base/auth/general.html:99 #: templates/web/base/report/new/form_user_loggedin.html:9 #: templates/web/base/report/new/form_user_loggedout_by_email.html:7 -#: templates/web/base/report/update/form_name.html:4 +#: templates/web/base/report/update/form_name.html:5 #: templates/web/base/reports/index.html:20 #: 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:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "Name" msgstr "Име" @@ -1556,8 +1504,8 @@ msgstr "" msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:455 -#: perllib/FixMyStreet/Cobrand/Default.pm:495 +#: perllib/FixMyStreet/Cobrand/Default.pm:454 +#: perllib/FixMyStreet/Cobrand/Default.pm:494 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" @@ -1579,7 +1527,7 @@ msgstr "Ðови <br>Ñигнали" msgid "New body added" msgstr "Районът е добавен" -#: perllib/FixMyStreet/App/Controller/Admin.pm:387 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 msgid "New category contact added" msgstr "КатегориÑта е добавена" @@ -1644,7 +1592,7 @@ msgstr "Слеващ" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 -#: templates/web/base/questionnaire/index.html:101 +#: templates/web/base/questionnaire/index.html:102 #: templates/web/base/questionnaire/index.html:53 msgid "No" msgstr "Ðе" @@ -1709,8 +1657,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Not Responsible" msgstr "" @@ -1743,7 +1691,7 @@ 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 "" -#: templates/web/base/admin/body.html:186 +#: templates/web/base/admin/body.html:184 #: templates/web/base/admin/category_edit.html:52 #: templates/web/zurich/admin/body.html:53 msgid "Note:" @@ -1757,15 +1705,15 @@ msgstr "Бележка: <strong>%s</strong>" msgid "Notes from SDM to DM" msgstr "" -#: templates/web/base/report/new/form_user_loggedout.html:14 #: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/form_user_loggedout.html:24 #: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "Сега да изпратим Ð’Ð°ÑˆÐ¸Ñ Ñигнал…" #: templates/web/base/report/update-form.html:28 -#: templates/web/base/report/update/form_user_loggedout.html:13 #: templates/web/base/report/update/form_user_loggedout.html:2 +#: templates/web/base/report/update/form_user_loggedout.html:23 msgid "Now to submit your update…" msgstr "Изпратете актуализациÑта…" @@ -1799,8 +1747,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:23 #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/report/update/form_update.html:36 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1835,13 +1783,13 @@ msgstr "" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "Или можете да Ñе абонирате за вÑички извеÑÑ‚Ð¸Ñ Ð½Ð° териториÑта на Ð¡Ð¾Ñ„Ð¸Ñ Ð¸Ð»Ð¸ Ñамо за района, в който Ñе намирате." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1055 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 -#: perllib/FixMyStreet/DB/Result/Problem.pm:558 -#: perllib/FixMyStreet/DB/Result/Problem.pm:568 -#: perllib/FixMyStreet/DB/Result/Problem.pm:578 -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1044 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:659 +#: perllib/FixMyStreet/DB/Result/Problem.pm:562 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 +#: perllib/FixMyStreet/DB/Result/Problem.pm:582 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 #: perllib/FixMyStreet/Script/Reports.pm:175 #: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" @@ -1866,7 +1814,7 @@ msgstr "Община" msgid "Partial" msgstr "ЧаÑтичен" -#: templates/web/base/auth/general.html:92 +#: templates/web/base/auth/general.html:102 #: templates/web/base/report/new/form_user_loggedout_by_email.html:31 #: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 @@ -1875,7 +1823,7 @@ msgid "Password (optional)" msgstr "Парола (незадължително)" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:72 +#: templates/web/base/auth/general.html:82 msgid "Password:" msgstr "Парола:" @@ -1883,7 +1831,7 @@ msgstr "Парола:" msgid "Permalink" msgstr "Връзка" -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:90 msgid "Phone number" msgstr "Телефонен номер" @@ -1899,13 +1847,21 @@ msgid "Phone:" msgstr "Телефон:" #: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/questionnaire/index.html:89 +#: templates/web/base/questionnaire/index.html:91 #: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/new/form_report.html:38 +#: templates/web/base/report/new/form_report.html:40 +#: templates/web/base/report/update/form_update.html:20 +#: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:6 #: 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:45 +#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/zurich/report/new/fill_in_details_form.html:63 msgid "Photo" msgstr "Снимка" @@ -1929,8 +1885,8 @@ msgstr "ПоÑтавете кабърче върху картата" #: perllib/FixMyStreet/Cobrand/Zurich.pm:955 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:6 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 @@ -1946,16 +1902,16 @@ msgstr "ÐœÐ¾Ð»Ñ Ð±ÑŠÐ´ÐµÑ‚Ðµ учтиви, кратки и Ñе придържРmsgid "Please check the passwords and try again" msgstr "ÐœÐ¾Ð»Ñ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐµÑ‚Ðµ паролите и пробвайте отново" -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:33 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:43 #: 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:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:856 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:921 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -1965,7 +1921,7 @@ msgstr "ÐœÐ¾Ð»Ñ Ð¸Ð·Ð±ÐµÑ€ÐµÑ‚Ðµ категориÑ" msgid "Please choose a property type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:378 +#: perllib/FixMyStreet/App/Controller/Admin.pm:376 msgid "Please correct the errors below" msgstr "" @@ -1986,11 +1942,10 @@ msgstr "ÐœÐ¾Ð»Ñ Ð½Ðµ обиждайте никого - обиждайки ÐžÐ±Ñ msgid "Please enter a message" msgstr "ÐœÐ¾Ð»Ñ Ð²ÑŠÐ²ÐµÐ´ÐµÑ‚Ðµ Ñъобщение" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Admin.pm:1079 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 msgid "Please enter a name" -msgstr "ÐœÐ¾Ð»Ñ Ð²ÑŠÐ²ÐµÐ´ÐµÑ‚Ðµ име" +msgstr "" #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 @@ -2004,10 +1959,10 @@ msgstr "ÐœÐ¾Ð»Ñ Ð²ÑŠÐ²ÐµÐ´ÐµÑ‚Ðµ парола" msgid "Please enter a subject" msgstr "ÐœÐ¾Ð»Ñ Ð²ÑŠÐ²ÐµÐ´ÐµÑ‚Ðµ тема" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1075 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1130 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:133 +#: perllib/FixMyStreet/DB/Result/User.pm:143 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2024,9 +1979,9 @@ msgid "Please enter some details" msgstr "ÐœÐ¾Ð»Ñ Ð²ÑŠÐ²ÐµÐ´ÐµÑ‚Ðµ информациÑ" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:130 -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:32 +#: perllib/FixMyStreet/DB/Result/User.pm:140 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:42 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2035,7 +1990,7 @@ msgid "Please enter your email" msgstr "ÐœÐ¾Ð»Ñ Ð²ÑŠÐ²ÐµÐ´ÐµÑ‚Ðµ имейл" #: templates/web/base/report/new/form_user_loggedout_email.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:80 +#: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "Please enter your email address" msgstr "ÐœÐ¾Ð»Ñ Ð²ÑŠÐ²ÐµÐ´ÐµÑ‚Ðµ имейл адреÑ" @@ -2051,7 +2006,7 @@ msgstr "ÐœÐ¾Ð»Ñ Ð²ÑŠÐ²ÐµÐ´ÐµÑ‚Ðµ цÑлото Ñи име, общината ÑÐ #: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:126 +#: perllib/FixMyStreet/DB/Result/User.pm:136 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "ÐœÐ¾Ð»Ñ Ð²ÑŠÐ²ÐµÐ´ÐµÑ‚Ðµ име" @@ -2078,7 +2033,7 @@ msgstr "Можете да <a href=\"%s\">влезете отново</a> или msgid "Please fill in details of the problem below." msgstr "ÐœÐ¾Ð»Ñ Ð¿Ð¾Ð¿ÑŠÐ»Ð½ÐµÑ‚Ðµ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° проблема." -#: templates/web/zurich/report/new/fill_in_details_form.html:72 +#: templates/web/zurich/report/new/fill_in_details_form.html:74 msgid "Please fill in details of the problem." msgstr "ÐœÐ¾Ð»Ñ Ð¿Ð¾Ð¿ÑŠÐ»Ð½ÐµÑ‚Ðµ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° проблема." @@ -2087,7 +2042,7 @@ msgstr "ÐœÐ¾Ð»Ñ Ð¿Ð¾Ð¿ÑŠÐ»Ð½ÐµÑ‚Ðµ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° проблема." msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "ÐœÐ¾Ð»Ñ Ð¿Ð¾Ð¿ÑŠÐ»Ð½ÐµÑ‚Ðµ формата Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° проблема и опишете меÑтоположението възможно най-точно." -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "ÐœÐ¾Ð»Ñ Ð¾Ñ‚Ð±ÐµÐ»ÐµÐ¶ÐµÑ‚Ðµ дали бихте иÑкали да учаÑтвате в друга анкета" @@ -2113,16 +2068,16 @@ msgstr "" msgid "Please note:" msgstr "Забележка:" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please provide some explanation as to why you're reopening this report" msgstr "ÐœÐ¾Ð»Ñ Ð²ÑŠÐ²ÐµÐ´ÐµÑ‚Ðµ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð°Ñ‰Ð¾ отварÑте Ñигнала отново." -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250 msgid "Please provide some text as well as a photo" msgstr "ÐœÐ¾Ð»Ñ Ð²ÑŠÐ²ÐµÐ´ÐµÑ‚Ðµ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¸ приложете Ñнимка." -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236 msgid "Please say whether you've ever reported a problem to your council before" msgstr "ÐœÐ¾Ð»Ñ Ð¾Ñ‚Ð³Ð¾Ð²Ð¾Ñ€ÐµÑ‚Ðµ дали нÑкога Ñте подавали Ñигнал към общината преди." @@ -2138,22 +2093,23 @@ msgstr "ÐœÐ¾Ð»Ñ Ð¸Ð·Ð±ÐµÑ€ÐµÑ‚Ðµ начин на извеÑÑ‚Ñване" msgid "Please select the type of alert you want" msgstr "ÐœÐ¾Ð»Ñ Ð¸Ð·Ð±ÐµÑ€ÐµÑ‚Ðµ тип извеÑтиÑ, които бихте иÑкали да получаваме" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232 msgid "Please state whether or not the problem has been fixed" msgstr "ÐœÐ¾Ð»Ñ Ð¿Ð¾Ñочете дали проблемът е бил разрешен или не" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:121 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 #: templates/web/base/js/translation_strings.html:53 -msgid "Please upload a JPEG image only" +#, fuzzy +msgid "Please upload an image only" msgstr "ÐœÐ¾Ð»Ñ ÐºÐ°Ñ‡Ð²Ð°Ð¹Ñ‚Ðµ Ñамо JPEG изображениÑ" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 msgid "Please write a message" msgstr "ÐœÐ¾Ð»Ñ Ð²ÑŠÐ²ÐµÐ´ÐµÑ‚Ðµ Ñъобщение" -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Please write your update here" msgstr "ÐœÐ¾Ð»Ñ Ð²ÑŠÐ²ÐµÐ´ÐµÑ‚Ðµ новото Ñъобщение тук" @@ -2184,7 +2140,7 @@ msgstr "" msgid "Previous" msgstr "Предишно" -#: templates/web/fixmystreet/footer.html:41 +#: templates/web/base/footer.html:41 msgid "Privacy" msgstr "" @@ -2194,7 +2150,7 @@ msgstr "" msgid "Privacy and cookies" msgstr "" -#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:200 #: templates/web/base/admin/body.html:85 #: templates/web/base/admin/category_edit.html:45 #: templates/web/base/admin/report_edit.html:77 @@ -2223,7 +2179,7 @@ msgstr "Сигналът %s е подаден към общината %s " msgid "Problem breakdown by state" msgstr "РазделÑне на Ñигналите по ÑтатуÑи" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1046 msgid "Problem marked as open." msgstr "Сигналът е маркиран като отворен." @@ -2235,10 +2191,6 @@ msgstr "СтатуÑÑŠÑ‚ на Ñигнала е променен на оÑнов msgid "Problems" msgstr "Сигнали" -#: templates/web/base/around/_updates.html:1 -msgid "Problems in this area" -msgstr "Други Ñигнали на тази териториÑ" - #: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "Други Ñигнали наоколо" @@ -2256,13 +2208,11 @@ msgid "Problems within %.1fkm of this location" msgstr "Сигнали в Ñ€Ð°Ð´Ð¸ÑƒÑ Ð¾Ñ‚ %.1fкм от това меÑтоположение" #: perllib/FixMyStreet/Cobrand/Default.pm:663 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 #: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "Сигнали в %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "Сигнали в квартал %s" @@ -2281,15 +2231,11 @@ msgstr "Сигнали в границите на:" msgid "Property address:" msgstr "ÐÐ´Ñ€ÐµÑ Ð½Ð° имота:" -#: templates/web/base/report/new/category.html:8 -msgid "Property type:" -msgstr "Тип на имота:" - #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Въведете Ð¸Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° актуализиране" -#: templates/web/base/auth/general.html:95 +#: templates/web/base/auth/general.html:105 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 "Използването на потребителÑко име е опционално, но това ще ви позволи по-леÑно да подавате Ñигнали и да публикувате Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¸ актуализации." @@ -2323,16 +2269,15 @@ msgstr "Ðнкетата %d е попълнена за проблем %d, %s дРmsgid "Questionnaire %d sent for problem %d" msgstr "Ðнкетата %d за проблем %d е изпратена" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 msgid "Questionnaire filled in by problem reporter" msgstr "Ðнкетата е попълнена от потребителÑ, подал Ñигнала" #: templates/web/base/alert/_list.html:22 +#: templates/web/base/alert/updates.html:9 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display_tools.html:34 -#: templates/web/base/reports/_rss.html:1 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed" msgstr "RSS абонамент" @@ -2360,18 +2305,12 @@ msgstr "RSS абонамент за %s, в квартал %s" msgid "RSS feed of nearby problems" msgstr "RSS абонамент за поÑледни проблеми наоколо" -#: templates/web/base/reports/_rss.html:1 -msgid "RSS feed of problems in this %s" -msgstr "RSS абонамент за проблеми в този %s" - #: perllib/FixMyStreet/Cobrand/Default.pm:664 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 #: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "RSS абонамент за проблеми в %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 #: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "RSS абонамент за проблеми в квартал %s" @@ -2381,14 +2320,13 @@ msgstr "RSS абонамент за проблеми в квартал %s" msgid "RSS feed of recent local problems" msgstr "RSS абонамент за поÑледни проблеми наоколо" +#: templates/web/base/alert/updates.html:9 #: templates/web/base/report/display_tools.html:34 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed of updates to this problem" msgstr "RSS абонамент за актуализации по този проблем" -#: templates/web/base/alert/updates.html:9 +#: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:36 -#: templates/web/fixmystreet/alert/updates.html:14 msgid "Receive email when updates are left on this problem." msgstr "Получаване на имейл при Ð°ÐºÑ‚ÑƒÐ°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ñ Ð½Ð° проблема." @@ -2424,12 +2362,11 @@ msgstr "Премахване на Ñнимката (необратимо Ð´ÐµÐ¹Ñ msgid "Reply to user:" msgstr "" -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/header_logo.html:2 msgid "Report" msgstr "" -#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:26 -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/footer.html:26 templates/web/base/header_logo.html:2 #: templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2439,7 +2376,7 @@ msgstr "Подайте Ñигнал" msgid "Report abuse" msgstr "Сигнализирай за неподходÑщо Ñъдържание" -#: perllib/FixMyStreet/App/Controller/Rss.pm:291 +#: perllib/FixMyStreet/App/Controller/Rss.pm:297 msgid "Report on %s" msgstr "Сигнал за %s " @@ -2454,7 +2391,7 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "Сигнализирай, разгледай или коментирай проблеми" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:577 #: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "" @@ -2464,7 +2401,7 @@ msgstr "" msgid "Reported before" msgstr "Подавал Ñъм и преди" -#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 #: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "" @@ -2478,27 +2415,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "Сигналът е подаден в ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ %s " -#: perllib/FixMyStreet/DB/Result/Problem.pm:569 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 msgid "Reported in the %s category anonymously at %s" msgstr "Сигналът е подаден анонимно в ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ %s в %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:591 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 msgid "Reported in the %s category by %s at %s" msgstr "Сигналът е подаден в ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ %s от %s в %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported via %s anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported via %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:561 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 msgid "Reported via %s in the %s category anonymously at %s" msgstr "Сигналът е подаден анонимно чрез %s в ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ %s в %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 msgid "Reported via %s in the %s category by %s at %s" msgstr "Сигналът е подаден чрез %s в ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ %s от %s в %s" @@ -2519,7 +2456,7 @@ msgstr "" msgid "Reporting a problem" msgstr "Сигнализиране за проблем" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1274 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" @@ -2562,15 +2499,15 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1496 #: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "Завъртане налÑво" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 #: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 @@ -2585,7 +2522,7 @@ msgstr "" msgid "Satellite" msgstr "" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/base/admin/category_edit.html:84 #: templates/web/zurich/admin/body.html:59 #: templates/web/zurich/admin/template_edit.html:29 @@ -2641,7 +2578,7 @@ msgstr "" msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:696 +#: perllib/FixMyStreet/DB/Result/Problem.pm:698 msgid "Sent to %s %s later" msgstr "Сигналът е подаден към %s преди %s" @@ -2660,21 +2597,21 @@ msgstr "Сподели" #: templates/web/base/report/new/form_user_loggedin.html:23 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22 -#: templates/web/base/report/update/form_name.html:15 +#: templates/web/base/report/update/form_name.html:16 msgid "Show my name publicly" msgstr "Показвай името ми публично" -#: templates/web/base/around/display_location.html:67 +#: templates/web/base/around/display_location.html:66 msgid "Show old" msgstr "Показване на Ñтарите" -#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:57 msgid "Show pins" msgstr "Покажи кабърчетата" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/general.html:110 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:76 +#: templates/web/base/auth/general.html:86 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2742,15 +2679,10 @@ msgstr "" msgid "Sorry, we could not parse that location. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:138 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 -#, fuzzy -msgid "Sorry, you can not log in with Facebook. Please try again later." -msgstr "Възникна проблем при визуализирането на Ñтраницата. ÐœÐ¾Ð»Ñ Ð¿Ñ€Ð¾Ð±Ð²Ð°Ð¹Ñ‚Ðµ по-къÑно." - #: templates/web/base/admin/stats.html:64 msgid "Start Date:" msgstr "Ðачална дата:" @@ -2759,7 +2691,7 @@ msgstr "Ðачална дата:" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/report/update/form_update.html:32 +#: templates/web/base/report/update/form_update.html:34 msgid "State" msgstr "" @@ -2772,7 +2704,7 @@ msgstr "" msgid "State:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2812,10 +2744,10 @@ msgid "Subject:" msgstr "Тема:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/base/report/new/form_user_loggedout_by_email.html:39 #: templates/web/base/report/new/form_user_loggedout_password.html:11 -#: templates/web/zurich/report/new/fill_in_details_form.html:96 +#: templates/web/zurich/report/new/fill_in_details_form.html:98 msgid "Submit" msgstr "Изпращане" @@ -2843,9 +2775,8 @@ msgstr "Изпращане на анкетата" msgid "Submitted" msgstr "Сигналът е потвърден" -#: templates/web/base/alert/updates.html:17 +#: templates/web/base/alert/updates.html:23 #: templates/web/base/report/display_tools.html:41 -#: templates/web/fixmystreet/alert/updates.html:23 msgid "Subscribe" msgstr "Ðбониране" @@ -2853,7 +2784,7 @@ msgstr "Ðбониране" msgid "Subscribe me to an email alert" msgstr "Ðбониране за извеÑÑ‚Ñване по имейл" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -2872,7 +2803,7 @@ msgstr "Обобщение" msgid "Summary reports" msgstr "Обобщена Ñправка" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 msgid "Survey" msgstr "Проучване" @@ -2929,7 +2860,7 @@ msgstr "Ð‘Ð»Ð°Ð³Ð¾Ð´Ð°Ñ€Ñ Ð·Ð° предоÑтавената Ñнимка. ТъРmsgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "БлагодарÑ! Радваме Ñе, че този проблем е бил разрешен! Бихме иÑкли да Ви питаме подавали ли Ñте Ñигнали към общината и преди?" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:157 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "Прикачването на изображение е неуÑпешно (%s). ÐœÐ¾Ð»Ñ Ð¾Ð¿Ð¸Ñ‚Ð°Ð¹Ñ‚Ðµ отново." @@ -2937,7 +2868,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:126 +#: perllib/FixMyStreet/App/Controller/Location.pm:127 msgid "That location does not appear to be in the UK; please try again." msgstr "" @@ -2947,11 +2878,11 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "ÐœÐ¾Ð»Ñ Ð´Ð° ни извините, този пощенÑки код не беше разпознат." -#: perllib/FixMyStreet/App/Controller/Admin.pm:724 +#: perllib/FixMyStreet/App/Controller/Admin.pm:722 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:716 +#: perllib/FixMyStreet/App/Controller/Admin.pm:714 msgid "That problem will now be resent." msgstr "Сигналът ще бъде препратен." @@ -2963,7 +2894,7 @@ msgstr "Сигналът не може да бъде разгледан %s." msgid "That report has been removed from FixMyStreet." msgstr "Този Ñигнал е бил изтрит от ПоправиСофиÑ." -#: templates/web/base/admin/body.html:144 +#: templates/web/base/admin/body.html:142 msgid "" "The <strong>email address</strong> is the destination to which reports about this category will be sent. \n" " Other categories for this body may have the same email address." @@ -3105,9 +3036,9 @@ msgstr "Възникна проблем при визуализирането н msgid "There was a problem showing this page. Please try again later." msgstr "Възникна проблем при визуализирането на Ñтраницата. ÐœÐ¾Ð»Ñ Ð¿Ñ€Ð¾Ð±Ð²Ð°Ð¹Ñ‚Ðµ по-къÑно." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:753 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 -#: templates/web/base/auth/general.html:43 +#: templates/web/base/auth/general.html:53 #: 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 "Възникна проблем Ñ ÐºÐ¾Ð¼Ð±Ð¸Ð½Ð°Ñ†Ð¸Ñта имейл/парола. Ðко не можете да Ñи Ñпомните паролата или нÑмате такава, Ð¼Ð¾Ð»Ñ Ð¿Ð¾Ð¿ÑŠÐ»Ð½ÐµÑ‚Ðµ ÑекциÑта ‘влизане чрез имейл’." @@ -3168,9 +3099,9 @@ msgstr "Този имейл е изпратен към двете общини Ð 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:920 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:898 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:935 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:977 #: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "Тази Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ðµ необходима" @@ -3183,11 +3114,11 @@ msgstr "" msgid "This is a summary of all reports on this site." msgstr "Това е обобщение на вÑички Ñигнали в Ñайта." -#: templates/web/base/report/update/form_update.html:52 +#: templates/web/base/report/update/form_update.html:54 msgid "This problem has been fixed" msgstr "Този проблем е решен." -#: templates/web/base/report/update/form_update.html:46 +#: templates/web/base/report/update/form_update.html:48 msgid "This problem has not been fixed" msgstr "Този проблем не е решен." @@ -3224,7 +3155,7 @@ msgstr "Тази Ñтраница Ñъдържа и Ñнимка, изпрате msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Времева линиÑ" @@ -3269,8 +3200,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Unable to fix" msgstr "" @@ -3287,7 +3218,7 @@ msgstr "Ðепотвърден" msgid "Unknown" msgstr "ÐеизвеÑтен" -#: perllib/FixMyStreet/App/Controller/Rss.pm:173 +#: perllib/FixMyStreet/App/Controller/Rss.pm:174 msgid "Unknown alert type" msgstr "" @@ -3302,7 +3233,7 @@ msgstr "Ðепозната грешка" msgid "Unknown problem ID" msgstr "" -#: templates/web/base/report/update/form_update.html:25 +#: templates/web/base/report/update/form_update.html:27 msgid "Update" msgstr "ÐктуализациÑ" @@ -3354,10 +3285,10 @@ msgstr "ÐÐºÑ‚ÑƒÐ°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ñ Ð½Ð° ÑтатуÑите" msgid "Updated" msgstr "Ðктуализирано!" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 -#: perllib/FixMyStreet/App/Controller/Admin.pm:821 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1096 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1144 +#: perllib/FixMyStreet/App/Controller/Admin.pm:809 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3384,7 +3315,7 @@ msgstr "Ðктуализиране на {{title}}" msgid "Updates to this problem, %s" msgstr "" -#: templates/web/base/admin/body.html:182 +#: templates/web/base/admin/body.html:180 msgid "Use the <strong>note</strong> to record details that are only displayed in the admin. Notes are not shown publicly, and are not sent to the body." msgstr "" @@ -3393,11 +3324,11 @@ msgstr "" msgid "Used map" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1421 msgid "User flagged" msgstr "" @@ -3405,16 +3336,16 @@ msgstr "" msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "Потребители" -#: perllib/FixMyStreet/App/Controller/Admin.pm:382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:412 -#: perllib/FixMyStreet/App/Controller/Admin.pm:429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:380 +#: perllib/FixMyStreet/App/Controller/Admin.pm:410 +#: perllib/FixMyStreet/App/Controller/Admin.pm:427 msgid "Values updated" msgstr "Ðктуализиране на ÑтойноÑтите" @@ -3451,16 +3382,15 @@ msgstr "Ðамерихме повече от едно Ñъвпадение за #: templates/web/base/auth/general.html:6 #: templates/web/base/report/display.html:27 #: templates/web/base/report/new/oauth_email_form.html:5 -#, fuzzy msgid "We need your email address, please give it below." -msgstr "Ðие никога не показваме Ð²Ð°ÑˆÐ¸Ñ Ð¸Ð¼ÐµÐ¹Ð» или телефонен номер." +msgstr "" #: templates/web/base/report/new/form_user_loggedout_email.html:2 #: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "Ðие никога не показваме Ð²Ð°ÑˆÐ¸Ñ Ð¸Ð¼ÐµÐ¹Ð»" -#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedin.html:30 #: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "Ðие никога не показваме Ð²Ð°ÑˆÐ¸Ñ Ð¸Ð¼ÐµÐ¹Ð» или телефонен номер." @@ -3469,7 +3399,7 @@ msgstr "Ðие никога не показваме Ð²Ð°ÑˆÐ¸Ñ Ð¸Ð¼ÐµÐ¹Ð» или 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 "" -#: templates/web/base/index-steps.html:31 +#: templates/web/base/index-steps.html:11 msgid "We send it to the council on your behalf" msgstr "Ðие ще го изпратим на общината вмеÑто ВаÑ" @@ -3507,10 +3437,6 @@ msgstr "Изпратен" msgid "Whoa there Testino! Three photos are enough." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 -msgid "Whole block of empty flats" -msgstr "" - #: templates/web/base/tokens/confirm_alert.html:7 msgid "Why stop there? <a href=\"/alert\">Set up more alerts</a> for free." msgstr "" @@ -3530,7 +3456,7 @@ msgstr "" msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "" -#: templates/web/base/questionnaire/index.html:96 +#: templates/web/base/questionnaire/index.html:97 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "Бихте ли иÑкали да получите още една анкета Ñлед 4 Ñедмици, за да ви напомни да проверите ÑтатуÑа?" @@ -3560,8 +3486,8 @@ msgstr "Година" #: templates/web/base/admin/update_edit.html:24 #: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 +#: templates/web/base/questionnaire/index.html:100 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "Да" @@ -3678,19 +3604,19 @@ msgid "Your Reports" msgstr "Вашите Сигнали" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/alert/updates.html:19 +#: templates/web/base/alert/updates.html:22 #: templates/web/base/contact/index.html:83 #: templates/web/base/report/display_tools.html:38 #: templates/web/base/report/display_tools.html:40 #: templates/web/base/report/new/form_user_loggedin.html:3 #: templates/web/base/report/new/form_user_loggedout_email.html:1 #: templates/web/base/report/update/form_user_loggedout_email.html:1 -#: templates/web/fixmystreet/alert/updates.html:19 -#: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/zurich/report/new/fill_in_details_form.html:76 +#: templates/web/zurich/report/new/fill_in_details_form.html:78 msgid "Your email" msgstr "Имейл" -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/general.html:55 #: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 @@ -3701,17 +3627,17 @@ msgstr "Имейл адреÑ" msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "Вашата Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ñ‰Ðµ бъде използва Ñамо ÑпрÑмо нашата <a href=\"/privacy\">Политика за поверителноÑÑ‚</a>" -#: templates/web/base/auth/general.html:90 +#: templates/web/base/auth/general.html:100 #: templates/web/base/contact/index.html:76 #: templates/web/base/report/new/form_user_loggedin.html:18 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17 -#: templates/web/base/report/update/form_name.html:11 +#: templates/web/base/report/update/form_name.html:12 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:86 +#: templates/web/zurich/report/new/fill_in_details_form.html:88 msgid "Your name" msgstr "Име" -#: templates/web/base/auth/general.html:75 +#: templates/web/base/auth/general.html:85 #: 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 @@ -3724,20 +3650,19 @@ msgstr "Паролата Ви беше променена уÑпешно" #: templates/web/base/report/new/form_user_loggedin.html:27 #: templates/web/base/report/new/form_user_loggedout_by_email.html:26 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:94 msgid "Your phone number" msgstr "Телефонен номер" #: templates/web/base/questionnaire/index.html:14 -#, fuzzy msgid "Your report" -msgstr "Вашите Ñигнали" +msgstr "" -#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 +#: templates/web/base/footer.html:29 msgid "Your reports" msgstr "Вашите Ñигнали" -#: templates/web/base/my/my.html:41 +#: templates/web/base/my/my.html:39 msgid "Your updates" msgstr "Ðктуализации" @@ -3763,7 +3688,7 @@ msgid "didn't use map" msgstr "картата не е била използвана" #: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/around/postcode_form.html:12 msgid "e.g. ‘%s’ or ‘%s’" msgstr "напр. ‘%s’ или ‘%s’" @@ -3869,8 +3794,7 @@ msgstr "други територии:" msgid "reopened" msgstr "отново отворен" -#: templates/web/base/header.html:33 templates/web/fixmystreet/header.html:64 -#: templates/web/zurich/footer.html:13 +#: templates/web/base/header.html:64 templates/web/zurich/footer.html:13 msgid "sign out" msgstr "излизане" @@ -3948,7 +3872,7 @@ msgid_plural "<big>%s</big> updates on reports" msgstr[0] "<big>%s</big>актуализиран Ñигнал" msgstr[1] "<big>%s</big>актуализирани Ñигнала" -#: templates/web/emptyhomes/report/new/councils_text_none.html:3 +#: templates/web/base/report/new/councils_text_none.html:3 #, perl-format msgid "We do not yet have details for the council that covers this location." msgid_plural "We do not yet have details for the councils that cover this location." @@ -3990,82 +3914,26 @@ msgid_plural "We do <strong>not</strong> yet have details for the other councils msgstr[0] "Ð’Ñе още <strong>нÑмаме</strong> Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° общината, коÑто ÑтопаниÑва тази териториÑ." msgstr[1] "Ð’Ñе още <strong>нÑмаме</strong> Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° общините, които ÑтопаниÑват тази териториÑ." -#~ msgid "(we never show your email address or phone number)" -#~ msgstr "(ние никога не показваме Ð²Ð°ÑˆÐ¸Ñ Ð¸Ð¼ÐµÐ¹Ð» или телефонен номер)" - -#~ msgid "(we never show your email)" -#~ msgstr "(ние никога не показваме Ð²Ð°ÑˆÐ¸Ñ Ð¸Ð¼ÐµÐ¹Ð»)" - -#~ msgid "<strong>No</strong>, let me confirm my report by email:" -#~ msgstr "<strong>Ðе</strong> Ðека да Ð¿Ð¾Ñ‚Ð²ÑŠÑ€Ð´Ñ Ñигнала чрез имейл" - -#~ msgid "<strong>No</strong>, let me confirm my update by email:" -#~ msgstr "<strong>Ðе</strong> Ðека Ð¿Ð¾Ñ‚Ð²ÑŠÑ€Ð´Ñ Ð¿Ñ€Ð¾Ð¼Ñната чрез имейл:" - -#~ msgid "Email me updates" -#~ msgstr "Съобщавай ми за промени" - -#~ msgid "Enter a new password:" -#~ msgstr "Въведете нова парола:" - -#~ msgid "If you use web-based email or have 'junk mail' filters, you may wish to check your bulk/spam mail folders: sometimes, our messages are marked that way." -#~ msgstr "Ðко използвате уеб мейл клиент или имате наÑтроени филтри за нежелана поща, Ð¼Ð¾Ð»Ñ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐµÑ‚Ðµ папките ÑÑŠÑ Ñпам/нежелана поща. ПонÑкога ÑъобщениÑта ни биват маркирани като Ñпам." - -#~ msgid "Message:" -#~ msgstr "Съобщение:" - -#~ msgid "More problems nearby" -#~ msgstr "Още Ñигнали наоколо" - -#~ msgid "Nearly Done! Now check your email..." -#~ msgstr "ÐœÐ¾Ð»Ñ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐµÑ‚Ðµ имейл адреÑа" - -#~ msgid "Offensive? Unsuitable? Tell us" -#~ msgstr "Обиден? ÐеподходÑщ? Кажете ни" - -#~ msgid "Photo:" -#~ msgstr "Снимка:" - -#~ msgid "Please check your email" -#~ msgstr "ÐœÐ¾Ð»Ñ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐµÑ‚Ðµ имейл адреÑа" - -#~ msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" -#~ msgstr "ÐœÐ¾Ð»Ñ Ð¸Ð¼Ð°Ð¹Ñ‚Ðµ предвид, че актуализациите не Ñе изпращат на Общината. Тази Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ðµ публична и ще бъде използвана единÑтвено и Ñамо в ÑъответÑтвие Ñ Ð½Ð°ÑˆÐ°Ñ‚Ð° <a href=\"/privacy\">Политика за поверителноÑÑ‚.</a>" - -#~ msgid "This may be because the link is too old or already used, or the address was not copied correctly." -#~ msgstr "Това може да е резултат от на оÑтарÑл или използва адреÑ, както и от грешно копиране на адреÑа." - -#~ msgid "This problem has been closed" -#~ msgstr "Този проблем е затворен." - -#~ msgid "This problem is in progress" -#~ msgstr "Този проблем е в Ð¿Ñ€Ð¾Ñ†ÐµÑ Ð½Ð° обработка." - -#~ msgid "This problem is old and of unknown status." -#~ msgstr "Този Ñигнал е Ñ Ð½ÐµÐ¸Ð·Ð²ÐµÑтен ÑтатуÑ." - -#~ msgid "Update:" -#~ msgstr "ÐктуализациÑ:" +#~ msgid "%s, reported at %s" +#~ msgstr "%s, Ñъобщено на %s" -#~ msgid "We have sent you an email containing a link to confirm your account." -#~ msgstr "Изпратили Ñме Ви имейл, за да потвърдите Ñъздаването на профил." +#~ msgid "About us" +#~ msgstr "За наÑ" -#~ msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:" -#~ msgstr "" -#~ "Ще Ñе раздваме да разберем какво миÑлите за Ñайта. ÐœÐ¾Ð»Ñ Ð¿Ð¾Ð¿ÑŠÐ»Ð½ÐµÑ‚Ðµ формата \n" -#~ "или ни изпратете майл на <a href='mailto:%s'>%s</a>:" +#~ msgid "Email me new local problems" +#~ msgstr "Съобщавай ми новите Ñигнали" -#~ msgid "You have already attached a photo to this report, attaching another one will replace it." -#~ msgstr "Вече Ñте прикачили Ñнимка към този Ñигнал. Ðко прикачите нова, то Ñ‚Ñ Ñ‰Ðµ замени ÑъщеÑтвуващата." +#~ msgid "FixMyStreet" +#~ msgstr "ПоправиСофиÑ" -#~ msgid "You have already attached a photo to this update, attaching another one will replace it." -#~ msgstr "Вече Ñте прикачили Ñнимка към актуализациÑта, прикачайки нова ще замените предходната." +#~ msgid "I am afraid you cannot confirm unconfirmed reports." +#~ msgstr "Ðе можете да потвърдите непотвърден през имейла Ñигнал" -#~ msgid "Your email:" -#~ msgstr "Имейл:" +#~ msgid "Problems in this area" +#~ msgstr "Други Ñигнали на тази териториÑ" -#~ msgid "Your name:" -#~ msgstr "Име:" +#~ msgid "Property type:" +#~ msgstr "Тип на имота:" -#~ msgid "Your email:" -#~ msgstr "ВашиÑÑ‚ имейл:" +#~ msgid "RSS feed of problems in this %s" +#~ msgstr "RSS абонамент за проблеми в този %s" diff --git a/locale/cs_CZ.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/cs_CZ.UTF-8/LC_MESSAGES/FixMyStreet.po index 05d448816..68d825492 100644 --- a/locale/cs_CZ.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/cs_CZ.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2016-03-02 13:09+0000\n" -"PO-Revision-Date: 2015-10-23 16:38+0000\n" +"POT-Creation-Date: 2016-05-03 10:41+0100\n" +"PO-Revision-Date: 2016-03-23 12:44+0000\n" "Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: Czech (Czech Republic) (http://www.transifex.com/mysociety/fixmystreet/language/cs_CZ/)\n" "Language: cs_CZ\n" @@ -18,7 +18,7 @@ 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:616 +#: perllib/FixMyStreet/DB/Result/Problem.pm:618 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr " a " @@ -51,9 +51,8 @@ msgid "%s admin:" msgstr "" #: templates/web/base/status/stats.html:26 -#, fuzzy msgid "%s bodies" -msgstr "Subjekty" +msgstr "" #: templates/web/base/status/stats.html:24 msgid "%s confirmed alerts, %s unconfirmed" @@ -88,7 +87,7 @@ msgstr "%s online aktualizace" msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "%s dotaznÃky zaslány -%s odpovÄ›dÄ›lo (%s %%)" -#: perllib/FixMyStreet/DB/Result/Problem.pm:683 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "%s ref: %s" msgstr "%s ref: %s" @@ -107,10 +106,6 @@ msgstr "" msgid "%s ward, %s" msgstr "%s, oddÄ›lenÃ, %" -#: perllib/FixMyStreet/DB/Result/Problem.pm:552 -msgid "%s, reported at %s" -msgstr "%s, nahlášeno %s" - #: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "% S, v% s oddÄ›lenÃ" @@ -165,7 +160,7 @@ msgstr "(napÅ™. graffiti, rozbité pouliÄnà osvÄ›tlenÃ, dÃry v komunikacÃch msgid "(not sent to council)" msgstr "(nenà odesláno na úřad)" -#: templates/web/zurich/report/new/fill_in_details_form.html:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "(optional)" msgstr "(volitelnÄ›)" @@ -177,12 +172,11 @@ msgstr "(veÅ™ejné)" msgid "(sent to both)" msgstr "(odesláno dvoum??)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Vyberte kategorii --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Vyberte typ nemovitosti --" @@ -217,26 +211,21 @@ msgstr "<strong>Ne</strong> PotvrdÃm hlášenà e-mailem" msgid "<strong>No</strong> Let me confirm my update by email" msgstr "<strong>Ne</strong> PotvrdÃm aktualizaci e-mailem" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:97 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>Ne</strong> pÅ™ihlásÃm se pomocà e-mailu" -#: templates/web/base/auth/general.html:70 +#: templates/web/base/auth/general.html:80 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Ano</strong> Mám heslo" -#: templates/web/base/about/about-en-gb.html:1 -#: templates/web/base/about/about-en-gb.html:3 -msgid "About us" -msgstr "O nás" - #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Action Scheduled" msgstr "Akce naplánována" @@ -270,7 +259,7 @@ msgstr "PÅ™idat novou kategorii" msgid "Add user" msgstr "PÅ™idat Uživatele" -#: templates/web/base/my/my.html:56 +#: templates/web/base/my/my.html:54 msgid "Added %s" msgstr "PÅ™idáno %s" @@ -290,7 +279,7 @@ msgstr "UpozornÄ›nà %d vytvoÅ™ené pro %s, typu %s, parametry %s / %s" msgid "Alert %d disabled (created %s)" msgstr "UpozornÄ›nà %d zruÅ¡eno (vytvoÅ™eno %s)" -#: templates/web/base/report/update/form_name.html:20 +#: templates/web/base/report/update/form_name.html:21 msgid "Alert me to future updates" msgstr "UpozornÄ›te mÄ› na budoucà aktualizace" @@ -303,7 +292,7 @@ msgstr "VÅ¡echna hlášenÃ" msgid "All Reports as CSV" msgstr "" -#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 +#: templates/web/base/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:20 @@ -402,7 +391,7 @@ msgstr "ZpÄ›t" msgid "Ban email address" msgstr "Zakázat emailovou adresu" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1273 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -433,7 +422,7 @@ msgstr "NevidÃte mapu? <em>vynechte tento krok</em>" #: templates/web/base/admin/body.html:68 #: templates/web/base/admin/index.html:54 -#: templates/web/base/report/new/category.html:10 +#: templates/web/base/report/new/category.html:7 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 @@ -448,7 +437,7 @@ msgstr "Katetorie" msgid "Category fix rate for problems > 4 weeks old" msgstr "Category fix rate for problems > 4 týdny staré" -#: templates/web/base/admin/body.html:138 +#: templates/web/base/admin/body.html:137 #: templates/web/base/admin/category_edit.html:23 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/admin/body.html:43 @@ -468,7 +457,7 @@ msgstr "Kategorie: %s" msgid "Change password" msgstr "ZmÄ›nit heslo" -#: templates/web/base/admin/body.html:160 +#: templates/web/base/admin/body.html:158 msgid "" "Check <strong>confirmed</strong> to indicate that this contact has been confirmed as correct.\n" " If you are not sure of the origin or validity of the contact, leave this unchecked." @@ -476,7 +465,7 @@ msgstr "" "Kontrola <strong>potvrzenÃ</strong> že je tento kontakt byl potvrzen a že je správný.\n" " Pokud si nejste jisti správnostÃ, ponechte nezaÅ¡krtnuté." -#: templates/web/base/admin/body.html:171 +#: templates/web/base/admin/body.html:169 msgid "" "Check <strong>deleted</strong> to remove the category from use. \n" " It will not appear as an available category in the drop-down menu on the report-a-problem page." @@ -484,7 +473,7 @@ msgstr "" "ZaÅ¡krtnÄ›te <strong>smazáno</strong> , kategorie nebude nadále použÃvána. \n" " Nebude se nadále zobrazovat v rozbalovacÃm menu pÅ™i zadánà hlášenÃ." -#: templates/web/base/admin/body.html:191 +#: templates/web/base/admin/body.html:189 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -501,7 +490,7 @@ msgstr "" " Toto nastavenà je vhodné pro hlášenà , která chcete umožnit uživatelům úřadům nahlásit, ale pro které neexistuje žádný veÅ™ejný \n" " zájem na veÅ™ejné zobrazenà zpráv. Může to být napÅ™Ãklad internà žádost o umÃstÄ›nà nových odpadkových košů na specifickou adresu a pod." -#: templates/web/base/admin/body.html:130 +#: templates/web/base/admin/body.html:129 msgid "" "Choose a <strong>category</strong> 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." @@ -544,8 +533,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:15 #: templates/web/base/admin/report_blocks.html:25 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 @@ -554,7 +543,7 @@ msgstr "" msgid "Closed" msgstr "UzavÅ™ena" -#: perllib/FixMyStreet/DB/Result/Problem.pm:779 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Closed by council" msgstr "UzavÅ™ena úřadem" @@ -580,7 +569,7 @@ msgstr "Data motivu:" msgid "Cobrand:" msgstr "Motiv:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "NastavenÃ" @@ -599,9 +588,8 @@ msgstr "Potvrdit úÄet" #: templates/web/base/report/new/form_user_loggedout_password.html:21 #: templates/web/base/report/update/form_user_loggedout_password.html:20 -#, fuzzy msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." -msgstr "PotvrÄte hlášenà nÞe a zadejte si nové heslo. Jakmile potvrdÃte ověřovacà mail, heslo bude aktualizováno a budete pÅ™ihlášeni do systému." +msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:1 #: templates/web/base/tokens/confirm_problem.html:1 @@ -611,7 +599,7 @@ msgstr "PotvrÄte hlášenà nÞe a zadejte si nové heslo. Jakmile potvrdÃte msgid "Confirmation" msgstr "PotvrzenÃ" -#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:164 #: templates/web/base/admin/body.html:79 #: templates/web/base/admin/category_edit.html:37 #: templates/web/base/admin/category_edit.html:92 @@ -630,7 +618,7 @@ msgid "Confirmed:" msgstr "Potvrzeno:" #. ("%s is the site name") -#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 +#: templates/web/base/about/_sidebar.html:6 msgid "Contact %s" msgstr "" @@ -649,8 +637,8 @@ msgstr "Kontaktujte nás!" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1417 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1445 msgid "Could not find user" msgstr "Uživatele nelze najÃt" @@ -668,7 +656,7 @@ msgstr "Úřad" msgid "Council contacts for %s" msgstr "Kontakty na úřad %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:681 +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "Council ref: %s" msgstr "ÄÃslo jednacÃ: %s" @@ -687,7 +675,7 @@ msgstr "PoÄet" msgid "Create a report" msgstr "VytvoÅ™it report" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "VytvoÅ™it kategorii" @@ -731,20 +719,20 @@ msgstr "PÅ™ehledy" msgid "Dealt with by subdivision within 5 working days" msgstr "Odbavované úřadem do 5 pracovnÃch dnů" -#: perllib/FixMyStreet/App/Controller/Admin.pm:877 +#: perllib/FixMyStreet/App/Controller/Admin.pm:865 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:175 #: templates/web/base/admin/body.html:81 #: templates/web/base/admin/category_edit.html:42 #: templates/web/base/admin/category_edit.html:93 msgid "Deleted" msgstr "Smazána" -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:47 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -752,7 +740,7 @@ msgid "Description" msgstr "Popis" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:68 +#: templates/web/zurich/report/new/fill_in_details_form.html:70 msgid "Details" msgstr "Podrobnosti" @@ -777,11 +765,11 @@ msgid "Diligency prize league table" msgstr "Tabulka VÞěhů" #. ("%s is the site name") -#: templates/web/base/auth/general.html:48 -#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/auth/general.html:58 +#: templates/web/base/report/new/form_user_loggedout.html:28 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout.html:17 +#: templates/web/base/report/update/form_user_loggedout.html:27 msgid "Do you have a %s password?" msgstr "" @@ -799,8 +787,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "Duplicate" msgstr "DuplicitnÃ" @@ -820,7 +808,7 @@ msgstr "Každému kontaktu daného subjektu můžeme pÅ™idÄ›lit kategorii, kter msgid "Edit" msgstr "Upravit" -#: templates/web/base/admin/body.html:220 +#: templates/web/base/admin/body.html:218 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "Editace podrobnostà subjektu" @@ -850,7 +838,7 @@ msgstr "Úprava" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:39 +#: templates/web/base/auth/general.html:49 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -858,11 +846,11 @@ msgstr "Úprava" msgid "Email" msgstr "E-Mail" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 msgid "Email added to abuse list" msgstr "E-mail pÅ™idán do seznamu zneužÃvánÃ" -#: templates/web/base/admin/body.html:155 +#: templates/web/base/admin/body.html:153 msgid "Email address:" msgstr "E-mailová adresa:" @@ -874,19 +862,14 @@ msgstr "" msgid "Email alert deleted" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1390 msgid "Email already in abuse list" msgstr "E-mail je již v seznamu zneužÃvánÃ" -#: templates/web/base/around/_updates.html:5 -msgid "Email me new local problems" -msgstr "Nová lokálnà hlášenà mi poÅ¡lete mailem" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 -#: templates/web/base/alert/updates.html:13 #: templates/web/zurich/admin/body.html:47 msgid "Email:" msgstr "E-mail:" @@ -895,26 +878,6 @@ msgstr "E-mail:" msgid "Email: %s" msgstr "E-mail: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 -msgid "Empty flat or maisonette" -msgstr "Prázdný byt nebo mesonet" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 -msgid "Empty house or bungalow" -msgstr "Prázdný dům nebo bungalow" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 -msgid "Empty office or other commercial" -msgstr "ZavÅ™ená kancelář nebo komerÄnà prostory" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 -msgid "Empty pub or bar" -msgstr "ZavÅ™ená hospoda nebo bar" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 -msgid "Empty public building - school, hospital, etc." -msgstr "Prázdná veÅ™ejná budova - Å¡kola, nemocnice a tp." - #: templates/web/base/admin/body-form.html:162 #: templates/web/base/admin/body-form.html:163 msgid "" @@ -958,18 +921,14 @@ msgstr "Zadejte blÃzké poÅ¡tovnà smÄ›rovacà ÄÃslo nebo název ulice Äi o msgid "Enter a nearby street name and area" msgstr "Zadejte PSÄŒ, název ulice nebo název oblasti" -#: perllib/FixMyStreet/Cobrand/ZeroTB.pm:7 -msgid "Enter a nearby street name and area, postal code or district in Delhi" -msgstr "Zadejte nejbližšà název ulice, oblasti, PSÄŒ nebo katastrálnà Äásti" - -#: templates/web/base/auth/general.html:99 +#: templates/web/base/auth/general.html:109 #: templates/web/base/report/new/form_user_loggedout_by_email.html:38 #: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Zadejte heslo" -#: templates/web/base/index-steps.html:26 +#: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "UveÄte podrobnosti daného problému" @@ -995,7 +954,7 @@ msgstr "PÅ™Ãklad PSÄŒ %s" msgid "Examples:" msgstr "PÅ™Ãklady:" -#: templates/web/base/report/new/form_report.html:49 +#: templates/web/base/report/new/form_report.html:51 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "VysvÄ›tlete, co je Å¡patnÄ› a kde, pÅ™ÃpadnÄ› jak dlouho to již trvá a tp. ..." @@ -1032,19 +991,15 @@ msgstr "Poprvé" msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." msgstr "Pro opravu vyberte <strong>oblast pokrytÃ</strong> v Äásti <em>Editace podrobnostà subjektu</em> ve formuláři nÞe." -#: templates/web/base/header.html:26 -msgid "FixMyStreet" -msgstr "FixMyStreet" - #: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:38 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:40 msgid "Fixed" msgstr "VyÅ™eÅ¡ené" @@ -1071,7 +1026,7 @@ msgstr "OznaÄené za smazané" msgid "Flag user" msgstr "Sledovat uživatele" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "UrÄeno ke sledovánÃ" @@ -1093,8 +1048,7 @@ msgstr "OznaÄenà uživatelé nejsou žádným způsobem omezováni. Je to jen msgid "Flagged:" msgstr "Sledováno:" -#: templates/web/base/reports/_ward-list.html:3 -#: templates/web/fixmystreet/reports/_ward-list.html:4 +#: templates/web/base/reports/_ward-list.html:4 msgid "Follow a ward link to view only reports within that ward." msgstr "KliknÄ›te na odkaz pro danou oblast, zobrazà se hlášenà pouze z této oblasti." @@ -1125,18 +1079,18 @@ msgstr "ÄŒasto kladené dotazy" msgid "GeoRSS on Google Maps" msgstr "GeoRSS na Google Mapách" +#: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:11 -#: templates/web/fixmystreet/around/_updates.html:3 msgid "Get updates" msgstr "ZasÃlánà aktualizacÃ" -#: templates/web/fixmystreet/reports/_rss.html:3 -#: templates/web/fixmystreet/reports/_rss.html:9 +#: templates/web/base/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:9 msgid "Get updates of %s problems" msgstr "ZÃskat aktualizace hlášenà %s " -#: templates/web/fixmystreet/reports/_rss.html:11 -#: templates/web/fixmystreet/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:11 +#: templates/web/base/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "ZÃskat aktualizace hlášenà %s " @@ -1149,7 +1103,7 @@ msgid "Glad to hear it’s been fixed!" msgstr "" #: templates/web/base/alert/index.html:34 -#: templates/web/base/around/postcode_form.html:16 +#: templates/web/base/around/postcode_form.html:13 #: templates/web/base/reports/_list-filters.html:28 #: templates/web/zurich/admin/stats.html:26 msgid "Go" @@ -1175,7 +1129,7 @@ msgstr "Byl tento problém vyÅ™eÅ¡en?" msgid "Have you ever reported a problem to a council before, or is this your first time?" msgstr "Už jste nÄ›kdy pÅ™ed tÃm hlásili problém úřadu a nebo je toto VaÅ¡e hlášenà poprvé?" -#: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:38 +#: templates/web/base/footer.html:38 #: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 @@ -1186,8 +1140,7 @@ msgstr "NápovÄ›da" msgid "Here are the types of local problem alerts for ‘%s’." msgstr "Možnosti pro upozornÄ›nà na lokálnà problém pro oblast ‘%s’." -#: templates/web/base/header.html:32 templates/web/fixmystreet/header.html:63 -#: templates/web/zurich/footer.html:12 +#: templates/web/base/header.html:63 templates/web/zurich/footer.html:12 msgid "Hi %s" msgstr "PÅ™ihlášená osoba: %s" @@ -1203,11 +1156,11 @@ msgstr "PÅ™ihlášená osoba: %s" msgid "Hidden" msgstr "Skrytý" -#: templates/web/base/around/display_location.html:65 +#: templates/web/base/around/display_location.html:64 msgid "Hide old" msgstr "Skrýt staré" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:59 msgid "Hide pins" msgstr "Schovat znaÄky" @@ -1227,10 +1180,6 @@ msgstr "Jak nahlásit problém" msgid "How to send successful reports" msgstr "Anleitung" -#: perllib/FixMyStreet/App/Controller/Admin.pm:752 -msgid "I am afraid you cannot confirm unconfirmed reports." -msgstr "Bohužel nemůžete potvrdit nepotvrzená hlášenÃ." - #: templates/web/base/tokens/confirm_problem.html:23 #: templates/web/base/tokens/confirm_problem.html:27 msgid "I just reported a problem on @fixmystreet" @@ -1241,7 +1190,7 @@ msgstr "" msgid "I just updated a problem on @fixmystreet" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88 msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "Bohužel, nelze lokalizovat VaÅ¡e hlášenà v databázi.\n" @@ -1265,7 +1214,7 @@ msgstr "" "Vyberte <strong>nadÅ™Ãzený subjekt</strong> pokud je subjekt souÄástà jiného subjektu.\n" " Pro základnà nastavenà instalace nevyžaduje propojovánà subjektů tÃmto způsobem." -#: templates/web/base/admin/body.html:133 +#: templates/web/base/admin/body.html:132 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." @@ -1288,7 +1237,7 @@ msgid "" "(please note it will not be sent to the council)." msgstr "" -#: templates/web/base/admin/body.html:149 +#: templates/web/base/admin/body.html:147 msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." msgstr "Pokud použÃváte <strong>metodu zasÃlánà mimo zaslánà emailu</strong>, zadejte zde ID služby (Open311) nebo jejà ekvivalent." @@ -1326,10 +1275,10 @@ msgstr "Neplatné ID" msgid "Illegal feed selection" msgstr "Neplatný výbÄ›r zdoje" +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "In Progress" msgstr "v Å™eÅ¡enÃ" @@ -1380,7 +1329,7 @@ msgstr "Internà postoupenÃ" msgid "Invalid agency_responsible value %s" msgstr "Chybná agency_responsible hodnota %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 msgid "Invalid end date" msgstr "Chybný koneÄný datum" @@ -1388,16 +1337,16 @@ msgstr "Chybný koneÄný datum" msgid "Invalid format %s specified." msgstr "Chybný formát %s specified." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 msgid "Invalid start date" msgstr "Chybné poÄáteÄnà datum" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:5 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Investigating" msgstr "Å etÅ™enÃ" @@ -1419,7 +1368,7 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:80 +#: 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 @@ -1457,7 +1406,6 @@ msgstr "NahrávánÃ..." #: 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/fixmystreet/alert/updates.html:1 msgid "Local RSS feeds and email alerts" msgstr "Lokálnà RSS kanály a mailové upozornÄ›nÃ" @@ -1466,11 +1414,11 @@ msgstr "Lokálnà RSS kanály a mailové upozornÄ›nÃ" msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "Lokálnà RSS kanály a mailové upozornÄ›nà pro ‘%s’" -#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:35 +#: templates/web/base/footer.html:35 msgid "Local alerts" msgstr "MÃstnà upozornÄ›nÃ" -#: templates/web/base/index-steps.html:25 +#: templates/web/base/index-steps.html:5 msgid "Locate the problem on a map of the area" msgstr "Lokalizujte vaÅ¡e hlášenà v mapÄ›" @@ -1530,14 +1478,14 @@ msgstr "MÄ›sÃc" #: templates/web/base/admin/list_updates.html:7 #: templates/web/base/admin/reports.html:13 #: templates/web/base/admin/users.html:15 -#: templates/web/base/auth/general.html:89 +#: templates/web/base/auth/general.html:99 #: templates/web/base/report/new/form_user_loggedin.html:9 #: templates/web/base/report/new/form_user_loggedout_by_email.html:7 -#: templates/web/base/report/update/form_name.html:4 +#: templates/web/base/report/update/form_name.html:5 #: templates/web/base/reports/index.html:20 #: 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:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "Name" msgstr "Jméno" @@ -1561,8 +1509,8 @@ 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:455 -#: perllib/FixMyStreet/Cobrand/Default.pm:495 +#: perllib/FixMyStreet/Cobrand/Default.pm:454 +#: perllib/FixMyStreet/Cobrand/Default.pm:494 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" @@ -1586,7 +1534,7 @@ msgstr "Nová <br>hlášenÃ" msgid "New body added" msgstr "PÅ™idán nový subjekt" -#: perllib/FixMyStreet/App/Controller/Admin.pm:387 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 msgid "New category contact added" msgstr "Do kategorie byl pÅ™idán nový kontakt" @@ -1651,7 +1599,7 @@ msgstr "DalÅ¡Ã" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 -#: templates/web/base/questionnaire/index.html:101 +#: templates/web/base/questionnaire/index.html:102 #: templates/web/base/questionnaire/index.html:53 msgid "No" msgstr "Ne" @@ -1722,8 +1670,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Not Responsible" msgstr "NezodpovÃdá" @@ -1756,7 +1704,7 @@ msgstr "Poznámka" 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/base/admin/body.html:186 +#: templates/web/base/admin/body.html:184 #: templates/web/base/admin/category_edit.html:52 #: templates/web/zurich/admin/body.html:53 msgid "Note:" @@ -1770,15 +1718,15 @@ msgstr "Poznámka: <strong>%s</strong>" msgid "Notes from SDM to DM" msgstr "" -#: templates/web/base/report/new/form_user_loggedout.html:14 #: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/form_user_loggedout.html:24 #: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "A teÄ staÄà hlášenà odeslat" #: templates/web/base/report/update-form.html:28 -#: templates/web/base/report/update/form_user_loggedout.html:13 #: templates/web/base/report/update/form_user_loggedout.html:2 +#: templates/web/base/report/update/form_user_loggedout.html:23 msgid "Now to submit your update…" msgstr "A nynà pro odeslánà aktualizace…" @@ -1812,8 +1760,8 @@ msgstr "jednořádkový nadpis" #: templates/web/base/admin/report_blocks.html:23 #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/report/update/form_update.html:36 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1848,13 +1796,13 @@ msgstr "Nebo problémy hlášené subjektu:" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "Nebo se můžete pÅ™ihlásit k odbÄ›ru vÅ¡ech upozornÄ›nà na hlášenÃ, které jsou v následujÃcÃch oblastech úřadu Äi ÄástÃ:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1055 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 -#: perllib/FixMyStreet/DB/Result/Problem.pm:558 -#: perllib/FixMyStreet/DB/Result/Problem.pm:568 -#: perllib/FixMyStreet/DB/Result/Problem.pm:578 -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1044 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:659 +#: perllib/FixMyStreet/DB/Result/Problem.pm:562 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 +#: perllib/FixMyStreet/DB/Result/Problem.pm:582 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 #: perllib/FixMyStreet/Script/Reports.pm:175 #: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" @@ -1879,7 +1827,7 @@ msgstr "NadÅ™azený subjekt" msgid "Partial" msgstr "ČásteÄnÄ›" -#: templates/web/base/auth/general.html:92 +#: templates/web/base/auth/general.html:102 #: templates/web/base/report/new/form_user_loggedout_by_email.html:31 #: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 @@ -1888,7 +1836,7 @@ msgid "Password (optional)" msgstr "Heslo (volitelnÄ›)" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:72 +#: templates/web/base/auth/general.html:82 msgid "Password:" msgstr "Heslo:" @@ -1896,7 +1844,7 @@ msgstr "Heslo:" msgid "Permalink" msgstr "Trvalý odkaz" -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:90 msgid "Phone number" msgstr "Telefonnà ÄÃslo" @@ -1912,13 +1860,21 @@ msgid "Phone:" msgstr "Telefon:" #: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/questionnaire/index.html:89 +#: templates/web/base/questionnaire/index.html:91 #: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/new/form_report.html:38 +#: templates/web/base/report/new/form_report.html:40 +#: templates/web/base/report/update/form_update.html:20 +#: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:6 #: 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:45 +#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/zurich/report/new/fill_in_details_form.html:63 msgid "Photo" msgstr "Fotografie" @@ -1942,8 +1898,8 @@ msgstr "UmÃsti Å¡pendlÃk na mapu" #: perllib/FixMyStreet/Cobrand/Zurich.pm:955 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:6 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 @@ -1959,16 +1915,16 @@ 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/general.html:27 -#: templates/web/base/auth/general.html:33 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:43 #: 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:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:856 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:921 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -1978,7 +1934,7 @@ msgstr "Vyberte kategorii" msgid "Please choose a property type" msgstr "Zvolte typ nemovitosti" -#: perllib/FixMyStreet/App/Controller/Admin.pm:378 +#: perllib/FixMyStreet/App/Controller/Admin.pm:376 msgid "Please correct the errors below" msgstr "Opravte prosÃm chyby uvedené nÞe" @@ -1999,11 +1955,10 @@ msgstr "NezneužÃvejte tento nástroj - zneužÃvánà vaÅ¡eho úřadu znehodno msgid "Please enter a message" msgstr "prosÃm zadejte zprávu" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Admin.pm:1079 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 msgid "Please enter a name" -msgstr "Zadejte vaÅ¡e jméno" +msgstr "" #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 @@ -2017,10 +1972,10 @@ msgstr "ProsÃm zadejte heslo" msgid "Please enter a subject" msgstr "ProsÃm zadejte název" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1075 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1130 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:133 +#: perllib/FixMyStreet/DB/Result/User.pm:143 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2037,9 +1992,9 @@ msgid "Please enter some details" msgstr "ProsÃm zadejte podrobnosti" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:130 -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:32 +#: perllib/FixMyStreet/DB/Result/User.pm:140 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:42 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2048,7 +2003,7 @@ msgid "Please enter your email" msgstr "ProsÃm zadejte váš e-mail" #: templates/web/base/report/new/form_user_loggedout_email.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:80 +#: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "Please enter your email address" msgstr "ProsÃm zadejte vaÅ¡i emailovou adresu" @@ -2064,7 +2019,7 @@ msgstr "Zadejte své celé jméno, úřad potÅ™ebuje tyto informace - jestliže #: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:126 +#: perllib/FixMyStreet/DB/Result/User.pm:136 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "Zadejte vaÅ¡e jméno" @@ -2091,7 +2046,7 @@ msgstr "Můžete se kdykoliv znovu <a href=\"%s\">pÅ™ipojit</a>, nebo pÅ™ejÃt msgid "Please fill in details of the problem below." msgstr "ProsÃm, nÞe vyplňte údaje o hlášeném problému." -#: templates/web/zurich/report/new/fill_in_details_form.html:72 +#: templates/web/zurich/report/new/fill_in_details_form.html:74 msgid "Please fill in details of the problem." msgstr "ProsÃm, vyplňte údaje o hlášeném problému." @@ -2100,7 +2055,7 @@ msgstr "ProsÃm, vyplňte údaje o hlášeném problému." msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "Vyplňte prosÃm nÞe uvedený formulář s údaji o problému, a popiÅ¡te mÃsto tak pÅ™esnÄ›, jak je to možné v poli podrobnosti." -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "UveÄte, zda chcete dostat dalÅ¡Ã dotaznÃk" @@ -2109,9 +2064,8 @@ msgid "Please note that updates are not sent to the council." msgstr "VezmÄ›te prosÃm na vÄ›domÃ, že aktualizace nejsou odeslány na úřad." #: templates/web/base/report/new/oauth_email_form.html:4 -#, fuzzy msgid "Please note your report has <strong>not yet been sent</strong>." -msgstr "VezmÄ›te prosÃm na vÄ›domÃ, že vaÅ¡e zpráva <strong> jeÅ¡tÄ› nebyla zaslána </strong>. Vyberte si kategorii a pÅ™idejte dalÅ¡Ã informace nÞe, a pak odeÅ¡lete." +msgstr "" #: templates/web/base/report/new/fill_in_details_form.html:20 #: templates/web/zurich/report/new/fill_in_details_form.html:11 @@ -2127,16 +2081,16 @@ msgstr "" msgid "Please note:" msgstr "VezmÄ›te prosÃm na vÄ›domÃ:" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please provide some explanation as to why you're reopening this report" msgstr "UveÄte prosÃm nÄ›jaké vysvÄ›tlenÃ, proÄ jste znovu otevÅ™eli toto hlášenÃ" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250 msgid "Please provide some text as well as a photo" msgstr "UveÄte prosÃm nÄ›jaký text, stejnÄ› jako fotografii" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236 msgid "Please say whether you've ever reported a problem to your council before" msgstr "ProsÃm, Å™eknÄ›te, jestli jste nÄ›kdy pÅ™edtÃm hlásili problémy na váš úřad" @@ -2152,22 +2106,23 @@ msgstr "ProsÃm, vyberte kanál, který chcete" msgid "Please select the type of alert you want" msgstr "Vyberte typ upozornÄ›nÃ, které chcete" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232 msgid "Please state whether or not the problem has been fixed" msgstr "UveÄte, prosÃm, zda byl Äi nebyl problém vyÅ™eÅ¡en" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:121 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 #: templates/web/base/js/translation_strings.html:53 -msgid "Please upload a JPEG image only" +#, fuzzy +msgid "Please upload an image only" msgstr "ProsÃm, nahrávejte pouze obrázky ve formátu JPEG" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 msgid "Please write a message" msgstr "NapiÅ¡te zprávu" -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Please write your update here" msgstr "Aktuálnà informace doplňte prosÃm zde" @@ -2198,7 +2153,7 @@ msgstr "" msgid "Previous" msgstr "PÅ™edcházejÃcÃ" -#: templates/web/fixmystreet/footer.html:41 +#: templates/web/base/footer.html:41 msgid "Privacy" msgstr "Ochrana osobnÃch údajů" @@ -2208,7 +2163,7 @@ msgstr "Ochrana osobnÃch údajů" msgid "Privacy and cookies" msgstr "" -#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:200 #: templates/web/base/admin/body.html:85 #: templates/web/base/admin/category_edit.html:45 #: templates/web/base/admin/report_edit.html:77 @@ -2237,7 +2192,7 @@ msgstr "Hlášenà %s bylo odesláno na úřad %s" msgid "Problem breakdown by state" msgstr "ÄŒlenÄ›nà hlášenà podle stavu" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1046 msgid "Problem marked as open." msgstr "Hlášenà bylo oznaÄeno za otevÅ™ené." @@ -2249,10 +2204,6 @@ msgstr "Stav hlášenà byl zmÄ›nÄ›n na základÄ› výsledků Å¡etÅ™enÃ" msgid "Problems" msgstr "HlášenÃ" -#: templates/web/base/around/_updates.html:1 -msgid "Problems in this area" -msgstr "Hlášenà v této oblasti" - #: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "Hlášenà v okolÃ" @@ -2270,13 +2221,11 @@ msgid "Problems within %.1fkm of this location" msgstr "Hlášenà v okolà %.1fkm od tohoto mÃsta" #: perllib/FixMyStreet/Cobrand/Default.pm:663 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 #: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "Hlášenà v oblasti %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "Hlášenà v oblasti %s" @@ -2295,15 +2244,11 @@ msgstr "Hlášenà uvnitÅ™ oblasti:" msgid "Property address:" msgstr "Adresa nemovitosti:" -#: templates/web/base/report/new/category.html:8 -msgid "Property type:" -msgstr "Typ nemovitosti:" - #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "PoskytnÄ›te aktuálnà informace" -#: templates/web/base/auth/general.html:95 +#: templates/web/base/auth/general.html:105 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Ã." @@ -2337,16 +2282,15 @@ msgstr "DotaznÃk %d odpovÄ›dÄ›l na hlášenà %d, %s to %s" msgid "Questionnaire %d sent for problem %d" msgstr "DotaznÃk %d poslal k hlášenà %d" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 msgid "Questionnaire filled in by problem reporter" msgstr "DotaznÃk vyplňuje uživatel, který podal hlášenà problému" #: templates/web/base/alert/_list.html:22 +#: templates/web/base/alert/updates.html:9 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display_tools.html:34 -#: templates/web/base/reports/_rss.html:1 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed" msgstr "RSS kanál" @@ -2374,18 +2318,12 @@ msgstr "RSS kanál pro %s, v oblasti %s " msgid "RSS feed of nearby problems" msgstr "RSS kanál hlášenà v okolÃ" -#: templates/web/base/reports/_rss.html:1 -msgid "RSS feed of problems in this %s" -msgstr "RSS kanál hlášenà v oblasti %s" - #: perllib/FixMyStreet/Cobrand/Default.pm:664 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 #: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "RSS kanál hlášenà v oblasti %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 #: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "RSS kanál hlášenà v oblasti %s " @@ -2395,14 +2333,13 @@ msgstr "RSS kanál hlášenà v oblasti %s " msgid "RSS feed of recent local problems" msgstr "RSS kanál aktuálnÃch lokálnÃch hlášenÃ" +#: templates/web/base/alert/updates.html:9 #: templates/web/base/report/display_tools.html:34 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed of updates to this problem" msgstr "RSS kanál aktualizacà tohoto hlášenÃ" -#: templates/web/base/alert/updates.html:9 +#: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:36 -#: templates/web/fixmystreet/alert/updates.html:14 msgid "Receive email when updates are left on this problem." msgstr "Dostávat e-mail, když je hlášenà aktualizováno." @@ -2438,12 +2375,11 @@ msgstr "Odstranit fotografii (nelze vrátit zpÄ›t!)" msgid "Reply to user:" msgstr "" -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/header_logo.html:2 msgid "Report" msgstr "" -#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:26 -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/footer.html:26 templates/web/base/header_logo.html:2 #: templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2453,7 +2389,7 @@ msgstr "Nahlásit problém" msgid "Report abuse" msgstr "Nevhodný obsah" -#: perllib/FixMyStreet/App/Controller/Rss.pm:291 +#: perllib/FixMyStreet/App/Controller/Rss.pm:297 msgid "Report on %s" msgstr "Hlášenà na webu %s" @@ -2468,7 +2404,7 @@ 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:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:577 #: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "Nahlášeno anonymnÄ› v %s" @@ -2478,7 +2414,7 @@ msgstr "Nahlášeno anonymnÄ› v %s" msgid "Reported before" msgstr "Hlásil(a) jsem již dÅ™Ãve" -#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 #: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "Nahlášeno uživatelem %s, urÄeno pro %s" @@ -2492,27 +2428,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "Nahlášeno v kategorii %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:569 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 msgid "Reported in the %s category anonymously at %s" msgstr "Nahlášeno anonymnÄ› v %s v kategorii %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:591 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 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:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported via %s anonymously at %s" msgstr "Nahlášeno prostÅ™ednictvÃm %s anonymnÄ› v %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 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:561 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 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:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 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" @@ -2533,7 +2469,7 @@ msgstr "" msgid "Reporting a problem" msgstr "Hlášenà problému" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1274 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" @@ -2576,15 +2512,15 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1496 #: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "OtoÄit doleva" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 #: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 @@ -2599,7 +2535,7 @@ msgstr "" msgid "Satellite" msgstr "SatelitnÃ" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/base/admin/category_edit.html:84 #: templates/web/zurich/admin/body.html:59 #: templates/web/zurich/admin/template_edit.html:29 @@ -2655,7 +2591,7 @@ msgstr "" msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:696 +#: perllib/FixMyStreet/DB/Result/Problem.pm:698 msgid "Sent to %s %s later" msgstr "odesláno do %s o %s pozdÄ›ji" @@ -2674,21 +2610,21 @@ msgstr "SdÃlet" #: templates/web/base/report/new/form_user_loggedin.html:23 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22 -#: templates/web/base/report/update/form_name.html:15 +#: templates/web/base/report/update/form_name.html:16 msgid "Show my name publicly" msgstr "Zobrazit moje jméno veÅ™ejnÄ›" -#: templates/web/base/around/display_location.html:67 +#: templates/web/base/around/display_location.html:66 msgid "Show old" msgstr "Zobrazit stará" -#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:57 msgid "Show pins" msgstr "Zobrazit znaÄky" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/general.html:110 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:76 +#: templates/web/base/auth/general.html:86 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2747,9 +2683,8 @@ msgstr "Nemůžeme bohužel nalézt tuto lokalitu." #: templates/web/base/auth/general.html:9 #: templates/web/base/report/display.html:21 #: templates/web/base/report/new/fill_in_details_form.html:23 -#, fuzzy msgid "Sorry, we could not log you in. Please fill in the form below." -msgstr "Omlouváme se, nelze lokalizovat. Zkuste jeÅ¡tÄ› jednou." +msgstr "" #: perllib/FixMyStreet/Geocode/Bing.pm:35 #: perllib/FixMyStreet/Geocode/Google.pm:45 @@ -2757,15 +2692,10 @@ msgstr "Omlouváme se, nelze lokalizovat. Zkuste jeÅ¡tÄ› jednou." msgid "Sorry, we could not parse that location. Please try again." msgstr "Omlouváme se, nelze lokalizovat. Zkuste jeÅ¡tÄ› jednou." -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:138 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 -#, fuzzy -msgid "Sorry, you can not log in with Facebook. Please try again later." -msgstr "Nastal problém v zobrazenà této stránky. ProsÃm, zkuste pozdÄ›ji." - #: templates/web/base/admin/stats.html:64 msgid "Start Date:" msgstr "PoÄáteÄnà datum:" @@ -2774,7 +2704,7 @@ msgstr "PoÄáteÄnà datum:" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/report/update/form_update.html:32 +#: templates/web/base/report/update/form_update.html:34 msgid "State" msgstr "Stav" @@ -2787,7 +2717,7 @@ msgstr "Stav" msgid "State:" msgstr "Stav:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2827,10 +2757,10 @@ msgid "Subject:" msgstr "PÅ™edmÄ›t:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/base/report/new/form_user_loggedout_by_email.html:39 #: templates/web/base/report/new/form_user_loggedout_password.html:11 -#: templates/web/zurich/report/new/fill_in_details_form.html:96 +#: templates/web/zurich/report/new/fill_in_details_form.html:98 msgid "Submit" msgstr "Odeslat" @@ -2858,9 +2788,8 @@ msgstr "Odeslat dotaznÃk" msgid "Submitted" msgstr "Odesláno" -#: templates/web/base/alert/updates.html:17 +#: templates/web/base/alert/updates.html:23 #: templates/web/base/report/display_tools.html:41 -#: templates/web/fixmystreet/alert/updates.html:23 msgid "Subscribe" msgstr "PÅ™ihlásit se k odbÄ›ru" @@ -2868,7 +2797,7 @@ msgstr "PÅ™ihlásit se k odbÄ›ru" msgid "Subscribe me to an email alert" msgstr "PÅ™ihlásit se k odbÄ›ru emailových upozornÄ›nÃ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -2887,7 +2816,7 @@ msgstr "PÅ™ehled" msgid "Summary reports" msgstr "Souhrnný pÅ™ehled" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 msgid "Survey" msgstr "Průzkum" @@ -2944,7 +2873,7 @@ msgstr "DÄ›kujeme za nahránà fotografie. Nynà je tÅ™eba lokalizovat VaÅ¡e hlà msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "DÃky, rádi slyÅ¡Ãme, že to bylo vyÅ™eÅ¡eno! Můžeme se jeÅ¡tÄ› zeptat, jestli jste nÄ›kdy pÅ™edtÃm hlásili úřadům problém?" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:157 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "Zdá se, že se obrázek nenahrál správnÄ› (%s), zkuste to prosÃm znovu." @@ -2952,7 +2881,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:126 +#: perllib/FixMyStreet/App/Controller/Location.pm:127 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." @@ -2962,11 +2891,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:724 +#: perllib/FixMyStreet/App/Controller/Admin.pm:722 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:716 +#: perllib/FixMyStreet/App/Controller/Admin.pm:714 msgid "That problem will now be resent." msgstr "Hlášenà bude nynà opÄ›t odesláno." @@ -2978,7 +2907,7 @@ msgstr "Tento report nemůže být zobrazen na %s." msgid "That report has been removed from FixMyStreet." msgstr "Toto hlášenà bylo vyjmuto z FixMyStreet." -#: templates/web/base/admin/body.html:144 +#: templates/web/base/admin/body.html:142 msgid "" "The <strong>email address</strong> is the destination to which reports about this category will be sent. \n" " Other categories for this body may have the same email address." @@ -3126,9 +3055,9 @@ msgstr "Nastal problém v zobrazenà stránky VÅ¡echna hlášenÃ. ProsÃm, zkus 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:764 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:753 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 -#: templates/web/base/auth/general.html:43 +#: templates/web/base/auth/general.html:53 #: 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." @@ -3199,9 +3128,9 @@ msgstr "Tento e-mail byl odeslán na oba úřady působÃcà v dané lokalitÄ›, 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:920 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:898 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:935 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:977 #: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "Tato informace je vyžadována" @@ -3214,11 +3143,11 @@ msgstr "Toto je vývojářský web; vÄ›ci mohou kdykoli pÅ™estat fungovat, data msgid "This is a summary of all reports on this site." msgstr "Zde je souhrn vÅ¡ech hlášenà na tomto webu." -#: templates/web/base/report/update/form_update.html:52 +#: templates/web/base/report/update/form_update.html:54 msgid "This problem has been fixed" msgstr "Hlášenà bylo vyÅ™eÅ¡eno" -#: templates/web/base/report/update/form_update.html:46 +#: templates/web/base/report/update/form_update.html:48 msgid "This problem has not been fixed" msgstr "Hlášenà nemohlo být vyÅ™eÅ¡eno" @@ -3255,7 +3184,7 @@ msgstr "Webová stránka také obsahuje fotografii hlášenÃ, poskytnutou uživ msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "ÄŒasová osa" @@ -3300,8 +3229,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Unable to fix" msgstr "Nelze opravit" @@ -3318,7 +3247,7 @@ msgstr "Nepotvrzeno" msgid "Unknown" msgstr "Neznámé" -#: perllib/FixMyStreet/App/Controller/Rss.pm:173 +#: perllib/FixMyStreet/App/Controller/Rss.pm:174 msgid "Unknown alert type" msgstr "Neznámý typ upozornÄ›nÃ" @@ -3333,7 +3262,7 @@ msgstr "Neznámá chyba" msgid "Unknown problem ID" msgstr "Neznámé ID hlášenÃ" -#: templates/web/base/report/update/form_update.html:25 +#: templates/web/base/report/update/form_update.html:27 msgid "Update" msgstr "Aktualizovat" @@ -3385,10 +3314,10 @@ msgstr "Aktualizovat status" msgid "Updated" msgstr "Aktualizováno" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 -#: perllib/FixMyStreet/App/Controller/Admin.pm:821 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1096 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1144 +#: perllib/FixMyStreet/App/Controller/Admin.pm:809 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3415,7 +3344,7 @@ msgstr "Aktualizace hlášenà {{title}}" msgid "Updates to this problem, %s" msgstr "" -#: templates/web/base/admin/body.html:182 +#: templates/web/base/admin/body.html:180 msgid "Use the <strong>note</strong> to record details that are only displayed in the admin. Notes are not shown publicly, and are not sent to the body." msgstr "<strong> Poznámka </strong> sloužà pro záznam ifnormacÃ, které jsou zobrazeny pouze v administraci. Poznámky nejsou zobrazeny veÅ™ejnÄ› a nejsou odeslány subjektům." @@ -3424,11 +3353,11 @@ msgstr "<strong> Poznámka </strong> sloužà pro záznam ifnormacÃ, které jso msgid "Used map" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 msgid "User flag removed" msgstr "Uživatel vyjmut ze sledovánÃ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1421 msgid "User flagged" msgstr "Uživatel sledován" @@ -3436,16 +3365,16 @@ msgstr "Uživatel sledován" 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/App/Controller/Admin.pm:1289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "Uživatelé" -#: perllib/FixMyStreet/App/Controller/Admin.pm:382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:412 -#: perllib/FixMyStreet/App/Controller/Admin.pm:429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:380 +#: perllib/FixMyStreet/App/Controller/Admin.pm:410 +#: perllib/FixMyStreet/App/Controller/Admin.pm:427 msgid "Values updated" msgstr "Hodnoty aktualizovány" @@ -3482,16 +3411,15 @@ msgstr "NaÅ¡li jsme vÃce než jednu shodu pro požadovanou lokalitu. NabÃzÃme #: templates/web/base/auth/general.html:6 #: templates/web/base/report/display.html:27 #: templates/web/base/report/new/oauth_email_form.html:5 -#, fuzzy msgid "We need your email address, please give it below." -msgstr "Váš email a telefonnà ÄÃslo nebudou nikde zveÅ™ejnÄ›ny." +msgstr "" #: templates/web/base/report/new/form_user_loggedout_email.html:2 #: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "váš email nebude nezveÅ™ejnÄ›n" -#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedin.html:30 #: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "Váš email a telefonnà ÄÃslo nebudou nikde zveÅ™ejnÄ›ny." @@ -3500,7 +3428,7 @@ msgstr "Váš email a telefonnà ÄÃslo nebudou nikde zveÅ™ejnÄ›ny." 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. " -#: templates/web/base/index-steps.html:31 +#: templates/web/base/index-steps.html:11 msgid "We send it to the council on your behalf" msgstr "VaÅ¡e upozornÄ›nà poÅ¡leme kompetentnÃm úřadům v dané lokalitÄ›" @@ -3538,10 +3466,6 @@ msgstr "Odesláno:" msgid "Whoa there Testino! Three photos are enough." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 -msgid "Whole block of empty flats" -msgstr "Celý blok prázdných bytů" - #: templates/web/base/tokens/confirm_alert.html:7 msgid "Why stop there? <a href=\"/alert\">Set up more alerts</a> for free." msgstr "" @@ -3561,7 +3485,7 @@ msgstr "V požadavku pro vyhledávánà je možné hledat s parametrem 'agency msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "Chcete se podÃlet na rozvoji projektu FixMyStreet? Náš kód je open source a je k dispozici na <a href=\"http://fixmystreet.org\">fixmystreet.org </a>." -#: templates/web/base/questionnaire/index.html:96 +#: templates/web/base/questionnaire/index.html:97 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "Můžeme Vám za mÄ›sÃc odeslat dalÅ¡Ã dotaznÃk, který Vám pÅ™ipomene zkontrolovat stav VaÅ¡eho hlášenÃ?" @@ -3591,8 +3515,8 @@ msgstr "Rok" #: templates/web/base/admin/update_edit.html:24 #: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 +#: templates/web/base/questionnaire/index.html:100 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "Ano" @@ -3711,19 +3635,19 @@ msgid "Your Reports" msgstr "VaÅ¡e hlášenÃ" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/alert/updates.html:19 +#: templates/web/base/alert/updates.html:22 #: templates/web/base/contact/index.html:83 #: templates/web/base/report/display_tools.html:38 #: templates/web/base/report/display_tools.html:40 #: templates/web/base/report/new/form_user_loggedin.html:3 #: templates/web/base/report/new/form_user_loggedout_email.html:1 #: templates/web/base/report/update/form_user_loggedout_email.html:1 -#: templates/web/fixmystreet/alert/updates.html:19 -#: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/zurich/report/new/fill_in_details_form.html:76 +#: templates/web/zurich/report/new/fill_in_details_form.html:78 msgid "Your email" msgstr "Váš e-mail" -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/general.html:55 #: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 @@ -3734,17 +3658,17 @@ msgstr "VaÅ¡e e-mailová adresa" msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "Vámi poskytnuté informace budou použity pouze v souladu se <a href=\"/privacy\">zásadami ochrany osobnÃch údajů</a>" -#: templates/web/base/auth/general.html:90 +#: templates/web/base/auth/general.html:100 #: templates/web/base/contact/index.html:76 #: templates/web/base/report/new/form_user_loggedin.html:18 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17 -#: templates/web/base/report/update/form_name.html:11 +#: templates/web/base/report/update/form_name.html:12 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:86 +#: templates/web/zurich/report/new/fill_in_details_form.html:88 msgid "Your name" msgstr "VaÅ¡e jméno a pÅ™ÃjmenÃ" -#: templates/web/base/auth/general.html:75 +#: templates/web/base/auth/general.html:85 #: 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 @@ -3757,20 +3681,19 @@ msgstr "VaÅ¡e heslo bylo zmÄ›nÄ›no" #: templates/web/base/report/new/form_user_loggedin.html:27 #: templates/web/base/report/new/form_user_loggedout_by_email.html:26 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:94 msgid "Your phone number" msgstr "VaÅ¡e telefonnà ÄÃslo:" #: templates/web/base/questionnaire/index.html:14 -#, fuzzy msgid "Your report" -msgstr "VaÅ¡e hlášenÃ" +msgstr "" -#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 +#: templates/web/base/footer.html:29 msgid "Your reports" msgstr "VaÅ¡e hlášenÃ" -#: templates/web/base/my/my.html:41 +#: templates/web/base/my/my.html:39 msgid "Your updates" msgstr "VaÅ¡e aktualizace" @@ -3796,7 +3719,7 @@ msgid "didn't use map" msgstr "bez mapy" #: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/around/postcode_form.html:12 msgid "e.g. ‘%s’ or ‘%s’" msgstr "napÅ™. ‘%s’ nebo ‘%s’" @@ -3902,8 +3825,7 @@ msgstr "ostatnà oblasti:" msgid "reopened" msgstr "znovu otevÅ™eno" -#: templates/web/base/header.html:33 templates/web/fixmystreet/header.html:64 -#: templates/web/zurich/footer.html:13 +#: templates/web/base/header.html:64 templates/web/zurich/footer.html:13 msgid "sign out" msgstr "odhlásit" @@ -3986,7 +3908,7 @@ msgstr[0] "<big>%s</big>aktualizované hlášenÃ" msgstr[1] "<big>%s</big> aktalizovan hlášenÃ" msgstr[2] "<big>%s</big> aktualizovaných hlášenÃ" -#: templates/web/emptyhomes/report/new/councils_text_none.html:3 +#: templates/web/base/report/new/councils_text_none.html:3 #, perl-format msgid "We do not yet have details for the council that covers this location." msgid_plural "We do not yet have details for the councils that cover this location." @@ -4034,86 +3956,47 @@ msgstr[0] "Doposud <strong>nemáme</strong> podrobnosti o dalÅ¡Ãm úřadÄ›, kt msgstr[1] "Doposud <strong>nemáme</strong> podrobnosti o dalÅ¡Ãch úřadech, které jsou za tuto oblast zodpovÄ›dné." msgstr[2] "Doposud <strong>nemáme</strong> podrobnosti o dalÅ¡Ãch úřadech, které jsou za tuto oblast zodpovÄ›dné." -#~ msgid "(we never show your email address or phone number)" -#~ msgstr "(váš email a telefonnà ÄÃslo nebudou nikde zveÅ™ejnÄ›ny)" - -#~ msgid "(we never show your email)" -#~ msgstr "(váš email nebude nezveÅ™ejnÄ›n)" - -#~ msgid "<strong>No</strong>, let me confirm my report by email:" -#~ msgstr "<strong>Ne</strong>, PotvrdÃm hlášenà prostÅ™ednictvÃm emailu:" - -#~ msgid "<strong>No</strong>, let me confirm my update by email:" -#~ msgstr "<strong>Ne</strong>, potvrdÃm aktualizaci pomocà e-mailu:" - -#~ msgid "Email me updates" -#~ msgstr "ZaÅ¡lete aktualizace mailem" - -#~ msgid "Enter a new password:" -#~ msgstr "Zadejte nové heslo:" - -#~ msgid "I'm afraid we couldn't validate that token. If you've copied the URL from an email, please check that you copied it exactly.\n" -#~ msgstr "Bohužel nelze ověřit platnost. Pokud jste kopÃrovali URL adresu z e-mailové zprávy, prosÃm zkontrolujte jejà správnost.\n" - -#~ msgid "If you use web-based email or have 'junk mail' filters, you may wish to check your bulk/spam mail folders: sometimes, our messages are marked that way." -#~ msgstr "Pokud použÃváte webový e-mail, nebo máte zapnutý filtr <em>nevyžádané poÅ¡ty</em>, zkontrolujte si <em>hromadnou</em> a <em>spam</em> složky. ObÄas jsou naÅ¡e zprávy jsou tÃmto způsobem oznaÄovány." - -#~ msgid "Message:" -#~ msgstr "Zpráva:" - -#~ msgid "More problems nearby" -#~ msgstr "DalÅ¡Ã hlášenà z okolÃ" - -#~ msgid "Nearly Done! Now check your email..." -#~ msgstr "Téměř hotovo! Nynà zkontrolujte svůj e-mail ..." - -#~ msgid "Offensive? Unsuitable? Tell us" -#~ msgstr "Urážlivé? Nevhodné? ŘeknÄ›te nám" - -#~ msgid "Photo:" -#~ msgstr "Fotografie:" - -#~ msgid "Please check your email" -#~ msgstr "Zkontrolujte svůj mail" +#~ msgid "%s, reported at %s" +#~ msgstr "%s, nahlášeno %s" -#~ msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" -#~ msgstr "VezmÄ›te prosÃm na vÄ›domÃ, že aktualizace nejsou odeslány na úřad. Uvedete-li zde své jméno, bude veÅ™ejnÄ› zobrazené. VaÅ¡e údaje budou použity pouze v souladu s naÅ¡imi <a href=\"/faq#privacy\"> zásadami ochrany osobnÃch údajů </a>" +#~ msgid "About us" +#~ msgstr "O nás" -#~ msgid "This may be because the link is too old or already used, or the address was not copied correctly." -#~ msgstr "To může být proto, že odkaz je pÅ™ÃliÅ¡ starý nebo již použitý, nebo adresa nebyla správnÄ› zkopÃrována." +#~ msgid "Email me new local problems" +#~ msgstr "Nová lokálnà hlášenà mi poÅ¡lete mailem" -#~ msgid "This problem has been closed" -#~ msgstr "Hlášenà bylo uzavÅ™eno" +#~ msgid "Empty flat or maisonette" +#~ msgstr "Prázdný byt nebo mesonet" -#~ msgid "This problem is in progress" -#~ msgstr "ŘeÅ¡enà hlášenà probÃhá" +#~ msgid "Empty house or bungalow" +#~ msgstr "Prázdný dům nebo bungalow" -#~ msgid "This problem is old and of unknown status." -#~ msgstr "Hlášenà je zastaralé a nenà znám stav." +#~ msgid "Empty office or other commercial" +#~ msgstr "ZavÅ™ená kancelář nebo komerÄnà prostory" -#~ msgid "Update:" -#~ msgstr "Aktualizace:" +#~ msgid "Empty pub or bar" +#~ msgstr "ZavÅ™ená hospoda nebo bar" -#~ msgid "We have not been able to confirm your account - sorry." -#~ msgstr "Omlouváme se, nebyli jsme schopni potvrdit Váš úÄet." +#~ msgid "Empty public building - school, hospital, etc." +#~ msgstr "Prázdná veÅ™ejná budova - Å¡kola, nemocnice a tp." -#~ msgid "We have sent you an email containing a link to confirm your account." -#~ msgstr "Odeslali jsme Vámi e-mail s odkazem pro potvrzenà vaÅ¡eho úÄtu." +#~ msgid "Enter a nearby street name and area, postal code or district in Delhi" +#~ msgstr "Zadejte nejbližšà název ulice, oblasti, PSÄŒ nebo katastrálnà Äásti" -#~ msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:" -#~ msgstr "Rádi bychom znali Váš názor, co si myslÃte o tomto webu. StaÄà vyplnit formulář, nebo poÅ¡lete e-mail na <a href='mailto:%s'>% s </a>:" +#~ msgid "FixMyStreet" +#~ msgstr "FixMyStreet" -#~ msgid "You have already attached a photo to this report, attaching another one will replace it." -#~ msgstr "Pro toto hlášenà již máte pÅ™ipojenou fotografii, pÅ™ipojenÃm dalÅ¡Ã dojde k jejÃmu nahrazenÃ." +#~ msgid "I am afraid you cannot confirm unconfirmed reports." +#~ msgstr "Bohužel nemůžete potvrdit nepotvrzená hlášenÃ." -#~ msgid "You have already attached a photo to this update, attaching another one will replace it." -#~ msgstr "Pro tuto aktualizaci již máte pÅ™ipojenou fotografii, pÅ™ipojenÃm dalÅ¡Ã dojde k jejÃmu nahrazenÃ." +#~ msgid "Problems in this area" +#~ msgstr "Hlášenà v této oblasti" -#~ msgid "Your email:" -#~ msgstr "Váš e-mail:" +#~ msgid "Property type:" +#~ msgstr "Typ nemovitosti:" -#~ msgid "Your name:" -#~ msgstr "VaÅ¡e jméno:" +#~ msgid "RSS feed of problems in this %s" +#~ msgstr "RSS kanál hlášenà v oblasti %s" -#~ msgid "Your email:" -#~ msgstr "Váš e-mail:" +#~ msgid "Whole block of empty flats" +#~ msgstr "Celý blok prázdných bytů" diff --git a/locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po index 14f1829f5..4a46062e7 100644 --- a/locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2016-03-02 13:09+0000\n" -"PO-Revision-Date: 2015-10-23 16:38+0000\n" +"POT-Creation-Date: 2016-05-03 10:41+0100\n" +"PO-Revision-Date: 2016-03-23 12:44+0000\n" "Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: Welsh (http://www.transifex.com/mysociety/fixmystreet/language/cy/)\n" "Language: cy\n" @@ -19,7 +19,7 @@ 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:616 +#: perllib/FixMyStreet/DB/Result/Problem.pm:618 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr "a" @@ -52,9 +52,8 @@ msgid "%s admin:" msgstr "" #: templates/web/base/status/stats.html:26 -#, fuzzy msgid "%s bodies" -msgstr "Cyrff" +msgstr "" #: templates/web/base/status/stats.html:24 msgid "%s confirmed alerts, %s unconfirmed" @@ -62,9 +61,8 @@ msgstr "%s hysbysiad wedi ei gadarnhau, %s heb ei gadarnhau" #: templates/web/base/status/stats.html:27 #: templates/web/zurich/admin/index.html:6 -#, fuzzy msgid "%s council contacts – %s confirmed, %s unconfirmed" -msgstr "%s hysbysiad wedi ei gadarnhau, %s heb ei gadarnhau" +msgstr "" #. ("%s is the site name") #: templates/web/base/alert/index.html:7 @@ -90,7 +88,7 @@ msgstr "%s diweddariad byw" msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:683 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "%s ref: %s" msgstr "" @@ -109,10 +107,6 @@ msgstr "" msgid "%s ward, %s" msgstr "ward %s, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:552 -msgid "%s, reported at %s" -msgstr "%s, adroddwyd am %s" - #: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "%s, o fewn ward %s" @@ -167,7 +161,7 @@ msgstr "" msgid "(not sent to council)" msgstr "(heb ei anfon at y cyngor)" -#: templates/web/zurich/report/new/fill_in_details_form.html:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "(optional)" msgstr "(dewisol)" @@ -179,12 +173,11 @@ msgstr "(cyhoeddus)" msgid "(sent to both)" msgstr "(anfonwyd i'r ddau)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Dewiswch gategori --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Dewiswch fath o eiddo --" @@ -216,26 +209,21 @@ msgstr "<strong>Nac oes</strong>, gadewch i fi gadarnhau'r adroddiad drwy e-bost msgid "<strong>No</strong> Let me confirm my update by email" msgstr "<strong>Nac oes</strong>, gadewch i fi gadarnhau'r diweddariad drwy e-bost" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:97 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>Nac oes</strong>, gadewch i fi fewngofnodi drwy e-bost" -#: templates/web/base/auth/general.html:70 +#: templates/web/base/auth/general.html:80 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Oes</strong>, mae gen i gyfrinair" -#: templates/web/base/about/about-en-gb.html:1 -#: templates/web/base/about/about-en-gb.html:3 -msgid "About us" -msgstr "Amdanom" - #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Action Scheduled" msgstr "" @@ -266,7 +254,7 @@ msgstr "Ychwanegu categori newydd" msgid "Add user" msgstr "Ychwanegu defnyddiwr" -#: templates/web/base/my/my.html:56 +#: templates/web/base/my/my.html:54 msgid "Added %s" msgstr "Ychwanegwyd %s" @@ -286,7 +274,7 @@ msgstr "" msgid "Alert %d disabled (created %s)" msgstr "Analluogwyd yr hysbysiad %d (créwyd %s)" -#: templates/web/base/report/update/form_name.html:20 +#: templates/web/base/report/update/form_name.html:21 msgid "Alert me to future updates" msgstr "Rhoi gwybod am ddiweddariadau i ddod" @@ -299,7 +287,7 @@ msgstr "Pob adroddiad" msgid "All Reports as CSV" msgstr "" -#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 +#: templates/web/base/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:20 @@ -398,7 +386,7 @@ msgstr "Yn ôl" msgid "Ban email address" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1273 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -429,7 +417,7 @@ msgstr "" #: templates/web/base/admin/body.html:68 #: templates/web/base/admin/index.html:54 -#: templates/web/base/report/new/category.html:10 +#: templates/web/base/report/new/category.html:7 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 @@ -444,7 +432,7 @@ msgstr "Categori" msgid "Category fix rate for problems > 4 weeks old" msgstr "" -#: templates/web/base/admin/body.html:138 +#: templates/web/base/admin/body.html:137 #: templates/web/base/admin/category_edit.html:23 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/admin/body.html:43 @@ -464,19 +452,19 @@ msgstr "Categori: %s" msgid "Change password" msgstr "Newid cyfrinair" -#: templates/web/base/admin/body.html:160 +#: templates/web/base/admin/body.html:158 msgid "" "Check <strong>confirmed</strong> to indicate that this contact has been confirmed as correct.\n" " If you are not sure of the origin or validity of the contact, leave this unchecked." msgstr "" -#: templates/web/base/admin/body.html:171 +#: templates/web/base/admin/body.html:169 msgid "" "Check <strong>deleted</strong> to remove the category from use. \n" " It will not appear as an available category in the drop-down menu on the report-a-problem page." msgstr "" -#: templates/web/base/admin/body.html:191 +#: templates/web/base/admin/body.html:189 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -487,7 +475,7 @@ msgid "" " at a specific address." msgstr "" -#: templates/web/base/admin/body.html:130 +#: templates/web/base/admin/body.html:129 msgid "" "Choose a <strong>category</strong> 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." @@ -528,8 +516,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:15 #: templates/web/base/admin/report_blocks.html:25 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 @@ -538,7 +526,7 @@ msgstr "" msgid "Closed" msgstr "Ar gau" -#: perllib/FixMyStreet/DB/Result/Problem.pm:779 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Closed by council" msgstr "Caewyd gan y cyngor" @@ -564,7 +552,7 @@ msgstr "" msgid "Cobrand:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "" @@ -583,9 +571,8 @@ msgstr "" #: templates/web/base/report/new/form_user_loggedout_password.html:21 #: templates/web/base/report/update/form_user_loggedout_password.html:20 -#, fuzzy msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." -msgstr "Cadarnhewch drwy e-bost isod, gan ddarparu cyfrinair newydd bryd hynny. Diweddarir eich cyfrinair pan fyddwch yn cadarnhau." +msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:1 #: templates/web/base/tokens/confirm_problem.html:1 @@ -595,7 +582,7 @@ msgstr "Cadarnhewch drwy e-bost isod, gan ddarparu cyfrinair newydd bryd hynny. msgid "Confirmation" msgstr "" -#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:164 #: templates/web/base/admin/body.html:79 #: templates/web/base/admin/category_edit.html:37 #: templates/web/base/admin/category_edit.html:92 @@ -614,7 +601,7 @@ msgid "Confirmed:" msgstr "Cadarnhawyd:" #. ("%s is the site name") -#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 +#: templates/web/base/about/_sidebar.html:6 msgid "Contact %s" msgstr "" @@ -633,8 +620,8 @@ msgstr "Cysylltu â'r tîm" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1417 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1445 msgid "Could not find user" msgstr "Methu dod o hyd i'r defnyddiwr" @@ -652,7 +639,7 @@ msgstr "Cyngor" msgid "Council contacts for %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:681 +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "Council ref: %s" msgstr "" @@ -671,7 +658,7 @@ msgstr "" msgid "Create a report" msgstr "Creu adroddiad" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "Creu categori" @@ -715,20 +702,20 @@ msgstr "" msgid "Dealt with by subdivision within 5 working days" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:877 +#: perllib/FixMyStreet/App/Controller/Admin.pm:865 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:175 #: templates/web/base/admin/body.html:81 #: templates/web/base/admin/category_edit.html:42 #: templates/web/base/admin/category_edit.html:93 msgid "Deleted" msgstr "Dilëwyd" -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:47 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -736,7 +723,7 @@ msgid "Description" msgstr "Disgrifiad" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:68 +#: templates/web/zurich/report/new/fill_in_details_form.html:70 msgid "Details" msgstr "Manylion" @@ -761,11 +748,11 @@ msgid "Diligency prize league table" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:48 -#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/auth/general.html:58 +#: templates/web/base/report/new/form_user_loggedout.html:28 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout.html:17 +#: templates/web/base/report/update/form_user_loggedout.html:27 msgid "Do you have a %s password?" msgstr "" @@ -783,8 +770,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "Duplicate" msgstr "Lluosogi" @@ -804,7 +791,7 @@ msgstr "" msgid "Edit" msgstr "Golygu" -#: templates/web/base/admin/body.html:220 +#: templates/web/base/admin/body.html:218 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "Golygu manylion y corff" @@ -834,7 +821,7 @@ msgstr "Golygydd" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:39 +#: templates/web/base/auth/general.html:49 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -842,11 +829,11 @@ msgstr "Golygydd" msgid "Email" msgstr "E-bost" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 msgid "Email added to abuse list" msgstr "Ychwanegwyd yr e-bost at y rhestr camddefnydd" -#: templates/web/base/admin/body.html:155 +#: templates/web/base/admin/body.html:153 msgid "Email address:" msgstr "Cyfeiriad e-bost:" @@ -858,19 +845,14 @@ msgstr "Crëwyd hysbysiad e-bost" msgid "Email alert deleted" msgstr "Dilëwyd hysbysiad e-bost" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1390 msgid "Email already in abuse list" msgstr "E-bost eisoes yn y rhestr camddefnydd" -#: templates/web/base/around/_updates.html:5 -msgid "Email me new local problems" -msgstr "Rhoi gwybod i fi am broblemau lleol newydd drwy e-bost" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 -#: templates/web/base/alert/updates.html:13 #: templates/web/zurich/admin/body.html:47 msgid "Email:" msgstr "E-bost:" @@ -879,26 +861,6 @@ msgstr "E-bost:" msgid "Email: %s" msgstr "E-bost: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 -msgid "Empty flat or maisonette" -msgstr "Fflat wag" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 -msgid "Empty house or bungalow" -msgstr "TÅ· neu fyngalo gwag" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 -msgid "Empty office or other commercial" -msgstr "Swyddfa neu adeilad masnachol arall gwag" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 -msgid "Empty pub or bar" -msgstr "Tafarn neu far gwag" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 -msgid "Empty public building - school, hospital, etc." -msgstr "Adeilad cyhoeddus gwag - ysgol, ysbyty, ac ati." - #: templates/web/base/admin/body-form.html:162 #: templates/web/base/admin/body-form.html:163 msgid "" @@ -942,18 +904,14 @@ msgstr "Rhowch god post, neu enw stryd ac ardal" msgid "Enter a nearby street name and area" msgstr "Rhowch enw stryd ac ardal gerllaw" -#: perllib/FixMyStreet/Cobrand/ZeroTB.pm:7 -msgid "Enter a nearby street name and area, postal code or district in Delhi" -msgstr "Rhowch enw stryd ac ardal gerllaw, cod post neu ardal yn Delhi" - -#: templates/web/base/auth/general.html:99 +#: templates/web/base/auth/general.html:109 #: templates/web/base/report/new/form_user_loggedout_by_email.html:38 #: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Rhowch gyfrinair" -#: templates/web/base/index-steps.html:26 +#: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "Rhowch fanylion am y broblem" @@ -979,7 +937,7 @@ msgstr "Cod post enghreifftiol %s" msgid "Examples:" msgstr "Enghraifft:" -#: templates/web/base/report/new/form_report.html:49 +#: templates/web/base/report/new/form_report.html:51 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "Esboniwch beth sy'n bod, ble'n union mae'r broblem, ac ers faint o amser mae hi yna..." @@ -1016,19 +974,15 @@ msgstr "Tro cyntaf" msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." msgstr "" -#: templates/web/base/header.html:26 -msgid "FixMyStreet" -msgstr "FixMyStreet" - #: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:38 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:40 msgid "Fixed" msgstr "" @@ -1055,7 +1009,7 @@ msgstr "" msgid "Flag user" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "" @@ -1077,8 +1031,7 @@ msgstr "" msgid "Flagged:" msgstr "" -#: templates/web/base/reports/_ward-list.html:3 -#: templates/web/fixmystreet/reports/_ward-list.html:4 +#: templates/web/base/reports/_ward-list.html:4 msgid "Follow a ward link to view only reports within that ward." msgstr "" @@ -1109,18 +1062,18 @@ msgstr "Cwestiynau a ofynnir yn aml" msgid "GeoRSS on Google Maps" msgstr "GeoRSS ar Google Maps" +#: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:11 -#: templates/web/fixmystreet/around/_updates.html:3 msgid "Get updates" msgstr "Derbyn diweddariadau" -#: templates/web/fixmystreet/reports/_rss.html:3 -#: templates/web/fixmystreet/reports/_rss.html:9 +#: templates/web/base/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:9 msgid "Get updates of %s problems" msgstr "Derbyn diweddariadau am broblemau %s" -#: templates/web/fixmystreet/reports/_rss.html:11 -#: templates/web/fixmystreet/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:11 +#: templates/web/base/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "" @@ -1133,7 +1086,7 @@ msgid "Glad to hear it’s been fixed!" msgstr "Mae'n dda gennym glywed y cafodd ei drwsio!" #: templates/web/base/alert/index.html:34 -#: templates/web/base/around/postcode_form.html:16 +#: templates/web/base/around/postcode_form.html:13 #: templates/web/base/reports/_list-filters.html:28 #: templates/web/zurich/admin/stats.html:26 msgid "Go" @@ -1159,7 +1112,7 @@ msgstr "Gafodd y broblem ei thrwsio?" msgid "Have you ever reported a problem to a council before, or is this your first time?" msgstr "Ydych chi wedi adrodd problem at y cyngor o'r blaen, neu ai dyma eich tro cyntaf?" -#: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:38 +#: templates/web/base/footer.html:38 #: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 @@ -1170,8 +1123,7 @@ msgstr "Cymorth" msgid "Here are the types of local problem alerts for ‘%s’." msgstr "Dyma'r mathau o hysbysiadau problemau lleol ar gyfer ‘%s’." -#: templates/web/base/header.html:32 templates/web/fixmystreet/header.html:63 -#: templates/web/zurich/footer.html:12 +#: templates/web/base/header.html:63 templates/web/zurich/footer.html:12 msgid "Hi %s" msgstr "Helo %s" @@ -1187,11 +1139,11 @@ msgstr "Helo %s" msgid "Hidden" msgstr "Cudd" -#: templates/web/base/around/display_location.html:65 +#: templates/web/base/around/display_location.html:64 msgid "Hide old" msgstr "Cuddio'r hen rai" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:59 msgid "Hide pins" msgstr "Cuddio'r piniau" @@ -1211,10 +1163,6 @@ msgstr "Sut i adrodd problem" msgid "How to send successful reports" msgstr "Sut i anfon adroddiadau llwyddiannus" -#: perllib/FixMyStreet/App/Controller/Admin.pm:752 -msgid "I am afraid you cannot confirm unconfirmed reports." -msgstr "Yn anffodus, ni allwch gadarnhau adroddiadau heb eu cadarnhau." - #: templates/web/base/tokens/confirm_problem.html:23 #: templates/web/base/tokens/confirm_problem.html:27 msgid "I just reported a problem on @fixmystreet" @@ -1225,7 +1173,7 @@ msgstr "Dwi newydd adrodd problem ar @fixmystreet" msgid "I just updated a problem on @fixmystreet" msgstr "Dwi newydd ddiweddaru problem ar @fixmystreet" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88 msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "" @@ -1247,7 +1195,7 @@ msgid "" " For basic installations, you don't need to join bodies in this way." msgstr "" -#: templates/web/base/admin/body.html:133 +#: templates/web/base/admin/body.html:132 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." @@ -1268,7 +1216,7 @@ msgid "" "(please note it will not be sent to the council)." msgstr "" -#: templates/web/base/admin/body.html:149 +#: templates/web/base/admin/body.html:147 msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." msgstr "" @@ -1303,10 +1251,10 @@ msgstr "ID annerbynniol" msgid "Illegal feed selection" msgstr "" +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "In Progress" msgstr "Ar y gweill" @@ -1357,7 +1305,7 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 msgid "Invalid end date" msgstr "Dyddiad dod i ben annilys" @@ -1365,16 +1313,16 @@ msgstr "Dyddiad dod i ben annilys" msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 msgid "Invalid start date" msgstr "Dyddiad cychwyn annilys" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:5 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Investigating" msgstr "" @@ -1396,7 +1344,7 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:80 +#: 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 @@ -1434,7 +1382,6 @@ msgstr "Wrthi'n llwytho..." #: 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/fixmystreet/alert/updates.html:1 msgid "Local RSS feeds and email alerts" msgstr "Ffrydiau RSS lleol a hysbysiadau e-bost" @@ -1443,11 +1390,11 @@ msgstr "Ffrydiau RSS lleol a hysbysiadau e-bost" msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "Ffrydiau RSS lleol a hysbysiadau e-bost ar gyfer '%s'" -#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:35 +#: templates/web/base/footer.html:35 msgid "Local alerts" msgstr "Hysbysiadau lleol" -#: templates/web/base/index-steps.html:25 +#: templates/web/base/index-steps.html:5 msgid "Locate the problem on a map of the area" msgstr "Lleoli'r broblem ar fap o'r ardal" @@ -1507,14 +1454,14 @@ msgstr "Mis" #: templates/web/base/admin/list_updates.html:7 #: templates/web/base/admin/reports.html:13 #: templates/web/base/admin/users.html:15 -#: templates/web/base/auth/general.html:89 +#: templates/web/base/auth/general.html:99 #: templates/web/base/report/new/form_user_loggedin.html:9 #: templates/web/base/report/new/form_user_loggedout_by_email.html:7 -#: templates/web/base/report/update/form_name.html:4 +#: templates/web/base/report/update/form_name.html:5 #: templates/web/base/reports/index.html:20 #: 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:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "Name" msgstr "Enw" @@ -1538,8 +1485,8 @@ msgstr "" msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:455 -#: perllib/FixMyStreet/Cobrand/Default.pm:495 +#: perllib/FixMyStreet/Cobrand/Default.pm:454 +#: perllib/FixMyStreet/Cobrand/Default.pm:494 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" @@ -1561,7 +1508,7 @@ msgstr "Problemau <br>newydd" msgid "New body added" msgstr "Ychwanegwyd corff newydd" -#: perllib/FixMyStreet/App/Controller/Admin.pm:387 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 msgid "New category contact added" msgstr "" @@ -1626,7 +1573,7 @@ msgstr "Nesaf" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 -#: templates/web/base/questionnaire/index.html:101 +#: templates/web/base/questionnaire/index.html:102 #: templates/web/base/questionnaire/index.html:53 msgid "No" msgstr "" @@ -1691,8 +1638,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Not Responsible" msgstr "" @@ -1725,7 +1672,7 @@ msgstr "Nodyn" 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/base/admin/body.html:186 +#: templates/web/base/admin/body.html:184 #: templates/web/base/admin/category_edit.html:52 #: templates/web/zurich/admin/body.html:53 msgid "Note:" @@ -1739,15 +1686,15 @@ msgstr "Nodyn: <strong>%s</strong>" msgid "Notes from SDM to DM" msgstr "" -#: templates/web/base/report/new/form_user_loggedout.html:14 #: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/form_user_loggedout.html:24 #: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "Nawr i gyflwyno eich adroddiad…" #: templates/web/base/report/update-form.html:28 -#: templates/web/base/report/update/form_user_loggedout.html:13 #: templates/web/base/report/update/form_user_loggedout.html:2 +#: templates/web/base/report/update/form_user_loggedout.html:23 msgid "Now to submit your update…" msgstr "Nawr i gyflwyno eich diweddariad…" @@ -1781,8 +1728,8 @@ msgstr "Crynodeb byr" #: templates/web/base/admin/report_blocks.html:23 #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/report/update/form_update.html:36 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1817,13 +1764,13 @@ msgstr "" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "Neu gallwch danysgrifio i hysbysiad yn seiliedig ar eich ward neu etholaeth:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1055 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 -#: perllib/FixMyStreet/DB/Result/Problem.pm:558 -#: perllib/FixMyStreet/DB/Result/Problem.pm:568 -#: perllib/FixMyStreet/DB/Result/Problem.pm:578 -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1044 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:659 +#: perllib/FixMyStreet/DB/Result/Problem.pm:562 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 +#: perllib/FixMyStreet/DB/Result/Problem.pm:582 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 #: perllib/FixMyStreet/Script/Reports.pm:175 #: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" @@ -1848,7 +1795,7 @@ msgstr "Rhiant" msgid "Partial" msgstr "Rhannol" -#: templates/web/base/auth/general.html:92 +#: templates/web/base/auth/general.html:102 #: templates/web/base/report/new/form_user_loggedout_by_email.html:31 #: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 @@ -1857,7 +1804,7 @@ msgid "Password (optional)" msgstr "Cyfrinair (dewisol)" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:72 +#: templates/web/base/auth/general.html:82 msgid "Password:" msgstr "Cyfrinair:" @@ -1865,7 +1812,7 @@ msgstr "Cyfrinair:" msgid "Permalink" msgstr "Dolen barhaol" -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:90 msgid "Phone number" msgstr "Rhif ffôn" @@ -1881,13 +1828,21 @@ msgid "Phone:" msgstr "Ffôn:" #: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/questionnaire/index.html:89 +#: templates/web/base/questionnaire/index.html:91 #: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/new/form_report.html:38 +#: templates/web/base/report/new/form_report.html:40 +#: templates/web/base/report/update/form_update.html:20 +#: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:6 #: 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:45 +#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/zurich/report/new/fill_in_details_form.html:63 msgid "Photo" msgstr "Llun" @@ -1911,8 +1866,8 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:955 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:6 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 @@ -1928,16 +1883,16 @@ msgstr "Byddwch yn gwrtais, yn gryno ac yn berthnasol." msgid "Please check the passwords and try again" msgstr "" -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:33 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:43 #: 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:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:856 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:921 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -1947,7 +1902,7 @@ msgstr "" msgid "Please choose a property type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:378 +#: perllib/FixMyStreet/App/Controller/Admin.pm:376 msgid "Please correct the errors below" msgstr "" @@ -1968,11 +1923,10 @@ msgstr "Peidiwch â bod yn sarhaus — byddai sarhau eich cyngor yn dib msgid "Please enter a message" msgstr "Rhowch neges" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Admin.pm:1079 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 msgid "Please enter a name" -msgstr "Rhowch eich enw" +msgstr "" #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 @@ -1986,10 +1940,10 @@ msgstr "Rhowch gyfrinair" msgid "Please enter a subject" msgstr "Rhowch bwnc" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1075 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1130 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:133 +#: perllib/FixMyStreet/DB/Result/User.pm:143 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2006,9 +1960,9 @@ msgid "Please enter some details" msgstr "Rhowch fanylion" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:130 -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:32 +#: perllib/FixMyStreet/DB/Result/User.pm:140 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:42 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2017,7 +1971,7 @@ msgid "Please enter your email" msgstr "Rhowch eich e-bost" #: templates/web/base/report/new/form_user_loggedout_email.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:80 +#: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "Please enter your email address" msgstr "Rhowch eich cyfeiriad e-bost" @@ -2033,7 +1987,7 @@ msgstr "Rhowch eich enw llawn, mae angen y wybodaeth hon ar y cyngor – os na h #: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:126 +#: perllib/FixMyStreet/DB/Result/User.pm:136 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "Rhowch eich enw" @@ -2060,7 +2014,7 @@ msgstr "Croeso i chi <a href=\"%s\">ailfewngofnodi</a>, neu fynd yn ôl i'r <a h msgid "Please fill in details of the problem below." msgstr "Rhowch fanylion am y broblem isod." -#: templates/web/zurich/report/new/fill_in_details_form.html:72 +#: templates/web/zurich/report/new/fill_in_details_form.html:74 msgid "Please fill in details of the problem." msgstr "Rhowch fanylion am y broblem." @@ -2069,7 +2023,7 @@ msgstr "Rhowch fanylion am y broblem." msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" @@ -2095,16 +2049,16 @@ msgstr "" msgid "Please note:" msgstr "Noder:" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please provide some explanation as to why you're reopening this report" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250 msgid "Please provide some text as well as a photo" msgstr "Rhowch destun yn ogystal â llun" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236 msgid "Please say whether you've ever reported a problem to your council before" msgstr "Dywedwch wrthym a ydych wedi adrodd problem i'ch cyngor o'r blaen" @@ -2120,22 +2074,23 @@ msgstr "Dewiswch y ffrwd hoffech chi ei chael" msgid "Please select the type of alert you want" msgstr "Dewiswch pa fath o hysbysiad hoffech chi ei gael" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232 msgid "Please state whether or not the problem has been fixed" msgstr "Dywedwch a gafodd y broblem ei thrwsio" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:121 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 #: templates/web/base/js/translation_strings.html:53 -msgid "Please upload a JPEG image only" +#, fuzzy +msgid "Please upload an image only" msgstr "Uwchlwythwch lun JPEG yn unig" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 msgid "Please write a message" msgstr "Ysgrifennwch neges" -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Please write your update here" msgstr "Ysgrifennwch eich diweddariad yma" @@ -2166,7 +2121,7 @@ msgstr "" msgid "Previous" msgstr "Blaenorol" -#: templates/web/fixmystreet/footer.html:41 +#: templates/web/base/footer.html:41 msgid "Privacy" msgstr "Preifatrwydd" @@ -2176,7 +2131,7 @@ msgstr "Preifatrwydd" msgid "Privacy and cookies" msgstr "" -#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:200 #: templates/web/base/admin/body.html:85 #: templates/web/base/admin/category_edit.html:45 #: templates/web/base/admin/report_edit.html:77 @@ -2205,7 +2160,7 @@ msgstr "Anfonwyd y broblem %s at y cyngor" msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1046 msgid "Problem marked as open." msgstr "" @@ -2217,10 +2172,6 @@ msgstr "" msgid "Problems" msgstr "Problemau" -#: templates/web/base/around/_updates.html:1 -msgid "Problems in this area" -msgstr "Problemau yn yr ardal hon" - #: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "Problemau gerllaw" @@ -2238,13 +2189,11 @@ msgid "Problems within %.1fkm of this location" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:663 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 #: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "Problemau yn %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "Problemau yn ward %s" @@ -2263,15 +2212,11 @@ msgstr "Problemau o fewn ffiniau:" msgid "Property address:" msgstr "Cyfeiriad yr eiddo:" -#: templates/web/base/report/new/category.html:8 -msgid "Property type:" -msgstr "Math o eiddo:" - #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Darparu diweddariad" -#: templates/web/base/auth/general.html:95 +#: templates/web/base/auth/general.html:105 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." @@ -2305,16 +2250,15 @@ msgstr "" msgid "Questionnaire %d sent for problem %d" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 msgid "Questionnaire filled in by problem reporter" msgstr "" #: templates/web/base/alert/_list.html:22 +#: templates/web/base/alert/updates.html:9 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display_tools.html:34 -#: templates/web/base/reports/_rss.html:1 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed" msgstr "Ffrwd RSS" @@ -2342,18 +2286,12 @@ msgstr "Ffrwd RSS %s, o fewn ward %s" msgid "RSS feed of nearby problems" msgstr "Ffrwd RSS o broblemau gerllaw" -#: templates/web/base/reports/_rss.html:1 -msgid "RSS feed of problems in this %s" -msgstr "" - #: perllib/FixMyStreet/Cobrand/Default.pm:664 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 #: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "Ffrwd RSS o broblemau yn %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 #: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "Ffrwd RSS o broblemau o fewn ward %s" @@ -2363,14 +2301,13 @@ msgstr "Ffrwd RSS o broblemau o fewn ward %s" msgid "RSS feed of recent local problems" msgstr "Ffrwd RSS o broblemau lleol diweddar" +#: templates/web/base/alert/updates.html:9 #: templates/web/base/report/display_tools.html:34 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed of updates to this problem" msgstr "Ffrwd RSS o ddiweddariadau i'r broblem hon" -#: templates/web/base/alert/updates.html:9 +#: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:36 -#: templates/web/fixmystreet/alert/updates.html:14 msgid "Receive email when updates are left on this problem." msgstr "Derbyn e-bost pan fydd diweddariadau i'r broblem hon." @@ -2406,12 +2343,11 @@ msgstr "" msgid "Reply to user:" msgstr "" -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/header_logo.html:2 msgid "Report" msgstr "" -#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:26 -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/footer.html:26 templates/web/base/header_logo.html:2 #: templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2421,7 +2357,7 @@ msgstr "Adrodd problem" msgid "Report abuse" msgstr "Adrodd camddefnydd" -#: perllib/FixMyStreet/App/Controller/Rss.pm:291 +#: perllib/FixMyStreet/App/Controller/Rss.pm:297 msgid "Report on %s" msgstr "Adroddwyd ar %s" @@ -2436,7 +2372,7 @@ msgstr "Adrodd eich problem" msgid "Report, view, or discuss local problems" msgstr "Adrodd, gweld, neu drafod problemau lleol" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:577 #: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "Adroddwyd yn ddienw am %s" @@ -2446,7 +2382,7 @@ msgstr "Adroddwyd yn ddienw am %s" msgid "Reported before" msgstr "Adroddwyd eisoes" -#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 #: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "Adroddwyd gan %s am %s" @@ -2460,27 +2396,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "Adroddwyd yn y categori %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:569 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 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:591 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 msgid "Reported in the %s category by %s at %s" msgstr "Adroddwyd yn y categori %s am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported via %s anonymously at %s" msgstr "Adroddwyd drwy %s yn ddienw am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported via %s by %s at %s" msgstr "Adroddwyd drwy %s gan %s am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:561 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 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:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 msgid "Reported via %s in the %s category by %s at %s" msgstr "Adroddwyd drwy %s yn y categori %s am %s" @@ -2501,7 +2437,7 @@ msgstr "" msgid "Reporting a problem" msgstr "Adrodd problem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1274 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" @@ -2544,15 +2480,15 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1496 #: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "Cylchdroi i'r chwith" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 #: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 @@ -2567,7 +2503,7 @@ msgstr "" msgid "Satellite" msgstr "" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/base/admin/category_edit.html:84 #: templates/web/zurich/admin/body.html:59 #: templates/web/zurich/admin/template_edit.html:29 @@ -2623,7 +2559,7 @@ msgstr "" msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:696 +#: perllib/FixMyStreet/DB/Result/Problem.pm:698 msgid "Sent to %s %s later" msgstr "" @@ -2642,21 +2578,21 @@ msgstr "Rhannu" #: templates/web/base/report/new/form_user_loggedin.html:23 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22 -#: templates/web/base/report/update/form_name.html:15 +#: templates/web/base/report/update/form_name.html:16 msgid "Show my name publicly" msgstr "Dangos fy enw yn gyhoeddus" -#: templates/web/base/around/display_location.html:67 +#: templates/web/base/around/display_location.html:66 msgid "Show old" msgstr "Dangos yr hen rai" -#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:57 msgid "Show pins" msgstr "Dangos piniau" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/general.html:110 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:76 +#: templates/web/base/auth/general.html:86 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2724,15 +2660,10 @@ msgstr "" msgid "Sorry, we could not parse that location. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:138 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 -#, fuzzy -msgid "Sorry, you can not log in with Facebook. Please try again later." -msgstr "Bu gwall dangos y dudalen hon. Rhowch gynnig arall arni nes ymlaen." - #: templates/web/base/admin/stats.html:64 msgid "Start Date:" msgstr "Dyddiad cychwyn:" @@ -2741,7 +2672,7 @@ msgstr "Dyddiad cychwyn:" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/report/update/form_update.html:32 +#: templates/web/base/report/update/form_update.html:34 msgid "State" msgstr "Cyflwr" @@ -2754,7 +2685,7 @@ msgstr "Cyflwr" msgid "State:" msgstr "Cyflwr:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2794,10 +2725,10 @@ msgid "Subject:" msgstr "Pwnc:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/base/report/new/form_user_loggedout_by_email.html:39 #: templates/web/base/report/new/form_user_loggedout_password.html:11 -#: templates/web/zurich/report/new/fill_in_details_form.html:96 +#: templates/web/zurich/report/new/fill_in_details_form.html:98 msgid "Submit" msgstr "Cyflwyno" @@ -2825,9 +2756,8 @@ msgstr "Cyflwyno'r holiadur" msgid "Submitted" msgstr "Cyflwynwyd" -#: templates/web/base/alert/updates.html:17 +#: templates/web/base/alert/updates.html:23 #: templates/web/base/report/display_tools.html:41 -#: templates/web/fixmystreet/alert/updates.html:23 msgid "Subscribe" msgstr "Tanysgrifio" @@ -2835,7 +2765,7 @@ msgstr "Tanysgrifio" msgid "Subscribe me to an email alert" msgstr "Tanysgrifio i hysbysiad e-bost" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -2854,7 +2784,7 @@ msgstr "Crynodeb" msgid "Summary reports" msgstr "Adroddiadau" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 msgid "Survey" msgstr "Arolwg" @@ -2911,7 +2841,7 @@ msgstr "Diolch am uwchlwytho eich llun. Nawr mae'n rhaid i ni leoli eich problem msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "Diolch, mae'n dda gennym glywed y cafodd ei drwsio! Gawn ni ofyn a ydych wedi adrodd problem i gyngor o'r blaen?" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:157 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "Ni uwchlwythwyd y llun yn gywir (%s), ceisiwch eto." @@ -2919,7 +2849,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:126 +#: perllib/FixMyStreet/App/Controller/Location.pm:127 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." @@ -2929,11 +2859,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:724 +#: perllib/FixMyStreet/App/Controller/Admin.pm:722 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:716 +#: perllib/FixMyStreet/App/Controller/Admin.pm:714 msgid "That problem will now be resent." msgstr "Ailanfonir y broblem nawr." @@ -2945,7 +2875,7 @@ msgstr "Ni ellir gweld yr adroddiad hwnnw ar %s." msgid "That report has been removed from FixMyStreet." msgstr "Tynnwyd yr adroddiad oddi ar FixMyStreet." -#: templates/web/base/admin/body.html:144 +#: templates/web/base/admin/body.html:142 msgid "" "The <strong>email address</strong> is the destination to which reports about this category will be sent. \n" " Other categories for this body may have the same email address." @@ -3085,9 +3015,9 @@ msgstr "" 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:764 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:753 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 -#: templates/web/base/auth/general.html:43 +#: templates/web/base/auth/general.html:53 #: 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." @@ -3148,9 +3078,9 @@ msgstr "" 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:920 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:898 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:935 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:977 #: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "Mae'r wybodaeth hon yn ofynnol" @@ -3163,11 +3093,11 @@ msgstr "" msgid "This is a summary of all reports on this site." msgstr "Dyma grynodeb o'r holl adroddiadau ar y wefan hon." -#: templates/web/base/report/update/form_update.html:52 +#: templates/web/base/report/update/form_update.html:54 msgid "This problem has been fixed" msgstr "Trwsiwyd y broblem hon" -#: templates/web/base/report/update/form_update.html:46 +#: templates/web/base/report/update/form_update.html:48 msgid "This problem has not been fixed" msgstr "Ni thrwsiwyd y broblem hon" @@ -3204,7 +3134,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/App/Controller/Admin.pm:1287 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Llinell amser" @@ -3249,8 +3179,8 @@ msgstr "Ceisiwch anfon e-bost atom yn uniongyrchol:" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Unable to fix" msgstr "Methu trwsio" @@ -3267,7 +3197,7 @@ msgstr "Heb ei gadarnhau" msgid "Unknown" msgstr "Anhysbys" -#: perllib/FixMyStreet/App/Controller/Rss.pm:173 +#: perllib/FixMyStreet/App/Controller/Rss.pm:174 msgid "Unknown alert type" msgstr "" @@ -3282,7 +3212,7 @@ msgstr "Gwall anhysbys" msgid "Unknown problem ID" msgstr "" -#: templates/web/base/report/update/form_update.html:25 +#: templates/web/base/report/update/form_update.html:27 msgid "Update" msgstr "" @@ -3334,10 +3264,10 @@ msgstr "" msgid "Updated" msgstr "Diweddarwyd" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 -#: perllib/FixMyStreet/App/Controller/Admin.pm:821 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1096 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1144 +#: perllib/FixMyStreet/App/Controller/Admin.pm:809 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3364,7 +3294,7 @@ msgstr "Diweddariadau ar {{title}}" msgid "Updates to this problem, %s" msgstr "" -#: templates/web/base/admin/body.html:182 +#: templates/web/base/admin/body.html:180 msgid "Use the <strong>note</strong> to record details that are only displayed in the admin. Notes are not shown publicly, and are not sent to the body." msgstr "Defnyddiwch y <strong>nodyn</strong> i gofnodi manylion a ddangosir yma yn unig. Ni ddangosir nodiadau'n gyhoeddus, ac ni chânt eu hanfon at y corff." @@ -3373,11 +3303,11 @@ msgstr "Defnyddiwch y <strong>nodyn</strong> i gofnodi manylion a ddangosir yma msgid "Used map" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1421 msgid "User flagged" msgstr "" @@ -3385,16 +3315,16 @@ msgstr "" msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "Defnyddwyr" -#: perllib/FixMyStreet/App/Controller/Admin.pm:382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:412 -#: perllib/FixMyStreet/App/Controller/Admin.pm:429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:380 +#: perllib/FixMyStreet/App/Controller/Admin.pm:410 +#: perllib/FixMyStreet/App/Controller/Admin.pm:427 msgid "Values updated" msgstr "" @@ -3431,16 +3361,15 @@ msgstr "" #: templates/web/base/auth/general.html:6 #: templates/web/base/report/display.html:27 #: templates/web/base/report/new/oauth_email_form.html:5 -#, fuzzy msgid "We need your email address, please give it below." -msgstr "(ni ddatgelir eich cyfeiriad e-bost na rhif ffôn)" +msgstr "" #: templates/web/base/report/new/form_user_loggedout_email.html:2 #: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "Ni ddatgelir eich e-bost" -#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedin.html:30 #: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "" @@ -3449,7 +3378,7 @@ msgstr "" 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 "" -#: templates/web/base/index-steps.html:31 +#: templates/web/base/index-steps.html:11 msgid "We send it to the council on your behalf" msgstr "" @@ -3487,10 +3416,6 @@ msgstr "" msgid "Whoa there Testino! Three photos are enough." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 -msgid "Whole block of empty flats" -msgstr "" - #: templates/web/base/tokens/confirm_alert.html:7 msgid "Why stop there? <a href=\"/alert\">Set up more alerts</a> for free." msgstr "" @@ -3510,7 +3435,7 @@ msgstr "" msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "" -#: templates/web/base/questionnaire/index.html:96 +#: templates/web/base/questionnaire/index.html:97 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "Hoffech chi dderbyn holiadur arall ymhen 4 wythnos, i'ch atgoffa i wirio'r statws?" @@ -3540,8 +3465,8 @@ msgstr "Blwyddyn" #: templates/web/base/admin/update_edit.html:24 #: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 +#: templates/web/base/questionnaire/index.html:100 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "" @@ -3655,19 +3580,19 @@ msgid "Your Reports" msgstr "Eich adroddiadau" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/alert/updates.html:19 +#: templates/web/base/alert/updates.html:22 #: templates/web/base/contact/index.html:83 #: templates/web/base/report/display_tools.html:38 #: templates/web/base/report/display_tools.html:40 #: templates/web/base/report/new/form_user_loggedin.html:3 #: templates/web/base/report/new/form_user_loggedout_email.html:1 #: templates/web/base/report/update/form_user_loggedout_email.html:1 -#: templates/web/fixmystreet/alert/updates.html:19 -#: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/zurich/report/new/fill_in_details_form.html:76 +#: templates/web/zurich/report/new/fill_in_details_form.html:78 msgid "Your email" msgstr "Eich e-bost" -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/general.html:55 #: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 @@ -3678,17 +3603,17 @@ msgstr "Eich cyfeiriad e-bost" msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "" -#: templates/web/base/auth/general.html:90 +#: templates/web/base/auth/general.html:100 #: templates/web/base/contact/index.html:76 #: templates/web/base/report/new/form_user_loggedin.html:18 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17 -#: templates/web/base/report/update/form_name.html:11 +#: templates/web/base/report/update/form_name.html:12 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:86 +#: templates/web/zurich/report/new/fill_in_details_form.html:88 msgid "Your name" msgstr "Eich enw" -#: templates/web/base/auth/general.html:75 +#: templates/web/base/auth/general.html:85 #: 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 @@ -3701,20 +3626,19 @@ msgstr "Newidiwyd eich cyfrinair" #: templates/web/base/report/new/form_user_loggedin.html:27 #: templates/web/base/report/new/form_user_loggedout_by_email.html:26 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:94 msgid "Your phone number" msgstr "Eich rhif ffôn" #: templates/web/base/questionnaire/index.html:14 -#, fuzzy msgid "Your report" -msgstr "Eich adroddiadau" +msgstr "" -#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 +#: templates/web/base/footer.html:29 msgid "Your reports" msgstr "Eich adroddiadau" -#: templates/web/base/my/my.html:41 +#: templates/web/base/my/my.html:39 msgid "Your updates" msgstr "Eich diweddariadau" @@ -3740,7 +3664,7 @@ msgid "didn't use map" msgstr "" #: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/around/postcode_form.html:12 msgid "e.g. ‘%s’ or ‘%s’" msgstr "e.e. '%s' neu '%s'" @@ -3846,8 +3770,7 @@ msgstr "ardaloedd eraill:" msgid "reopened" msgstr "ailagorwyd" -#: templates/web/base/header.html:33 templates/web/fixmystreet/header.html:64 -#: templates/web/zurich/footer.html:13 +#: templates/web/base/header.html:64 templates/web/zurich/footer.html:13 msgid "sign out" msgstr "allgofnodi" @@ -3935,7 +3858,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: templates/web/emptyhomes/report/new/councils_text_none.html:3 +#: templates/web/base/report/new/councils_text_none.html:3 #, perl-format msgid "We do not yet have details for the council that covers this location." msgid_plural "We do not yet have details for the councils that cover this location." @@ -3989,68 +3912,41 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#~ msgid "(we never show your email)" -#~ msgstr "(ni ddatgelir eich e-bost)" - -#~ msgid "<strong>No</strong>, let me confirm my report by email:" -#~ msgstr "<strong>Nac oes</strong>, gadewch i fi gadarnhau'r adroddiad drwy e-bost:" - -#~ msgid "<strong>No</strong>, let me confirm my update by email:" -#~ msgstr "<strong>Nac oes</strong>, gadewch i fi gadarnhau'r diweddariad drwy e-bost:" - -#~ msgid "Email me updates" -#~ msgstr "Anfon diweddariadau ataf drwy e-bost" - -#~ msgid "Enter a new password:" -#~ msgstr "Rhowch gyfrinair newydd:" - -#~ msgid "If you use web-based email or have 'junk mail' filters, you may wish to check your bulk/spam mail folders: sometimes, our messages are marked that way." -#~ msgstr "Os ydych chi'n defnyddio e-bost drwy'r we neu os oes gennych chi hidlydd sothach, gwiriwch eich plygellau e-bost sothach: o bryd i'w gilydd, deuir o hyd i'n negeseuon yno." - -#~ msgid "Message:" -#~ msgstr "Neges:" - -#~ msgid "More problems nearby" -#~ msgstr "Rhagor o broblemau gerllaw" - -#~ msgid "Nearly Done! Now check your email..." -#~ msgstr "Bron yna! Nawr gwiriwch eich e-bost..." - -#~ msgid "Offensive? Unsuitable? Tell us" -#~ msgstr "Sarhaus? Anaddas? Dywedwch wrthym" +#~ msgid "%s, reported at %s" +#~ msgstr "%s, adroddwyd am %s" -#~ msgid "Photo:" -#~ msgstr "Llun:" +#~ msgid "About us" +#~ msgstr "Amdanom" -#~ msgid "This problem has been closed" -#~ msgstr "Caewyd y broblem hon" +#~ msgid "Email me new local problems" +#~ msgstr "Rhoi gwybod i fi am broblemau lleol newydd drwy e-bost" -#~ msgid "This problem is in progress" -#~ msgstr "Mae'r broblem hon ar y gweill" +#~ msgid "Empty flat or maisonette" +#~ msgstr "Fflat wag" -#~ msgid "This problem is old and of unknown status." -#~ msgstr "mae'r broblem hon yn hen a'i statws yn anhysbys." +#~ msgid "Empty house or bungalow" +#~ msgstr "TÅ· neu fyngalo gwag" -#~ msgid "We have not been able to confirm your account - sorry." -#~ msgstr "Doedd hi ddim yn bosib i ni gadarnhau eich cyfrif - mae'n ddrwg gennym." +#~ msgid "Empty office or other commercial" +#~ msgstr "Swyddfa neu adeilad masnachol arall gwag" -#~ msgid "We have sent you an email containing a link to confirm your account." -#~ msgstr "Rydym wedi anfon e-bost atoch sy'n cynnwys dolen i gadarnhau eich cyfrif." +#~ msgid "Empty pub or bar" +#~ msgstr "Tafarn neu far gwag" -#~ msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:" -#~ msgstr "Carem glywed eich barn am y wefan hon. Llenwch y ffurflen, neu anfonwch e-bost at <a href='mailto:%s'>%s</a>:" +#~ msgid "Empty public building - school, hospital, etc." +#~ msgstr "Adeilad cyhoeddus gwag - ysgol, ysbyty, ac ati." -#~ msgid "You have already attached a photo to this report, attaching another one will replace it." -#~ msgstr "Rydych wedi atodi llun i'r adroddiad hwn eisoes, byddai atodi un arall yn ei amnewid." +#~ msgid "Enter a nearby street name and area, postal code or district in Delhi" +#~ msgstr "Rhowch enw stryd ac ardal gerllaw, cod post neu ardal yn Delhi" -#~ msgid "You have already attached a photo to this update, attaching another one will replace it." -#~ msgstr "Rydych wedi atodi llun i'r diweddariad hwn eisoes, byddai atodi un arall yn ei amnewid." +#~ msgid "FixMyStreet" +#~ msgstr "FixMyStreet" -#~ msgid "Your email:" -#~ msgstr "Eich e-bost:" +#~ msgid "I am afraid you cannot confirm unconfirmed reports." +#~ msgstr "Yn anffodus, ni allwch gadarnhau adroddiadau heb eu cadarnhau." -#~ msgid "Your name:" -#~ msgstr "Eich enw:" +#~ msgid "Problems in this area" +#~ msgstr "Problemau yn yr ardal hon" -#~ msgid "Your email:" -#~ msgstr "Eich e-bost:" +#~ msgid "Property type:" +#~ msgstr "Math o eiddo:" diff --git a/locale/da_DK.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/da_DK.UTF-8/LC_MESSAGES/FixMyStreet.po index b097e4ab1..14a384c40 100644 --- a/locale/da_DK.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/da_DK.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2016-03-02 13:09+0000\n" -"PO-Revision-Date: 2015-10-23 16:35+0000\n" +"POT-Creation-Date: 2016-05-03 10:41+0100\n" +"PO-Revision-Date: 2016-03-23 12:43+0000\n" "Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: Danish (Denmark) (http://www.transifex.com/mysociety/fixmystreet/language/da_DK/)\n" "Language: da_DK\n" @@ -24,7 +24,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/DB/Result/Problem.pm:618 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr " og " @@ -57,9 +57,8 @@ msgid "%s admin:" msgstr "" #: templates/web/base/status/stats.html:26 -#, fuzzy msgid "%s bodies" -msgstr "Administrationer" +msgstr "" #: templates/web/base/status/stats.html:24 msgid "%s confirmed alerts, %s unconfirmed" @@ -94,7 +93,7 @@ msgstr "%s aktive opdateringer" msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "%s spørgeskemaer sendt – %s besvaret (%s%%)" -#: perllib/FixMyStreet/DB/Result/Problem.pm:683 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "%s ref: %s" msgstr "%s ref: %s" @@ -113,10 +112,6 @@ msgstr "" msgid "%s ward, %s" msgstr "%s bydel, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:552 -msgid "%s, reported at %s" -msgstr "%s, rapporteret %s" - #: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "%s, indefor bydel %s" @@ -171,7 +166,7 @@ msgstr "(som graffite, affald, hul i vejen, eller ødelagt gadelys)" msgid "(not sent to council)" msgstr "(ikke rapporteret til myndigheden)" -#: templates/web/zurich/report/new/fill_in_details_form.html:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "(optional)" msgstr "(valgfrit)" @@ -183,12 +178,11 @@ msgstr "(offentlig)" msgid "(sent to both)" msgstr "(sendt til begge)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Vælg en kategori --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Vælg en ejendomsstype --" @@ -220,26 +214,21 @@ msgstr "<strong>Nej</strong> Lad mig bekræfte min rapport med e-post" msgid "<strong>No</strong> Let me confirm my update by email" msgstr "<strong>Nej</strong> Lad mig bekræfte min opdatering med e-post" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:97 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>Nej</strong>, lad mig logge ind med e-post:" -#: templates/web/base/auth/general.html:70 +#: templates/web/base/auth/general.html:80 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Ja</strong>, jeg har en adgangskode" -#: templates/web/base/about/about-en-gb.html:1 -#: templates/web/base/about/about-en-gb.html:3 -msgid "About us" -msgstr "Om os" - #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Action Scheduled" msgstr "Handling planlagt" @@ -270,7 +259,7 @@ msgstr "Tilføj ny kategori" msgid "Add user" msgstr "Tilføj bruger" -#: templates/web/base/my/my.html:56 +#: templates/web/base/my/my.html:54 msgid "Added %s" msgstr "Tilføjede %s" @@ -290,7 +279,7 @@ msgstr "Varsel %d oprettet for %s, type %s, parameter %s / %s" msgid "Alert %d disabled (created %s)" msgstr "Varsel %d koblet fra (oprettet %s)" -#: templates/web/base/report/update/form_name.html:20 +#: templates/web/base/report/update/form_name.html:21 msgid "Alert me to future updates" msgstr "Send mig varsel ved fremtidige opdateringer" @@ -303,7 +292,7 @@ msgstr "Alle rapporter" msgid "All Reports as CSV" msgstr "" -#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 +#: templates/web/base/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:20 @@ -402,7 +391,7 @@ msgstr "Tilbage" msgid "Ban email address" msgstr "Bandlys epostadresse" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1273 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -433,7 +422,7 @@ msgstr "Hvis du ikke kan se kortet, <em>sÃ¥ overspring dette trin</em>." #: templates/web/base/admin/body.html:68 #: templates/web/base/admin/index.html:54 -#: templates/web/base/report/new/category.html:10 +#: templates/web/base/report/new/category.html:7 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 @@ -448,7 +437,7 @@ msgstr "Kategori" msgid "Category fix rate for problems > 4 weeks old" msgstr "Løsningsrate fordelt pÃ¥ kategori for problemer > 4 uger gamle" -#: templates/web/base/admin/body.html:138 +#: templates/web/base/admin/body.html:137 #: templates/web/base/admin/category_edit.html:23 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/admin/body.html:43 @@ -468,7 +457,7 @@ msgstr "Kategori: %s" msgid "Change password" msgstr "Skift adgangskode" -#: templates/web/base/admin/body.html:160 +#: templates/web/base/admin/body.html:158 msgid "" "Check <strong>confirmed</strong> to indicate that this contact has been confirmed as correct.\n" " If you are not sure of the origin or validity of the contact, leave this unchecked." @@ -476,7 +465,7 @@ msgstr "" "Markér <strong>bekræftet</strong> for at indikere at dette kontaktpunkt er blevet bekræftet som korrekt.\n" "Hvis du ikke er sikker pÃ¥ oprindelsen eller gyldigheden for kontaktpunktet, sÃ¥ markér ikke feltet." -#: templates/web/base/admin/body.html:171 +#: templates/web/base/admin/body.html:169 msgid "" "Check <strong>deleted</strong> to remove the category from use. \n" " It will not appear as an available category in the drop-down menu on the report-a-problem page." @@ -484,7 +473,7 @@ msgstr "" "Markér <strong>slettet</strong> for at ikke længere bruge kategorien\n" "Den vil ikke længere dukke op som en tilgængelig kategori i rullegardinmenuen pÃ¥ rapportér-et-problem-siden." -#: templates/web/base/admin/body.html:191 +#: templates/web/base/admin/body.html:189 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -500,7 +489,7 @@ msgstr "" "Dette er passerende nÃ¥r du ønsker at tillade brugere at indsende besked til myndigheden, men ikke vil vise\n" "den udadtil. I England har de brugt dette til opgaver som at bede om en ekstra papirkurv pÃ¥ et bestemt sted." -#: templates/web/base/admin/body.html:130 +#: templates/web/base/admin/body.html:129 msgid "" "Choose a <strong>category</strong> 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." @@ -541,8 +530,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:15 #: templates/web/base/admin/report_blocks.html:25 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 @@ -551,7 +540,7 @@ msgstr "" msgid "Closed" msgstr "Lukket" -#: perllib/FixMyStreet/DB/Result/Problem.pm:779 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Closed by council" msgstr "Lukket af myndigheden" @@ -577,7 +566,7 @@ msgstr "Mærkevaresamarbejdsdata:" msgid "Cobrand:" msgstr "Mærkevaresamarbejde:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Opsætning" @@ -596,9 +585,8 @@ msgstr "Bekræft konto" #: templates/web/base/report/new/form_user_loggedout_password.html:21 #: templates/web/base/report/update/form_user_loggedout_password.html:20 -#, fuzzy msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." -msgstr "Bekræft via epost nedenfor, og angiv en ny adgangskode der. NÃ¥r du har bekræftet vil adgangskode dit blive opdatert." +msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:1 #: templates/web/base/tokens/confirm_problem.html:1 @@ -608,7 +596,7 @@ msgstr "Bekræft via epost nedenfor, og angiv en ny adgangskode der. NÃ¥r du har msgid "Confirmation" msgstr "Bekræftelse" -#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:164 #: templates/web/base/admin/body.html:79 #: templates/web/base/admin/category_edit.html:37 #: templates/web/base/admin/category_edit.html:92 @@ -627,7 +615,7 @@ msgid "Confirmed:" msgstr "Bekræftet:" #. ("%s is the site name") -#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 +#: templates/web/base/about/_sidebar.html:6 msgid "Contact %s" msgstr "" @@ -646,8 +634,8 @@ msgstr "Kontakt projektgruppen" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1417 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1445 msgid "Could not find user" msgstr "Kunne ikke finde bruger" @@ -665,7 +653,7 @@ msgstr "Administration" msgid "Council contacts for %s" msgstr "Administrationskontakter for %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:681 +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "Council ref: %s" msgstr "myndighedsreference: %s" @@ -684,7 +672,7 @@ msgstr "Antal" msgid "Create a report" msgstr "Lav en rapport" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "Lav kategori" @@ -728,20 +716,20 @@ msgstr "Oversigt" msgid "Dealt with by subdivision within 5 working days" msgstr "Behandlet af underafdeling inden 5 arbejdsdage" -#: perllib/FixMyStreet/App/Controller/Admin.pm:877 +#: perllib/FixMyStreet/App/Controller/Admin.pm:865 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:175 #: templates/web/base/admin/body.html:81 #: templates/web/base/admin/category_edit.html:42 #: templates/web/base/admin/category_edit.html:93 msgid "Deleted" msgstr "Slettet" -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:47 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -749,7 +737,7 @@ msgid "Description" msgstr "Beskrivelse" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:68 +#: templates/web/zurich/report/new/fill_in_details_form.html:70 msgid "Details" msgstr "Detaljer" @@ -774,11 +762,11 @@ msgid "Diligency prize league table" msgstr "Arbejdsheste" #. ("%s is the site name") -#: templates/web/base/auth/general.html:48 -#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/auth/general.html:58 +#: templates/web/base/report/new/form_user_loggedout.html:28 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout.html:17 +#: templates/web/base/report/update/form_user_loggedout.html:27 msgid "Do you have a %s password?" msgstr "" @@ -796,8 +784,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "Duplicate" msgstr "Duplikat" @@ -820,7 +808,7 @@ msgstr "" msgid "Edit" msgstr "Redigér" -#: templates/web/base/admin/body.html:220 +#: templates/web/base/admin/body.html:218 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "Redigér detaljer for myndighed" @@ -850,7 +838,7 @@ msgstr "Opdateret af" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:39 +#: templates/web/base/auth/general.html:49 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -858,11 +846,11 @@ msgstr "Opdateret af" msgid "Email" msgstr "E-post" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 msgid "Email added to abuse list" msgstr "Epost lagt til misbrugsliste" -#: templates/web/base/admin/body.html:155 +#: templates/web/base/admin/body.html:153 msgid "Email address:" msgstr "E-postadresse:" @@ -874,19 +862,14 @@ msgstr "Epostvarsel laget" msgid "Email alert deleted" msgstr "Epostvarsel slettet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1390 msgid "Email already in abuse list" msgstr "Epost allerede i misbrugslisten" -#: templates/web/base/around/_updates.html:5 -msgid "Email me new local problems" -msgstr "Send mig e-post om lokale problemer" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 -#: templates/web/base/alert/updates.html:13 #: templates/web/zurich/admin/body.html:47 msgid "Email:" msgstr "E-post:" @@ -895,26 +878,6 @@ msgstr "E-post:" msgid "Email: %s" msgstr "E-post: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 -msgid "Empty flat or maisonette" -msgstr "Tom lejlighed" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 -msgid "Empty house or bungalow" -msgstr "Tomt hus eller bungalow" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 -msgid "Empty office or other commercial" -msgstr "Tomt kontor eller forretningsbygning" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 -msgid "Empty pub or bar" -msgstr "Tom pub eller bar" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 -msgid "Empty public building - school, hospital, etc." -msgstr "Tom offentlig bygning - skole, sygehus, etc." - #: templates/web/base/admin/body-form.html:162 #: templates/web/base/admin/body-form.html:163 msgid "" @@ -964,18 +927,14 @@ msgstr "Indtast postnummer i nærheden, eller vejnavn og sted" msgid "Enter a nearby street name and area" msgstr "Indtast et vejnavn og sted" -#: perllib/FixMyStreet/Cobrand/ZeroTB.pm:7 -msgid "Enter a nearby street name and area, postal code or district in Delhi" -msgstr "Vælg et nærliggende gadenavn og omrÃ¥de, postnummer eller distrikt i Delhi" - -#: templates/web/base/auth/general.html:99 +#: templates/web/base/auth/general.html:109 #: templates/web/base/report/new/form_user_loggedout_by_email.html:38 #: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Indtast en ny adgangskode" -#: templates/web/base/index-steps.html:26 +#: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "Indtast detaljer om problemet" @@ -1001,7 +960,7 @@ msgstr "Eksempel-postnummer %s" msgid "Examples:" msgstr "Eksempler:" -#: templates/web/base/report/new/form_report.html:49 +#: templates/web/base/report/new/form_report.html:51 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "Forklar hvad som er galt, nøjagtigt hvor det er og hvor længe det har været galt..." @@ -1038,19 +997,15 @@ msgstr "Første gang" msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." msgstr "Fiks dette ved at vælge en <strong>area covered</strong> i <em> Edit body details</em>-skemaet nedenfor." -#: templates/web/base/header.html:26 -msgid "FixMyStreet" -msgstr "FixMinVej" - #: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:38 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:40 msgid "Fixed" msgstr "Løst" @@ -1077,7 +1032,7 @@ msgstr "Markér som slettet" msgid "Flag user" msgstr "Markér bruger" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "Markeret:" @@ -1099,8 +1054,7 @@ msgstr "Markerede brugere er ikke begrænset pÃ¥ noget mÃ¥de. Dette er bare en msgid "Flagged:" msgstr "Markeret:" -#: templates/web/base/reports/_ward-list.html:3 -#: templates/web/fixmystreet/reports/_ward-list.html:4 +#: templates/web/base/reports/_ward-list.html:4 msgid "Follow a ward link to view only reports within that ward." msgstr "Følg en bydelslænke for at kun se rapporter indenfor denne bydel." @@ -1131,18 +1085,18 @@ msgstr "Ofte spurgte spørgsmÃ¥l" msgid "GeoRSS on Google Maps" msgstr "GeoRSS pÃ¥ Google Maps" +#: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:11 -#: templates/web/fixmystreet/around/_updates.html:3 msgid "Get updates" msgstr "FÃ¥ opdateringer" -#: templates/web/fixmystreet/reports/_rss.html:3 -#: templates/web/fixmystreet/reports/_rss.html:9 +#: templates/web/base/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:9 msgid "Get updates of %s problems" msgstr "FÃ¥ opdateringer for problemer i denne %s" -#: templates/web/fixmystreet/reports/_rss.html:11 -#: templates/web/fixmystreet/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:11 +#: templates/web/base/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "FÃ¥ opdateringer for problemer i denne %s" @@ -1155,7 +1109,7 @@ msgid "Glad to hear it’s been fixed!" msgstr "Glad for at høre at det er i orden!" #: templates/web/base/alert/index.html:34 -#: templates/web/base/around/postcode_form.html:16 +#: templates/web/base/around/postcode_form.html:13 #: templates/web/base/reports/_list-filters.html:28 #: templates/web/zurich/admin/stats.html:26 msgid "Go" @@ -1181,7 +1135,7 @@ msgstr "Er dette problem blevet løst?" msgid "Have you ever reported a problem to a council before, or is this your first time?" msgstr "Har du rapporteret et problem til en myndighed før, eller er dette første gang?" -#: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:38 +#: templates/web/base/footer.html:38 #: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 @@ -1192,8 +1146,7 @@ msgstr "Hjælp" msgid "Here are the types of local problem alerts for ‘%s’." msgstr "Her er de forskellige typer lokale problemvarsler for ‘%s’." -#: templates/web/base/header.html:32 templates/web/fixmystreet/header.html:63 -#: templates/web/zurich/footer.html:12 +#: templates/web/base/header.html:63 templates/web/zurich/footer.html:12 msgid "Hi %s" msgstr "Hej, %s" @@ -1209,11 +1162,11 @@ msgstr "Hej, %s" msgid "Hidden" msgstr "Skjul" -#: templates/web/base/around/display_location.html:65 +#: templates/web/base/around/display_location.html:64 msgid "Hide old" msgstr "Skjul gamle" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:59 msgid "Hide pins" msgstr "Skjul nÃ¥le" @@ -1233,10 +1186,6 @@ msgstr "Hvordan rapporteres et problem" msgid "How to send successful reports" msgstr "Hvordan indsendes rapporter som er løst" -#: perllib/FixMyStreet/App/Controller/Admin.pm:752 -msgid "I am afraid you cannot confirm unconfirmed reports." -msgstr "Jeg er bange for at du ikke kan bekræfte ubekræftede rapporter." - #: templates/web/base/tokens/confirm_problem.html:23 #: templates/web/base/tokens/confirm_problem.html:27 msgid "I just reported a problem on @fixmystreet" @@ -1247,7 +1196,7 @@ msgstr "Jeg rapporterede netop et problem pÃ¥ @fixminvej" msgid "I just updated a problem on @fixmystreet" msgstr "Jeg opdaterede netop et problem pÃ¥ @fixminvej" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88 msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "Jeg er bange for at vi ikke kunne finde dit problem i databasen.\n" @@ -1269,7 +1218,7 @@ msgid "" " For basic installations, you don't need to join bodies in this way." msgstr "Identificér en <strong>parent</strong> hvis instansen selv er en del af en anden myndighed." -#: templates/web/base/admin/body.html:133 +#: templates/web/base/admin/body.html:132 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." @@ -1290,7 +1239,7 @@ msgid "" "(please note it will not be sent to the council)." msgstr "" -#: templates/web/base/admin/body.html:149 +#: templates/web/base/admin/body.html:147 msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." msgstr "Hvis du bruger <strong>en sendemetode som ikke er e-post</strong>, sÃ¥ indtast tjeneste-ID (Open311) eller tilsvarende identifikator her." @@ -1332,10 +1281,10 @@ msgstr "Ugyldigt ID" msgid "Illegal feed selection" msgstr "Ugyldigt valg af feed" +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "In Progress" msgstr "Under Udførelse" @@ -1386,7 +1335,7 @@ msgstr "Intern reference" msgid "Invalid agency_responsible value %s" msgstr "Ugyldig agency_responsible-værdi %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 msgid "Invalid end date" msgstr "Ugyldig slut-dato" @@ -1394,16 +1343,16 @@ msgstr "Ugyldig slut-dato" msgid "Invalid format %s specified." msgstr "Ugyldigt format %s angivet." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 msgid "Invalid start date" msgstr "Ugyldig startdato" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:5 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Investigating" msgstr "Undersøges" @@ -1425,7 +1374,7 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:80 +#: 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 @@ -1463,7 +1412,6 @@ msgstr "Indlæser..." #: 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/fixmystreet/alert/updates.html:1 msgid "Local RSS feeds and email alerts" msgstr "Lokale RSS-strømme og e-postvarsler" @@ -1472,11 +1420,11 @@ msgstr "Lokale RSS-strømme og e-postvarsler" msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "Lokale RSS-strømme og e-postvarsler" -#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:35 +#: templates/web/base/footer.html:35 msgid "Local alerts" msgstr "Lokale varsler" -#: templates/web/base/index-steps.html:25 +#: templates/web/base/index-steps.html:5 msgid "Locate the problem on a map of the area" msgstr "Lokalisér problemet pÃ¥ kortet over omrÃ¥det" @@ -1536,14 +1484,14 @@ msgstr "MÃ¥ned" #: templates/web/base/admin/list_updates.html:7 #: templates/web/base/admin/reports.html:13 #: templates/web/base/admin/users.html:15 -#: templates/web/base/auth/general.html:89 +#: templates/web/base/auth/general.html:99 #: templates/web/base/report/new/form_user_loggedin.html:9 #: templates/web/base/report/new/form_user_loggedout_by_email.html:7 -#: templates/web/base/report/update/form_name.html:4 +#: templates/web/base/report/update/form_name.html:5 #: templates/web/base/reports/index.html:20 #: 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:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "Name" msgstr "Navn" @@ -1567,8 +1515,8 @@ 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:455 -#: perllib/FixMyStreet/Cobrand/Default.pm:495 +#: perllib/FixMyStreet/Cobrand/Default.pm:454 +#: perllib/FixMyStreet/Cobrand/Default.pm:494 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" @@ -1592,7 +1540,7 @@ msgstr "Nye <br>problemer" msgid "New body added" msgstr "Ny myndighed tilføjet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:387 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 msgid "New category contact added" msgstr "Ny kategorikontakt tilføjet" @@ -1657,7 +1605,7 @@ msgstr "Næste" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 -#: templates/web/base/questionnaire/index.html:101 +#: templates/web/base/questionnaire/index.html:102 #: templates/web/base/questionnaire/index.html:53 msgid "No" msgstr "Nej" @@ -1729,8 +1677,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Not Responsible" msgstr "Ikke ansvarlig" @@ -1763,7 +1711,7 @@ msgstr "Bemærk" 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/base/admin/body.html:186 +#: templates/web/base/admin/body.html:184 #: templates/web/base/admin/category_edit.html:52 #: templates/web/zurich/admin/body.html:53 msgid "Note:" @@ -1777,15 +1725,15 @@ msgstr "Note: <strong>%d</strong>" msgid "Notes from SDM to DM" msgstr "" -#: templates/web/base/report/new/form_user_loggedout.html:14 #: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/form_user_loggedout.html:24 #: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "PÃ¥ tide at sende din rapport…" #: templates/web/base/report/update-form.html:28 -#: templates/web/base/report/update/form_user_loggedout.html:13 #: templates/web/base/report/update/form_user_loggedout.html:2 +#: templates/web/base/report/update/form_user_loggedout.html:23 msgid "Now to submit your update…" msgstr "PÃ¥ tide at registrere din opdatering…" @@ -1819,8 +1767,8 @@ msgstr "Enlinjers opsummering" #: templates/web/base/admin/report_blocks.html:23 #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/report/update/form_update.html:36 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1855,13 +1803,13 @@ msgstr "Eller problemer meldt til:" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "Eller du kan abonnere pÃ¥ varsel baseret pÃ¥ bydel eller myndighed du hører ind under:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1055 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 -#: perllib/FixMyStreet/DB/Result/Problem.pm:558 -#: perllib/FixMyStreet/DB/Result/Problem.pm:568 -#: perllib/FixMyStreet/DB/Result/Problem.pm:578 -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1044 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:659 +#: perllib/FixMyStreet/DB/Result/Problem.pm:562 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 +#: perllib/FixMyStreet/DB/Result/Problem.pm:582 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 #: perllib/FixMyStreet/Script/Reports.pm:175 #: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" @@ -1886,7 +1834,7 @@ msgstr "Forælder" msgid "Partial" msgstr "Delvis" -#: templates/web/base/auth/general.html:92 +#: templates/web/base/auth/general.html:102 #: templates/web/base/report/new/form_user_loggedout_by_email.html:31 #: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 @@ -1895,7 +1843,7 @@ msgid "Password (optional)" msgstr "Adgangskode (valgfrit)" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:72 +#: templates/web/base/auth/general.html:82 msgid "Password:" msgstr "Adgangskode:" @@ -1903,7 +1851,7 @@ msgstr "Adgangskode:" msgid "Permalink" msgstr "Permalink" -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:90 msgid "Phone number" msgstr "Telefonnummer" @@ -1919,13 +1867,21 @@ msgid "Phone:" msgstr "Telefon:" #: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/questionnaire/index.html:89 +#: templates/web/base/questionnaire/index.html:91 #: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/new/form_report.html:38 +#: templates/web/base/report/new/form_report.html:40 +#: templates/web/base/report/update/form_update.html:20 +#: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:6 #: 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:45 +#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/zurich/report/new/fill_in_details_form.html:63 msgid "Photo" msgstr "Billed" @@ -1949,8 +1905,8 @@ msgstr "Placér tegnestiften pÃ¥ kortet" #: perllib/FixMyStreet/Cobrand/Zurich.pm:955 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:6 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 @@ -1966,16 +1922,16 @@ 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/general.html:27 -#: templates/web/base/auth/general.html:33 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:43 #: 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:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:856 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:921 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -1985,7 +1941,7 @@ msgstr "Vælg en kategori" msgid "Please choose a property type" msgstr "Vælg en type egenskab" -#: perllib/FixMyStreet/App/Controller/Admin.pm:378 +#: perllib/FixMyStreet/App/Controller/Admin.pm:376 msgid "Please correct the errors below" msgstr "Husk at rette op pÃ¥ fejlene nedenfor." @@ -2006,11 +1962,10 @@ msgstr "Vær ikke ufin — at skælde ud pÃ¥ din myndighed skader værdien a msgid "Please enter a message" msgstr "Venligst indlæg en besked" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Admin.pm:1079 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 msgid "Please enter a name" -msgstr "Angiv dit navn" +msgstr "" #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 @@ -2024,10 +1979,10 @@ msgstr "Indtast en adgangskode" msgid "Please enter a subject" msgstr "Venligst angiv et emne" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1075 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1130 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:133 +#: perllib/FixMyStreet/DB/Result/User.pm:143 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2044,9 +1999,9 @@ msgid "Please enter some details" msgstr "Angiv oplysninger om problemet" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:130 -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:32 +#: perllib/FixMyStreet/DB/Result/User.pm:140 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:42 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2055,7 +2010,7 @@ msgid "Please enter your email" msgstr "Angiv din e-post" #: templates/web/base/report/new/form_user_loggedout_email.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:80 +#: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "Please enter your email address" msgstr "Venligst angiv din e-postadresse" @@ -2071,7 +2026,7 @@ msgstr "Venligst angiv dit fulde navn, myndigheder som modtager dit problem har #: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:126 +#: perllib/FixMyStreet/DB/Result/User.pm:136 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "Angiv dit navn" @@ -2098,7 +2053,7 @@ msgstr "Du kan ogsÃ¥ <a href=\"%s\">logge ind igen</a> eller gÃ¥ tilbage til <a msgid "Please fill in details of the problem below." msgstr "Venligst udfyld detaljer om problemet nedenfor" -#: templates/web/zurich/report/new/fill_in_details_form.html:72 +#: templates/web/zurich/report/new/fill_in_details_form.html:74 msgid "Please fill in details of the problem." msgstr "Venligst udfyld detaljer om problemet." @@ -2109,7 +2064,7 @@ msgstr "" "Venligst udfyld skemaet nedenfor med detaljerne om problemet,\n" "og beskriv placeringen sÃ¥ nøjagtigt som muligt i boksen for detaljer." -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Venligst indikér om du ønsker at modtage et nyt spørgeskema" @@ -2118,9 +2073,8 @@ msgid "Please note that updates are not sent to the council." msgstr "Vær opmærksom pÃ¥ at opdateringer ikke bliver videresendt til myndigheden." #: templates/web/base/report/new/oauth_email_form.html:4 -#, fuzzy msgid "Please note your report has <strong>not yet been sent</strong>." -msgstr "Bemærk at din rapport <strong>endnu ikke er sendt</strong. Vælg en kategori og tilføj mere information nedenfor før du sender den ind." +msgstr "" #: templates/web/base/report/new/fill_in_details_form.html:20 #: templates/web/zurich/report/new/fill_in_details_form.html:11 @@ -2136,16 +2090,16 @@ msgstr "" msgid "Please note:" msgstr "Venligst bemærk:" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please provide some explanation as to why you're reopening this report" msgstr "Venligst bidrag med en forklaring pÃ¥ hvorfor du genÃ¥bner denne problemrapport" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250 msgid "Please provide some text as well as a photo" msgstr "Venligst bidrag med lidt tekst i tillæg til et billede" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236 msgid "Please say whether you've ever reported a problem to your council before" msgstr "Venligst oplys om du har rapporteret et problem til din myndighed tidligere" @@ -2161,22 +2115,23 @@ msgstr "Vælg den kilde du ønsker" msgid "Please select the type of alert you want" msgstr "Venligst vælg hvilken type varsel du ønsker" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232 msgid "Please state whether or not the problem has been fixed" msgstr "Venligs angiv om dette problem er blevet fikset eller ikke" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:121 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 #: templates/web/base/js/translation_strings.html:53 -msgid "Please upload a JPEG image only" +#, fuzzy +msgid "Please upload an image only" msgstr "Venligst læg kun JPEG-bilder op" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 msgid "Please write a message" msgstr "Indtast en besked" -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Please write your update here" msgstr "Indtast venligst din opdatering her" @@ -2207,7 +2162,7 @@ msgstr "" msgid "Previous" msgstr "Forrige" -#: templates/web/fixmystreet/footer.html:41 +#: templates/web/base/footer.html:41 msgid "Privacy" msgstr "Personliv" @@ -2217,7 +2172,7 @@ msgstr "Personliv" msgid "Privacy and cookies" msgstr "" -#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:200 #: templates/web/base/admin/body.html:85 #: templates/web/base/admin/category_edit.html:45 #: templates/web/base/admin/report_edit.html:77 @@ -2246,7 +2201,7 @@ msgstr "Problem %s sendt til myndighed %s" msgid "Problem breakdown by state" msgstr "Tilstandsfordeling af problemer" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1046 msgid "Problem marked as open." msgstr "Problem markeret som Ã¥bent." @@ -2258,10 +2213,6 @@ msgstr "Problemtilstandsændring baseret pÃ¥ spørgeundersøgelsesresultater" msgid "Problems" msgstr "Problemer" -#: templates/web/base/around/_updates.html:1 -msgid "Problems in this area" -msgstr "Problemer i dette omrÃ¥de" - #: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "Problemer i nærheden" @@ -2279,13 +2230,11 @@ msgid "Problems within %.1fkm of this location" msgstr "Problemer indenfor %.1fkm fra denne positionen" #: perllib/FixMyStreet/Cobrand/Default.pm:663 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 #: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "Problemer indenfor %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "Problemer indenfor %s bydel" @@ -2304,15 +2253,11 @@ msgstr "Problemer indenfor grænserne af:" msgid "Property address:" msgstr "Ejendomsadresse:" -#: templates/web/base/report/new/category.html:8 -msgid "Property type:" -msgstr "Type egenskab:" - #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Bidrag med en opdatering" -#: templates/web/base/auth/general.html:95 +#: templates/web/base/auth/general.html:105 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." @@ -2346,16 +2291,15 @@ msgstr "Spørgeskema %d udfyldt for problem %d, %s til %s" msgid "Questionnaire %d sent for problem %d" msgstr "Spørgeskema %d sendt for problem %d" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 msgid "Questionnaire filled in by problem reporter" msgstr "Spørgeskema udfyldt af fejlrapportøren" #: templates/web/base/alert/_list.html:22 +#: templates/web/base/alert/updates.html:9 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display_tools.html:34 -#: templates/web/base/reports/_rss.html:1 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed" msgstr "RSS-strøm" @@ -2383,18 +2327,12 @@ msgstr "RSS-strøm af %s, indenfor %s bydel" msgid "RSS feed of nearby problems" msgstr "RSS-strøm med problemer i nærheden" -#: templates/web/base/reports/_rss.html:1 -msgid "RSS feed of problems in this %s" -msgstr "RSS-strøm for problemer i denne %s" - #: perllib/FixMyStreet/Cobrand/Default.pm:664 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 #: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "RSS-strøm for problemer indenfor %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 #: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "RSS-strøm for problemer indenfor %s bydel" @@ -2404,14 +2342,13 @@ msgstr "RSS-strøm for problemer indenfor %s bydel" msgid "RSS feed of recent local problems" msgstr "RSS-strøm med nylige lokale problemer" +#: templates/web/base/alert/updates.html:9 #: templates/web/base/report/display_tools.html:34 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed of updates to this problem" msgstr "RSS-strøm med opdateringer for dette problem" -#: templates/web/base/alert/updates.html:9 +#: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:36 -#: templates/web/fixmystreet/alert/updates.html:14 msgid "Receive email when updates are left on this problem." msgstr "Modtag e-post nÃ¥r der er opdateringer pÃ¥ dette problem" @@ -2447,12 +2384,11 @@ msgstr "Fjern billede (kan ikke fortrydes!)" msgid "Reply to user:" msgstr "" -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/header_logo.html:2 msgid "Report" msgstr "Rapport" -#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:26 -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/footer.html:26 templates/web/base/header_logo.html:2 #: templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2462,7 +2398,7 @@ msgstr "Rapportér et problem" msgid "Report abuse" msgstr "Rapportér misbrug" -#: perllib/FixMyStreet/App/Controller/Rss.pm:291 +#: perllib/FixMyStreet/App/Controller/Rss.pm:297 msgid "Report on %s" msgstr "Rapport pÃ¥ %s" @@ -2477,7 +2413,7 @@ 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:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:577 #: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "Rapporteret anonymt %s" @@ -2487,7 +2423,7 @@ msgstr "Rapporteret anonymt %s" msgid "Reported before" msgstr "Rapporteret tidligere" -#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 #: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "Publiceret af %s %s" @@ -2501,27 +2437,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "Rapporteret i kategorien %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:569 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 msgid "Reported in the %s category anonymously at %s" msgstr "Rapporteret i kategorien %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:591 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 msgid "Reported in the %s category by %s at %s" msgstr "Rapporteret i kategorien %s af %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported via %s anonymously at %s" msgstr "Publiceret af %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported via %s by %s at %s" msgstr "Rapporteret af %s af %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:561 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 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:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 msgid "Reported via %s in the %s category by %s at %s" msgstr "Rapporteret af %s i kategorien %s af %s %s" @@ -2542,7 +2478,7 @@ msgstr "" msgid "Reporting a problem" msgstr "Rapporterer et problem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1274 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" @@ -2585,15 +2521,15 @@ msgstr "Vejoperatør for denne navngivne vej (udledt af vejens referencenummer o msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Vejoperatør for denne navngivne vej (fra OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1496 #: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "Rotér til venstre" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 #: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 @@ -2608,7 +2544,7 @@ msgstr "" msgid "Satellite" msgstr "Satelit" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/base/admin/category_edit.html:84 #: templates/web/zurich/admin/body.html:59 #: templates/web/zurich/admin/template_edit.html:29 @@ -2664,7 +2600,7 @@ msgstr "" msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:696 +#: perllib/FixMyStreet/DB/Result/Problem.pm:698 msgid "Sent to %s %s later" msgstr "Sendt til %s %s senere" @@ -2683,21 +2619,21 @@ msgstr "Del" #: templates/web/base/report/new/form_user_loggedin.html:23 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22 -#: templates/web/base/report/update/form_name.html:15 +#: templates/web/base/report/update/form_name.html:16 msgid "Show my name publicly" msgstr "Vis mit navn offentligt" -#: templates/web/base/around/display_location.html:67 +#: templates/web/base/around/display_location.html:66 msgid "Show old" msgstr "Vis gamle" -#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:57 msgid "Show pins" msgstr "Vis nÃ¥le" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/general.html:110 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:76 +#: templates/web/base/auth/general.html:86 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2759,9 +2695,8 @@ msgstr "Beklager, men vi kunne ikke finde dette sted." #: templates/web/base/auth/general.html:9 #: templates/web/base/report/display.html:21 #: templates/web/base/report/new/fill_in_details_form.html:23 -#, fuzzy msgid "Sorry, we could not log you in. Please fill in the form below." -msgstr "Beklager, men vi kunne ikke tolke den position. Prøv venligst igen." +msgstr "" #: perllib/FixMyStreet/Geocode/Bing.pm:35 #: perllib/FixMyStreet/Geocode/Google.pm:45 @@ -2769,15 +2704,10 @@ msgstr "Beklager, men vi kunne ikke tolke den position. Prøv venligst igen." msgid "Sorry, we could not parse that location. Please try again." msgstr "Beklager, men vi kunne ikke tolke den position. Prøv venligst igen." -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:138 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 -#, fuzzy -msgid "Sorry, you can not log in with Facebook. Please try again later." -msgstr "Der var problemer med at vise denne side. Venligst prøv igen senere." - #: templates/web/base/admin/stats.html:64 msgid "Start Date:" msgstr "Start-dato:" @@ -2786,7 +2716,7 @@ msgstr "Start-dato:" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/report/update/form_update.html:32 +#: templates/web/base/report/update/form_update.html:34 msgid "State" msgstr "Tilstand" @@ -2799,7 +2729,7 @@ msgstr "Tilstand" msgid "State:" msgstr "Tilstand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2839,10 +2769,10 @@ msgid "Subject:" msgstr "Emne:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/base/report/new/form_user_loggedout_by_email.html:39 #: templates/web/base/report/new/form_user_loggedout_password.html:11 -#: templates/web/zurich/report/new/fill_in_details_form.html:96 +#: templates/web/zurich/report/new/fill_in_details_form.html:98 msgid "Submit" msgstr "Send ind" @@ -2870,9 +2800,8 @@ msgstr "Indsend spørgeskema" msgid "Submitted" msgstr "Sendt ind" -#: templates/web/base/alert/updates.html:17 +#: templates/web/base/alert/updates.html:23 #: templates/web/base/report/display_tools.html:41 -#: templates/web/fixmystreet/alert/updates.html:23 msgid "Subscribe" msgstr "Abonnér" @@ -2880,7 +2809,7 @@ msgstr "Abonnér" msgid "Subscribe me to an email alert" msgstr "Jeg ønsker at abonnere pÃ¥ e-postvarsel" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -2899,7 +2828,7 @@ msgstr "Opsummering" msgid "Summary reports" msgstr "Opsummeringsrapporter" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 msgid "Survey" msgstr "Spørgeundersøgelse" @@ -2956,7 +2885,7 @@ msgstr "Tak for at du har lagt dit billede op. Vi skal nu placere dit problem, msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "Tak, glad for at høre at problemet er fikset! Vi vil gjerne spørge dig om du har rapporteret et problem til en myndighed tidligere?" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:157 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "Billedet ser ikke ud til at være blevet lagt op rigtigt (%s), prøv igen." @@ -2964,7 +2893,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:126 +#: perllib/FixMyStreet/App/Controller/Location.pm:127 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." @@ -2974,11 +2903,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:724 +#: perllib/FixMyStreet/App/Controller/Admin.pm:722 msgid "That problem has been marked as sent." msgstr "Det problem er blevet markeret som sendt." -#: perllib/FixMyStreet/App/Controller/Admin.pm:716 +#: perllib/FixMyStreet/App/Controller/Admin.pm:714 msgid "That problem will now be resent." msgstr "Det problem vil nu blive sendt igen." @@ -2990,7 +2919,7 @@ msgstr "Denne rapport kan ikke vises pÃ¥ %s." msgid "That report has been removed from FixMyStreet." msgstr "Den rapport er blevet fjernet fra FixMinVej." -#: templates/web/base/admin/body.html:144 +#: templates/web/base/admin/body.html:142 msgid "" "The <strong>email address</strong> is the destination to which reports about this category will be sent. \n" " Other categories for this body may have the same email address." @@ -3146,9 +3075,9 @@ msgstr "Der var problemer med at vise 'Alle rapporter'-siden. Venligst prøv ig 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:764 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:753 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 -#: templates/web/base/auth/general.html:43 +#: templates/web/base/auth/general.html:53 #: 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" @@ -3218,9 +3147,9 @@ msgstr "Denne e-post er blevet sendt til begge myndigheder som dækker stedet fo 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:920 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:898 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:935 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:977 #: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "Denne information er pÃ¥krævet" @@ -3233,11 +3162,11 @@ msgstr "Dette er et udviklernetsted.Ting kan gÃ¥ i stykker nÃ¥r som helst og dat msgid "This is a summary of all reports on this site." msgstr "Dette er en oplistning af alle problemerne i denne tjeneste." -#: templates/web/base/report/update/form_update.html:52 +#: templates/web/base/report/update/form_update.html:54 msgid "This problem has been fixed" msgstr "Dette problem er løst" -#: templates/web/base/report/update/form_update.html:46 +#: templates/web/base/report/update/form_update.html:48 msgid "This problem has not been fixed" msgstr "Dette problem er ikke blevet løst" @@ -3274,7 +3203,7 @@ msgstr "Denne netside indeholder ogsÃ¥ et billede af problemet, sendt ind af bru msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Tidslinje" @@ -3319,8 +3248,8 @@ msgstr "Forsøg at sende epost direkte til os:" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Unable to fix" msgstr "Kan ikke fikses" @@ -3337,7 +3266,7 @@ msgstr "Ubekræftet" msgid "Unknown" msgstr "Ukendt" -#: perllib/FixMyStreet/App/Controller/Rss.pm:173 +#: perllib/FixMyStreet/App/Controller/Rss.pm:174 msgid "Unknown alert type" msgstr "Ukendt varsel-type" @@ -3352,7 +3281,7 @@ msgstr "Ukendt fejl" msgid "Unknown problem ID" msgstr "Ukendt problem-Id" -#: templates/web/base/report/update/form_update.html:25 +#: templates/web/base/report/update/form_update.html:27 msgid "Update" msgstr "Opdatering" @@ -3404,10 +3333,10 @@ msgstr "Opdatér tilstanden" msgid "Updated" msgstr "Opdateret" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 -#: perllib/FixMyStreet/App/Controller/Admin.pm:821 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1096 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1144 +#: perllib/FixMyStreet/App/Controller/Admin.pm:809 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3434,7 +3363,7 @@ msgstr "Opdateringer af {{title}}" msgid "Updates to this problem, %s" msgstr "" -#: templates/web/base/admin/body.html:182 +#: templates/web/base/admin/body.html:180 msgid "Use the <strong>note</strong> to record details that are only displayed in the admin. Notes are not shown publicly, and are not sent to the body." msgstr "Brug <strong>notater</strong> for at notere detaljer som skal vises i admin-grænsefladen. Notater vises ikke offentligt og bliver ikke sendt til myndigheden." @@ -3443,11 +3372,11 @@ msgstr "Brug <strong>notater</strong> for at notere detaljer som skal vises i ad msgid "Used map" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 msgid "User flag removed" msgstr "Brugermarkering fjernet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1421 msgid "User flagged" msgstr "Bruger markeret" @@ -3455,16 +3384,16 @@ msgstr "Bruger markeret" msgid "User search finds matches in users' names and email addresses." msgstr "Brugersøgning finder træf pÃ¥ brugernavne og epostadresser. " -#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "Brugere" -#: perllib/FixMyStreet/App/Controller/Admin.pm:382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:412 -#: perllib/FixMyStreet/App/Controller/Admin.pm:429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:380 +#: perllib/FixMyStreet/App/Controller/Admin.pm:410 +#: perllib/FixMyStreet/App/Controller/Admin.pm:427 msgid "Values updated" msgstr "Værdier opdateret" @@ -3501,16 +3430,15 @@ msgstr "Vi fandt mere en et træf for dette sted. Vi viser op til ti træf, sÃ¥ #: templates/web/base/auth/general.html:6 #: templates/web/base/report/display.html:27 #: templates/web/base/report/new/oauth_email_form.html:5 -#, fuzzy msgid "We need your email address, please give it below." -msgstr "Vi viser aldrig din e-postadresse eller dit telefonnummer" +msgstr "" #: templates/web/base/report/new/form_user_loggedout_email.html:2 #: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "Vi viser aldrig din e-postadresse" -#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedin.html:30 #: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "Vi viser aldrig din e-postadresse eller dit telefonnummer" @@ -3519,7 +3447,7 @@ msgstr "Vi viser aldrig din e-postadresse eller dit telefonnummer" 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." -#: templates/web/base/index-steps.html:31 +#: templates/web/base/index-steps.html:11 msgid "We send it to the council on your behalf" msgstr "Vi sender til myndigheden pÃ¥ dine vegne" @@ -3557,10 +3485,6 @@ msgstr "HvornÃ¥r sendt" msgid "Whoa there Testino! Three photos are enough." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 -msgid "Whole block of empty flats" -msgstr "Hel blok med tomme lejligheder" - #: templates/web/base/tokens/confirm_alert.html:7 msgid "Why stop there? <a href=\"/alert\">Set up more alerts</a> for free." msgstr "Hvorfor stoppe der? <a href=\"/alert\">Sæt flere varsler</a> op gratis." @@ -3580,7 +3504,7 @@ msgstr "NÃ¥r du søger efter forespørgsler, sÃ¥ er det ogsÃ¥ muligt at søge ef msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "Kunne du tænke dig at bidrage til FixMinVej? Vores kKildekoden er frit programmel og <a href=\"http://fixmystreet.org\">tilgængelig via fixmystreet.org</a>." -#: templates/web/base/questionnaire/index.html:96 +#: templates/web/base/questionnaire/index.html:97 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "Kunne du tænke dig at modtage en ny forespørgsel om 4 uger, som minder dig om at tjekke status?" @@ -3610,8 +3534,8 @@ msgstr "Ã…r" #: templates/web/base/admin/update_edit.html:24 #: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 +#: templates/web/base/questionnaire/index.html:100 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "Ja" @@ -3729,19 +3653,19 @@ msgid "Your Reports" msgstr "Dine rapporter" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/alert/updates.html:19 +#: templates/web/base/alert/updates.html:22 #: templates/web/base/contact/index.html:83 #: templates/web/base/report/display_tools.html:38 #: templates/web/base/report/display_tools.html:40 #: templates/web/base/report/new/form_user_loggedin.html:3 #: templates/web/base/report/new/form_user_loggedout_email.html:1 #: templates/web/base/report/update/form_user_loggedout_email.html:1 -#: templates/web/fixmystreet/alert/updates.html:19 -#: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/zurich/report/new/fill_in_details_form.html:76 +#: templates/web/zurich/report/new/fill_in_details_form.html:78 msgid "Your email" msgstr "Din e-post" -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/general.html:55 #: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 @@ -3752,17 +3676,17 @@ msgstr "Din e-postadresse" msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "Vi vil kun bruge personlig information om dig i henhold til vores <a href=\"/faq#privacy\">privatlivsregler.</a>" -#: templates/web/base/auth/general.html:90 +#: templates/web/base/auth/general.html:100 #: templates/web/base/contact/index.html:76 #: templates/web/base/report/new/form_user_loggedin.html:18 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17 -#: templates/web/base/report/update/form_name.html:11 +#: templates/web/base/report/update/form_name.html:12 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:86 +#: templates/web/zurich/report/new/fill_in_details_form.html:88 msgid "Your name" msgstr "Dit navn" -#: templates/web/base/auth/general.html:75 +#: templates/web/base/auth/general.html:85 #: 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 @@ -3775,20 +3699,19 @@ msgstr "Din adgangskode er blevet ændret" #: templates/web/base/report/new/form_user_loggedin.html:27 #: templates/web/base/report/new/form_user_loggedout_by_email.html:26 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:94 msgid "Your phone number" msgstr "Dit telefonnummer" #: templates/web/base/questionnaire/index.html:14 -#, fuzzy msgid "Your report" -msgstr "Dine opdateringer" +msgstr "" -#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 +#: templates/web/base/footer.html:29 msgid "Your reports" msgstr "Dine opdateringer" -#: templates/web/base/my/my.html:41 +#: templates/web/base/my/my.html:39 msgid "Your updates" msgstr "Dine opdateringer" @@ -3814,7 +3737,7 @@ msgid "didn't use map" msgstr "brugte ikke kort" #: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/around/postcode_form.html:12 msgid "e.g. ‘%s’ or ‘%s’" msgstr "for eksempel '%s' eller '%s'" @@ -3920,8 +3843,7 @@ msgstr "andre omrÃ¥der:" msgid "reopened" msgstr "Ã¥bnet igen" -#: templates/web/base/header.html:33 templates/web/fixmystreet/header.html:64 -#: templates/web/zurich/footer.html:13 +#: templates/web/base/header.html:64 templates/web/zurich/footer.html:13 msgid "sign out" msgstr "log ud" @@ -3999,7 +3921,7 @@ msgid_plural "<big>%s</big> updates on reports" msgstr[0] "<big>%s</big> rapport-<br>opdatering" msgstr[1] "<big>%s</big> rapport-<br>opdateringer" -#: templates/web/emptyhomes/report/new/councils_text_none.html:3 +#: templates/web/base/report/new/councils_text_none.html:3 #, perl-format msgid "We do not yet have details for the council that covers this location." msgid_plural "We do not yet have details for the councils that cover this location." @@ -4041,86 +3963,47 @@ msgid_plural "We do <strong>not</strong> yet have details for the other councils msgstr[0] "Vi har endnu <strong>ikke</strong> detaljerne for den anden myndighed som dækker dette sted." msgstr[1] "Vi har endnu <strong>ikke</strong> detaljerne for de andre myndigheder som dækker dette sted." -#~ msgid "(we never show your email address or phone number)" -#~ msgstr "(vi viser aldrig din e-postadresse eller dit telefonnummer)" - -#~ msgid "(we never show your email)" -#~ msgstr "(vi viser aldrig din e-postadresse)" - -#~ msgid "<strong>No</strong>, let me confirm my report by email:" -#~ msgstr "<strong>Nej</strong>, lad mig bekræfte min rapport med e-post:" - -#~ msgid "<strong>No</strong>, let me confirm my update by email:" -#~ msgstr "<strong>Nej</strong>, lad mig bekræfte min opdatering med e-post:" - -#~ msgid "Email me updates" -#~ msgstr "Send mig opdateringer" - -#~ msgid "Enter a new password:" -#~ msgstr "Indtast en ny adgangskode:" - -#~ msgid "I'm afraid we couldn't validate that token. If you've copied the URL from an email, please check that you copied it exactly.\n" -#~ msgstr "Jeg er bange for at vi ikke kunne verificere denne reference. Hvis du kopierede webadressen fra en e-post, kontrollér at du har kopieret den korrekt.\n" - -#~ msgid "If you use web-based email or have 'junk mail' filters, you may wish to check your bulk/spam mail folders: sometimes, our messages are marked that way." -#~ msgstr "Hvis du bruger web-baseret e-post eller har filtre for affalds-e-post pÃ¥ din e-postkonto, skal du i nogen tilfælde se efter vores beskeder der." - -#~ msgid "Message:" -#~ msgstr "Besked:" - -#~ msgid "More problems nearby" -#~ msgstr "Flere problemer i nærheden" - -#~ msgid "Nearly Done! Now check your email..." -#~ msgstr "Nesten færdig! Nu skal du tjekke din e-post..." - -#~ msgid "Offensive? Unsuitable? Tell us" -#~ msgstr "Stødende? Upassende? Giv os besked" - -#~ msgid "Photo:" -#~ msgstr "Billed:" - -#~ msgid "Please check your email" -#~ msgstr "Venligst kontrollér e-posten du angav" +#~ msgid "%s, reported at %s" +#~ msgstr "%s, rapporteret %s" -#~ msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" -#~ msgstr "Venligst bemærk at opdateringer ikke bliver sendt til myndigheden. Hvis du vedlægger dit navnet sÃ¥ vil det være offentlig tilgængeligt. Din information vil kun blive brugt i henhold til vores <a href=\"/faq#privacy\">privatlivspolicy</a>" +#~ msgid "About us" +#~ msgstr "Om os" -#~ msgid "This may be because the link is too old or already used, or the address was not copied correctly." -#~ msgstr "Dette kan være fordi lænken er for gammel eller allerede brugt, eller at lænken ikke blev kopieret rigtigt." +#~ msgid "Email me new local problems" +#~ msgstr "Send mig e-post om lokale problemer" -#~ msgid "This problem has been closed" -#~ msgstr "Dette problem er lukket" +#~ msgid "Empty flat or maisonette" +#~ msgstr "Tom lejlighed" -#~ msgid "This problem is in progress" -#~ msgstr "Dette problemet er under udførelse" +#~ msgid "Empty house or bungalow" +#~ msgstr "Tomt hus eller bungalow" -#~ msgid "This problem is old and of unknown status." -#~ msgstr "Dette problem er gammelt og med ukendt status." +#~ msgid "Empty office or other commercial" +#~ msgstr "Tomt kontor eller forretningsbygning" -#~ msgid "Update:" -#~ msgstr "Opdatering:" +#~ msgid "Empty pub or bar" +#~ msgstr "Tom pub eller bar" -#~ msgid "We have not been able to confirm your account - sorry." -#~ msgstr "Vi har ikke kunnet bekræfte din konto - beklager." +#~ msgid "Empty public building - school, hospital, etc." +#~ msgstr "Tom offentlig bygning - skole, sygehus, etc." -#~ msgid "We have sent you an email containing a link to confirm your account." -#~ msgstr "Vi har sendt dig en epost som indeholder link for at bekræfte din konto." +#~ msgid "Enter a nearby street name and area, postal code or district in Delhi" +#~ msgstr "Vælg et nærliggende gadenavn og omrÃ¥de, postnummer eller distrikt i Delhi" -#~ msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:" -#~ msgstr "Vi ønsker at fÃ¥ din tilbagemelding om hvad du mener om denne tjeneste. Bare udfyld skemaet, eller send en e-post <a href='mailto:%s'>%s</a>:" +#~ msgid "FixMyStreet" +#~ msgstr "FixMinVej" -#~ msgid "You have already attached a photo to this report, attaching another one will replace it." -#~ msgstr "Du har allerede vedlagt et billede til dette problem. At vedlægge et andet vil erstatte dette." +#~ msgid "I am afraid you cannot confirm unconfirmed reports." +#~ msgstr "Jeg er bange for at du ikke kan bekræfte ubekræftede rapporter." -#~ msgid "You have already attached a photo to this update, attaching another one will replace it." -#~ msgstr "Du har allerede vedlagt et billede til denne opdatering. At vedlægge et andet vil erstatte dette." +#~ msgid "Problems in this area" +#~ msgstr "Problemer i dette omrÃ¥de" -#~ msgid "Your email:" -#~ msgstr "Din e-post" +#~ msgid "Property type:" +#~ msgstr "Type egenskab:" -#~ msgid "Your name:" -#~ msgstr "Dit navn:" +#~ msgid "RSS feed of problems in this %s" +#~ msgstr "RSS-strøm for problemer i denne %s" -#~ msgid "Your email:" -#~ msgstr "Din e-post:" +#~ msgid "Whole block of empty flats" +#~ msgstr "Hel blok med tomme lejligheder" diff --git a/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po index 35ff4065f..32ac3d660 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: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2016-03-02 13:09+0000\n" +"POT-Creation-Date: 2016-05-03 10:41+0100\n" "PO-Revision-Date: 2015-10-23 16:37+0000\n" "Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: German (Switzerland) (http://www.transifex.com/mysociety/fixmystreet/language/de_CH/)\n" @@ -18,7 +18,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/DB/Result/Problem.pm:618 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr "und" @@ -89,7 +89,7 @@ msgstr "Schicken Sie mir Aktualisierungen" msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:683 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "%s ref: %s" msgstr "" @@ -108,10 +108,6 @@ msgstr "" msgid "%s ward, %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:552 -msgid "%s, reported at %s" -msgstr "Gemeldet von %s um %s" - #: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "" @@ -166,7 +162,7 @@ msgstr "(z.B. illegale Deponien, Strassenschäden, Graffitis usw.)" msgid "(not sent to council)" msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "(optional)" msgstr "(optional)" @@ -178,12 +174,11 @@ msgstr "" msgid "(sent to both)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Wählen Sie eine Kategorie --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "" @@ -215,26 +210,21 @@ msgstr "Meldung per E-Mail bestätigen" msgid "<strong>No</strong> Let me confirm my update by email" msgstr "" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:97 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "Neu Registrieren" -#: templates/web/base/auth/general.html:70 +#: templates/web/base/auth/general.html:80 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "Passwort" -#: templates/web/base/about/about-en-gb.html:1 -#: templates/web/base/about/about-en-gb.html:3 -msgid "About us" -msgstr "Über uns" - #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Action Scheduled" msgstr "" @@ -265,7 +255,7 @@ msgstr "Füge neue Kategorie hinzu" msgid "Add user" msgstr "User hinzufügen" -#: templates/web/base/my/my.html:56 +#: templates/web/base/my/my.html:54 msgid "Added %s" msgstr "" @@ -285,7 +275,7 @@ msgstr "" msgid "Alert %d disabled (created %s)" msgstr "" -#: templates/web/base/report/update/form_name.html:20 +#: templates/web/base/report/update/form_name.html:21 msgid "Alert me to future updates" msgstr "" @@ -298,7 +288,7 @@ msgstr "Alle Meldungen" msgid "All Reports as CSV" msgstr "Als CSV exportieren" -#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 +#: templates/web/base/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:20 @@ -397,7 +387,7 @@ msgstr "Zurück" msgid "Ban email address" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1273 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -428,7 +418,7 @@ msgstr "Karte nicht sichtbar? <em>Überspringen Sie diesen Schritt</em>" #: templates/web/base/admin/body.html:68 #: templates/web/base/admin/index.html:54 -#: templates/web/base/report/new/category.html:10 +#: templates/web/base/report/new/category.html:7 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 @@ -443,7 +433,7 @@ msgstr "Kategorie" msgid "Category fix rate for problems > 4 weeks old" msgstr "" -#: templates/web/base/admin/body.html:138 +#: templates/web/base/admin/body.html:137 #: templates/web/base/admin/category_edit.html:23 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/admin/body.html:43 @@ -463,19 +453,19 @@ msgstr "Kategorie: %s" msgid "Change password" msgstr "Passwort ändern" -#: templates/web/base/admin/body.html:160 +#: templates/web/base/admin/body.html:158 msgid "" "Check <strong>confirmed</strong> to indicate that this contact has been confirmed as correct.\n" " If you are not sure of the origin or validity of the contact, leave this unchecked." msgstr "" -#: templates/web/base/admin/body.html:171 +#: templates/web/base/admin/body.html:169 msgid "" "Check <strong>deleted</strong> to remove the category from use. \n" " It will not appear as an available category in the drop-down menu on the report-a-problem page." msgstr "" -#: templates/web/base/admin/body.html:191 +#: templates/web/base/admin/body.html:189 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -486,7 +476,7 @@ msgid "" " at a specific address." msgstr "" -#: templates/web/base/admin/body.html:130 +#: templates/web/base/admin/body.html:129 msgid "" "Choose a <strong>category</strong> 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." @@ -527,8 +517,8 @@ msgstr "Klicken Sie auf den Link im Bestätigungsemail um sich anzumelden." #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:15 #: templates/web/base/admin/report_blocks.html:25 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 @@ -537,7 +527,7 @@ msgstr "Klicken Sie auf den Link im Bestätigungsemail um sich anzumelden." msgid "Closed" msgstr "Beantwortet" -#: perllib/FixMyStreet/DB/Result/Problem.pm:779 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Closed by council" msgstr "" @@ -563,7 +553,7 @@ msgstr "" msgid "Cobrand:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "" @@ -593,7 +583,7 @@ msgstr "" msgid "Confirmation" msgstr "Bestätigung" -#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:164 #: templates/web/base/admin/body.html:79 #: templates/web/base/admin/category_edit.html:37 #: templates/web/base/admin/category_edit.html:92 @@ -612,7 +602,7 @@ msgid "Confirmed:" msgstr "Bestätigt:" #. ("%s is the site name") -#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 +#: templates/web/base/about/_sidebar.html:6 msgid "Contact %s" msgstr "%s kontaktieren" @@ -631,8 +621,8 @@ msgstr "" msgid "Coordinates:" msgstr "Koordinaten" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1417 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1445 msgid "Could not find user" msgstr "" @@ -650,7 +640,7 @@ msgstr "" msgid "Council contacts for %s" msgstr "Kontaktdetails von %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:681 +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "Council ref: %s" msgstr "" @@ -669,7 +659,7 @@ msgstr "Anzahl" msgid "Create a report" msgstr "Erfasse eine Meldung" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "Kategorie erstellen" @@ -713,20 +703,20 @@ msgstr "" msgid "Dealt with by subdivision within 5 working days" msgstr "Innerhalb von fünf Arbeitstagen abgeschlossen" -#: perllib/FixMyStreet/App/Controller/Admin.pm:877 +#: perllib/FixMyStreet/App/Controller/Admin.pm:865 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "Vorlage löschen" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:175 #: templates/web/base/admin/body.html:81 #: templates/web/base/admin/category_edit.html:42 #: templates/web/base/admin/category_edit.html:93 msgid "Deleted" msgstr "Gelöscht" -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:47 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -734,7 +724,7 @@ msgid "Description" msgstr "Beschreibung" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:68 +#: templates/web/zurich/report/new/fill_in_details_form.html:70 msgid "Details" msgstr "Beschreibung" @@ -759,11 +749,11 @@ msgid "Diligency prize league table" msgstr "Weiss ich nicht" #. ("%s is the site name") -#: templates/web/base/auth/general.html:48 -#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/auth/general.html:58 +#: templates/web/base/report/new/form_user_loggedout.html:28 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout.html:17 +#: templates/web/base/report/update/form_user_loggedout.html:27 msgid "Do you have a %s password?" msgstr "Haben Sie ein %s Passwort?" @@ -781,8 +771,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "Duplicate" msgstr "" @@ -802,7 +792,7 @@ msgstr "" msgid "Edit" msgstr "Anpassen" -#: templates/web/base/admin/body.html:220 +#: templates/web/base/admin/body.html:218 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "Details editieren" @@ -832,7 +822,7 @@ msgstr "" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:39 +#: templates/web/base/auth/general.html:49 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -840,11 +830,11 @@ msgstr "" msgid "Email" msgstr "E-Mail" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 msgid "Email added to abuse list" msgstr "" -#: templates/web/base/admin/body.html:155 +#: templates/web/base/admin/body.html:153 msgid "Email address:" msgstr "" @@ -856,19 +846,14 @@ msgstr "E-Mail Benachrichtigung erstellt" msgid "Email alert deleted" msgstr "E-Mail Benachrichtigung gelöscht" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1390 msgid "Email already in abuse list" msgstr "" -#: templates/web/base/around/_updates.html:5 -msgid "Email me new local problems" -msgstr "" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 -#: templates/web/base/alert/updates.html:13 #: templates/web/zurich/admin/body.html:47 msgid "Email:" msgstr "E-mail:" @@ -877,26 +862,6 @@ msgstr "E-mail:" msgid "Email: %s" msgstr "E-mail:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 -msgid "Empty flat or maisonette" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 -msgid "Empty house or bungalow" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 -msgid "Empty office or other commercial" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 -msgid "Empty pub or bar" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 -msgid "Empty public building - school, hospital, etc." -msgstr "" - #: templates/web/base/admin/body-form.html:162 #: templates/web/base/admin/body-form.html:163 msgid "" @@ -940,18 +905,14 @@ msgstr "Ungefähre Adresse des Schadens" msgid "Enter a nearby street name and area" msgstr "Ungefähre Adresse des Schadens" -#: perllib/FixMyStreet/Cobrand/ZeroTB.pm:7 -msgid "Enter a nearby street name and area, postal code or district in Delhi" -msgstr "" - -#: templates/web/base/auth/general.html:99 +#: templates/web/base/auth/general.html:109 #: templates/web/base/report/new/form_user_loggedout_by_email.html:38 #: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Ihr Passwort" -#: templates/web/base/index-steps.html:26 +#: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "Beschreiben Sie den Schaden" @@ -977,7 +938,7 @@ msgstr "Beispieladresse" msgid "Examples:" msgstr "Beispiele:" -#: templates/web/base/report/new/form_report.html:49 +#: templates/web/base/report/new/form_report.html:51 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "" @@ -1014,19 +975,15 @@ msgstr "" msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." msgstr "" -#: templates/web/base/header.html:26 -msgid "FixMyStreet" -msgstr "" - #: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:38 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:40 msgid "Fixed" msgstr "Beantwortet" @@ -1053,7 +1010,7 @@ msgstr "Als gelöscht markieren" msgid "Flag user" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "" @@ -1075,8 +1032,7 @@ msgstr "" msgid "Flagged:" msgstr "" -#: templates/web/base/reports/_ward-list.html:3 -#: templates/web/fixmystreet/reports/_ward-list.html:4 +#: templates/web/base/reports/_ward-list.html:4 msgid "Follow a ward link to view only reports within that ward." msgstr "" @@ -1107,18 +1063,18 @@ msgstr "Hilfe" msgid "GeoRSS on Google Maps" msgstr "" +#: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:11 -#: templates/web/fixmystreet/around/_updates.html:3 msgid "Get updates" msgstr "" -#: templates/web/fixmystreet/reports/_rss.html:3 -#: templates/web/fixmystreet/reports/_rss.html:9 +#: templates/web/base/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:9 msgid "Get updates of %s problems" msgstr "Beschreiben Sie den Schaden" -#: templates/web/fixmystreet/reports/_rss.html:11 -#: templates/web/fixmystreet/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:11 +#: templates/web/base/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "" @@ -1131,7 +1087,7 @@ msgid "Glad to hear it’s been fixed!" msgstr "" #: templates/web/base/alert/index.html:34 -#: templates/web/base/around/postcode_form.html:16 +#: templates/web/base/around/postcode_form.html:13 #: templates/web/base/reports/_list-filters.html:28 #: templates/web/zurich/admin/stats.html:26 msgid "Go" @@ -1157,7 +1113,7 @@ msgstr "" msgid "Have you ever reported a problem to a council before, or is this your first time?" msgstr "" -#: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:38 +#: templates/web/base/footer.html:38 #: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 @@ -1168,8 +1124,7 @@ msgstr "Hilfe" msgid "Here are the types of local problem alerts for ‘%s’." msgstr "" -#: templates/web/base/header.html:32 templates/web/fixmystreet/header.html:63 -#: templates/web/zurich/footer.html:12 +#: templates/web/base/header.html:63 templates/web/zurich/footer.html:12 msgid "Hi %s" msgstr "Hallo %s" @@ -1185,11 +1140,11 @@ msgstr "Hallo %s" msgid "Hidden" msgstr "Unsichtbar" -#: templates/web/base/around/display_location.html:65 +#: templates/web/base/around/display_location.html:64 msgid "Hide old" msgstr "Alte ausblenden" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:59 msgid "Hide pins" msgstr "Stecknadeln ausblenden" @@ -1209,10 +1164,6 @@ msgstr "Erfassen Sie eine neue Meldung:" msgid "How to send successful reports" msgstr "Anleitung" -#: perllib/FixMyStreet/App/Controller/Admin.pm:752 -msgid "I am afraid you cannot confirm unconfirmed reports." -msgstr "" - #: templates/web/base/tokens/confirm_problem.html:23 #: templates/web/base/tokens/confirm_problem.html:27 msgid "I just reported a problem on @fixmystreet" @@ -1223,7 +1174,7 @@ msgstr "" msgid "I just updated a problem on @fixmystreet" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88 msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "" @@ -1245,7 +1196,7 @@ msgid "" " For basic installations, you don't need to join bodies in this way." msgstr "" -#: templates/web/base/admin/body.html:133 +#: templates/web/base/admin/body.html:132 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." @@ -1266,7 +1217,7 @@ msgid "" "(please note it will not be sent to the council)." msgstr "" -#: templates/web/base/admin/body.html:149 +#: templates/web/base/admin/body.html:147 msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." msgstr "" @@ -1301,10 +1252,10 @@ msgstr "Unbekannt ID" msgid "Illegal feed selection" msgstr "" +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "In Progress" msgstr "In Bearbeitung" @@ -1355,7 +1306,7 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 msgid "Invalid end date" msgstr "Ung&ultiges Enddatum" @@ -1363,16 +1314,16 @@ msgstr "Ung&ultiges Enddatum" msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 msgid "Invalid start date" msgstr "Ung&ultiges Startdatum" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:5 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Investigating" msgstr "" @@ -1394,7 +1345,7 @@ msgstr "Zuständigkeit unbekannt" msgid "Jurisdiction unknown" msgstr "Zuständigkeit unbekannt" -#: templates/web/base/auth/general.html:80 +#: 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 @@ -1432,7 +1383,6 @@ msgstr "" #: 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/fixmystreet/alert/updates.html:1 msgid "Local RSS feeds and email alerts" msgstr "" @@ -1441,11 +1391,11 @@ msgstr "" msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "" -#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:35 +#: templates/web/base/footer.html:35 msgid "Local alerts" msgstr "RSS" -#: templates/web/base/index-steps.html:25 +#: templates/web/base/index-steps.html:5 msgid "Locate the problem on a map of the area" msgstr "Lokalisieren Sie den Schaden auf der Karte" @@ -1505,14 +1455,14 @@ msgstr "Monat" #: templates/web/base/admin/list_updates.html:7 #: templates/web/base/admin/reports.html:13 #: templates/web/base/admin/users.html:15 -#: templates/web/base/auth/general.html:89 +#: templates/web/base/auth/general.html:99 #: templates/web/base/report/new/form_user_loggedin.html:9 #: templates/web/base/report/new/form_user_loggedout_by_email.html:7 -#: templates/web/base/report/update/form_name.html:4 +#: templates/web/base/report/update/form_name.html:5 #: templates/web/base/reports/index.html:20 #: 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:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "Name" msgstr "Name" @@ -1536,8 +1486,8 @@ msgstr "" msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:455 -#: perllib/FixMyStreet/Cobrand/Default.pm:495 +#: perllib/FixMyStreet/Cobrand/Default.pm:454 +#: perllib/FixMyStreet/Cobrand/Default.pm:494 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" @@ -1559,7 +1509,7 @@ msgstr "Neue <br>Meldungen" msgid "New body added" msgstr "Neue Organisation hinzugefügt" -#: perllib/FixMyStreet/App/Controller/Admin.pm:387 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 msgid "New category contact added" msgstr "" @@ -1624,7 +1574,7 @@ msgstr "Weiter" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 -#: templates/web/base/questionnaire/index.html:101 +#: templates/web/base/questionnaire/index.html:102 #: templates/web/base/questionnaire/index.html:53 msgid "No" msgstr "Nein" @@ -1689,8 +1639,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Not Responsible" msgstr "" @@ -1723,7 +1673,7 @@ 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 "" -#: templates/web/base/admin/body.html:186 +#: templates/web/base/admin/body.html:184 #: templates/web/base/admin/category_edit.html:52 #: templates/web/zurich/admin/body.html:53 msgid "Note:" @@ -1737,15 +1687,15 @@ msgstr "" msgid "Notes from SDM to DM" msgstr "Nachrichten an die Kommunikationstelle" -#: templates/web/base/report/new/form_user_loggedout.html:14 #: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/form_user_loggedout.html:24 #: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "" #: templates/web/base/report/update-form.html:28 -#: templates/web/base/report/update/form_user_loggedout.html:13 #: templates/web/base/report/update/form_user_loggedout.html:2 +#: templates/web/base/report/update/form_user_loggedout.html:23 msgid "Now to submit your update…" msgstr "" @@ -1779,8 +1729,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:23 #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/report/update/form_update.html:36 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1815,13 +1765,13 @@ msgstr "" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1055 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 -#: perllib/FixMyStreet/DB/Result/Problem.pm:558 -#: perllib/FixMyStreet/DB/Result/Problem.pm:568 -#: perllib/FixMyStreet/DB/Result/Problem.pm:578 -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1044 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:659 +#: perllib/FixMyStreet/DB/Result/Problem.pm:562 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 +#: perllib/FixMyStreet/DB/Result/Problem.pm:582 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 #: perllib/FixMyStreet/Script/Reports.pm:175 #: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" @@ -1846,7 +1796,7 @@ msgstr "Gehört zu" msgid "Partial" msgstr "" -#: templates/web/base/auth/general.html:92 +#: templates/web/base/auth/general.html:102 #: templates/web/base/report/new/form_user_loggedout_by_email.html:31 #: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 @@ -1855,7 +1805,7 @@ msgid "Password (optional)" msgstr "Passwort" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:72 +#: templates/web/base/auth/general.html:82 msgid "Password:" msgstr "" @@ -1863,7 +1813,7 @@ msgstr "" msgid "Permalink" msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:90 msgid "Phone number" msgstr "Telefonnummer" @@ -1879,13 +1829,21 @@ msgid "Phone:" msgstr "Telefonnummer:" #: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/questionnaire/index.html:89 +#: templates/web/base/questionnaire/index.html:91 #: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/new/form_report.html:38 +#: templates/web/base/report/new/form_report.html:40 +#: templates/web/base/report/update/form_update.html:20 +#: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:6 #: 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:45 +#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/zurich/report/new/fill_in_details_form.html:63 msgid "Photo" msgstr "Foto" @@ -1909,8 +1867,8 @@ msgstr "Pin auf der Karte absetzen" #: perllib/FixMyStreet/Cobrand/Zurich.pm:955 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:6 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 @@ -1926,16 +1884,16 @@ msgstr "Bitte seien Sie freundlich und prägnant." msgid "Please check the passwords and try again" msgstr "" -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:33 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:43 #: 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:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:856 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:921 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -1945,7 +1903,7 @@ msgstr "Bitte wählen Sie eine Kategorie" msgid "Please choose a property type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:378 +#: perllib/FixMyStreet/App/Controller/Admin.pm:376 msgid "Please correct the errors below" msgstr "" @@ -1966,8 +1924,8 @@ msgstr "" msgid "Please enter a message" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1079 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 #, fuzzy msgid "Please enter a name" msgstr "Bitte geben Sie Ihren Namen an" @@ -1984,10 +1942,10 @@ msgstr "Obligatorisches Feld" msgid "Please enter a subject" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1075 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1130 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:133 +#: perllib/FixMyStreet/DB/Result/User.pm:143 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2004,9 +1962,9 @@ msgid "Please enter some details" msgstr "Bitte geben Sie einige Details an" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:130 -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:32 +#: perllib/FixMyStreet/DB/Result/User.pm:140 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:42 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2015,7 +1973,7 @@ msgid "Please enter your email" msgstr "Ihre E-Mail Adresse" #: templates/web/base/report/new/form_user_loggedout_email.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:80 +#: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "Please enter your email address" msgstr "Ihre E-Mail Adresse" @@ -2031,7 +1989,7 @@ msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:126 +#: perllib/FixMyStreet/DB/Result/User.pm:136 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "Bitte geben Sie Ihren Namen an" @@ -2058,7 +2016,7 @@ msgstr "<a href=\"%s\">Erneut anmelden</a> oder <a href=\"/\">zurück zur St msgid "Please fill in details of the problem below." msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:72 +#: templates/web/zurich/report/new/fill_in_details_form.html:74 msgid "Please fill in details of the problem." msgstr "Beschreiben Sie den Schaden." @@ -2067,7 +2025,7 @@ msgstr "Beschreiben Sie den Schaden." msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "Füllen Sie das Formular mit den Details des Schadens aus und beschreiben Sie den Ort des Schadens möglichst genau." -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" @@ -2093,16 +2051,16 @@ msgstr "" msgid "Please note:" msgstr "Hinweise:" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please provide some explanation as to why you're reopening this report" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250 msgid "Please provide some text as well as a photo" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236 msgid "Please say whether you've ever reported a problem to your council before" msgstr "" @@ -2118,22 +2076,23 @@ msgstr "" msgid "Please select the type of alert you want" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232 msgid "Please state whether or not the problem has been fixed" msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:121 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 #: templates/web/base/js/translation_strings.html:53 -msgid "Please upload a JPEG image only" +#, fuzzy +msgid "Please upload an image only" msgstr "Bitte laden Sie nur JPEG Bilder hoch." #: perllib/FixMyStreet/App/Controller/Contact.pm:115 msgid "Please write a message" msgstr "" -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Please write your update here" msgstr "" @@ -2164,7 +2123,7 @@ msgstr "" msgid "Previous" msgstr "Zurück" -#: templates/web/fixmystreet/footer.html:41 +#: templates/web/base/footer.html:41 msgid "Privacy" msgstr "" @@ -2174,7 +2133,7 @@ msgstr "" msgid "Privacy and cookies" msgstr "" -#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:200 #: templates/web/base/admin/body.html:85 #: templates/web/base/admin/category_edit.html:45 #: templates/web/base/admin/report_edit.html:77 @@ -2203,7 +2162,7 @@ msgstr "" msgid "Problem breakdown by state" msgstr "Meldungen nach Status sortiert" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1046 msgid "Problem marked as open." msgstr "" @@ -2215,10 +2174,6 @@ msgstr "" msgid "Problems" msgstr "Meldungen" -#: templates/web/base/around/_updates.html:1 -msgid "Problems in this area" -msgstr "Meldungen in dieser Gegend" - #: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "Meldungen in der Nähe" @@ -2236,13 +2191,11 @@ msgid "Problems within %.1fkm of this location" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:663 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 #: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "Meldungen innerhalb %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "" @@ -2261,15 +2214,11 @@ msgstr "" msgid "Property address:" msgstr "" -#: templates/web/base/report/new/category.html:8 -msgid "Property type:" -msgstr "" - #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Meldung aktualisieren" -#: templates/web/base/auth/general.html:95 +#: templates/web/base/auth/general.html:105 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 "" @@ -2303,16 +2252,15 @@ msgstr "" msgid "Questionnaire %d sent for problem %d" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 msgid "Questionnaire filled in by problem reporter" msgstr "" #: templates/web/base/alert/_list.html:22 +#: templates/web/base/alert/updates.html:9 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display_tools.html:34 -#: templates/web/base/reports/_rss.html:1 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed" msgstr "" @@ -2340,18 +2288,12 @@ msgstr "" msgid "RSS feed of nearby problems" msgstr "" -#: templates/web/base/reports/_rss.html:1 -msgid "RSS feed of problems in this %s" -msgstr "" - #: perllib/FixMyStreet/Cobrand/Default.pm:664 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 #: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 #: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "" @@ -2361,14 +2303,13 @@ msgstr "" msgid "RSS feed of recent local problems" msgstr "" +#: templates/web/base/alert/updates.html:9 #: templates/web/base/report/display_tools.html:34 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed of updates to this problem" msgstr "" -#: templates/web/base/alert/updates.html:9 +#: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:36 -#: templates/web/fixmystreet/alert/updates.html:14 msgid "Receive email when updates are left on this problem." msgstr "Erhalten Sie Aktualisierungen dieser Meldung." @@ -2404,12 +2345,11 @@ msgstr "" msgid "Reply to user:" msgstr "Antwort an User" -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/header_logo.html:2 msgid "Report" msgstr "Meldung" -#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:26 -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/footer.html:26 templates/web/base/header_logo.html:2 #: templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2419,7 +2359,7 @@ msgstr "Eine Meldung erfassen" msgid "Report abuse" msgstr "Missbrauch melden" -#: perllib/FixMyStreet/App/Controller/Rss.pm:291 +#: perllib/FixMyStreet/App/Controller/Rss.pm:297 msgid "Report on %s" msgstr "" @@ -2434,7 +2374,7 @@ 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:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:577 #: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "Anonym gemeldet um" @@ -2444,7 +2384,7 @@ msgstr "Anonym gemeldet um" msgid "Reported before" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 #: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "Gemeldet von %s um %s" @@ -2458,27 +2398,27 @@ msgstr "Gemeldet von" msgid "Reported in the %s category" msgstr "In der Kategorie %s gemeldet" -#: perllib/FixMyStreet/DB/Result/Problem.pm:569 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 msgid "Reported in the %s category anonymously at %s" msgstr "In der Kategorie %s um %s gemeldet" -#: perllib/FixMyStreet/DB/Result/Problem.pm:591 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 msgid "Reported in the %s category by %s at %s" msgstr "Gemeldet in der Kategorie %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported via %s anonymously at %s" msgstr "Anonym gemeldet von %s um %s " -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported via %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:561 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 msgid "Reported via %s in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 msgid "Reported via %s in the %s category by %s at %s" msgstr "" @@ -2499,7 +2439,7 @@ msgstr "Gemeldet" msgid "Reporting a problem" msgstr "Ihre Meldung" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1274 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" @@ -2542,15 +2482,15 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1496 #: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "Links drehen" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 #: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 @@ -2565,7 +2505,7 @@ msgstr "Durch das Drehen des Fotos gehen nicht gespeicherte Änderungen verloren msgid "Satellite" msgstr "" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/base/admin/category_edit.html:84 #: templates/web/zurich/admin/body.html:59 #: templates/web/zurich/admin/template_edit.html:29 @@ -2621,7 +2561,7 @@ msgstr "" msgid "Sent report back" msgstr "Meldung zurückgewiesen" -#: perllib/FixMyStreet/DB/Result/Problem.pm:696 +#: perllib/FixMyStreet/DB/Result/Problem.pm:698 msgid "Sent to %s %s later" msgstr "" @@ -2640,21 +2580,21 @@ msgstr "" #: templates/web/base/report/new/form_user_loggedin.html:23 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22 -#: templates/web/base/report/update/form_name.html:15 +#: templates/web/base/report/update/form_name.html:16 msgid "Show my name publicly" msgstr "" -#: templates/web/base/around/display_location.html:67 +#: templates/web/base/around/display_location.html:66 msgid "Show old" msgstr "" -#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:57 msgid "Show pins" msgstr "Zeige Stecknadeln" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/general.html:110 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:76 +#: templates/web/base/auth/general.html:86 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2723,15 +2663,10 @@ msgstr "Diese Adresse wurde nicht gefunden." msgid "Sorry, we could not parse that location. Please try again." msgstr "Diese Adresse wurde nicht gefunden." -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:138 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "Ihre Bilder konnten nicht gespeichert werden. Bitte versuchen Sie es nochmals." -#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 -#, fuzzy -msgid "Sorry, you can not log in with Facebook. Please try again later." -msgstr "Diese Adresse wurde nicht gefunden." - #: templates/web/base/admin/stats.html:64 msgid "Start Date:" msgstr "" @@ -2740,7 +2675,7 @@ msgstr "" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/report/update/form_update.html:32 +#: templates/web/base/report/update/form_update.html:34 msgid "State" msgstr "Status" @@ -2753,7 +2688,7 @@ msgstr "Status" msgid "State:" msgstr "Status" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2793,10 +2728,10 @@ msgid "Subject:" msgstr "Titel" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/base/report/new/form_user_loggedout_by_email.html:39 #: templates/web/base/report/new/form_user_loggedout_password.html:11 -#: templates/web/zurich/report/new/fill_in_details_form.html:96 +#: templates/web/zurich/report/new/fill_in_details_form.html:98 msgid "Submit" msgstr "Abschicken" @@ -2824,9 +2759,8 @@ msgstr "" msgid "Submitted" msgstr "Erfasst" -#: templates/web/base/alert/updates.html:17 +#: templates/web/base/alert/updates.html:23 #: templates/web/base/report/display_tools.html:41 -#: templates/web/fixmystreet/alert/updates.html:23 msgid "Subscribe" msgstr "" @@ -2834,7 +2768,7 @@ msgstr "" msgid "Subscribe me to an email alert" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -2853,7 +2787,7 @@ msgstr "Zusammenfassung" msgid "Summary reports" msgstr "Alle Meldungen" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 msgid "Survey" msgstr "" @@ -2910,7 +2844,7 @@ msgstr "" msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:157 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" @@ -2918,7 +2852,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:126 +#: perllib/FixMyStreet/App/Controller/Location.pm:127 msgid "That location does not appear to be in the UK; please try again." msgstr "" @@ -2928,11 +2862,11 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:724 +#: perllib/FixMyStreet/App/Controller/Admin.pm:722 msgid "That problem has been marked as sent." msgstr "Die Meldung wurde als gesendet markiert." -#: perllib/FixMyStreet/App/Controller/Admin.pm:716 +#: perllib/FixMyStreet/App/Controller/Admin.pm:714 msgid "That problem will now be resent." msgstr "" @@ -2944,7 +2878,7 @@ msgstr "Diese Meldung wurde von «Züri wie neu» entfernt." msgid "That report has been removed from FixMyStreet." msgstr "Diese Meldung wurde von «Züri wie neu» entfernt." -#: templates/web/base/admin/body.html:144 +#: templates/web/base/admin/body.html:142 msgid "" "The <strong>email address</strong> is the destination to which reports about this category will be sent. \n" " Other categories for this body may have the same email address." @@ -3084,9 +3018,9 @@ msgstr "" msgid "There was a problem showing this page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:753 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 -#: templates/web/base/auth/general.html:43 +#: templates/web/base/auth/general.html:53 #: 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." @@ -3147,9 +3081,9 @@ msgstr "" 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:920 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:898 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:935 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:977 #: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "Diese Information wird benötigt" @@ -3162,11 +3096,11 @@ msgstr "" msgid "This is a summary of all reports on this site." msgstr "" -#: templates/web/base/report/update/form_update.html:52 +#: templates/web/base/report/update/form_update.html:54 msgid "This problem has been fixed" msgstr "Dieser Schaden wurde behoben" -#: templates/web/base/report/update/form_update.html:46 +#: templates/web/base/report/update/form_update.html:48 msgid "This problem has not been fixed" msgstr "Dieser Schaden wurde nicht behoben" @@ -3203,7 +3137,7 @@ msgstr "" msgid "Time spent (in minutes):" msgstr "Aufwand (in Minuten)" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -3248,8 +3182,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Unable to fix" msgstr "" @@ -3266,7 +3200,7 @@ msgstr "Unbestätigt" msgid "Unknown" msgstr "Unbekannt" -#: perllib/FixMyStreet/App/Controller/Rss.pm:173 +#: perllib/FixMyStreet/App/Controller/Rss.pm:174 msgid "Unknown alert type" msgstr "" @@ -3281,7 +3215,7 @@ msgstr "Unbekannter Fehler" msgid "Unknown problem ID" msgstr "" -#: templates/web/base/report/update/form_update.html:25 +#: templates/web/base/report/update/form_update.html:27 msgid "Update" msgstr "Speichern" @@ -3333,10 +3267,10 @@ msgstr "" msgid "Updated" msgstr "Aktualisiert" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 -#: perllib/FixMyStreet/App/Controller/Admin.pm:821 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1096 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1144 +#: perllib/FixMyStreet/App/Controller/Admin.pm:809 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3363,7 +3297,7 @@ msgstr "" msgid "Updates to this problem, %s" msgstr "Änderungen an dieser Meldung, %s" -#: templates/web/base/admin/body.html:182 +#: templates/web/base/admin/body.html:180 msgid "Use the <strong>note</strong> to record details that are only displayed in the admin. Notes are not shown publicly, and are not sent to the body." msgstr "" @@ -3372,11 +3306,11 @@ msgstr "" msgid "Used map" msgstr "Karte verwendet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1421 msgid "User flagged" msgstr "" @@ -3384,16 +3318,16 @@ msgstr "" msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:412 -#: perllib/FixMyStreet/App/Controller/Admin.pm:429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:380 +#: perllib/FixMyStreet/App/Controller/Admin.pm:410 +#: perllib/FixMyStreet/App/Controller/Admin.pm:427 msgid "Values updated" msgstr "" @@ -3439,7 +3373,7 @@ msgstr "Ihre E-Mail Adresse oder Telefonnummer werden nie angezeigt" msgid "We never show your email" msgstr "Ihr E-Mail wird nie angezeigt" -#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedin.html:30 #: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "Ihre E-Mail Adresse oder Telefonnummer werden nie angezeigt" @@ -3448,7 +3382,7 @@ msgstr "Ihre E-Mail Adresse oder Telefonnummer werden nie angezeigt" 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 "" -#: templates/web/base/index-steps.html:31 +#: templates/web/base/index-steps.html:11 msgid "We send it to the council on your behalf" msgstr "" @@ -3486,10 +3420,6 @@ msgstr "Wann gesendet" msgid "Whoa there Testino! Three photos are enough." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 -msgid "Whole block of empty flats" -msgstr "" - #: templates/web/base/tokens/confirm_alert.html:7 msgid "Why stop there? <a href=\"/alert\">Set up more alerts</a> for free." msgstr "" @@ -3509,7 +3439,7 @@ msgstr "" msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "" -#: templates/web/base/questionnaire/index.html:96 +#: templates/web/base/questionnaire/index.html:97 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "" @@ -3539,8 +3469,8 @@ msgstr "Jahr" #: templates/web/base/admin/update_edit.html:24 #: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 +#: templates/web/base/questionnaire/index.html:100 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "Ja" @@ -3655,19 +3585,19 @@ msgid "Your Reports" msgstr "Ihre Meldungen" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/alert/updates.html:19 +#: templates/web/base/alert/updates.html:22 #: templates/web/base/contact/index.html:83 #: templates/web/base/report/display_tools.html:38 #: templates/web/base/report/display_tools.html:40 #: templates/web/base/report/new/form_user_loggedin.html:3 #: templates/web/base/report/new/form_user_loggedout_email.html:1 #: templates/web/base/report/update/form_user_loggedout_email.html:1 -#: templates/web/fixmystreet/alert/updates.html:19 -#: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/zurich/report/new/fill_in_details_form.html:76 +#: templates/web/zurich/report/new/fill_in_details_form.html:78 msgid "Your email" msgstr "E-Mail Adresse" -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/general.html:55 #: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 @@ -3678,17 +3608,17 @@ msgstr "Ihre E-Mail Adresse" msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "Wir verwenden Ihre persönlichen Daten nur entsprechend unserer <a href=\"/faq#privacy\">Datenschutzrichtlinien.</a>" -#: templates/web/base/auth/general.html:90 +#: templates/web/base/auth/general.html:100 #: templates/web/base/contact/index.html:76 #: templates/web/base/report/new/form_user_loggedin.html:18 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17 -#: templates/web/base/report/update/form_name.html:11 +#: templates/web/base/report/update/form_name.html:12 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:86 +#: templates/web/zurich/report/new/fill_in_details_form.html:88 msgid "Your name" msgstr "Ihr Name" -#: templates/web/base/auth/general.html:75 +#: templates/web/base/auth/general.html:85 #: 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 @@ -3701,7 +3631,7 @@ msgstr "Ihr Passwort wurde geändert" #: templates/web/base/report/new/form_user_loggedin.html:27 #: templates/web/base/report/new/form_user_loggedout_by_email.html:26 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:94 msgid "Your phone number" msgstr "Ihre Telefonnummer" @@ -3710,11 +3640,11 @@ msgstr "Ihre Telefonnummer" msgid "Your report" msgstr "Ihre Meldungen" -#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 +#: templates/web/base/footer.html:29 msgid "Your reports" msgstr "Ihre Meldungen" -#: templates/web/base/my/my.html:41 +#: templates/web/base/my/my.html:39 msgid "Your updates" msgstr "" @@ -3740,7 +3670,7 @@ msgid "didn't use map" msgstr "hat Karte nicht verwendet" #: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/around/postcode_form.html:12 msgid "e.g. ‘%s’ or ‘%s’" msgstr "z.B. ‘%s’ oder ‘%s’" @@ -3846,8 +3776,7 @@ msgstr "" msgid "reopened" msgstr "" -#: templates/web/base/header.html:33 templates/web/fixmystreet/header.html:64 -#: templates/web/zurich/footer.html:13 +#: templates/web/base/header.html:64 templates/web/zurich/footer.html:13 msgid "sign out" msgstr "ausloggen" @@ -3925,7 +3854,7 @@ msgid_plural "<big>%s</big> updates on reports" msgstr[0] "<big>%s</big> Meldung bearbeitet" msgstr[1] "<big>%s</big> Meldungen bearbeitet" -#: templates/web/emptyhomes/report/new/councils_text_none.html:3 +#: templates/web/base/report/new/councils_text_none.html:3 #, perl-format msgid "We do not yet have details for the council that covers this location." msgid_plural "We do not yet have details for the councils that cover this location." @@ -3967,6 +3896,19 @@ msgid_plural "We do <strong>not</strong> yet have details for the other councils msgstr[0] "" msgstr[1] "" +#~ msgid "%s, reported at %s" +#~ msgstr "Gemeldet von %s um %s" + +#~ msgid "About us" +#~ msgstr "Über uns" + +#~ msgid "Problems in this area" +#~ msgstr "Meldungen in dieser Gegend" + +#, fuzzy +#~ msgid "Sorry, you can not log in with Facebook. Please try again later." +#~ msgstr "Diese Adresse wurde nicht gefunden." + #~ msgid "(we never show your email address or phone number)" #~ msgstr "(Ihre E-Mail Adresse und Telefonnummer werden nie angezeigt)" diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/de_DE.UTF-8/LC_MESSAGES/FixMyStreet.po index f0dde036f..beba8c165 100644 --- a/locale/de_DE.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/de_DE.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2016-03-02 13:09+0000\n" -"PO-Revision-Date: 2015-10-23 17:54+0000\n" -"Last-Translator: Ettore Atalan <atalanttore@googlemail.com>\n" +"POT-Creation-Date: 2016-05-03 10:41+0100\n" +"PO-Revision-Date: 2016-03-23 12:43+0000\n" +"Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: German (Germany) (http://www.transifex.com/mysociety/fixmystreet/language/de_DE/)\n" "Language: de_DE\n" "MIME-Version: 1.0\n" @@ -20,7 +20,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/DB/Result/Problem.pm:618 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr "und" @@ -89,7 +89,7 @@ msgstr "%s Aktualisierungen in Echtzeit" msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "%s Fragebögen versandt – %s beantwortet (%s%%)" -#: perllib/FixMyStreet/DB/Result/Problem.pm:683 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "%s ref: %s" msgstr "%s ref: %s" @@ -108,10 +108,6 @@ msgstr "" msgid "%s ward, %s" msgstr "%s Stadtteil, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:552 -msgid "%s, reported at %s" -msgstr "%s, gemeldet am %s" - #: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "" @@ -166,7 +162,7 @@ msgstr "(z.B. illegale Deponien, Strassenschäden, Graffitis usw.)" msgid "(not sent to council)" msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "(optional)" msgstr "(optional)" @@ -178,12 +174,11 @@ msgstr "(öffentlich)" msgid "(sent to both)" msgstr "(gesendet an beide)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Wählen Sie eine Kategorie --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "" @@ -215,26 +210,21 @@ msgstr "" msgid "<strong>No</strong> Let me confirm my update by email" msgstr "" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:97 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "" -#: templates/web/base/auth/general.html:70 +#: templates/web/base/auth/general.html:80 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Ja</strong>, ich habe ein Passwort" -#: templates/web/base/about/about-en-gb.html:1 -#: templates/web/base/about/about-en-gb.html:3 -msgid "About us" -msgstr "Über uns" - #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Action Scheduled" msgstr "Aktion geplant" @@ -265,7 +255,7 @@ msgstr "Füge neue Kategorie hinzu" msgid "Add user" msgstr "Benutzer hinzufügen" -#: templates/web/base/my/my.html:56 +#: templates/web/base/my/my.html:54 msgid "Added %s" msgstr "%s hinzugefügt" @@ -285,7 +275,7 @@ msgstr "" msgid "Alert %d disabled (created %s)" msgstr "Alarm %d deaktiviert (erstellt %s)" -#: templates/web/base/report/update/form_name.html:20 +#: templates/web/base/report/update/form_name.html:21 msgid "Alert me to future updates" msgstr "" @@ -298,7 +288,7 @@ msgstr "Alle Meldungen" msgid "All Reports as CSV" msgstr "Alle Berichte als CSV" -#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 +#: templates/web/base/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:20 @@ -397,7 +387,7 @@ msgstr "Zurück" msgid "Ban email address" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1273 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -428,7 +418,7 @@ msgstr "" #: templates/web/base/admin/body.html:68 #: templates/web/base/admin/index.html:54 -#: templates/web/base/report/new/category.html:10 +#: templates/web/base/report/new/category.html:7 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 @@ -443,7 +433,7 @@ msgstr "Kategorie" msgid "Category fix rate for problems > 4 weeks old" msgstr "" -#: templates/web/base/admin/body.html:138 +#: templates/web/base/admin/body.html:137 #: templates/web/base/admin/category_edit.html:23 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/admin/body.html:43 @@ -463,19 +453,19 @@ msgstr "Kategorie: %s" msgid "Change password" msgstr "Passwort ändern" -#: templates/web/base/admin/body.html:160 +#: templates/web/base/admin/body.html:158 msgid "" "Check <strong>confirmed</strong> to indicate that this contact has been confirmed as correct.\n" " If you are not sure of the origin or validity of the contact, leave this unchecked." msgstr "" -#: templates/web/base/admin/body.html:171 +#: templates/web/base/admin/body.html:169 msgid "" "Check <strong>deleted</strong> to remove the category from use. \n" " It will not appear as an available category in the drop-down menu on the report-a-problem page." msgstr "" -#: templates/web/base/admin/body.html:191 +#: templates/web/base/admin/body.html:189 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -486,7 +476,7 @@ msgid "" " at a specific address." msgstr "" -#: templates/web/base/admin/body.html:130 +#: templates/web/base/admin/body.html:129 msgid "" "Choose a <strong>category</strong> 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." @@ -527,8 +517,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:15 #: templates/web/base/admin/report_blocks.html:25 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 @@ -537,7 +527,7 @@ msgstr "" msgid "Closed" msgstr "Geschlossen" -#: perllib/FixMyStreet/DB/Result/Problem.pm:779 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Closed by council" msgstr "" @@ -563,7 +553,7 @@ msgstr "" msgid "Cobrand:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Konfiguration" @@ -593,7 +583,7 @@ msgstr "" msgid "Confirmation" msgstr "Bestätigung" -#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:164 #: templates/web/base/admin/body.html:79 #: templates/web/base/admin/category_edit.html:37 #: templates/web/base/admin/category_edit.html:92 @@ -612,7 +602,7 @@ msgid "Confirmed:" msgstr "Bestätigt:" #. ("%s is the site name") -#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 +#: templates/web/base/about/_sidebar.html:6 msgid "Contact %s" msgstr "%s kontaktieren" @@ -631,8 +621,8 @@ msgstr "Kontaktieren Sie das Team" msgid "Coordinates:" msgstr "Koordinaten:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1417 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1445 msgid "Could not find user" msgstr "Benutzer konnte nicht gefunden werden" @@ -650,7 +640,7 @@ msgstr "Rat" msgid "Council contacts for %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:681 +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "Council ref: %s" msgstr "" @@ -669,7 +659,7 @@ msgstr "Anzahl" msgid "Create a report" msgstr "Erfasse eine Meldung" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "Kategorie erstellen" @@ -713,20 +703,20 @@ msgstr "Ãœbersichtsseite" msgid "Dealt with by subdivision within 5 working days" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:877 +#: perllib/FixMyStreet/App/Controller/Admin.pm:865 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "Vorlage löschen" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:175 #: templates/web/base/admin/body.html:81 #: templates/web/base/admin/category_edit.html:42 #: templates/web/base/admin/category_edit.html:93 msgid "Deleted" msgstr "Gelöscht" -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:47 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -734,7 +724,7 @@ msgid "Description" msgstr "Beschreibung" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:68 +#: templates/web/zurich/report/new/fill_in_details_form.html:70 msgid "Details" msgstr "Beschreibung" @@ -759,11 +749,11 @@ msgid "Diligency prize league table" msgstr "Weiss ich nicht" #. ("%s is the site name") -#: templates/web/base/auth/general.html:48 -#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/auth/general.html:58 +#: templates/web/base/report/new/form_user_loggedout.html:28 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout.html:17 +#: templates/web/base/report/update/form_user_loggedout.html:27 msgid "Do you have a %s password?" msgstr "" @@ -781,8 +771,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "Duplicate" msgstr "Duplizieren" @@ -802,7 +792,7 @@ msgstr "" msgid "Edit" msgstr "Bearbeiten" -#: templates/web/base/admin/body.html:220 +#: templates/web/base/admin/body.html:218 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "" @@ -832,7 +822,7 @@ msgstr "Editor" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:39 +#: templates/web/base/auth/general.html:49 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -840,11 +830,11 @@ msgstr "Editor" msgid "Email" msgstr "E-Mail" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 msgid "Email added to abuse list" msgstr "" -#: templates/web/base/admin/body.html:155 +#: templates/web/base/admin/body.html:153 msgid "Email address:" msgstr "E-Mail-Adresse:" @@ -856,19 +846,14 @@ msgstr "E-Mail-Benachrichtigung erstellt" msgid "Email alert deleted" msgstr "E-Mail-Benachrichtigung gelöscht" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1390 msgid "Email already in abuse list" msgstr "" -#: templates/web/base/around/_updates.html:5 -msgid "Email me new local problems" -msgstr "" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 -#: templates/web/base/alert/updates.html:13 #: templates/web/zurich/admin/body.html:47 msgid "Email:" msgstr "E-Mail:" @@ -877,26 +862,6 @@ msgstr "E-Mail:" msgid "Email: %s" msgstr "E-Mail: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 -msgid "Empty flat or maisonette" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 -msgid "Empty house or bungalow" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 -msgid "Empty office or other commercial" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 -msgid "Empty pub or bar" -msgstr "Leere Kneipe oder Bar" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 -msgid "Empty public building - school, hospital, etc." -msgstr "" - #: templates/web/base/admin/body-form.html:162 #: templates/web/base/admin/body-form.html:163 msgid "" @@ -940,18 +905,14 @@ msgstr "Geben Sie eine Adresse an" msgid "Enter a nearby street name and area" msgstr "Geben Sie eine Adresse an" -#: perllib/FixMyStreet/Cobrand/ZeroTB.pm:7 -msgid "Enter a nearby street name and area, postal code or district in Delhi" -msgstr "" - -#: templates/web/base/auth/general.html:99 +#: templates/web/base/auth/general.html:109 #: templates/web/base/report/new/form_user_loggedout_by_email.html:38 #: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Geben Sie ein Passwort ein" -#: templates/web/base/index-steps.html:26 +#: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "Beschreiben sie den Mangel" @@ -977,7 +938,7 @@ msgstr "Beispieladresse" msgid "Examples:" msgstr "Beispiele:" -#: templates/web/base/report/new/form_report.html:49 +#: templates/web/base/report/new/form_report.html:51 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "" @@ -1014,19 +975,15 @@ msgstr "Erstes Mal" msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." msgstr "" -#: templates/web/base/header.html:26 -msgid "FixMyStreet" -msgstr "FixMyStreet" - #: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:38 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:40 msgid "Fixed" msgstr "Gelöst" @@ -1053,7 +1010,7 @@ msgstr "" msgid "Flag user" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "" @@ -1075,8 +1032,7 @@ msgstr "" msgid "Flagged:" msgstr "" -#: templates/web/base/reports/_ward-list.html:3 -#: templates/web/fixmystreet/reports/_ward-list.html:4 +#: templates/web/base/reports/_ward-list.html:4 msgid "Follow a ward link to view only reports within that ward." msgstr "" @@ -1107,18 +1063,18 @@ msgstr "Häufig gestellte Fragen" msgid "GeoRSS on Google Maps" msgstr "GeoRSS auf Google Maps" +#: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:11 -#: templates/web/fixmystreet/around/_updates.html:3 msgid "Get updates" msgstr "Aktualisierungen holen" -#: templates/web/fixmystreet/reports/_rss.html:3 -#: templates/web/fixmystreet/reports/_rss.html:9 +#: templates/web/base/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:9 msgid "Get updates of %s problems" msgstr "Aktualisierungen von %s Problemen holen" -#: templates/web/fixmystreet/reports/_rss.html:11 -#: templates/web/fixmystreet/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:11 +#: templates/web/base/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "Aktualisierungen von Problemen in diesem %s holen" @@ -1131,7 +1087,7 @@ msgid "Glad to hear it’s been fixed!" msgstr "" #: templates/web/base/alert/index.html:34 -#: templates/web/base/around/postcode_form.html:16 +#: templates/web/base/around/postcode_form.html:13 #: templates/web/base/reports/_list-filters.html:28 #: templates/web/zurich/admin/stats.html:26 msgid "Go" @@ -1157,7 +1113,7 @@ msgstr "" msgid "Have you ever reported a problem to a council before, or is this your first time?" msgstr "" -#: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:38 +#: templates/web/base/footer.html:38 #: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 @@ -1168,8 +1124,7 @@ msgstr "Hilfe" msgid "Here are the types of local problem alerts for ‘%s’." msgstr "" -#: templates/web/base/header.html:32 templates/web/fixmystreet/header.html:63 -#: templates/web/zurich/footer.html:12 +#: templates/web/base/header.html:63 templates/web/zurich/footer.html:12 msgid "Hi %s" msgstr "Hallo %s" @@ -1185,11 +1140,11 @@ msgstr "Hallo %s" msgid "Hidden" msgstr "Unsichtbar" -#: templates/web/base/around/display_location.html:65 +#: templates/web/base/around/display_location.html:64 msgid "Hide old" msgstr "Alte ausblenden" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:59 msgid "Hide pins" msgstr "Stecknadeln ausblenden" @@ -1209,10 +1164,6 @@ msgstr "Erfasse eine neue Meldung:" msgid "How to send successful reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:752 -msgid "I am afraid you cannot confirm unconfirmed reports." -msgstr "" - #: templates/web/base/tokens/confirm_problem.html:23 #: templates/web/base/tokens/confirm_problem.html:27 msgid "I just reported a problem on @fixmystreet" @@ -1223,7 +1174,7 @@ msgstr "" msgid "I just updated a problem on @fixmystreet" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88 msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "" @@ -1245,7 +1196,7 @@ msgid "" " For basic installations, you don't need to join bodies in this way." msgstr "" -#: templates/web/base/admin/body.html:133 +#: templates/web/base/admin/body.html:132 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." @@ -1266,7 +1217,7 @@ msgid "" "(please note it will not be sent to the council)." msgstr "" -#: templates/web/base/admin/body.html:149 +#: templates/web/base/admin/body.html:147 msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." msgstr "" @@ -1301,10 +1252,10 @@ msgstr "Unbekannt ID" msgid "Illegal feed selection" msgstr "" +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "In Progress" msgstr "In Bearbeitung" @@ -1355,7 +1306,7 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 msgid "Invalid end date" msgstr "Ung&ultiges Enddatum" @@ -1363,16 +1314,16 @@ msgstr "Ung&ultiges Enddatum" msgid "Invalid format %s specified." msgstr "Ungültiges Format %s angegeben." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 msgid "Invalid start date" msgstr "Ung&ultiges Startdatum" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:5 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Investigating" msgstr "Untersuchen" @@ -1394,7 +1345,7 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:80 +#: 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 @@ -1432,7 +1383,6 @@ msgstr "Lade..." #: 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/fixmystreet/alert/updates.html:1 msgid "Local RSS feeds and email alerts" msgstr "" @@ -1441,11 +1391,11 @@ msgstr "" msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "" -#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:35 +#: templates/web/base/footer.html:35 msgid "Local alerts" msgstr "RSS" -#: templates/web/base/index-steps.html:25 +#: templates/web/base/index-steps.html:5 msgid "Locate the problem on a map of the area" msgstr "Identifizieren Sie den Mangel auf der Karte" @@ -1505,14 +1455,14 @@ msgstr "Monat" #: templates/web/base/admin/list_updates.html:7 #: templates/web/base/admin/reports.html:13 #: templates/web/base/admin/users.html:15 -#: templates/web/base/auth/general.html:89 +#: templates/web/base/auth/general.html:99 #: templates/web/base/report/new/form_user_loggedin.html:9 #: templates/web/base/report/new/form_user_loggedout_by_email.html:7 -#: templates/web/base/report/update/form_name.html:4 +#: templates/web/base/report/update/form_name.html:5 #: templates/web/base/reports/index.html:20 #: 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:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "Name" msgstr "Name" @@ -1536,8 +1486,8 @@ msgstr "" msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:455 -#: perllib/FixMyStreet/Cobrand/Default.pm:495 +#: perllib/FixMyStreet/Cobrand/Default.pm:454 +#: perllib/FixMyStreet/Cobrand/Default.pm:494 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" @@ -1559,7 +1509,7 @@ msgstr "Neue <br>Probleme" msgid "New body added" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:387 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 msgid "New category contact added" msgstr "" @@ -1624,7 +1574,7 @@ msgstr "Weiter" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 -#: templates/web/base/questionnaire/index.html:101 +#: templates/web/base/questionnaire/index.html:102 #: templates/web/base/questionnaire/index.html:53 msgid "No" msgstr "Nein" @@ -1689,8 +1639,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Not Responsible" msgstr "Nicht verantwortlich" @@ -1723,7 +1673,7 @@ msgstr "Anmerkung" 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/base/admin/body.html:186 +#: templates/web/base/admin/body.html:184 #: templates/web/base/admin/category_edit.html:52 #: templates/web/zurich/admin/body.html:53 msgid "Note:" @@ -1737,15 +1687,15 @@ msgstr "Anmerkung: <strong>%s</strong>" msgid "Notes from SDM to DM" msgstr "" -#: templates/web/base/report/new/form_user_loggedout.html:14 #: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/form_user_loggedout.html:24 #: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "" #: templates/web/base/report/update-form.html:28 -#: templates/web/base/report/update/form_user_loggedout.html:13 #: templates/web/base/report/update/form_user_loggedout.html:2 +#: templates/web/base/report/update/form_user_loggedout.html:23 msgid "Now to submit your update…" msgstr "" @@ -1779,8 +1729,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:23 #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/report/update/form_update.html:36 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1815,13 +1765,13 @@ msgstr "" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1055 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 -#: perllib/FixMyStreet/DB/Result/Problem.pm:558 -#: perllib/FixMyStreet/DB/Result/Problem.pm:568 -#: perllib/FixMyStreet/DB/Result/Problem.pm:578 -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1044 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:659 +#: perllib/FixMyStreet/DB/Result/Problem.pm:562 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 +#: perllib/FixMyStreet/DB/Result/Problem.pm:582 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 #: perllib/FixMyStreet/Script/Reports.pm:175 #: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" @@ -1846,7 +1796,7 @@ msgstr "Ãœbergeordnet" msgid "Partial" msgstr "Teilweise" -#: templates/web/base/auth/general.html:92 +#: templates/web/base/auth/general.html:102 #: templates/web/base/report/new/form_user_loggedout_by_email.html:31 #: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 @@ -1855,7 +1805,7 @@ msgid "Password (optional)" msgstr "Passwort (optional)" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:72 +#: templates/web/base/auth/general.html:82 msgid "Password:" msgstr "Passwort:" @@ -1863,7 +1813,7 @@ msgstr "Passwort:" msgid "Permalink" msgstr "Permalink" -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:90 msgid "Phone number" msgstr "Telefonnummer" @@ -1879,13 +1829,21 @@ msgid "Phone:" msgstr "Telefonnummer:" #: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/questionnaire/index.html:89 +#: templates/web/base/questionnaire/index.html:91 #: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/new/form_report.html:38 +#: templates/web/base/report/new/form_report.html:40 +#: templates/web/base/report/update/form_update.html:20 +#: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:6 #: 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:45 +#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/zurich/report/new/fill_in_details_form.html:63 msgid "Photo" msgstr "Foto" @@ -1909,8 +1867,8 @@ msgstr "Stecknadel auf Karte platzieren" #: perllib/FixMyStreet/Cobrand/Zurich.pm:955 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:6 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 @@ -1926,16 +1884,16 @@ msgstr "Bitte seien Sie freundlich und prägnant." msgid "Please check the passwords and try again" msgstr "" -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:33 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:43 #: 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:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:856 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:921 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -1945,7 +1903,7 @@ msgstr "Bitte wählen Sie eine Kategorie" msgid "Please choose a property type" msgstr "Bitte wählen Sie eine Eigentumsart" -#: perllib/FixMyStreet/App/Controller/Admin.pm:378 +#: perllib/FixMyStreet/App/Controller/Admin.pm:376 msgid "Please correct the errors below" msgstr "Bitte korrigieren Sie die Fehler unten" @@ -1966,11 +1924,10 @@ msgstr "" msgid "Please enter a message" msgstr "Bitte geben Sie eine Nachricht ein" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Admin.pm:1079 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 msgid "Please enter a name" -msgstr "Bitte geben Sie Ihren Namen an" +msgstr "" #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 @@ -1984,10 +1941,10 @@ msgstr "Bitte geben Sie ein Passwort ein" msgid "Please enter a subject" msgstr "Bitte geben Sie einen Betreff ein" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1075 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1130 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:133 +#: perllib/FixMyStreet/DB/Result/User.pm:143 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2004,9 +1961,9 @@ msgid "Please enter some details" msgstr "Bitte geben Sie einiges Details an" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:130 -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:32 +#: perllib/FixMyStreet/DB/Result/User.pm:140 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:42 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2015,7 +1972,7 @@ msgid "Please enter your email" msgstr "Bitte geben Sie Ihre eMail-Adresse an" #: templates/web/base/report/new/form_user_loggedout_email.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:80 +#: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "Please enter your email address" msgstr "Bitte geben Sie eine Ihre eMail-Adresse an" @@ -2031,7 +1988,7 @@ msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:126 +#: perllib/FixMyStreet/DB/Result/User.pm:136 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "Bitte geben Sie Ihren Namen an" @@ -2058,7 +2015,7 @@ msgstr "" msgid "Please fill in details of the problem below." msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:72 +#: templates/web/zurich/report/new/fill_in_details_form.html:74 msgid "Please fill in details of the problem." msgstr "" @@ -2067,7 +2024,7 @@ msgstr "" msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" @@ -2093,16 +2050,16 @@ msgstr "" msgid "Please note:" msgstr "Hinweise:" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please provide some explanation as to why you're reopening this report" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250 msgid "Please provide some text as well as a photo" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236 msgid "Please say whether you've ever reported a problem to your council before" msgstr "" @@ -2118,22 +2075,23 @@ msgstr "" msgid "Please select the type of alert you want" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232 msgid "Please state whether or not the problem has been fixed" msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:121 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 #: templates/web/base/js/translation_strings.html:53 -msgid "Please upload a JPEG image only" +#, fuzzy +msgid "Please upload an image only" msgstr "Bitte nur ein JPEG-BIld hochladen" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 msgid "Please write a message" msgstr "Bitte schreiben Sie eine Nachricht" -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Please write your update here" msgstr "Bitte schreiben Sie hier Ihre Aktualisierung" @@ -2164,7 +2122,7 @@ msgstr "" msgid "Previous" msgstr "Vorherige" -#: templates/web/fixmystreet/footer.html:41 +#: templates/web/base/footer.html:41 msgid "Privacy" msgstr "Datenschutz" @@ -2174,7 +2132,7 @@ msgstr "Datenschutz" msgid "Privacy and cookies" msgstr "Datenschutz und Cookies" -#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:200 #: templates/web/base/admin/body.html:85 #: templates/web/base/admin/category_edit.html:45 #: templates/web/base/admin/report_edit.html:77 @@ -2203,7 +2161,7 @@ msgstr "" msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1046 msgid "Problem marked as open." msgstr "Problem als offen markiert." @@ -2215,10 +2173,6 @@ msgstr "" msgid "Problems" msgstr "Meldungen" -#: templates/web/base/around/_updates.html:1 -msgid "Problems in this area" -msgstr "Meldungen in dieser Gegend" - #: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "Meldungen in der Nähe" @@ -2236,13 +2190,11 @@ msgid "Problems within %.1fkm of this location" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:663 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 #: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "Meldungen innerhalb %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "" @@ -2261,15 +2213,11 @@ msgstr "Probleme innerhalb der Grenze von:" msgid "Property address:" msgstr "Immobilien-Adresse:" -#: templates/web/base/report/new/category.html:8 -msgid "Property type:" -msgstr "Eigentumstyp" - #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Meldung aktualisieren" -#: templates/web/base/auth/general.html:95 +#: templates/web/base/auth/general.html:105 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 "" @@ -2303,16 +2251,15 @@ msgstr "" msgid "Questionnaire %d sent for problem %d" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 msgid "Questionnaire filled in by problem reporter" msgstr "" #: templates/web/base/alert/_list.html:22 +#: templates/web/base/alert/updates.html:9 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display_tools.html:34 -#: templates/web/base/reports/_rss.html:1 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed" msgstr "RSS-Feed" @@ -2340,18 +2287,12 @@ msgstr "" msgid "RSS feed of nearby problems" msgstr "" -#: templates/web/base/reports/_rss.html:1 -msgid "RSS feed of problems in this %s" -msgstr "" - #: perllib/FixMyStreet/Cobrand/Default.pm:664 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 #: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 #: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "" @@ -2361,14 +2302,13 @@ msgstr "" msgid "RSS feed of recent local problems" msgstr "" +#: templates/web/base/alert/updates.html:9 #: templates/web/base/report/display_tools.html:34 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed of updates to this problem" msgstr "" -#: templates/web/base/alert/updates.html:9 +#: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:36 -#: templates/web/fixmystreet/alert/updates.html:14 msgid "Receive email when updates are left on this problem." msgstr "Erhalten Sie Aktualisierungen dieser Meldung." @@ -2404,12 +2344,11 @@ msgstr "Foto entfernen (kann nicht rückgängig gemacht werden!)" msgid "Reply to user:" msgstr "" -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/header_logo.html:2 msgid "Report" msgstr "Bericht" -#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:26 -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/footer.html:26 templates/web/base/header_logo.html:2 #: templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2419,7 +2358,7 @@ msgstr "Eine Meldung erfassen" msgid "Report abuse" msgstr "Missbrauch melden" -#: perllib/FixMyStreet/App/Controller/Rss.pm:291 +#: perllib/FixMyStreet/App/Controller/Rss.pm:297 msgid "Report on %s" msgstr "Bericht auf %s" @@ -2434,7 +2373,7 @@ 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:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:577 #: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "Anonym gemeldet um" @@ -2444,7 +2383,7 @@ msgstr "Anonym gemeldet um" msgid "Reported before" msgstr "Vorher berichtet" -#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 #: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "Gemeldet von %s um %s" @@ -2458,27 +2397,27 @@ msgstr "Gemeldet von:" msgid "Reported in the %s category" msgstr "Gemeldet in der Kategorie %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:569 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 msgid "Reported in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:591 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 msgid "Reported in the %s category by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported via %s anonymously at %s" msgstr "Anonym gemeldet von %s um %s " -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported via %s by %s at %s" msgstr "Gemeldet von %s um %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:561 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 msgid "Reported via %s in the %s category anonymously at %s" msgstr "Anonym gemeldet von %s um %s " -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 msgid "Reported via %s in the %s category by %s at %s" msgstr "Gemeldet von %s um %s" @@ -2499,7 +2438,7 @@ msgstr "Gemeldet:" msgid "Reporting a problem" msgstr "Verfassen Sie eine Meldung" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1274 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" @@ -2542,15 +2481,15 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1496 #: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "Nach links drehen" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 #: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 @@ -2565,7 +2504,7 @@ msgstr "" msgid "Satellite" msgstr "Satellit" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/base/admin/category_edit.html:84 #: templates/web/zurich/admin/body.html:59 #: templates/web/zurich/admin/template_edit.html:29 @@ -2621,7 +2560,7 @@ msgstr "" msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:696 +#: perllib/FixMyStreet/DB/Result/Problem.pm:698 msgid "Sent to %s %s later" msgstr "" @@ -2640,21 +2579,21 @@ msgstr "Teilen" #: templates/web/base/report/new/form_user_loggedin.html:23 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22 -#: templates/web/base/report/update/form_name.html:15 +#: templates/web/base/report/update/form_name.html:16 msgid "Show my name publicly" msgstr "Meinen Namen öffentlich anzeigen" -#: templates/web/base/around/display_location.html:67 +#: templates/web/base/around/display_location.html:66 msgid "Show old" msgstr "Alte anzeigen" -#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:57 msgid "Show pins" msgstr "Zeige Stecknadeln" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/general.html:110 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:76 +#: templates/web/base/auth/general.html:86 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2722,14 +2661,10 @@ msgstr "" msgid "Sorry, we could not parse that location. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:138 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 -msgid "Sorry, you can not log in with Facebook. Please try again later." -msgstr "" - #: templates/web/base/admin/stats.html:64 msgid "Start Date:" msgstr "Startdatum:" @@ -2738,7 +2673,7 @@ msgstr "Startdatum:" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/report/update/form_update.html:32 +#: templates/web/base/report/update/form_update.html:34 msgid "State" msgstr "Status" @@ -2751,7 +2686,7 @@ msgstr "Status" msgid "State:" msgstr "Status:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2791,10 +2726,10 @@ msgid "Subject:" msgstr "Titel:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/base/report/new/form_user_loggedout_by_email.html:39 #: templates/web/base/report/new/form_user_loggedout_password.html:11 -#: templates/web/zurich/report/new/fill_in_details_form.html:96 +#: templates/web/zurich/report/new/fill_in_details_form.html:98 msgid "Submit" msgstr "Abschicken" @@ -2822,9 +2757,8 @@ msgstr "Fragebogen absenden" msgid "Submitted" msgstr "Gesendet" -#: templates/web/base/alert/updates.html:17 +#: templates/web/base/alert/updates.html:23 #: templates/web/base/report/display_tools.html:41 -#: templates/web/fixmystreet/alert/updates.html:23 msgid "Subscribe" msgstr "Abonnieren" @@ -2832,7 +2766,7 @@ msgstr "Abonnieren" msgid "Subscribe me to an email alert" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -2851,7 +2785,7 @@ msgstr "Zusammenfassung" msgid "Summary reports" msgstr "Zusammenfassungsberichte" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 msgid "Survey" msgstr "Umfrage" @@ -2908,7 +2842,7 @@ msgstr "" msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:157 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" @@ -2916,7 +2850,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:126 +#: perllib/FixMyStreet/App/Controller/Location.pm:127 msgid "That location does not appear to be in the UK; please try again." msgstr "" @@ -2926,11 +2860,11 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:724 +#: perllib/FixMyStreet/App/Controller/Admin.pm:722 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:716 +#: perllib/FixMyStreet/App/Controller/Admin.pm:714 msgid "That problem will now be resent." msgstr "Das Problem wird jetzt erneut gesendet." @@ -2942,7 +2876,7 @@ msgstr "Dieser Bericht kann nicht auf %s angeschaut werden." msgid "That report has been removed from FixMyStreet." msgstr "Diese Meldung wurde von Fix My Zürich entfernt." -#: templates/web/base/admin/body.html:144 +#: templates/web/base/admin/body.html:142 msgid "" "The <strong>email address</strong> is the destination to which reports about this category will be sent. \n" " Other categories for this body may have the same email address." @@ -3082,9 +3016,9 @@ msgstr "" msgid "There was a problem showing this page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:753 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 -#: templates/web/base/auth/general.html:43 +#: templates/web/base/auth/general.html:53 #: 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 "" @@ -3145,9 +3079,9 @@ msgstr "" 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:920 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:898 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:935 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:977 #: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "Diese Information wird benötigt" @@ -3160,11 +3094,11 @@ msgstr "" msgid "This is a summary of all reports on this site." msgstr "" -#: templates/web/base/report/update/form_update.html:52 +#: templates/web/base/report/update/form_update.html:54 msgid "This problem has been fixed" msgstr "Dieser Mangel wurde behoben" -#: templates/web/base/report/update/form_update.html:46 +#: templates/web/base/report/update/form_update.html:48 msgid "This problem has not been fixed" msgstr "Dieser Mangel wurde nicht behoben" @@ -3201,7 +3135,7 @@ msgstr "" msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Zeitleiste" @@ -3246,8 +3180,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Unable to fix" msgstr "Kann nicht behoben werden" @@ -3264,7 +3198,7 @@ msgstr "Unbestätigt" msgid "Unknown" msgstr "Unbekannt" -#: perllib/FixMyStreet/App/Controller/Rss.pm:173 +#: perllib/FixMyStreet/App/Controller/Rss.pm:174 msgid "Unknown alert type" msgstr "Unbekannter Benachrichtigungstyp" @@ -3279,7 +3213,7 @@ msgstr "Unbekannter Fehler" msgid "Unknown problem ID" msgstr "Unbekannte Problemkennung" -#: templates/web/base/report/update/form_update.html:25 +#: templates/web/base/report/update/form_update.html:27 msgid "Update" msgstr "Beschreibung" @@ -3331,10 +3265,10 @@ msgstr "" msgid "Updated" msgstr "Aktualisiert" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 -#: perllib/FixMyStreet/App/Controller/Admin.pm:821 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1096 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1144 +#: perllib/FixMyStreet/App/Controller/Admin.pm:809 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3361,7 +3295,7 @@ msgstr "Aktualisierungen auf {{title}}" msgid "Updates to this problem, %s" msgstr "Aktualisierungen für dieses Problem, %s" -#: templates/web/base/admin/body.html:182 +#: templates/web/base/admin/body.html:180 msgid "Use the <strong>note</strong> to record details that are only displayed in the admin. Notes are not shown publicly, and are not sent to the body." msgstr "" @@ -3370,11 +3304,11 @@ msgstr "" msgid "Used map" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1421 msgid "User flagged" msgstr "" @@ -3382,16 +3316,16 @@ msgstr "" msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "Benutzer" -#: perllib/FixMyStreet/App/Controller/Admin.pm:382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:412 -#: perllib/FixMyStreet/App/Controller/Admin.pm:429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:380 +#: perllib/FixMyStreet/App/Controller/Admin.pm:410 +#: perllib/FixMyStreet/App/Controller/Admin.pm:427 msgid "Values updated" msgstr "Werte aktualisiert" @@ -3428,16 +3362,15 @@ msgstr "" #: templates/web/base/auth/general.html:6 #: templates/web/base/report/display.html:27 #: templates/web/base/report/new/oauth_email_form.html:5 -#, fuzzy msgid "We need your email address, please give it below." -msgstr "Ihre eMail-Adresse oder Telefonnummer werden nie angezeigt" +msgstr "" #: templates/web/base/report/new/form_user_loggedout_email.html:2 #: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "Ihre eMail wird nie angezeigt" -#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedin.html:30 #: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "Ihre eMail-Adresse oder Telefonnummer werden nie angezeigt" @@ -3446,7 +3379,7 @@ msgstr "Ihre eMail-Adresse oder Telefonnummer werden nie angezeigt" 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 "" -#: templates/web/base/index-steps.html:31 +#: templates/web/base/index-steps.html:11 msgid "We send it to the council on your behalf" msgstr "" @@ -3484,10 +3417,6 @@ msgstr "Wann gesendet" msgid "Whoa there Testino! Three photos are enough." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 -msgid "Whole block of empty flats" -msgstr "" - #: templates/web/base/tokens/confirm_alert.html:7 msgid "Why stop there? <a href=\"/alert\">Set up more alerts</a> for free." msgstr "" @@ -3507,7 +3436,7 @@ msgstr "" msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "" -#: templates/web/base/questionnaire/index.html:96 +#: templates/web/base/questionnaire/index.html:97 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "" @@ -3537,8 +3466,8 @@ msgstr "Jahr" #: templates/web/base/admin/update_edit.html:24 #: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 +#: templates/web/base/questionnaire/index.html:100 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "Ja" @@ -3652,19 +3581,19 @@ msgid "Your Reports" msgstr "Ihre Berichte" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/alert/updates.html:19 +#: templates/web/base/alert/updates.html:22 #: templates/web/base/contact/index.html:83 #: templates/web/base/report/display_tools.html:38 #: templates/web/base/report/display_tools.html:40 #: templates/web/base/report/new/form_user_loggedin.html:3 #: templates/web/base/report/new/form_user_loggedout_email.html:1 #: templates/web/base/report/update/form_user_loggedout_email.html:1 -#: templates/web/fixmystreet/alert/updates.html:19 -#: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/zurich/report/new/fill_in_details_form.html:76 +#: templates/web/zurich/report/new/fill_in_details_form.html:78 msgid "Your email" msgstr "Ihre eMail" -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/general.html:55 #: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 @@ -3675,17 +3604,17 @@ msgstr "Ihre eMail-Adresse" msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "" -#: templates/web/base/auth/general.html:90 +#: templates/web/base/auth/general.html:100 #: templates/web/base/contact/index.html:76 #: templates/web/base/report/new/form_user_loggedin.html:18 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17 -#: templates/web/base/report/update/form_name.html:11 +#: templates/web/base/report/update/form_name.html:12 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:86 +#: templates/web/zurich/report/new/fill_in_details_form.html:88 msgid "Your name" msgstr "Ihr Name" -#: templates/web/base/auth/general.html:75 +#: templates/web/base/auth/general.html:85 #: 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 @@ -3698,20 +3627,19 @@ msgstr "Ihr Passwort wurde geändert" #: templates/web/base/report/new/form_user_loggedin.html:27 #: templates/web/base/report/new/form_user_loggedout_by_email.html:26 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:94 msgid "Your phone number" msgstr "Ihre Telefonnummer" #: templates/web/base/questionnaire/index.html:14 -#, fuzzy msgid "Your report" -msgstr "Ihre Meldungen" +msgstr "" -#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 +#: templates/web/base/footer.html:29 msgid "Your reports" msgstr "Ihre Meldungen" -#: templates/web/base/my/my.html:41 +#: templates/web/base/my/my.html:39 msgid "Your updates" msgstr "Ihre Aktualisierungen" @@ -3737,7 +3665,7 @@ msgid "didn't use map" msgstr "hat Karte nicht verwendet" #: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/around/postcode_form.html:12 msgid "e.g. ‘%s’ or ‘%s’" msgstr "z.B. ‘%s’ oder ‘%s’" @@ -3843,8 +3771,7 @@ msgstr "andere Gebiete:" msgid "reopened" msgstr "erneut geöffnet" -#: templates/web/base/header.html:33 templates/web/fixmystreet/header.html:64 -#: templates/web/zurich/footer.html:13 +#: templates/web/base/header.html:64 templates/web/zurich/footer.html:13 msgid "sign out" msgstr "ausloggen" @@ -3922,7 +3849,7 @@ msgid_plural "<big>%s</big> updates on reports" msgstr[0] "<big>%s</big> Meldung bearbeitet" msgstr[1] "<big>%s</big> Meldungen bearbeitet" -#: templates/web/emptyhomes/report/new/councils_text_none.html:3 +#: templates/web/base/report/new/councils_text_none.html:3 #, perl-format msgid "We do not yet have details for the council that covers this location." msgid_plural "We do not yet have details for the councils that cover this location." @@ -3964,53 +3891,20 @@ msgid_plural "We do <strong>not</strong> yet have details for the other councils msgstr[0] "" msgstr[1] "" -#~ msgid "(we never show your email address or phone number)" -#~ msgstr "(ihre eMail-Adresse oder Telefonnummer werden nie angezeigt)" - -#~ msgid "(we never show your email)" -#~ msgstr "(ihre eMail-Adresse wird nie angezeigt)" - -#~ msgid "Email me updates" -#~ msgstr "Schicken sie mir Aktualisierungen" - -#~ msgid "Enter a new password:" -#~ msgstr "Geben Sie ein neues Passwort ein:" - -#~ msgid "I'm afraid we couldn't validate that token. If you've copied the URL from an email, please check that you copied it exactly.\n" -#~ msgstr "Leider konnte ihre URL nicht aufgelöst werden. Falls sie die URL aus einer Mail kopiert haben, überprüfen sie bitte ob sie die gesamte URL kopiert haben.\n" - -#~ msgid "Message:" -#~ msgstr "Nachricht:" - -#~ msgid "More problems nearby" -#~ msgstr "Meldungen in der Nähe" - -#~ msgid "Nearly Done! Now check your email..." -#~ msgstr "Fast Fertig! Bitte checken Sie ihre Mailbox..." - -#~ msgid "Photo:" -#~ msgstr "Foto:" - -#~ msgid "Please check your email" -#~ msgstr "Bitte überprüfen sie ihre eMail" - -#~ msgid "This problem has been closed" -#~ msgstr "Dieses Problem wurde geschlossen" - -#~ msgid "This problem is in progress" -#~ msgstr "Dieser Mangel ist in Bearbeitung" +#~ msgid "%s, reported at %s" +#~ msgstr "%s, gemeldet am %s" -#~ msgid "This problem is old and of unknown status." -#~ msgstr "Dieses Problem ist alt und hat einen unbekannten Status" +#~ msgid "About us" +#~ msgstr "Über uns" -#~ msgid "Update:" -#~ msgstr "Aktualisierung:" +#~ msgid "Empty pub or bar" +#~ msgstr "Leere Kneipe oder Bar" -#~ msgid "Your email:" -#~ msgstr "Ihre eMail:" +#~ msgid "FixMyStreet" +#~ msgstr "FixMyStreet" -#~ msgid "Your name:" -#~ msgstr "Ihr Name:" +#~ msgid "Problems in this area" +#~ msgstr "Meldungen in dieser Gegend" -#~ msgid "Your email:" -#~ msgstr "Ihre E-Mail-Adresse:" +#~ msgid "Property type:" +#~ msgstr "Eigentumstyp" diff --git a/locale/el_GR.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/el_GR.UTF-8/LC_MESSAGES/FixMyStreet.po index 825da0a18..4d62236d7 100644 --- a/locale/el_GR.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/el_GR.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2016-03-02 13:09+0000\n" -"PO-Revision-Date: 2015-10-23 16:38+0000\n" +"POT-Creation-Date: 2016-05-03 10:41+0100\n" +"PO-Revision-Date: 2016-03-23 12:44+0000\n" "Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: Greek (Greece) (http://www.transifex.com/mysociety/fixmystreet/language/el_GR/)\n" "Language: el_GR\n" @@ -23,7 +23,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/DB/Result/Problem.pm:618 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr "και" @@ -56,9 +56,8 @@ msgid "%s admin:" msgstr "" #: templates/web/base/status/stats.html:26 -#, fuzzy msgid "%s bodies" -msgstr "Τομείς" +msgstr "" #: templates/web/base/status/stats.html:24 msgid "%s confirmed alerts, %s unconfirmed" @@ -93,7 +92,7 @@ msgstr "%s ζωντανÎÏ‚ ενημεÏώσεις" msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "στάλθηκαν %s εÏωτηματολόγια – %s απαντήθηκαν (%s%%)" -#: perllib/FixMyStreet/DB/Result/Problem.pm:683 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "%s ref: %s" msgstr "%s αναφ.: %s" @@ -112,10 +111,6 @@ msgstr "" msgid "%s ward, %s" msgstr "%s πεÏιοχή, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:552 -msgid "%s, reported at %s" -msgstr "%s, Îγινε αναφοÏά στο "%s"" - #: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "%s, στην πεÏιοχή %quot;%s"" @@ -170,7 +165,7 @@ msgstr "(όπως graffiti, παÏατημÎνα σκουπίδια, σπασμΠmsgid "(not sent to council)" msgstr "(δεν αποστάλθηκε σε υπηÏεσία)" -#: templates/web/zurich/report/new/fill_in_details_form.html:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "(optional)" msgstr "(Ï€ÏοαιÏετικό)" @@ -182,12 +177,11 @@ msgstr "(φαίνεται δημόσια)" msgid "(sent to both)" msgstr "(στάλθηκε και στις δÏο)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Διάλεξε κατηγοÏία --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Διάλεξε είδος ακινήτου --" @@ -222,26 +216,21 @@ msgstr "<strong>Όχι</strong> Îα γίνει επιβεβαίωση της α msgid "<strong>No</strong> Let me confirm my update by email" msgstr "<strong>Όχι</strong> Îα γίνει επιβεβαίωση της ενημÎÏωσης μÎσω email" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:97 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>Όχι</strong> να συνδεθώ μÎσω email" -#: templates/web/base/auth/general.html:70 +#: templates/web/base/auth/general.html:80 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Îαι</strong> Îχω κωδικό Ï€Ïόσβασης" -#: templates/web/base/about/about-en-gb.html:1 -#: templates/web/base/about/about-en-gb.html:3 -msgid "About us" -msgstr "Σχετικά με εμάς" - #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Action Scheduled" msgstr "Η ΔÏάση Î ÏογÏαμματίστηκε" @@ -274,7 +263,7 @@ msgstr "Î Ïοσθήκη νÎας κατηγοÏίας" msgid "Add user" msgstr "Î Ïοσθήκη χÏήστη" -#: templates/web/base/my/my.html:56 +#: templates/web/base/my/my.html:54 msgid "Added %s" msgstr "Î ÏοστÎθηκε %s" @@ -294,7 +283,7 @@ msgstr "Η ειδοποίηση %d δημιουÏγήθηκε για το " msgid "Alert %d disabled (created %s)" msgstr "Η ειδοποίηση %d απενεÏγοποιήθηκε (δημιουÏγήθηκε %s)" -#: templates/web/base/report/update/form_name.html:20 +#: templates/web/base/report/update/form_name.html:21 msgid "Alert me to future updates" msgstr "ΕιδοποίησΠμε για μελλοντικÎÏ‚ ενημεÏώσεις" @@ -307,7 +296,7 @@ msgstr "Όλες οι ΑναφοÏÎÏ‚" msgid "All Reports as CSV" msgstr "" -#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 +#: templates/web/base/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:20 @@ -406,7 +395,7 @@ msgstr "Πίσω" msgid "Ban email address" msgstr "Αποκλεισμός της διεÏθυνσης email" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1273 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -437,7 +426,7 @@ msgstr "Δεν μποÏείς να δεις τον χάÏτη; <em>ΠαÏάλεΠ#: templates/web/base/admin/body.html:68 #: templates/web/base/admin/index.html:54 -#: templates/web/base/report/new/category.html:10 +#: templates/web/base/report/new/category.html:7 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 @@ -452,7 +441,7 @@ msgstr "ΚατηγοÏία" msgid "Category fix rate for problems > 4 weeks old" msgstr "ÎœÎσος ÏŒÏος διόÏθωσης Ï€Ïοβλημάτων για την κατηγοÏία > 4 εβδομάδες" -#: templates/web/base/admin/body.html:138 +#: templates/web/base/admin/body.html:137 #: templates/web/base/admin/category_edit.html:23 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/admin/body.html:43 @@ -472,7 +461,7 @@ msgstr "ΚατηγοÏία: %s" msgid "Change password" msgstr "Αλλαγή ÎºÏ‰Î´Î¹ÎºÎ¿Ï Ï€Ïόσβασης" -#: templates/web/base/admin/body.html:160 +#: templates/web/base/admin/body.html:158 msgid "" "Check <strong>confirmed</strong> to indicate that this contact has been confirmed as correct.\n" " If you are not sure of the origin or validity of the contact, leave this unchecked." @@ -480,7 +469,7 @@ msgstr "" "ΤσÎκαÏε το <strong>επιβεβαιώθηκε</strong> για να φαίνεται ότι αυτή η επαφή Îχει επιβεβαιωθεί ως σωστή.\n" "Αν δεν είσαι σίγουÏος για την Ï€ÏοÎλευση ή την εγκυÏότητα της επαφής, άφησε το μη τσεκαÏισμÎνο." -#: templates/web/base/admin/body.html:171 +#: templates/web/base/admin/body.html:169 msgid "" "Check <strong>deleted</strong> to remove the category from use. \n" " It will not appear as an available category in the drop-down menu on the report-a-problem page." @@ -488,7 +477,7 @@ msgstr "" "ΤσÎκαÏε το <strong>διαγÏάφηκε</strong> για να αφαιÏÎσεις την κατηγοÏία από χÏήση.\n" "Δεν θα φαίνεται ως διαθÎσιμη κατηγοÏία στο Î¼ÎµÎ½Î¿Ï Ï„Î·Ï‚ σελίδας \"ΑνάφεÏε Îνα Ï€Ïόβλημα\"." -#: templates/web/base/admin/body.html:191 +#: templates/web/base/admin/body.html:189 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -504,7 +493,7 @@ msgstr "" "<br>\n" "Αυτό είναι κατάλληλο για ζητήματα που θÎλεις να επιτÏÎψεις σε χÏήστες να υποβάλλουν αναφοÏÎÏ‚ στον τομÎα, αλλά για τα οποία δεν χÏειάζεται η αναφοÏά να είναι δημόσια. Ένα Ï„Îτοιο παÏάδειγμα είναι αν κάποιος θÎλει να ζητήσει Îναν επιπλÎον κάδο αποÏÏιμάτων σε συγκεκÏιμÎνη διεÏθυνση." -#: templates/web/base/admin/body.html:130 +#: templates/web/base/admin/body.html:129 msgid "" "Choose a <strong>category</strong> 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." @@ -545,8 +534,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:15 #: templates/web/base/admin/report_blocks.html:25 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 @@ -555,7 +544,7 @@ msgstr "" msgid "Closed" msgstr "Κλειστό" -#: perllib/FixMyStreet/DB/Result/Problem.pm:779 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Closed by council" msgstr "Κλειστό από την υπηÏεσία" @@ -581,7 +570,7 @@ msgstr "ΔεδομÎνα Ï€ÏοστεθÎντος σήματος:" msgid "Cobrand:" msgstr "Î ÏοστεθÎν σήμα:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Ρυθμίσεις" @@ -600,9 +589,8 @@ msgstr "Επιβεβαίωση λογαÏιασμοÏ" #: templates/web/base/report/new/form_user_loggedout_password.html:21 #: templates/web/base/report/update/form_user_loggedout_password.html:20 -#, fuzzy msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." -msgstr "Κάνε επιβεβαίωση μÎσω email παÏακάτω, εισάγοντας Îναν νÎο κωδικό Ï€Ïόσβασης. Όταν γίνει η επιβεβαίωση, ο κωδικός Ï€Ïόσβασης θα αλλάξει." +msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:1 #: templates/web/base/tokens/confirm_problem.html:1 @@ -612,7 +600,7 @@ msgstr "Κάνε επιβεβαίωση μÎσω email παÏακάτω, εισΠmsgid "Confirmation" msgstr "Επιβεβαίωση" -#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:164 #: templates/web/base/admin/body.html:79 #: templates/web/base/admin/category_edit.html:37 #: templates/web/base/admin/category_edit.html:92 @@ -631,7 +619,7 @@ msgid "Confirmed:" msgstr "Επιβεβαιώθηκε:" #. ("%s is the site name") -#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 +#: templates/web/base/about/_sidebar.html:6 msgid "Contact %s" msgstr "" @@ -650,8 +638,8 @@ msgstr "Επικοινώνησε με την ομάδα διαχείÏισης" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1417 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1445 msgid "Could not find user" msgstr "Δεν είναι δυνατή η εÏÏεση χÏήστη" @@ -669,7 +657,7 @@ msgstr "ΥπηÏεσία" msgid "Council contacts for %s" msgstr "ΕπαφÎÏ‚ υπηÏεσίας για "%s"" -#: perllib/FixMyStreet/DB/Result/Problem.pm:681 +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "Council ref: %s" msgstr "υπηÏεσία αναφ.: %s" @@ -688,7 +676,7 @@ msgstr "ΚαταμÎÏ„Ïηση" msgid "Create a report" msgstr "ΔημιουÏγία αναφοÏάς" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "ΔημιουÏγία κατηγοÏίας" @@ -732,20 +720,20 @@ msgstr "Πίνακας ΕλÎγχου" msgid "Dealt with by subdivision within 5 working days" msgstr "Εξετάστηκε από το τμήμα μÎσα σε 5 εÏγάσιμες ημÎÏες" -#: perllib/FixMyStreet/App/Controller/Admin.pm:877 +#: perllib/FixMyStreet/App/Controller/Admin.pm:865 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:175 #: templates/web/base/admin/body.html:81 #: templates/web/base/admin/category_edit.html:42 #: templates/web/base/admin/category_edit.html:93 msgid "Deleted" msgstr "ΔιαγÏαμμÎνα" -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:47 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -753,7 +741,7 @@ msgid "Description" msgstr "ΠεÏιγÏαφή" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:68 +#: templates/web/zurich/report/new/fill_in_details_form.html:70 msgid "Details" msgstr "ΠληÏοφοÏίες" @@ -778,11 +766,11 @@ msgid "Diligency prize league table" msgstr "Πίνακας βÏαβείων επιμÎλειας" #. ("%s is the site name") -#: templates/web/base/auth/general.html:48 -#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/auth/general.html:58 +#: templates/web/base/report/new/form_user_loggedout.html:28 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout.html:17 +#: templates/web/base/report/update/form_user_loggedout.html:27 msgid "Do you have a %s password?" msgstr "" @@ -800,8 +788,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "Duplicate" msgstr "Διπλότυπο" @@ -824,7 +812,7 @@ msgstr "" msgid "Edit" msgstr "ΕπεξεÏγασία" -#: templates/web/base/admin/body.html:220 +#: templates/web/base/admin/body.html:218 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "ΕπεξεÏγασία λεπτομεÏειών του τομÎα" @@ -854,7 +842,7 @@ msgstr "ΕπεξεÏγαστής" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:39 +#: templates/web/base/auth/general.html:49 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -862,11 +850,11 @@ msgstr "ΕπεξεÏγαστής" msgid "Email" msgstr "Email" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 msgid "Email added to abuse list" msgstr "Το Email Ï€ÏοστÎθηκε στην μαÏÏη λίστα" -#: templates/web/base/admin/body.html:155 +#: templates/web/base/admin/body.html:153 msgid "Email address:" msgstr "ΗλεκτÏονική διεÏθυνση:" @@ -878,19 +866,14 @@ msgstr "Η ειδοποίηση μÎσω email δημιουÏγήθηκε" msgid "Email alert deleted" msgstr "Η ειδοποίηση μÎσω email διεγÏάφη" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1390 msgid "Email already in abuse list" msgstr "Το Email είναι ήδη στην μαÏÏη λίστα" -#: templates/web/base/around/_updates.html:5 -msgid "Email me new local problems" -msgstr "Στείλε μου email για νÎα Ï€Ïοβλήματα της πεÏιοχής" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 -#: templates/web/base/alert/updates.html:13 #: templates/web/zurich/admin/body.html:47 msgid "Email:" msgstr "Email:" @@ -899,26 +882,6 @@ msgstr "Email:" msgid "Email: %s" msgstr "Email: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 -msgid "Empty flat or maisonette" -msgstr "Άδειο διαμÎÏισμα ή μεζονÎτα" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 -msgid "Empty house or bungalow" -msgstr "Άδειο σπίτι ή μονοκατοικία" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 -msgid "Empty office or other commercial" -msgstr "Άδειο γÏαφείο ή άλλος χώÏος εμποÏικής χÏήσης" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 -msgid "Empty pub or bar" -msgstr "Άδειο μπαÏ" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 -msgid "Empty public building - school, hospital, etc." -msgstr "Άδειο δημόσιο κτήÏιο - σχολείο, νοσοκομείο, κτλ." - #: templates/web/base/admin/body-form.html:162 #: templates/web/base/admin/body-form.html:163 msgid "" @@ -969,18 +932,14 @@ msgstr "ΓÏάψε Îναν κοντινό ταχυδÏομικό κώδικα, msgid "Enter a nearby street name and area" msgstr "ΓÏάψε μία κοντινή οδό ή πεÏιοχή" -#: perllib/FixMyStreet/Cobrand/ZeroTB.pm:7 -msgid "Enter a nearby street name and area, postal code or district in Delhi" -msgstr "ΓÏάψε μία κοντινή οδό, πεÏιοχή, ταχυδÏομικό κώδικα ή πεÏιφÎÏεια" - -#: templates/web/base/auth/general.html:99 +#: templates/web/base/auth/general.html:109 #: templates/web/base/report/new/form_user_loggedout_by_email.html:38 #: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "ΓÏάψε Îνα κωδικό Ï€Ïόσβασης" -#: templates/web/base/index-steps.html:26 +#: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "ΓÏάψε λεπτομÎÏειες σχετικά με το Ï€Ïόβλημα" @@ -1006,7 +965,7 @@ msgstr "ΠαÏάδειγμα ταχυδÏÎ¿Î¼Î¹ÎºÎ¿Ï ÎºÏŽÎ´Î¹ÎºÎ± %s" msgid "Examples:" msgstr "ΠαÏαδείγματα:" -#: templates/web/base/report/new/form_report.html:49 +#: templates/web/base/report/new/form_report.html:51 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "Εξήγησε ποιο είναι το Ï€Ïόβλημα, που βÏίσκεται ακÏιβώς και για πόσο καιÏÏŒ υπάÏχει..." @@ -1043,19 +1002,15 @@ msgstr "Î Ïώτη φοÏά" msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." msgstr "ΔιόÏθωσΠτο επιλÎγοντας μία <strong>πεÏιοχή αÏμοδιότητας</strong> στη φόÏμα <em>ΕπεξεÏγασία λεπτομεÏειών του σώματος</em> παÏακάτω." -#: templates/web/base/header.html:26 -msgid "FixMyStreet" -msgstr "FixMyStreet" - #: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:38 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:40 msgid "Fixed" msgstr "ΔιοÏθώθηκε" @@ -1082,7 +1037,7 @@ msgstr "Σήμανση ως διαγÏαμμÎνο" msgid "Flag user" msgstr "Επισήμανση χÏήστη" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "ΕπισημασμÎνα" @@ -1104,8 +1059,7 @@ msgstr "Οι επισημασμÎνοι χÏήστες δεν υφίσταντα msgid "Flagged:" msgstr "ΕπισημασμÎνοι:" -#: templates/web/base/reports/_ward-list.html:3 -#: templates/web/fixmystreet/reports/_ward-list.html:4 +#: templates/web/base/reports/_ward-list.html:4 msgid "Follow a ward link to view only reports within that ward." msgstr "ΑκολοÏθησε Îνα σÏνδεσμο πεÏιοχής για να δεις μόνο αναφοÏÎÏ‚ που αφοÏοÏν αυτήν την πεÏιοχή." @@ -1136,18 +1090,18 @@ msgstr "ΣυχνÎÏ‚ ΕÏωτήσεις" msgid "GeoRSS on Google Maps" msgstr "GeoRSS στους ΧάÏτες Google" +#: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:11 -#: templates/web/fixmystreet/around/_updates.html:3 msgid "Get updates" msgstr "Λήψη ενημεÏώσεων" -#: templates/web/fixmystreet/reports/_rss.html:3 -#: templates/web/fixmystreet/reports/_rss.html:9 +#: templates/web/base/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:9 msgid "Get updates of %s problems" msgstr "Λήψη ενημεÏώσεων για Ï€Ïοβλήματα %s" -#: templates/web/fixmystreet/reports/_rss.html:11 -#: templates/web/fixmystreet/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:11 +#: templates/web/base/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "Λήψη ενημεÏώσεων για Ï€Ïοβλήματα σε αυτό το "%s"" @@ -1160,7 +1114,7 @@ msgid "Glad to hear it’s been fixed!" msgstr "ΧαιÏόμαστε που φτιάχτηκε!" #: templates/web/base/alert/index.html:34 -#: templates/web/base/around/postcode_form.html:16 +#: templates/web/base/around/postcode_form.html:13 #: templates/web/base/reports/_list-filters.html:28 #: templates/web/zurich/admin/stats.html:26 msgid "Go" @@ -1186,7 +1140,7 @@ msgstr "ΔιοÏθώθηκε το Ï€Ïόβλημα;" msgid "Have you ever reported a problem to a council before, or is this your first time?" msgstr "Έχεις αναφÎÏει ποτΠξανά Îνα Ï€Ïόβλημα στην υπηÏεσία ή αυτή είναι η Ï€Ïώτη φοÏά;" -#: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:38 +#: templates/web/base/footer.html:38 #: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 @@ -1197,8 +1151,7 @@ msgstr "Βοήθεια" msgid "Here are the types of local problem alerts for ‘%s’." msgstr "ΑυτÎÏ‚ είναι οι κατηγοÏίες ειδοποιήσεων για τοπικά Ï€Ïοβλήματα για ‘%s’." -#: templates/web/base/header.html:32 templates/web/fixmystreet/header.html:63 -#: templates/web/zurich/footer.html:12 +#: templates/web/base/header.html:63 templates/web/zurich/footer.html:12 msgid "Hi %s" msgstr "Γεια %s" @@ -1214,11 +1167,11 @@ msgstr "Γεια %s" msgid "Hidden" msgstr "ΚÏυμμÎνα" -#: templates/web/base/around/display_location.html:65 +#: templates/web/base/around/display_location.html:64 msgid "Hide old" msgstr "ΑπόκÏυψη παλιών" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:59 msgid "Hide pins" msgstr "ΑπόκÏυψη καÏφιτσών" @@ -1238,10 +1191,6 @@ msgstr "Î ÏŽÏ‚ να αναφÎÏεις Îνα Ï€Ïόβλημα" msgid "How to send successful reports" msgstr "Î ÏŽÏ‚ να στείλεις επιτυχημÎνες αναφοÏÎÏ‚" -#: perllib/FixMyStreet/App/Controller/Admin.pm:752 -msgid "I am afraid you cannot confirm unconfirmed reports." -msgstr "ΦοβοÏμαστε ότι δε γίνεται να επιβεβαιώσεις ανεπιβεβαίωτες αναφοÏÎÏ‚." - #: templates/web/base/tokens/confirm_problem.html:23 #: templates/web/base/tokens/confirm_problem.html:27 msgid "I just reported a problem on @fixmystreet" @@ -1252,7 +1201,7 @@ msgstr "Μόλις ανÎφεÏα Îνα Ï€Ïόβλημα στο @fixmystreet" msgid "I just updated a problem on @fixmystreet" msgstr "Μόλις ενημÎÏωσα Îνα Ï€Ïόβλημα στο @fixmystreet" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88 msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "Δεν μποÏÎσαμε να εντοπίσουμε το Ï€Ïόβλημά σου στην βάση δεδομÎνων.\n" @@ -1276,7 +1225,7 @@ msgstr "" "Κάνε ταυτοποίηση ενός <strong>γονÎα</strong> αν αυτός ο τομÎας είναι από μόνος του μÎÏος ενός άλλου τομÎα.\n" "Για βασικÎÏ‚ διαÏθÏώσεις, δεν χÏειάζεται να συνδÎσεις τους τομείς Î¼ÎµÏ„Î±Î¾Ï Ï„Î¿Ï…Ï‚, με αυτόν τον Ï„Ïόπο." -#: templates/web/base/admin/body.html:133 +#: templates/web/base/admin/body.html:132 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." @@ -1297,7 +1246,7 @@ msgid "" "(please note it will not be sent to the council)." msgstr "" -#: templates/web/base/admin/body.html:149 +#: templates/web/base/admin/body.html:147 msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." msgstr "Αν χÏησιμοποιείς κάποια μÎθοδο αποστολής <strong>εκτός από email</strong>, γÏάψε το ID της υπηÏεσίας (Open311) ή κάποιο ισοδÏναμο ID εδώ." @@ -1334,10 +1283,10 @@ msgstr "ΛανθασμÎνη ID" msgid "Illegal feed selection" msgstr "ΛανθασμÎνη επιλογή Ïοής" +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "In Progress" msgstr "Σε ΕξÎλιξη" @@ -1388,7 +1337,7 @@ msgstr "ΕσωτεÏική αναφοÏά" msgid "Invalid agency_responsible value %s" msgstr "ΕσφαλμÎνη τιμή agency_responsible %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 msgid "Invalid end date" msgstr "ΛανθασμÎνη ημεÏομηνία λήξης" @@ -1396,16 +1345,16 @@ msgstr "ΛανθασμÎνη ημεÏομηνία λήξης" msgid "Invalid format %s specified." msgstr "ΛανθασμÎνη μοÏφοποίηση %s." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 msgid "Invalid start date" msgstr "ΛανθασμÎνη ημεÏομηνία ÎναÏξης" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:5 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Investigating" msgstr "Γίνεται διεÏεÏνηση" @@ -1427,7 +1376,7 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:80 +#: 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 @@ -1465,7 +1414,6 @@ msgstr "ΦοÏτώνει..." #: 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/fixmystreet/alert/updates.html:1 msgid "Local RSS feeds and email alerts" msgstr "ΤοπικÎÏ‚ ÏοÎÏ‚ RSS και ειδοποιήσεις email" @@ -1474,11 +1422,11 @@ msgstr "ΤοπικÎÏ‚ ÏοÎÏ‚ RSS και ειδοποιήσεις email" msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "ΤοπικÎÏ‚ ÏοÎÏ‚ RSS και ειδοποιήσεις email για ‘%s’" -#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:35 +#: templates/web/base/footer.html:35 msgid "Local alerts" msgstr "ΤοπικÎÏ‚ ειδοποιήσεις" -#: templates/web/base/index-steps.html:25 +#: templates/web/base/index-steps.html:5 msgid "Locate the problem on a map of the area" msgstr "Εντόπισε το Ï€Ïόβλημα στον χάÏτη της πεÏιοχής" @@ -1538,14 +1486,14 @@ msgstr "Μήνας" #: templates/web/base/admin/list_updates.html:7 #: templates/web/base/admin/reports.html:13 #: templates/web/base/admin/users.html:15 -#: templates/web/base/auth/general.html:89 +#: templates/web/base/auth/general.html:99 #: templates/web/base/report/new/form_user_loggedin.html:9 #: templates/web/base/report/new/form_user_loggedout_by_email.html:7 -#: templates/web/base/report/update/form_name.html:4 +#: templates/web/base/report/update/form_name.html:5 #: templates/web/base/reports/index.html:20 #: 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:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "Name" msgstr "Όνομα" @@ -1569,8 +1517,8 @@ msgstr "Η οδός που βÏίσκεται πλησιÎστεÏα στην κ msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "Ο ταχυδÏομικός κώδικας που βÏίσκεται πλησιÎστεÏα στην καÏφίτσα που τοποθετήθηκε στον χάÏτη (παÏÎχεται αυτόματα): %s (%sm μακÏιά)" -#: perllib/FixMyStreet/Cobrand/Default.pm:455 -#: perllib/FixMyStreet/Cobrand/Default.pm:495 +#: perllib/FixMyStreet/Cobrand/Default.pm:454 +#: perllib/FixMyStreet/Cobrand/Default.pm:494 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "Η οδός που βÏίσκεται πλησιÎστεÏα στην καÏφίτσα που τοποθετήθηκε στον χάÏτη (παÏÎχεται αυτόματα από το Bing Maps): %s" @@ -1594,7 +1542,7 @@ msgstr "ÎÎα <br>Ï€Ïοβλήματα" msgid "New body added" msgstr "Î ÏοστÎθηκε νÎος τομÎας" -#: perllib/FixMyStreet/App/Controller/Admin.pm:387 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 msgid "New category contact added" msgstr "Î ÏοστÎθηκε νÎα επαφή κατηγοÏίας" @@ -1659,7 +1607,7 @@ msgstr "Επόμενο" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 -#: templates/web/base/questionnaire/index.html:101 +#: templates/web/base/questionnaire/index.html:102 #: templates/web/base/questionnaire/index.html:53 msgid "No" msgstr "Όχι" @@ -1727,8 +1675,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Not Responsible" msgstr "Δεν είναι ΥπεÏθυνος" @@ -1761,7 +1709,7 @@ 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 "Όταν συμπεÏιλαμβάνουμε ανεπιβεβαίωτες αναφοÏÎÏ‚, χÏησιμοποιοÏμε την ημεÏομηνία που δημιουÏγήθηκε η αναφοÏά, η οποία ενδÎχεται να μην Îγινε στον ίδιο μήνα που επιβεβαιώθηκε η αναφοÏά. ΕπομÎνως, οι αÏιθμοί ίσως είναι λίγο εκτός." -#: templates/web/base/admin/body.html:186 +#: templates/web/base/admin/body.html:184 #: templates/web/base/admin/category_edit.html:52 #: templates/web/zurich/admin/body.html:53 msgid "Note:" @@ -1775,15 +1723,15 @@ msgstr "Σημείωση: <strong>%s</strong>" msgid "Notes from SDM to DM" msgstr "" -#: templates/web/base/report/new/form_user_loggedout.html:14 #: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/form_user_loggedout.html:24 #: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "ΤώÏα, για να υποβάλεις την αναφοÏά σου…" #: templates/web/base/report/update-form.html:28 -#: templates/web/base/report/update/form_user_loggedout.html:13 #: templates/web/base/report/update/form_user_loggedout.html:2 +#: templates/web/base/report/update/form_user_loggedout.html:23 msgid "Now to submit your update…" msgstr "ΤώÏα, για να υποβάλεις την ενημÎÏωσή σου…" @@ -1817,8 +1765,8 @@ msgstr "ΠεÏίληψη μιας γÏαμμής" #: templates/web/base/admin/report_blocks.html:23 #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/report/update/form_update.html:36 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1853,13 +1801,13 @@ msgstr "Ή Ï€Ïοβλήματα που αναφÎÏθηκαν σε:" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "Ή μποÏείς να λαμβάνεις ειδοποιήσεις που αφοÏοÏν μία συγκεκÏιμÎνη υπηÏεσία της πεÏιοχής:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1055 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 -#: perllib/FixMyStreet/DB/Result/Problem.pm:558 -#: perllib/FixMyStreet/DB/Result/Problem.pm:568 -#: perllib/FixMyStreet/DB/Result/Problem.pm:578 -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1044 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:659 +#: perllib/FixMyStreet/DB/Result/Problem.pm:562 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 +#: perllib/FixMyStreet/DB/Result/Problem.pm:582 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 #: perllib/FixMyStreet/Script/Reports.pm:175 #: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" @@ -1884,7 +1832,7 @@ msgstr "Πηγή" msgid "Partial" msgstr "Εν μÎÏει" -#: templates/web/base/auth/general.html:92 +#: templates/web/base/auth/general.html:102 #: templates/web/base/report/new/form_user_loggedout_by_email.html:31 #: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 @@ -1893,7 +1841,7 @@ msgid "Password (optional)" msgstr "Κωδικός Ï€Ïόσβασης (Ï€ÏοαιÏετικό)" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:72 +#: templates/web/base/auth/general.html:82 msgid "Password:" msgstr "ÎÎος κωδικός Ï€Ïόσβασης:" @@ -1901,7 +1849,7 @@ msgstr "ÎÎος κωδικός Ï€Ïόσβασης:" msgid "Permalink" msgstr "ΣÏνδεσμος" -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:90 msgid "Phone number" msgstr "ΑÏιθμός τηλεφώνου" @@ -1917,13 +1865,21 @@ msgid "Phone:" msgstr "ΤηλÎφωνο:" #: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/questionnaire/index.html:89 +#: templates/web/base/questionnaire/index.html:91 #: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/new/form_report.html:38 +#: templates/web/base/report/new/form_report.html:40 +#: templates/web/base/report/update/form_update.html:20 +#: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:6 #: 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:45 +#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/zurich/report/new/fill_in_details_form.html:63 msgid "Photo" msgstr "ΦωτογÏαφία" @@ -1947,8 +1903,8 @@ msgstr "ΘÎση της πεÏιοχής στο χάÏτη" #: perllib/FixMyStreet/Cobrand/Zurich.pm:955 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:6 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 @@ -1964,16 +1920,16 @@ msgstr "ΠαÏακαλοÏμε να είσαι ευγενικός, συνοπτΠmsgid "Please check the passwords and try again" msgstr "ΠαÏακαλοÏμε Îλεγξε τους κωδικοÏÏ‚ Ï€Ïόσβασης και Ï€Ïοσπάθησε πάλι." -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:33 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:43 #: 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:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:856 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:921 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -1983,7 +1939,7 @@ msgstr "ΠαÏακαλοÏμε επίλεξε μια κατηγοÏία" msgid "Please choose a property type" msgstr "ΠαÏακαλοÏμε επίλεξε Îνα είδος ακινήτου" -#: perllib/FixMyStreet/App/Controller/Admin.pm:378 +#: perllib/FixMyStreet/App/Controller/Admin.pm:376 msgid "Please correct the errors below" msgstr "ΠαÏακαλοÏμε διόÏθωσε τα παÏακάτω λάθη" @@ -2004,11 +1960,10 @@ msgstr "ΠαÏακαλοÏμε να μην κάνεις κατάχÏηση msgid "Please enter a message" msgstr "ΠαÏακαλοÏμε γÏάψε Îνα μήνυμα" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Admin.pm:1079 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 msgid "Please enter a name" -msgstr "ΠαÏακαλοÏμε γÏάψε το όνομά σου" +msgstr "" #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 @@ -2022,10 +1977,10 @@ msgstr "ΠαÏακαλοÏμε γÏάψε Îναν κωδικό Ï€Ïόσβαση msgid "Please enter a subject" msgstr "ΠαÏακαλοÏμε γÏάψε Îνα θÎμα" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1075 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1130 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:133 +#: perllib/FixMyStreet/DB/Result/User.pm:143 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2042,9 +1997,9 @@ msgid "Please enter some details" msgstr "ΠαÏακαλοÏμε γÏάψε μεÏικÎÏ‚ λεπτομÎÏειες" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:130 -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:32 +#: perllib/FixMyStreet/DB/Result/User.pm:140 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:42 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2053,7 +2008,7 @@ msgid "Please enter your email" msgstr "ΠαÏακαλοÏμε γÏάψε το email σου" #: templates/web/base/report/new/form_user_loggedout_email.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:80 +#: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "Please enter your email address" msgstr "ΠαÏακαλοÏμε γÏάψε τη διεÏθυνση email σου" @@ -2069,7 +2024,7 @@ msgstr "ΠαÏακαλοÏμε γÏάψε το ονοματεπώνυμό σου #: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:126 +#: perllib/FixMyStreet/DB/Result/User.pm:136 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "ΠαÏακαλοÏμε γÏάψε το όνομά σου" @@ -2096,7 +2051,7 @@ msgstr "Μη διστάσεις να <a href=\"%s\">συνδεθείς ξανά< msgid "Please fill in details of the problem below." msgstr "ΠαÏακαλοÏμε συμπλήÏωσε τις λεπτομÎÏειες του Ï€Ïοβλήματος παÏακάτω." -#: templates/web/zurich/report/new/fill_in_details_form.html:72 +#: templates/web/zurich/report/new/fill_in_details_form.html:74 msgid "Please fill in details of the problem." msgstr "ΠαÏακαλοÏμε συμπλήÏωσε τις λεπτομÎÏειες του Ï€Ïοβλήματος." @@ -2105,7 +2060,7 @@ msgstr "ΠαÏακαλοÏμε συμπλήÏωσε τις λεπτομÎÏειΠmsgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "ΠαÏακαλοÏμε συμπλήÏωσε την παÏακάτω φόÏμα με τις λεπτομÎÏειες του Ï€Ïοβλήματος, και πεÏίγÏαψε την τοποθεσία όσο ακÏιβÎστεÏα γίνεται στο πεδίο με τις λεπτομÎÏειες." -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "ΠαÏακαλοÏμε σήμανε αν θα ήθελες να λάβεις άλλο εÏωτηματολόγιο" @@ -2114,9 +2069,8 @@ msgid "Please note that updates are not sent to the council." msgstr "ΠαÏακαλοÏμε σημείωσε ότι οι ενημεÏώσεις δεν στÎλνονται στην υπηÏεσία." #: templates/web/base/report/new/oauth_email_form.html:4 -#, fuzzy msgid "Please note your report has <strong>not yet been sent</strong>." -msgstr "ΠαÏακαλοÏμε σημείωσε ότι η αναφοÏά σου <strong>δεν Îχει αποσταλεί ακόμη</strong>. Επίλεξε μια κατηγοÏία και Î±Ï†Î¿Ï Ï€ÏοσθÎσεις πεÏαιτÎÏω πληÏοφοÏίες παÏακάτω, κάνε υποβολή." +msgstr "" #: templates/web/base/report/new/fill_in_details_form.html:20 #: templates/web/zurich/report/new/fill_in_details_form.html:11 @@ -2132,16 +2086,16 @@ msgstr "" msgid "Please note:" msgstr "ΠαÏακαλοÏμε σημείωσε ότι:" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please provide some explanation as to why you're reopening this report" msgstr "ΠαÏακαλοÏμε δώσε μεÏικÎÏ‚ εξηγήσεις για τους λόγους που ξανανοίγεις αυτή την αναφοÏά" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250 msgid "Please provide some text as well as a photo" msgstr "ΠαÏακαλοÏμε γÏάψε κείμενο καθώς και δώσε μία φωτογÏαφία" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236 msgid "Please say whether you've ever reported a problem to your council before" msgstr "ΠαÏακαλοÏμε πες αν Îχεις ξαναναφÎÏει Îνα Ï€Ïόβλημα στην υπηÏεσία στο παÏελθόν" @@ -2157,22 +2111,23 @@ msgstr "ΠαÏακαλοÏμε επίλεξε τη Ïοή που επιθυμεΠmsgid "Please select the type of alert you want" msgstr "ΠαÏακαλοÏμε επίλεξε το είδος της ειδοποίησης που επιθυμείς" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232 msgid "Please state whether or not the problem has been fixed" msgstr "ΠαÏακαλοÏμε δήλωσε αν το Ï€Ïόβλημα Îχει διοÏθωθεί ή όχι" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:121 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 #: templates/web/base/js/translation_strings.html:53 -msgid "Please upload a JPEG image only" +#, fuzzy +msgid "Please upload an image only" msgstr "ΠαÏακαλοÏμε ανÎβασε μία εικόνα JPEG μόνο" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 msgid "Please write a message" msgstr "ΠαÏακαλοÏμε γÏάψε Îνα μήνυμα" -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Please write your update here" msgstr "ΠαÏακαλοÏμε γÏάψε την ενημÎÏωσή σου εδώ" @@ -2203,7 +2158,7 @@ msgstr "" msgid "Previous" msgstr "Î ÏοηγοÏμενα" -#: templates/web/fixmystreet/footer.html:41 +#: templates/web/base/footer.html:41 msgid "Privacy" msgstr "Ιδιωτικότητα" @@ -2213,7 +2168,7 @@ msgstr "Ιδιωτικότητα" msgid "Privacy and cookies" msgstr "" -#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:200 #: templates/web/base/admin/body.html:85 #: templates/web/base/admin/category_edit.html:45 #: templates/web/base/admin/report_edit.html:77 @@ -2242,7 +2197,7 @@ msgstr "Το Ï€Ïόβλημα %s στάλθηκε στην υπηÏεσία %s" msgid "Problem breakdown by state" msgstr "Ανάλυση Ï€Ïοβλήματος ανά κατάσταση" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1046 msgid "Problem marked as open." msgstr "Το Ï€Ïόβλημα επισημάνθηκε ως ανοιχτό." @@ -2254,10 +2209,6 @@ msgstr "Αλλαγή κατάστασης Ï€Ïοβλήματος βάσει απ msgid "Problems" msgstr "Î Ïοβλήματα" -#: templates/web/base/around/_updates.html:1 -msgid "Problems in this area" -msgstr "Î Ïοβλήματα στην πεÏιοχή" - #: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "Κοντινά Ï€Ïοβλήματα" @@ -2275,13 +2226,11 @@ msgid "Problems within %.1fkm of this location" msgstr "Λήψη ειδοποιήσεων για Ï€Ïοβλήματα σε ακτίνα %.1f χλμ από εδώ" #: perllib/FixMyStreet/Cobrand/Default.pm:663 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 #: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "Î Ïοβλήματα στο "%s"" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "Î Ïοβλήματα στην πεÏιοχή "%s"" @@ -2300,15 +2249,11 @@ msgstr "Î Ïοβλήματα μÎσα στα ÏŒÏια του:" msgid "Property address:" msgstr "ΔιεÏθυνση ακινήτου:" -#: templates/web/base/report/new/category.html:8 -msgid "Property type:" -msgstr "Είδος ακινήτου:" - #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Δώσε μια ενημÎÏωση" -#: templates/web/base/auth/general.html:95 +#: templates/web/base/auth/general.html:105 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 "Η εισαγωγή ονόματος και ÎºÏ‰Î´Î¹ÎºÎ¿Ï Ï€Ïόσβασης είναι Ï€ÏοαιÏετική, αλλά Îτσι θα σου είναι ευκολότεÏο να αναφÎÏεις Ï€Ïοβλήματα, να αφήνεις ενημεÏώσεις και να διαχειÏίζεσαι τις αναφοÏÎÏ‚ σου." @@ -2342,16 +2287,15 @@ msgstr "Το εÏωτηματολόγιο %d απαντήθηκε για το Ï€ msgid "Questionnaire %d sent for problem %d" msgstr "Το εÏωτηματολόγιο %d στάλθηκε για το Ï€Ïόβλημα %d" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 msgid "Questionnaire filled in by problem reporter" msgstr "Το εÏωτηματολόγιο συμπληÏώθηκε από τον υποβολÎα του Ï€Ïοβλήματος" #: templates/web/base/alert/_list.html:22 +#: templates/web/base/alert/updates.html:9 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display_tools.html:34 -#: templates/web/base/reports/_rss.html:1 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed" msgstr "Ροή RSS" @@ -2379,18 +2323,12 @@ msgstr "Ροή RSS από %s, στην πεÏιοχή "%s"" msgid "RSS feed of nearby problems" msgstr "Ροή RSS για κοντινά Ï€Ïοβλήματα" -#: templates/web/base/reports/_rss.html:1 -msgid "RSS feed of problems in this %s" -msgstr "Ροή RSS για Ï€Ïοβλήματα σε αυτό το "%s"" - #: perllib/FixMyStreet/Cobrand/Default.pm:664 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 #: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "Ροή RSS για Ï€Ïοβλήματα στο "%s"" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 #: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "Ροή RSS για Ï€Ïοβλήματα στην πεÏιοχή "%s"" @@ -2400,14 +2338,13 @@ msgstr "Ροή RSS για Ï€Ïοβλήματα στην πεÏιοχή "%s& msgid "RSS feed of recent local problems" msgstr "Ροή RSS για Ï€Ïόσφατα τοπικά Ï€Ïοβλήματα" +#: templates/web/base/alert/updates.html:9 #: templates/web/base/report/display_tools.html:34 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed of updates to this problem" msgstr "Ροή RSS για ενημεÏώσεις σε αυτό το Ï€Ïόβλημα" -#: templates/web/base/alert/updates.html:9 +#: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:36 -#: templates/web/fixmystreet/alert/updates.html:14 msgid "Receive email when updates are left on this problem." msgstr "Λήψη email όταν γίνονται ενημεÏώσεις για αυτό το Ï€Ïόβλημα" @@ -2443,12 +2380,11 @@ msgstr "ΑφαίÏεση φωτογÏαφίας (δεν αναιÏείται!)" msgid "Reply to user:" msgstr "" -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/header_logo.html:2 msgid "Report" msgstr "ΑναφοÏά" -#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:26 -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/footer.html:26 templates/web/base/header_logo.html:2 #: templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2458,7 +2394,7 @@ msgstr "ΑναφοÏά Ï€Ïοβλήματος" msgid "Report abuse" msgstr "ΑναφοÏά κατάχÏησης" -#: perllib/FixMyStreet/App/Controller/Rss.pm:291 +#: perllib/FixMyStreet/App/Controller/Rss.pm:297 msgid "Report on %s" msgstr "ΑναφοÏά στο "%s"" @@ -2473,7 +2409,7 @@ msgstr "ΑνάφεÏε το Ï€Ïόβλημά σου" msgid "Report, view, or discuss local problems" msgstr "ΑνάφεÏε, δες ή συζήτησε τα τοπικά Ï€Ïοβλήματα" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:577 #: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "ΑναφÎÏθηκε ανώνυμα στις %s" @@ -2483,7 +2419,7 @@ msgstr "ΑναφÎÏθηκε ανώνυμα στις %s" msgid "Reported before" msgstr "ΑναφÎÏθηκε Ï€ÏοηγουμÎνως" -#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 #: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "ΑναφÎÏθηκε από %s στις %s" @@ -2497,27 +2433,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "ΑναφÎÏθηκε στην κατηγοÏία %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:569 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 msgid "Reported in the %s category anonymously at %s" msgstr "ΑναφÎÏθηκε στην κατηγοÏία %s, ανώνυμα στις %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:591 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 msgid "Reported in the %s category by %s at %s" msgstr "ΑναφÎÏθηκε στην κατηγοÏία %s από τον %s στις %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported via %s anonymously at %s" msgstr "ΑναφÎÏθηκε μÎσω %s ανώνυμα στις %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported via %s by %s at %s" msgstr "ΑναφÎÏθηκε μÎσω %s από τον %s στις %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:561 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 msgid "Reported via %s in the %s category anonymously at %s" msgstr "ΑναφÎÏθηκε μÎσω %s στην κατηγοÏία %s ανώνυμα στις %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 msgid "Reported via %s in the %s category by %s at %s" msgstr "ΑναφÎÏθηκε μÎσω %s στην κατηγοÏία %s από τον %s στις %s" @@ -2538,7 +2474,7 @@ msgstr "" msgid "Reporting a problem" msgstr "ΑναφοÏά Ï€Ïοβλήματος" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1274 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" @@ -2581,15 +2517,15 @@ msgstr "ΧειÏιστής δÏόμου για την ονομασμÎνη Î¿Î´Ï msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "ΧειÏιστής δÏόμου για την ονομασμÎνη οδο (από το OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1496 #: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "ΠεÏιστÏοφή αÏιστεÏά" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 #: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 @@ -2604,7 +2540,7 @@ msgstr "" msgid "Satellite" msgstr "ΔοÏυφόÏος" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/base/admin/category_edit.html:84 #: templates/web/zurich/admin/body.html:59 #: templates/web/zurich/admin/template_edit.html:29 @@ -2660,7 +2596,7 @@ msgstr "" msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:696 +#: perllib/FixMyStreet/DB/Result/Problem.pm:698 msgid "Sent to %s %s later" msgstr "Στάλθηκε στο %s %s αÏγότεÏα" @@ -2679,21 +2615,21 @@ msgstr "Κοινοποίηση" #: templates/web/base/report/new/form_user_loggedin.html:23 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22 -#: templates/web/base/report/update/form_name.html:15 +#: templates/web/base/report/update/form_name.html:16 msgid "Show my name publicly" msgstr "Δημόσια Ï€Ïοβολή του ονόματός μου" -#: templates/web/base/around/display_location.html:67 +#: templates/web/base/around/display_location.html:66 msgid "Show old" msgstr "Î Ïοβολή παλαιότεÏων" -#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:57 msgid "Show pins" msgstr "Î Ïοβολή καÏφιτσών" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/general.html:110 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:76 +#: templates/web/base/auth/general.html:86 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2752,9 +2688,8 @@ msgstr "Συγνώμη, δεν μποÏÎσαμε να βÏοÏμε αυτήν Ï #: templates/web/base/auth/general.html:9 #: templates/web/base/report/display.html:21 #: templates/web/base/report/new/fill_in_details_form.html:23 -#, fuzzy msgid "Sorry, we could not log you in. Please fill in the form below." -msgstr "Συγνώμη, δεν μποÏÎσαμε να αναλÏσουμε αυτήν την τοποθεσία. ΠαÏακαλοÏμε Ï€Ïοσπάθησε ξανά." +msgstr "" #: perllib/FixMyStreet/Geocode/Bing.pm:35 #: perllib/FixMyStreet/Geocode/Google.pm:45 @@ -2762,15 +2697,10 @@ msgstr "Συγνώμη, δεν μποÏÎσαμε να αναλÏσουμε αυ msgid "Sorry, we could not parse that location. Please try again." msgstr "Συγνώμη, δεν μποÏÎσαμε να αναλÏσουμε αυτήν την τοποθεσία. ΠαÏακαλοÏμε Ï€Ïοσπάθησε ξανά." -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:138 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 -#, fuzzy -msgid "Sorry, you can not log in with Facebook. Please try again later." -msgstr "ΥπήÏξε Ï€Ïόβλημα στην Ï€Ïοβολή αυτής της σελίδας. ΠαÏακαλοÏμε Ï€Ïοσπάθησε αÏγότεÏα." - #: templates/web/base/admin/stats.html:64 msgid "Start Date:" msgstr "ΗμεÏομηνία ΈναÏξης:" @@ -2779,7 +2709,7 @@ msgstr "ΗμεÏομηνία ΈναÏξης:" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/report/update/form_update.html:32 +#: templates/web/base/report/update/form_update.html:34 msgid "State" msgstr "Κατάσταση" @@ -2792,7 +2722,7 @@ msgstr "Κατάσταση" msgid "State:" msgstr "Κατάσταση:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2832,10 +2762,10 @@ msgid "Subject:" msgstr "ΘÎμα:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/base/report/new/form_user_loggedout_by_email.html:39 #: templates/web/base/report/new/form_user_loggedout_password.html:11 -#: templates/web/zurich/report/new/fill_in_details_form.html:96 +#: templates/web/zurich/report/new/fill_in_details_form.html:98 msgid "Submit" msgstr "Υποβολή" @@ -2863,9 +2793,8 @@ msgstr "Υποβολή εÏωτηματολογίου" msgid "Submitted" msgstr "Υποβλήθηκε" -#: templates/web/base/alert/updates.html:17 +#: templates/web/base/alert/updates.html:23 #: templates/web/base/report/display_tools.html:41 -#: templates/web/fixmystreet/alert/updates.html:23 msgid "Subscribe" msgstr "Γίνε συνδÏομητής" @@ -2873,7 +2802,7 @@ msgstr "Γίνε συνδÏομητής" msgid "Subscribe me to an email alert" msgstr "Γίνε συνδÏομητής σε ειδοποιήσεις μÎσω email" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -2892,7 +2821,7 @@ msgstr "ΠεÏίληψη" msgid "Summary reports" msgstr "ΠεÏιληπτικÎÏ‚ αναφοÏÎÏ‚" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 msgid "Survey" msgstr "ΈÏευνα" @@ -2949,7 +2878,7 @@ msgstr "ΕυχαÏιστοÏμε που ανÎβασες την φωτογÏαφ msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "ΕυχαÏιστοÏμε, χαιÏόμαστε που διοÏθώθηκε! ΜποÏοÏμε απλά να σε Ïωτήσουμε αν Îχεις αναφÎÏει ξανά κάποιο Ï€Ïόβλημα στην υπηÏεσία στο παÏελθόν;" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:157 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "Η εικόνα δεν φαίνεται να Îχει μεταφοÏτωθεί σωστά (%s), παÏακαλοÏμε Ï€Ïοσπάθησε ξανά." @@ -2957,7 +2886,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:126 +#: perllib/FixMyStreet/App/Controller/Location.pm:127 msgid "That location does not appear to be in the UK; please try again." msgstr "Η τοποθεσία δεν φαίνεται να βÏίσκεται στην Ελλάδα. ΠαÏακαλοÏμε Ï€Ïοσπάθησε ξανά." @@ -2967,11 +2896,11 @@ msgstr "Η τοποθεσία δεν φαίνεται να βÏίσκεται σ msgid "That postcode was not recognised, sorry." msgstr "Ο ταχυδÏομικός κώδικας δεν αναγνωÏίστηκε, λυποÏμαστε." -#: perllib/FixMyStreet/App/Controller/Admin.pm:724 +#: perllib/FixMyStreet/App/Controller/Admin.pm:722 msgid "That problem has been marked as sent." msgstr "Αυτό το Ï€Ïόβλημα Îχει σημειωθεί ως απεσταλμÎνο." -#: perllib/FixMyStreet/App/Controller/Admin.pm:716 +#: perllib/FixMyStreet/App/Controller/Admin.pm:714 msgid "That problem will now be resent." msgstr "Το Ï€Ïόβλημα Ï„ÏŽÏα θα αποσταλθεί ξανά." @@ -2983,7 +2912,7 @@ msgstr "Η αναφοÏά δεν μποÏεί να Ï€Ïοβληθεί σε %s." msgid "That report has been removed from FixMyStreet." msgstr "Η αναφοÏά αφαιÏÎθηκε από το FixMyStreet." -#: templates/web/base/admin/body.html:144 +#: templates/web/base/admin/body.html:142 msgid "" "The <strong>email address</strong> is the destination to which reports about this category will be sent. \n" " Other categories for this body may have the same email address." @@ -3131,9 +3060,9 @@ msgstr "ΥπήÏξε Ï€Ïόβλημα στην Ï€Ïοβολή της σελίδΠmsgid "There was a problem showing this page. Please try again later." msgstr "ΥπήÏξε Ï€Ïόβλημα στην Ï€Ïοβολή αυτής της σελίδας. ΠαÏακαλοÏμε Ï€Ïοσπάθησε αÏγότεÏα." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:753 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 -#: templates/web/base/auth/general.html:43 +#: templates/web/base/auth/general.html:53 #: 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’ αυτής της φόÏμας." @@ -3202,9 +3131,9 @@ msgstr "Αυτό το email στάλθηκε και στις δÏο υπηÏεσ 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:920 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:898 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:935 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:977 #: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "Αυτή η πληÏοφοÏία απαιτείται" @@ -3217,11 +3146,11 @@ msgstr "Αυτή είναι μια ιστοσελίδα για Ï€ÏογÏαμμΠmsgid "This is a summary of all reports on this site." msgstr "Αυτή είναι μια πεÏίληψη όλων των αναφοÏών σε αυτή την ιστοσελίδα" -#: templates/web/base/report/update/form_update.html:52 +#: templates/web/base/report/update/form_update.html:54 msgid "This problem has been fixed" msgstr "Αυτό το Ï€Ïόβλημα Îχει διοÏθωθεί" -#: templates/web/base/report/update/form_update.html:46 +#: templates/web/base/report/update/form_update.html:48 msgid "This problem has not been fixed" msgstr "Αυτό το Ï€Ïόβλημα δεν Îχει διοÏθωθεί" @@ -3258,7 +3187,7 @@ msgstr "Αυτή η ιστοσελίδα πεÏιÎχει επίσης μία φ msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "ΧÏονοδιάγÏαμμα" @@ -3303,8 +3232,8 @@ msgstr "Στείλε μας Îνα email:" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Unable to fix" msgstr "Δεν είναι εφικτή η διόÏθωση" @@ -3321,7 +3250,7 @@ msgstr "Ανεπιβεβαίωτο" msgid "Unknown" msgstr "Άγνωστο" -#: perllib/FixMyStreet/App/Controller/Rss.pm:173 +#: perllib/FixMyStreet/App/Controller/Rss.pm:174 msgid "Unknown alert type" msgstr "Άγνωστο είδος ειδοποίησης" @@ -3336,7 +3265,7 @@ msgstr "Άγνωστο σφάλμα" msgid "Unknown problem ID" msgstr "Άγνωστη ταυτότητα Ï€Ïοβλήματος" -#: templates/web/base/report/update/form_update.html:25 +#: templates/web/base/report/update/form_update.html:27 msgid "Update" msgstr "ΕνημÎÏωση" @@ -3388,10 +3317,10 @@ msgstr "Καταστάσεις ενημÎÏωσης" msgid "Updated" msgstr "ΕνημεÏώθηκε" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 -#: perllib/FixMyStreet/App/Controller/Admin.pm:821 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1096 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1144 +#: perllib/FixMyStreet/App/Controller/Admin.pm:809 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3418,7 +3347,7 @@ msgstr "ΕνημεÏώσεις για {{title}}" msgid "Updates to this problem, %s" msgstr "" -#: templates/web/base/admin/body.html:182 +#: templates/web/base/admin/body.html:180 msgid "Use the <strong>note</strong> to record details that are only displayed in the admin. Notes are not shown publicly, and are not sent to the body." msgstr "ΧÏησιμοποίησε την <strong>σημείωση</strong> για να καταγÏάψεις τις λεπτομÎÏειες που θα φαίνονται στον διαχειÏιστή. Οι σημειώσεις δεν εμφανίζονται δημόσια και δεν αποστÎλλονται στον τομÎα." @@ -3427,11 +3356,11 @@ msgstr "ΧÏησιμοποίησε την <strong>σημείωση</strong> γι msgid "Used map" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 msgid "User flag removed" msgstr "Η επισήμανση του χÏήστη αφαιÏÎθηκε" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1421 msgid "User flagged" msgstr "Ο χÏήστης επισημάνθηκε" @@ -3439,16 +3368,16 @@ msgstr "Ο χÏήστης επισημάνθηκε" msgid "User search finds matches in users' names and email addresses." msgstr "Η αναζήτηση χÏηστών βÏίσκει αποτελÎσματα για ονόματα χÏηστών και διευθÏνσεις email." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "ΧÏήστες" -#: perllib/FixMyStreet/App/Controller/Admin.pm:382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:412 -#: perllib/FixMyStreet/App/Controller/Admin.pm:429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:380 +#: perllib/FixMyStreet/App/Controller/Admin.pm:410 +#: perllib/FixMyStreet/App/Controller/Admin.pm:427 msgid "Values updated" msgstr "Οι τιμÎÏ‚ ενημεÏώθηκαν" @@ -3485,16 +3414,15 @@ msgstr "Î’Ïήκαμε παÏαπάνω από Îνα αποτÎλεσμα γιΠ#: templates/web/base/auth/general.html:6 #: templates/web/base/report/display.html:27 #: templates/web/base/report/new/oauth_email_form.html:5 -#, fuzzy msgid "We need your email address, please give it below." -msgstr "Δε δείχνουμε ποτΠτο email ή το τηλÎφωνό σου" +msgstr "" #: templates/web/base/report/new/form_user_loggedout_email.html:2 #: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "Δε δείχνουμε ποτΠτο email σου" -#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedin.html:30 #: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "Δε δείχνουμε ποτΠτο email ή το τηλÎφωνό σου" @@ -3503,7 +3431,7 @@ msgstr "Δε δείχνουμε ποτΠτο email ή το τηλÎφωνό σΠ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. Ωστόσο, μÎχÏι στιγμής δεν Îχουμε πληÏοφοÏίες επικοινωνίας μαζί τους. Αν γνωÏίζεις μία κατάλληλη διεÏθυνση επικοινωνίας, παÏακαλοÏμε επικοινώνησε μαζί τους." -#: templates/web/base/index-steps.html:31 +#: templates/web/base/index-steps.html:11 msgid "We send it to the council on your behalf" msgstr "Και εμείς θα το στείλουμε στην υπηÏεσία εκ μÎÏους σου" @@ -3541,10 +3469,6 @@ msgstr "Όταν αποστάλθηκε " msgid "Whoa there Testino! Three photos are enough." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 -msgid "Whole block of empty flats" -msgstr "ΟλόκληÏο τετÏάγωνο από άδεια διαμεÏίσματα" - #: templates/web/base/tokens/confirm_alert.html:7 msgid "Why stop there? <a href=\"/alert\">Set up more alerts</a> for free." msgstr "Μόνο αυτό? <a href=\"/alert\">Î Ïόσθεσε πεÏισσότεÏες ειδοποιήσεις</a> δωÏεάν." @@ -3564,7 +3488,7 @@ msgstr "Με τις αναζητήσεις αιτημάτων, είναι επί msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "Θα ήθελες να συνεισφÎÏεις στο FixMyStreet; Ο κώδικας μας είναι ανοιχτής πηγής και <a href=\"http://fixmystreet.org\">διαθÎσιμος στο fixmystreet.org</a>." -#: templates/web/base/questionnaire/index.html:96 +#: templates/web/base/questionnaire/index.html:97 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "Θα ήθελες να λάβεις και άλλο εÏωτηματολόγιο σε 4 εβδομάδες, για να σου υπενθυμίσει να ελÎγξεις την Ï„ÏÎχουσα κατάσταση;" @@ -3594,8 +3518,8 @@ msgstr "Έτος" #: templates/web/base/admin/update_edit.html:24 #: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 +#: templates/web/base/questionnaire/index.html:100 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "Îαι" @@ -3715,19 +3639,19 @@ msgid "Your Reports" msgstr "Οι ΑναφοÏÎÏ‚ σου" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/alert/updates.html:19 +#: templates/web/base/alert/updates.html:22 #: templates/web/base/contact/index.html:83 #: templates/web/base/report/display_tools.html:38 #: templates/web/base/report/display_tools.html:40 #: templates/web/base/report/new/form_user_loggedin.html:3 #: templates/web/base/report/new/form_user_loggedout_email.html:1 #: templates/web/base/report/update/form_user_loggedout_email.html:1 -#: templates/web/fixmystreet/alert/updates.html:19 -#: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/zurich/report/new/fill_in_details_form.html:76 +#: templates/web/zurich/report/new/fill_in_details_form.html:78 msgid "Your email" msgstr "Το e-mail σου" -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/general.html:55 #: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 @@ -3738,17 +3662,17 @@ msgstr "Η διεÏθυνση του e-mail σου" msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "Οι πληÏοφοÏίες σου θα χÏησιμοποιηθοÏν μόνο σÏμφωνα με την <a href=\"/privacy\">πολιτική αποÏÏήτου</a>" -#: templates/web/base/auth/general.html:90 +#: templates/web/base/auth/general.html:100 #: templates/web/base/contact/index.html:76 #: templates/web/base/report/new/form_user_loggedin.html:18 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17 -#: templates/web/base/report/update/form_name.html:11 +#: templates/web/base/report/update/form_name.html:12 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:86 +#: templates/web/zurich/report/new/fill_in_details_form.html:88 msgid "Your name" msgstr "Το όνομά σου" -#: templates/web/base/auth/general.html:75 +#: templates/web/base/auth/general.html:85 #: 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 @@ -3761,20 +3685,19 @@ msgstr "Ο κωδικός σου Îχει αλλάξει" #: templates/web/base/report/new/form_user_loggedin.html:27 #: templates/web/base/report/new/form_user_loggedout_by_email.html:26 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:94 msgid "Your phone number" msgstr "Ο αÏιθμός τηλεφώνου σου" #: templates/web/base/questionnaire/index.html:14 -#, fuzzy msgid "Your report" -msgstr "Οι αναφοÏÎÏ‚ σου" +msgstr "" -#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 +#: templates/web/base/footer.html:29 msgid "Your reports" msgstr "Οι αναφοÏÎÏ‚ σου" -#: templates/web/base/my/my.html:41 +#: templates/web/base/my/my.html:39 msgid "Your updates" msgstr "Οι ενημεÏώσεις σου" @@ -3800,7 +3723,7 @@ msgid "didn't use map" msgstr "δεν χÏησιμοποιήθηκε χάÏτης" #: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/around/postcode_form.html:12 msgid "e.g. ‘%s’ or ‘%s’" msgstr "Ï€.χ. ‘%s’ ή ‘%s’" @@ -3906,8 +3829,7 @@ msgstr "άλλες πεÏιοχÎÏ‚:" msgid "reopened" msgstr "άνοιξε ξανά" -#: templates/web/base/header.html:33 templates/web/fixmystreet/header.html:64 -#: templates/web/zurich/footer.html:13 +#: templates/web/base/header.html:64 templates/web/zurich/footer.html:13 msgid "sign out" msgstr "Îξοδος" @@ -3985,7 +3907,7 @@ msgid_plural "<big>%s</big> updates on reports" msgstr[0] "<big>%s</big> ενημÎÏωση σε αναφοÏÎÏ‚" msgstr[1] "<big>%s</big> ενημεÏώσεις σε αναφοÏÎÏ‚" -#: templates/web/emptyhomes/report/new/councils_text_none.html:3 +#: templates/web/base/report/new/councils_text_none.html:3 #, perl-format msgid "We do not yet have details for the council that covers this location." msgid_plural "We do not yet have details for the councils that cover this location." @@ -4027,86 +3949,47 @@ msgid_plural "We do <strong>not</strong> yet have details for the other councils msgstr[0] "<strong>Δεν</strong> Îχουμε ακόμη λεπτομÎÏειες για το άλλο συμβοÏλιο που είναι αÏμόδια σε αυτήν την τοποθεσία." msgstr[1] "<strong>Δεν</strong> Îχουμε ακόμη λεπτομÎÏειες για τις υπόλοιπες υπηÏεσίες που είναι αÏμόδιες για αυτήν την τοποθεσία." -#~ msgid "(we never show your email address or phone number)" -#~ msgstr "(δεν φαίνεται ποτΠτο email ή ο τηλεφωνικός αÏιθμός σου)" - -#~ msgid "(we never show your email)" -#~ msgstr "(δεν φαίνεται ποτΠτο email σου)" - -#~ msgid "<strong>No</strong>, let me confirm my report by email:" -#~ msgstr "<strong>Όχι<strong>, να γίνει επιβεβαίωση της αναφοÏάς μÎσω email:" - -#~ msgid "<strong>No</strong>, let me confirm my update by email:" -#~ msgstr "<strong>Όχι</strong>, να γίνει επιβεβαίωση της ενημÎÏωσης μÎσω email:" - -#~ msgid "Email me updates" -#~ msgstr "Στείλτε Email για ενημεÏώσεις" - -#~ msgid "Enter a new password:" -#~ msgstr "ΓÏάψε Îνα νÎο κωδικό Ï€Ïόσβασης:" - -#~ msgid "I'm afraid we couldn't validate that token. If you've copied the URL from an email, please check that you copied it exactly.\n" -#~ msgstr "ΦοβοÏμαστε ότι δεν μποÏÎσαμε να επαληθεÏσουμε αυτό το token. Αν αντÎγÏαψες τη διεÏθυνση URL από κάποιο email, παÏακαλοÏμε Îλεγξε ότι την αντÎγÏαψες επακÏιβώς.\n" - -#~ msgid "If you use web-based email or have 'junk mail' filters, you may wish to check your bulk/spam mail folders: sometimes, our messages are marked that way." -#~ msgstr "Αν χÏησιμοποιείς διαδικτυακό email ή Îχεις φίλτÏα \"ανεπιθÏμητης αλληλογÏαφίας\", Îλεγξε τους φακÎλους ανεπιθÏμητων/spam email: μεÏικÎÏ‚ φοÏÎÏ‚, τα μηνÏματά μας επισημαίνονται Îτσι." - -#~ msgid "Message:" -#~ msgstr "Μήνυμα:" - -#~ msgid "More problems nearby" -#~ msgstr "ΠεÏισσότεÏα Ï€Ïοβλήματα στην πεÏιοχή" - -#~ msgid "Nearly Done! Now check your email..." -#~ msgstr "Σχεδόν τελειώσαμε! ΤώÏα Îλεγξε το email σου..." - -#~ msgid "Offensive? Unsuitable? Tell us" -#~ msgstr "Î Ïοσβλητικό; Ακατάλληλο; Πες μας" - -#~ msgid "Photo:" -#~ msgstr "ΦωτογÏαφία:" - -#~ msgid "Please check your email" -#~ msgstr "ΠαÏακαλοÏμε Îλεγξε το email σου" +#~ msgid "%s, reported at %s" +#~ msgstr "%s, Îγινε αναφοÏά στο "%s"" -#~ msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" -#~ msgstr "ΠαÏακαλοÏμε σημείωσε ότι οι ενημεÏώσεις δεν στÎλνονται στην υπηÏεσία. Αν αφήσεις το όνομά σου θα είναι δημόσιο. Οι πληÏοφοÏίες θα χÏησιμοποιηθοÏν μόνο σÏμφωνα με την <a href=\"/faq#privacy\">πολιτική αποÏÏήτου</a>" +#~ msgid "About us" +#~ msgstr "Σχετικά με εμάς" -#~ msgid "This may be because the link is too old or already used, or the address was not copied correctly." -#~ msgstr "Αυτό ίσως συμβαίνει επειδή ο σÏνδεσμος είναι παλιός ή ήδη χÏησιμοποιημÎνος, ή επειδή η διεÏθυνση δεν αντιγÏάφηκε σωστά." +#~ msgid "Email me new local problems" +#~ msgstr "Στείλε μου email για νÎα Ï€Ïοβλήματα της πεÏιοχής" -#~ msgid "This problem has been closed" -#~ msgstr "Αυτό το Ï€Ïόβλημα Îχει κλείσει" +#~ msgid "Empty flat or maisonette" +#~ msgstr "Άδειο διαμÎÏισμα ή μεζονÎτα" -#~ msgid "This problem is in progress" -#~ msgstr "Αυτό το Ï€Ïόβλημα βÏίσκεται σε εξÎλιξη" +#~ msgid "Empty house or bungalow" +#~ msgstr "Άδειο σπίτι ή μονοκατοικία" -#~ msgid "This problem is old and of unknown status." -#~ msgstr "Αυτό το Ï€Ïόβλημα είναι παλιό και σε άγνωστη κατάσταση." +#~ msgid "Empty office or other commercial" +#~ msgstr "Άδειο γÏαφείο ή άλλος χώÏος εμποÏικής χÏήσης" -#~ msgid "Update:" -#~ msgstr "ΕνημÎÏωση:" +#~ msgid "Empty pub or bar" +#~ msgstr "Άδειο μπαÏ" -#~ msgid "We have not been able to confirm your account - sorry." -#~ msgstr "Δεν μποÏÎσαμε να επιβεβαιώσουμε το λογαÏιασμό σου - συγγνώμη." +#~ msgid "Empty public building - school, hospital, etc." +#~ msgstr "Άδειο δημόσιο κτήÏιο - σχολείο, νοσοκομείο, κτλ." -#~ msgid "We have sent you an email containing a link to confirm your account." -#~ msgstr "Σου στείλαμε Îνα email με Îνα σÏνδεσμο για την επιβεβαίωση του λογαÏÎ¹Î±ÏƒÎ¼Î¿Ï ÏƒÎ¿Ï…." +#~ msgid "Enter a nearby street name and area, postal code or district in Delhi" +#~ msgstr "ΓÏάψε μία κοντινή οδό, πεÏιοχή, ταχυδÏομικό κώδικα ή πεÏιφÎÏεια" -#~ msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:" -#~ msgstr "Θα θÎλαμε να ακοÏσουμε τι σκÎφτεσαι για αυτόν τον ιστότοπο. Απλά συμπλήÏωσε την φόÏμα ή στείλε μας e-mail στο <a href='mailto:%s'>%s</a>:" +#~ msgid "FixMyStreet" +#~ msgstr "FixMyStreet" -#~ msgid "You have already attached a photo to this report, attaching another one will replace it." -#~ msgstr "Έχεις ήδη Ï€ÏοσθÎσει μια φωτογÏαφία σε αυτή την αναφοÏά, αν Ï€ÏοσθÎσεις μια καινοÏÏια θα την αντικαταστήσει. " +#~ msgid "I am afraid you cannot confirm unconfirmed reports." +#~ msgstr "ΦοβοÏμαστε ότι δε γίνεται να επιβεβαιώσεις ανεπιβεβαίωτες αναφοÏÎÏ‚." -#~ msgid "You have already attached a photo to this update, attaching another one will replace it." -#~ msgstr "Έχεις ήδη Ï€ÏοσθÎσει μια φωτογÏαφία σε αυτή την αναφοÏά, αν Ï€ÏοσθÎσεις μια καινοÏÏια θα την αντικαταστήσει. " +#~ msgid "Problems in this area" +#~ msgstr "Î Ïοβλήματα στην πεÏιοχή" -#~ msgid "Your email:" -#~ msgstr "Το e-mail σου:" +#~ msgid "Property type:" +#~ msgstr "Είδος ακινήτου:" -#~ msgid "Your name:" -#~ msgstr "Το όνομά σου:" +#~ msgid "RSS feed of problems in this %s" +#~ msgstr "Ροή RSS για Ï€Ïοβλήματα σε αυτό το "%s"" -#~ msgid "Your email:" -#~ msgstr "Το e-mail σου:" +#~ msgid "Whole block of empty flats" +#~ msgstr "ΟλόκληÏο τετÏάγωνο από άδεια διαμεÏίσματα" diff --git a/locale/es.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/es.UTF-8/LC_MESSAGES/FixMyStreet.po index 8349e3388..b72b9bd7e 100644 --- a/locale/es.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/es.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2016-03-02 13:09+0000\n" -"PO-Revision-Date: 2015-10-23 16:37+0000\n" +"POT-Creation-Date: 2016-05-03 10:41+0100\n" +"PO-Revision-Date: 2016-03-23 12:43+0000\n" "Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: Spanish (Spain) (http://www.transifex.com/mysociety/fixmystreet/language/es_ES/)\n" "Language: es_ES\n" @@ -23,7 +23,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/DB/Result/Problem.pm:618 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr " y " @@ -56,9 +56,8 @@ msgid "%s admin:" msgstr "" #: templates/web/base/status/stats.html:26 -#, fuzzy msgid "%s bodies" -msgstr "Órganos administrativos" +msgstr "" #: templates/web/base/status/stats.html:24 msgid "%s confirmed alerts, %s unconfirmed" @@ -93,7 +92,7 @@ msgstr "%s actualizaciones en vivo" msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "%s cuestionarios enviados – %s respondidos (%s%%)" -#: perllib/FixMyStreet/DB/Result/Problem.pm:683 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "%s ref: %s" msgstr "%s ref: %s" @@ -112,10 +111,6 @@ msgstr "" msgid "%s ward, %s" msgstr "%s barrio, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:552 -msgid "%s, reported at %s" -msgstr "%s, reportado el %s" - #: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "%s, en %s barrio" @@ -170,7 +165,7 @@ msgstr "(como pintadas, basuras, pavimento o alumbrado rotos)" msgid "(not sent to council)" msgstr "(no enviadas al ayuntamiento)" -#: templates/web/zurich/report/new/fill_in_details_form.html:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "(optional)" msgstr "(opcional)" @@ -182,12 +177,11 @@ msgstr "(público)" msgid "(sent to both)" msgstr "(enviado a ambos)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Escoja una categorÃa --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Escoja un tipo de propiedad --" @@ -222,26 +216,21 @@ msgstr "<strong>No</strong>- confirmar mi notificación por email" msgid "<strong>No</strong> Let me confirm my update by email" msgstr "<strong>No</strong>- confirmar mi actualización por email" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:97 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>No</strong>- permÃtanme registrarme por email" -#: templates/web/base/auth/general.html:70 +#: templates/web/base/auth/general.html:80 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>SÃ</strong>- tengo una contraseña" -#: templates/web/base/about/about-en-gb.html:1 -#: templates/web/base/about/about-en-gb.html:3 -msgid "About us" -msgstr "¿Quiénes somos?" - #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Action Scheduled" msgstr "Acción programada" @@ -275,7 +264,7 @@ msgstr "Agregar nueva categorÃa" msgid "Add user" msgstr "Añadir un usuario" -#: templates/web/base/my/my.html:56 +#: templates/web/base/my/my.html:54 msgid "Added %s" msgstr "Añadido %s" @@ -295,7 +284,7 @@ msgstr "Alerta %d creada por %s, tipo %s, parámetros %s / %s" msgid "Alert %d disabled (created %s)" msgstr "Alerta %d desactivada (creada %s)" -#: templates/web/base/report/update/form_name.html:20 +#: templates/web/base/report/update/form_name.html:21 msgid "Alert me to future updates" msgstr "Notificadme actualizaciones futuras" @@ -308,7 +297,7 @@ msgstr "Todas las notificaciones" msgid "All Reports as CSV" msgstr "" -#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 +#: templates/web/base/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:20 @@ -407,7 +396,7 @@ msgstr "Atras" msgid "Ban email address" msgstr "Suspender este email" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1273 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -438,7 +427,7 @@ msgstr "¿No puedes ver el mapa? <em>Salte este paso</em>" #: templates/web/base/admin/body.html:68 #: templates/web/base/admin/index.html:54 -#: templates/web/base/report/new/category.html:10 +#: templates/web/base/report/new/category.html:7 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 @@ -453,7 +442,7 @@ msgstr "CategorÃa" msgid "Category fix rate for problems > 4 weeks old" msgstr "Ratio de arreglo de problemas > 4 semanas" -#: templates/web/base/admin/body.html:138 +#: templates/web/base/admin/body.html:137 #: templates/web/base/admin/category_edit.html:23 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/admin/body.html:43 @@ -473,7 +462,7 @@ msgstr "CategorÃa: %s" msgid "Change password" msgstr "Cambiar contraseña" -#: templates/web/base/admin/body.html:160 +#: templates/web/base/admin/body.html:158 msgid "" "Check <strong>confirmed</strong> to indicate that this contact has been confirmed as correct.\n" " If you are not sure of the origin or validity of the contact, leave this unchecked." @@ -481,7 +470,7 @@ msgstr "" "Marcar <strong>confirmado</ strong> para indicar que este contacto se ha confirmado como correcto.\n" "Si no está seguro del origen o la validez del contacto, deje esta casilla sin marcar." -#: templates/web/base/admin/body.html:171 +#: templates/web/base/admin/body.html:169 msgid "" "Check <strong>deleted</strong> to remove the category from use. \n" " It will not appear as an available category in the drop-down menu on the report-a-problem page." @@ -489,7 +478,7 @@ msgstr "" "Marcar <strong>borrado</ strong> para dejar de usar la categorÃa. \n" "Dejará de aparecer en el menú desplegable que se muestra al notificar los problemas." -#: templates/web/base/admin/body.html:191 +#: templates/web/base/admin/body.html:189 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -507,7 +496,7 @@ msgstr "" "no hay mayor interés en ser desplegados. En el Reino Unido, hemos utilizado esto para servicios como requerir un\n" "basurero extra en una dirección especÃfica" -#: templates/web/base/admin/body.html:130 +#: templates/web/base/admin/body.html:129 msgid "" "Choose a <strong>category</strong> 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." @@ -550,8 +539,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:15 #: templates/web/base/admin/report_blocks.html:25 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 @@ -560,7 +549,7 @@ msgstr "" msgid "Closed" msgstr "Cerrada" -#: perllib/FixMyStreet/DB/Result/Problem.pm:779 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Closed by council" msgstr "Cerrada por el Ayuntamiento" @@ -586,7 +575,7 @@ msgstr "Datos cobrand:" msgid "Cobrand:" msgstr "Cobrand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Configuración" @@ -605,9 +594,8 @@ msgstr "Confirmar cuenta" #: templates/web/base/report/new/form_user_loggedout_password.html:21 #: templates/web/base/report/update/form_user_loggedout_password.html:20 -#, fuzzy msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." -msgstr "Confirme por email, proporcionando una nueva contraseña. Al confirmar, su contraseña se actualizará." +msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:1 #: templates/web/base/tokens/confirm_problem.html:1 @@ -617,7 +605,7 @@ msgstr "Confirme por email, proporcionando una nueva contraseña. Al confirmar, msgid "Confirmation" msgstr "Confirmación" -#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:164 #: templates/web/base/admin/body.html:79 #: templates/web/base/admin/category_edit.html:37 #: templates/web/base/admin/category_edit.html:92 @@ -636,7 +624,7 @@ msgid "Confirmed:" msgstr "Confirmada:" #. ("%s is the site name") -#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 +#: templates/web/base/about/_sidebar.html:6 msgid "Contact %s" msgstr "" @@ -655,8 +643,8 @@ msgstr "Contactar con el equipo" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1417 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1445 msgid "Could not find user" msgstr "No se pudo encontrar el usuario" @@ -674,7 +662,7 @@ msgstr "Ayuntamiento" msgid "Council contacts for %s" msgstr "Contactos del ayuntamiento para %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:681 +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "Council ref: %s" msgstr "Referencia del ayuntamiento: %s" @@ -693,7 +681,7 @@ msgstr "Total" msgid "Create a report" msgstr "Crear una notificación" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "Crear una categorÃa" @@ -737,20 +725,20 @@ msgstr "Cuadro de mando" msgid "Dealt with by subdivision within 5 working days" msgstr "Tratado por el departamento dentro de los 5 dÃas hábiles" -#: perllib/FixMyStreet/App/Controller/Admin.pm:877 +#: perllib/FixMyStreet/App/Controller/Admin.pm:865 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:175 #: templates/web/base/admin/body.html:81 #: templates/web/base/admin/category_edit.html:42 #: templates/web/base/admin/category_edit.html:93 msgid "Deleted" msgstr "Eliminado" -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:47 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -758,7 +746,7 @@ msgid "Description" msgstr "Descripción" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:68 +#: templates/web/zurich/report/new/fill_in_details_form.html:70 msgid "Details" msgstr "Detalles" @@ -783,11 +771,11 @@ msgid "Diligency prize league table" msgstr "Ranking de premios a la constancia" #. ("%s is the site name") -#: templates/web/base/auth/general.html:48 -#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/auth/general.html:58 +#: templates/web/base/report/new/form_user_loggedout.html:28 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout.html:17 +#: templates/web/base/report/update/form_user_loggedout.html:27 msgid "Do you have a %s password?" msgstr "" @@ -805,8 +793,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "Duplicate" msgstr "Duplicado" @@ -829,7 +817,7 @@ msgstr "" msgid "Edit" msgstr "Editar" -#: templates/web/base/admin/body.html:220 +#: templates/web/base/admin/body.html:218 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "Editar los detalles del órgano administrativo" @@ -859,7 +847,7 @@ msgstr "Editor" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:39 +#: templates/web/base/auth/general.html:49 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -867,11 +855,11 @@ msgstr "Editor" msgid "Email" msgstr "Email:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 msgid "Email added to abuse list" msgstr "Email añadido a lista de abusones" -#: templates/web/base/admin/body.html:155 +#: templates/web/base/admin/body.html:153 msgid "Email address:" msgstr "Dirección de email:" @@ -883,19 +871,14 @@ msgstr "Creada alerta de email" msgid "Email alert deleted" msgstr "Borrada alerta de email" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1390 msgid "Email already in abuse list" msgstr "Email ya incluido en la lista de abusones" -#: templates/web/base/around/_updates.html:5 -msgid "Email me new local problems" -msgstr "Reciba por email notificaciones sobre los nuevos problemas" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 -#: templates/web/base/alert/updates.html:13 #: templates/web/zurich/admin/body.html:47 msgid "Email:" msgstr "Email:" @@ -904,26 +887,6 @@ msgstr "Email:" msgid "Email: %s" msgstr "Email: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 -msgid "Empty flat or maisonette" -msgstr "Piso o duplex vacÃo" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 -msgid "Empty house or bungalow" -msgstr "Casa o bungalow vacÃo" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 -msgid "Empty office or other commercial" -msgstr "Oficina u otros establecimientos comerciales vacÃos" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 -msgid "Empty pub or bar" -msgstr "Pub o bar vacÃo" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 -msgid "Empty public building - school, hospital, etc." -msgstr "Edificio público vacÃo - escuela, hospital, etc" - #: templates/web/base/admin/body-form.html:162 #: templates/web/base/admin/body-form.html:163 msgid "" @@ -974,18 +937,14 @@ msgstr "Introduzca un código postal cercano, o el nombre de la calle y el área msgid "Enter a nearby street name and area" msgstr "Introduzca el nombre de una calle cercana" -#: perllib/FixMyStreet/Cobrand/ZeroTB.pm:7 -msgid "Enter a nearby street name and area, postal code or district in Delhi" -msgstr "Introduzca un nombre de calle cercana y área, código postal o distrito en Nueva Delhi" - -#: templates/web/base/auth/general.html:99 +#: templates/web/base/auth/general.html:109 #: templates/web/base/report/new/form_user_loggedout_by_email.html:38 #: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Introduzca una contraseña" -#: templates/web/base/index-steps.html:26 +#: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "Introduzca detalles del problema" @@ -1011,7 +970,7 @@ msgstr "Ejemplo de código postal %s" msgid "Examples:" msgstr "Ejemplos:" -#: templates/web/base/report/new/form_report.html:49 +#: templates/web/base/report/new/form_report.html:51 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "Explique el problema o incidencia, su localización exacta, cuánto tiempo lleva ahÃ..." @@ -1048,19 +1007,15 @@ msgstr "Primera vez" msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." msgstr "Arreglar esto eligiendo un <strong>área cubierta</ strong> en el formulario <em>Editar detalles del organismo</ em> a continuación." -#: templates/web/base/header.html:26 -msgid "FixMyStreet" -msgstr "FixMyStreet" - #: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:38 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:40 msgid "Fixed" msgstr "Arreglado" @@ -1087,7 +1042,7 @@ msgstr "Marcar como borrado" msgid "Flag user" msgstr "Marca usuario" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "Marcado" @@ -1109,8 +1064,7 @@ msgstr "Las capacidades de los \"usuarios marcados\" no se limitan de ninguna m msgid "Flagged:" msgstr "Marcado:" -#: templates/web/base/reports/_ward-list.html:3 -#: templates/web/fixmystreet/reports/_ward-list.html:4 +#: templates/web/base/reports/_ward-list.html:4 msgid "Follow a ward link to view only reports within that ward." msgstr "Haga clic en el enlace de un barrio para ver solo sus notificaciones." @@ -1141,18 +1095,18 @@ msgstr "Listado de Preguntas Frecuentes" msgid "GeoRSS on Google Maps" msgstr "GeoRSS en Google Maps" +#: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:11 -#: templates/web/fixmystreet/around/_updates.html:3 msgid "Get updates" msgstr "Recibe actualizaciones" -#: templates/web/fixmystreet/reports/_rss.html:3 -#: templates/web/fixmystreet/reports/_rss.html:9 +#: templates/web/base/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:9 msgid "Get updates of %s problems" msgstr "Recibe actualizaciones de los problemas %s" -#: templates/web/fixmystreet/reports/_rss.html:11 -#: templates/web/fixmystreet/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:11 +#: templates/web/base/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "Recibe actualizaciones de los problemas en este %s" @@ -1165,7 +1119,7 @@ msgid "Glad to hear it’s been fixed!" msgstr "¡Nos alegra saber que ha sido arreglado!" #: templates/web/base/alert/index.html:34 -#: templates/web/base/around/postcode_form.html:16 +#: templates/web/base/around/postcode_form.html:13 #: templates/web/base/reports/_list-filters.html:28 #: templates/web/zurich/admin/stats.html:26 msgid "Go" @@ -1191,7 +1145,7 @@ msgstr "¿Ha sido corregido este problema?" msgid "Have you ever reported a problem to a council before, or is this your first time?" msgstr "¿Alguna vez informó de un problema a un Ayuntamiento antes, o es su primera vez?" -#: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:38 +#: templates/web/base/footer.html:38 #: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 @@ -1202,8 +1156,7 @@ msgstr "Ayuda" msgid "Here are the types of local problem alerts for ‘%s’." msgstr "Estos son los tipos de notificaciones de incidencias locales para '%s'." -#: templates/web/base/header.html:32 templates/web/fixmystreet/header.html:63 -#: templates/web/zurich/footer.html:12 +#: templates/web/base/header.html:63 templates/web/zurich/footer.html:12 msgid "Hi %s" msgstr "%s" @@ -1219,11 +1172,11 @@ msgstr "%s" msgid "Hidden" msgstr "Oculto" -#: templates/web/base/around/display_location.html:65 +#: templates/web/base/around/display_location.html:64 msgid "Hide old" msgstr "Ocultar antiguos" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:59 msgid "Hide pins" msgstr "Ocultar marcadores" @@ -1243,10 +1196,6 @@ msgstr "Cómo notificar un problema" msgid "How to send successful reports" msgstr "¿Cómo enviar informes exitosos?" -#: perllib/FixMyStreet/App/Controller/Admin.pm:752 -msgid "I am afraid you cannot confirm unconfirmed reports." -msgstr "No puede confirmar alertas no confirmadas." - #: templates/web/base/tokens/confirm_problem.html:23 #: templates/web/base/tokens/confirm_problem.html:27 msgid "I just reported a problem on @fixmystreet" @@ -1257,7 +1206,7 @@ msgstr "Acabo de informar de un problema en @fixmystreet" msgid "I just updated a problem on @fixmystreet" msgstr "Acabo de actualizar un problema en @fixmystreet" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88 msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "No se ha podido localizar su problema en la base de datos.\n" @@ -1281,7 +1230,7 @@ msgstr "" "Identificar una <strong>sub-organismos</ strong> si este organismo forma parte de otro organismo.\n" "Para las instalaciones básicas, no necesita asociar los organismos de esta manera." -#: templates/web/base/admin/body.html:133 +#: templates/web/base/admin/body.html:132 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." @@ -1304,7 +1253,7 @@ msgid "" "(please note it will not be sent to the council)." msgstr "" -#: templates/web/base/admin/body.html:149 +#: templates/web/base/admin/body.html:147 msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." msgstr "Si utiliza <strong> un método de envÃo distinto del email</ strong>, introduzca el ID de servicio (Open311) o identificador equivalente aquÃ." @@ -1347,10 +1296,10 @@ msgstr "ID incorrecto" msgid "Illegal feed selection" msgstr "Selección de listado incorrecta" +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "In Progress" msgstr "Procesando" @@ -1401,7 +1350,7 @@ msgstr "Remisión interna" msgid "Invalid agency_responsible value %s" msgstr "Valor inválido para agency_responsible %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 msgid "Invalid end date" msgstr "Fecha de fin inválida" @@ -1409,16 +1358,16 @@ msgstr "Fecha de fin inválida" msgid "Invalid format %s specified." msgstr "Especificado un formato no válido %s." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 msgid "Invalid start date" msgstr "Fecha de inicio no válida" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:5 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Investigating" msgstr "Investigando" @@ -1440,7 +1389,7 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:80 +#: 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 @@ -1478,7 +1427,6 @@ msgstr "Cargando..." #: 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/fixmystreet/alert/updates.html:1 msgid "Local RSS feeds and email alerts" msgstr "Listados RSS locales y alertas por email" @@ -1487,11 +1435,11 @@ msgstr "Listados RSS locales y alertas por email" msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "Listados RSS locales y alertas por email para '%s'" -#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:35 +#: templates/web/base/footer.html:35 msgid "Local alerts" msgstr "Alertas locales" -#: templates/web/base/index-steps.html:25 +#: templates/web/base/index-steps.html:5 msgid "Locate the problem on a map of the area" msgstr "Señale en el mapa de la zona la localización del problema" @@ -1551,14 +1499,14 @@ msgstr "Mes" #: templates/web/base/admin/list_updates.html:7 #: templates/web/base/admin/reports.html:13 #: templates/web/base/admin/users.html:15 -#: templates/web/base/auth/general.html:89 +#: templates/web/base/auth/general.html:99 #: templates/web/base/report/new/form_user_loggedin.html:9 #: templates/web/base/report/new/form_user_loggedout_by_email.html:7 -#: templates/web/base/report/update/form_name.html:4 +#: templates/web/base/report/update/form_name.html:5 #: templates/web/base/reports/index.html:20 #: 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:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "Name" msgstr "Nombre" @@ -1582,8 +1530,8 @@ 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:455 -#: perllib/FixMyStreet/Cobrand/Default.pm:495 +#: perllib/FixMyStreet/Cobrand/Default.pm:454 +#: perllib/FixMyStreet/Cobrand/Default.pm:494 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" @@ -1607,7 +1555,7 @@ msgstr "Nuevos <br>problemas" msgid "New body added" msgstr "Nuevo organismo añadido" -#: perllib/FixMyStreet/App/Controller/Admin.pm:387 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 msgid "New category contact added" msgstr "Añadida nueva categorÃa de contactos" @@ -1672,7 +1620,7 @@ msgstr "Siguiente" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 -#: templates/web/base/questionnaire/index.html:101 +#: templates/web/base/questionnaire/index.html:102 #: templates/web/base/questionnaire/index.html:53 msgid "No" msgstr "No" @@ -1743,8 +1691,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Not Responsible" msgstr "No responsable" @@ -1777,7 +1725,7 @@ msgstr "Nota" 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/base/admin/body.html:186 +#: templates/web/base/admin/body.html:184 #: templates/web/base/admin/category_edit.html:52 #: templates/web/zurich/admin/body.html:53 msgid "Note:" @@ -1791,15 +1739,15 @@ msgstr "Nota: <strong>%s</strong>" msgid "Notes from SDM to DM" msgstr "" -#: templates/web/base/report/new/form_user_loggedout.html:14 #: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/form_user_loggedout.html:24 #: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "Ahora a enviar tu notificación…" #: templates/web/base/report/update-form.html:28 -#: templates/web/base/report/update/form_user_loggedout.html:13 #: templates/web/base/report/update/form_user_loggedout.html:2 +#: templates/web/base/report/update/form_user_loggedout.html:23 msgid "Now to submit your update…" msgstr "Ahora a enviar tu notificación…" @@ -1833,8 +1781,8 @@ msgstr "Resumen" #: templates/web/base/admin/report_blocks.html:23 #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/report/update/form_update.html:36 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1869,13 +1817,13 @@ msgstr "O problemas notificados a:" 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:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1055 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 -#: perllib/FixMyStreet/DB/Result/Problem.pm:558 -#: perllib/FixMyStreet/DB/Result/Problem.pm:568 -#: perllib/FixMyStreet/DB/Result/Problem.pm:578 -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1044 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:659 +#: perllib/FixMyStreet/DB/Result/Problem.pm:562 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 +#: perllib/FixMyStreet/DB/Result/Problem.pm:582 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 #: perllib/FixMyStreet/Script/Reports.pm:175 #: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" @@ -1900,7 +1848,7 @@ msgstr "Padre" msgid "Partial" msgstr "Parcial" -#: templates/web/base/auth/general.html:92 +#: templates/web/base/auth/general.html:102 #: templates/web/base/report/new/form_user_loggedout_by_email.html:31 #: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 @@ -1909,7 +1857,7 @@ msgid "Password (optional)" msgstr "Contraseña (opcional)" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:72 +#: templates/web/base/auth/general.html:82 msgid "Password:" msgstr "Contraseña:" @@ -1917,7 +1865,7 @@ msgstr "Contraseña:" msgid "Permalink" msgstr "Enlace permanente" -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:90 msgid "Phone number" msgstr "Número de teléfono" @@ -1933,13 +1881,21 @@ msgid "Phone:" msgstr "Teléfono:" #: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/questionnaire/index.html:89 +#: templates/web/base/questionnaire/index.html:91 #: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/new/form_report.html:38 +#: templates/web/base/report/new/form_report.html:40 +#: templates/web/base/report/update/form_update.html:20 +#: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:6 #: 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:45 +#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/zurich/report/new/fill_in_details_form.html:63 msgid "Photo" msgstr "Foto" @@ -1963,8 +1919,8 @@ msgstr "Coloque el marcador en el mapa" #: perllib/FixMyStreet/Cobrand/Zurich.pm:955 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:6 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 @@ -1980,16 +1936,16 @@ 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/general.html:27 -#: templates/web/base/auth/general.html:33 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:43 #: 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:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:856 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:921 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -1999,7 +1955,7 @@ msgstr "Por favor, elija una categorÃa" msgid "Please choose a property type" msgstr "Por favor, elija un tipo de propiedad" -#: perllib/FixMyStreet/App/Controller/Admin.pm:378 +#: perllib/FixMyStreet/App/Controller/Admin.pm:376 msgid "Please correct the errors below" msgstr "Por favor, corrija los errores a continuación" @@ -2020,11 +1976,10 @@ msgstr "Por favor notifique incidencias relevantes y no abuse; abusando de su ay msgid "Please enter a message" msgstr "Por favor escriba su mensaje." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Admin.pm:1079 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 msgid "Please enter a name" -msgstr "Por favor, introduzca su nombre" +msgstr "" #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 @@ -2038,10 +1993,10 @@ msgstr "Por favor, introduzca una contraseña" msgid "Please enter a subject" msgstr "Por favor, introduzca un tÃtulo" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1075 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1130 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:133 +#: perllib/FixMyStreet/DB/Result/User.pm:143 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2058,9 +2013,9 @@ msgid "Please enter some details" msgstr "Por favor, describa los detalles más relevantes" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:130 -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:32 +#: perllib/FixMyStreet/DB/Result/User.pm:140 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:42 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2069,7 +2024,7 @@ msgid "Please enter your email" msgstr "Por favor, introduzca su dirección de email" #: templates/web/base/report/new/form_user_loggedout_email.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:80 +#: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "Please enter your email address" msgstr "Por favor introduzca su email" @@ -2085,7 +2040,7 @@ msgstr "Por favor escriba su nombre completo, ya que los ayuntamientos necesitan #: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:126 +#: perllib/FixMyStreet/DB/Result/User.pm:136 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "Por favor, introduzca su nombre" @@ -2112,7 +2067,7 @@ msgstr "Por favor, siéntase libre para <a href=\"%s\">acceder nuevamente</a> o msgid "Please fill in details of the problem below." msgstr "Por favor proporcione a continuación las informaciones sobre el problema." -#: templates/web/zurich/report/new/fill_in_details_form.html:72 +#: templates/web/zurich/report/new/fill_in_details_form.html:74 msgid "Please fill in details of the problem." msgstr "Por favor proporcione las informaciones sobre el problema." @@ -2121,7 +2076,7 @@ msgstr "Por favor proporcione las informaciones sobre el problema." msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "Por favor, complete el siguiente formulario con los detalles del problema y describa la ubicación con la mayor precisión posible en el cuadro de detalles." -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Por favor, indique si le gustarÃa recibir algún otro cuestionario" @@ -2130,9 +2085,8 @@ msgid "Please note that updates are not sent to the council." msgstr "Tenga en cuenta que las actualizaciones no son enviadas al ayuntamiento." #: templates/web/base/report/new/oauth_email_form.html:4 -#, fuzzy msgid "Please note your report has <strong>not yet been sent</strong>." -msgstr "Por favor, tenga en cuenta la notificación <strong>no ha sido enviada aún</strong>. Elija una categorÃa y añada más información a continuación antes de enviar." +msgstr "" #: templates/web/base/report/new/fill_in_details_form.html:20 #: templates/web/zurich/report/new/fill_in_details_form.html:11 @@ -2148,16 +2102,16 @@ msgstr "" msgid "Please note:" msgstr "Por favor, tenga en cuenta:" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please provide some explanation as to why you're reopening this report" msgstr "Por favor, explique por qué está reabriendo esta notificación." -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250 msgid "Please provide some text as well as a photo" msgstr "Proporcione un texto y una foto" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236 msgid "Please say whether you've ever reported a problem to your council before" msgstr "Por favor, indique si ha notificado un problema al ayuntamiento alguna vez." @@ -2173,22 +2127,23 @@ msgstr "Por favor, seleccione el tipo de listado que desea" msgid "Please select the type of alert you want" msgstr "Por favor, seleccione el tipo de alerta que desea" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232 msgid "Please state whether or not the problem has been fixed" msgstr "Por favor, indique si el problema se ha solucionado" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:121 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 #: templates/web/base/js/translation_strings.html:53 -msgid "Please upload a JPEG image only" +#, fuzzy +msgid "Please upload an image only" msgstr "Por favor, suba una imagen JPEG" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 msgid "Please write a message" msgstr "Por favor, escriba un mensaje" -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Please write your update here" msgstr "Por favor, escriba su actualización aquÃ" @@ -2219,7 +2174,7 @@ msgstr "" msgid "Previous" msgstr "Previo" -#: templates/web/fixmystreet/footer.html:41 +#: templates/web/base/footer.html:41 msgid "Privacy" msgstr "Privacidad" @@ -2229,7 +2184,7 @@ msgstr "Privacidad" msgid "Privacy and cookies" msgstr "" -#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:200 #: templates/web/base/admin/body.html:85 #: templates/web/base/admin/category_edit.html:45 #: templates/web/base/admin/report_edit.html:77 @@ -2258,7 +2213,7 @@ msgstr "Problema %s enviado al Ayuntamiento %s" msgid "Problem breakdown by state" msgstr "Desglose de problemas según estado" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1046 msgid "Problem marked as open." msgstr "Problema marcado como abierto." @@ -2270,10 +2225,6 @@ msgstr "El estado del problema cambió debido a los resultados de la encuesta" msgid "Problems" msgstr "Problemas" -#: templates/web/base/around/_updates.html:1 -msgid "Problems in this area" -msgstr "Problemas en este área" - #: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "Problemas cercanos" @@ -2291,13 +2242,11 @@ msgid "Problems within %.1fkm of this location" msgstr "Problemas en %.1fkm alrededor" #: perllib/FixMyStreet/Cobrand/Default.pm:663 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 #: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "Problemas en %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "Problemas en el barrio %s" @@ -2316,15 +2265,11 @@ msgstr "Problemas en:" msgid "Property address:" msgstr "Dirección de la propiedad:" -#: templates/web/base/report/new/category.html:8 -msgid "Property type:" -msgstr "Tipo de propiedad:" - #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Proporcionar una actualización" -#: templates/web/base/auth/general.html:95 +#: templates/web/base/auth/general.html:105 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." @@ -2358,16 +2303,15 @@ msgstr "Cuestionario %d para el problema %d respondido, %s para %s" msgid "Questionnaire %d sent for problem %d" msgstr "Cuestionario %d enviado para el problema %d" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 msgid "Questionnaire filled in by problem reporter" msgstr "Cuestionario cumplimentado por el notificador problema" #: templates/web/base/alert/_list.html:22 +#: templates/web/base/alert/updates.html:9 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display_tools.html:34 -#: templates/web/base/reports/_rss.html:1 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed" msgstr "Listado RSS" @@ -2395,18 +2339,12 @@ msgstr "Listado RSS para %s, en el barrio %s" msgid "RSS feed of nearby problems" msgstr "Listado RSS de los problemas cercanos" -#: templates/web/base/reports/_rss.html:1 -msgid "RSS feed of problems in this %s" -msgstr "Listado RSS de los problemas en este %s" - #: perllib/FixMyStreet/Cobrand/Default.pm:664 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 #: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "Listado RSS de los problemas dentro de %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 #: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "Listado RSS de los problemas dentro del barrio %s" @@ -2416,14 +2354,13 @@ msgstr "Listado RSS de los problemas dentro del barrio %s" msgid "RSS feed of recent local problems" msgstr "Listado RSS de los problemas locales más recientes" +#: templates/web/base/alert/updates.html:9 #: templates/web/base/report/display_tools.html:34 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed of updates to this problem" msgstr "Listado RSS de actualizaciones sobre este problema" -#: templates/web/base/alert/updates.html:9 +#: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:36 -#: templates/web/fixmystreet/alert/updates.html:14 msgid "Receive email when updates are left on this problem." msgstr "Reciba un correo cuando se dejen actualizaciones sobre este problema." @@ -2459,12 +2396,11 @@ msgstr "Quitar foto (¡no se puede deshacer!)" msgid "Reply to user:" msgstr "" -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/header_logo.html:2 msgid "Report" msgstr "Notificar" -#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:26 -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/footer.html:26 templates/web/base/header_logo.html:2 #: templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2474,7 +2410,7 @@ msgstr "Notificar un problema" msgid "Report abuse" msgstr "Denunciar abuso" -#: perllib/FixMyStreet/App/Controller/Rss.pm:291 +#: perllib/FixMyStreet/App/Controller/Rss.pm:297 msgid "Report on %s" msgstr "Notificar sobre %s" @@ -2489,7 +2425,7 @@ msgstr "Notifique su incidencia" msgid "Report, view, or discuss local problems" msgstr "Notifique, consulte o discuta problemas locales" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:577 #: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "Notificado anónimamente en %s" @@ -2499,7 +2435,7 @@ msgstr "Notificado anónimamente en %s" msgid "Reported before" msgstr "Notificado con anterioridad" -#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 #: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "Notificado por %s en %s" @@ -2513,27 +2449,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "Notificado en la categorÃa %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:569 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 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:591 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 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:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported via %s anonymously at %s" msgstr "Notificado anónimamente vÃa %s en %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported via %s by %s at %s" msgstr "Notificado vÃa %s por %s en %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:561 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 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:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 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" @@ -2554,7 +2490,7 @@ msgstr "" msgid "Reporting a problem" msgstr "Notificando un problema" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1274 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" @@ -2597,15 +2533,15 @@ msgstr "Operador responsable de este camino (derivado del número de referencia msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Operador responsable de este camino (de OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1496 #: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "Rotar a la izquierda" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 #: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 @@ -2620,7 +2556,7 @@ msgstr "" msgid "Satellite" msgstr "Satélite" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/base/admin/category_edit.html:84 #: templates/web/zurich/admin/body.html:59 #: templates/web/zurich/admin/template_edit.html:29 @@ -2676,7 +2612,7 @@ msgstr "" msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:696 +#: perllib/FixMyStreet/DB/Result/Problem.pm:698 msgid "Sent to %s %s later" msgstr "Enviado a %s %s después" @@ -2695,21 +2631,21 @@ msgstr "Compartir" #: templates/web/base/report/new/form_user_loggedin.html:23 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22 -#: templates/web/base/report/update/form_name.html:15 +#: templates/web/base/report/update/form_name.html:16 msgid "Show my name publicly" msgstr "Mostrar mi nombre públicamente" -#: templates/web/base/around/display_location.html:67 +#: templates/web/base/around/display_location.html:66 msgid "Show old" msgstr "Mostrar antiguos" -#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:57 msgid "Show pins" msgstr "Mostrar marcadores" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/general.html:110 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:76 +#: templates/web/base/auth/general.html:86 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2770,9 +2706,8 @@ msgstr "Lo sentimos, no hemos podido encontrar ese lugar." #: templates/web/base/auth/general.html:9 #: templates/web/base/report/display.html:21 #: templates/web/base/report/new/fill_in_details_form.html:23 -#, fuzzy msgid "Sorry, we could not log you in. Please fill in the form below." -msgstr "Lo sentimos, pero no pudo analizar esa ubicación. Por favor, inténtelo de nuevo." +msgstr "" #: perllib/FixMyStreet/Geocode/Bing.pm:35 #: perllib/FixMyStreet/Geocode/Google.pm:45 @@ -2780,15 +2715,10 @@ msgstr "Lo sentimos, pero no pudo analizar esa ubicación. Por favor, inténtelo msgid "Sorry, we could not parse that location. Please try again." msgstr "Lo sentimos, pero no pudo analizar esa ubicación. Por favor, inténtelo de nuevo." -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:138 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 -#, fuzzy -msgid "Sorry, you can not log in with Facebook. Please try again later." -msgstr "Hubo un problema mostrando esta página. Por favor, inténtelo de nuevo más tarde." - #: templates/web/base/admin/stats.html:64 msgid "Start Date:" msgstr "Fecha de inicio:" @@ -2797,7 +2727,7 @@ msgstr "Fecha de inicio:" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/report/update/form_update.html:32 +#: templates/web/base/report/update/form_update.html:34 msgid "State" msgstr "Estado" @@ -2810,7 +2740,7 @@ msgstr "Estado" msgid "State:" msgstr "Estado/Prov.:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2850,10 +2780,10 @@ msgid "Subject:" msgstr "TÃtulo:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/base/report/new/form_user_loggedout_by_email.html:39 #: templates/web/base/report/new/form_user_loggedout_password.html:11 -#: templates/web/zurich/report/new/fill_in_details_form.html:96 +#: templates/web/zurich/report/new/fill_in_details_form.html:98 msgid "Submit" msgstr "Enviar" @@ -2881,9 +2811,8 @@ msgstr "Enviar cuestionario" msgid "Submitted" msgstr "Enviado" -#: templates/web/base/alert/updates.html:17 +#: templates/web/base/alert/updates.html:23 #: templates/web/base/report/display_tools.html:41 -#: templates/web/fixmystreet/alert/updates.html:23 msgid "Subscribe" msgstr "Suscribirse" @@ -2891,7 +2820,7 @@ msgstr "Suscribirse" msgid "Subscribe me to an email alert" msgstr "SuscrÃbeme a alertas por email" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -2910,7 +2839,7 @@ msgstr "Resumen" msgid "Summary reports" msgstr "Resumen de notificaciones" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 msgid "Survey" msgstr "Encuesta" @@ -2967,7 +2896,7 @@ msgstr "Gracias por subir una foto. Ahora necesitamos situar la incidencia, asà msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "¡Gracias, nos alegra saber que fue arreglado! ¿PodrÃa decirnos si habÃa notificado un problema a un ayuntamiento con anterioridad?" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:157 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "La imagen no ha cargado correctamente (%s), por favor inténtelo de nuevo." @@ -2975,7 +2904,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:126 +#: perllib/FixMyStreet/App/Controller/Location.pm:127 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." @@ -2985,11 +2914,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:724 +#: perllib/FixMyStreet/App/Controller/Admin.pm:722 msgid "That problem has been marked as sent." msgstr "El problema se ha marcado como enviado." -#: perllib/FixMyStreet/App/Controller/Admin.pm:716 +#: perllib/FixMyStreet/App/Controller/Admin.pm:714 msgid "That problem will now be resent." msgstr "El problema ahora será reenviado." @@ -3001,7 +2930,7 @@ msgstr "Esa notificación no se puede ver en %s." msgid "That report has been removed from FixMyStreet." msgstr "Esa notificación ha sido eliminada de FixMyStreet." -#: templates/web/base/admin/body.html:144 +#: templates/web/base/admin/body.html:142 msgid "" "The <strong>email address</strong> is the destination to which reports about this category will be sent. \n" " Other categories for this body may have the same email address." @@ -3151,9 +3080,9 @@ msgstr "Hubo un problema mostrando la página de Todas las Notificaciones. Por f 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:764 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:753 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 -#: templates/web/base/auth/general.html:43 +#: templates/web/base/auth/general.html:53 #: 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." @@ -3223,9 +3152,9 @@ msgstr "Este correo electrónico ha sido enviado a los dos ayuntamientos que cub 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:920 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:898 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:935 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:977 #: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "Esta información es necesaria" @@ -3238,11 +3167,11 @@ msgstr "Este es un sitio para desarrolladores, las cosas podrÃan romperse en cu msgid "This is a summary of all reports on this site." msgstr "Este es un resumen de todos los informes en esta web." -#: templates/web/base/report/update/form_update.html:52 +#: templates/web/base/report/update/form_update.html:54 msgid "This problem has been fixed" msgstr "Este problema se ha arreglado" -#: templates/web/base/report/update/form_update.html:46 +#: templates/web/base/report/update/form_update.html:48 msgid "This problem has not been fixed" msgstr "Este problema no se ha arreglado" @@ -3279,7 +3208,7 @@ msgstr "Esta página web también contiene una foto del problema, proporcionada msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "CronologÃa" @@ -3324,8 +3253,8 @@ msgstr "Pruebe enviándonos un correo directamente:" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Unable to fix" msgstr "Incapaz de arreglarlo" @@ -3342,7 +3271,7 @@ msgstr "Sin confirmar" msgid "Unknown" msgstr "Desconocido" -#: perllib/FixMyStreet/App/Controller/Rss.pm:173 +#: perllib/FixMyStreet/App/Controller/Rss.pm:174 msgid "Unknown alert type" msgstr "Tipo de alerta desconocida" @@ -3357,7 +3286,7 @@ msgstr "Error desconocido" msgid "Unknown problem ID" msgstr "ID de problema desconocido" -#: templates/web/base/report/update/form_update.html:25 +#: templates/web/base/report/update/form_update.html:27 msgid "Update" msgstr "Actualizar" @@ -3409,10 +3338,10 @@ msgstr "Actualización de estados" msgid "Updated" msgstr "Actualizado" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 -#: perllib/FixMyStreet/App/Controller/Admin.pm:821 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1096 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1144 +#: perllib/FixMyStreet/App/Controller/Admin.pm:809 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3439,7 +3368,7 @@ msgstr "Actualizaciones en {{title}}" msgid "Updates to this problem, %s" msgstr "" -#: templates/web/base/admin/body.html:182 +#: templates/web/base/admin/body.html:180 msgid "Use the <strong>note</strong> to record details that are only displayed in the admin. Notes are not shown publicly, and are not sent to the body." msgstr "Usa la <strong>nota</strong> para guardar detalles que sólo serán desplegados en la sección de administración. Las notas no son mostradas públicamente ni son enviadas al órgano administrativo." @@ -3448,11 +3377,11 @@ msgstr "Usa la <strong>nota</strong> para guardar detalles que sólo serán desp msgid "Used map" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 msgid "User flag removed" msgstr "Eliminada marca de usuario" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1421 msgid "User flagged" msgstr "Usuario marcado" @@ -3460,16 +3389,16 @@ msgstr "Usuario marcado" 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/App/Controller/Admin.pm:1289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "Usuarios" -#: perllib/FixMyStreet/App/Controller/Admin.pm:382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:412 -#: perllib/FixMyStreet/App/Controller/Admin.pm:429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:380 +#: perllib/FixMyStreet/App/Controller/Admin.pm:410 +#: perllib/FixMyStreet/App/Controller/Admin.pm:427 msgid "Values updated" msgstr "Valores actualizados" @@ -3506,16 +3435,15 @@ msgstr "Hemos encontrado más de una coincidencia para esa ubicación. Se muestr #: templates/web/base/auth/general.html:6 #: templates/web/base/report/display.html:27 #: templates/web/base/report/new/oauth_email_form.html:5 -#, fuzzy msgid "We need your email address, please give it below." -msgstr "Nunca mostramos su dirección de email o número de teléfono." +msgstr "" #: templates/web/base/report/new/form_user_loggedout_email.html:2 #: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "Nunca mostramos su dirección de email" -#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedin.html:30 #: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "Nunca mostramos su dirección de email o número de teléfono." @@ -3524,7 +3452,7 @@ msgstr "Nunca mostramos su dirección de email o número de teléfono." 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." -#: templates/web/base/index-steps.html:31 +#: templates/web/base/index-steps.html:11 msgid "We send it to the council on your behalf" msgstr "Se lo enviamos al Ayuntamiento en su nombre" @@ -3562,10 +3490,6 @@ msgstr "Una vez enviada" msgid "Whoa there Testino! Three photos are enough." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 -msgid "Whole block of empty flats" -msgstr "Bloque de pisos vacÃos" - #: templates/web/base/tokens/confirm_alert.html:7 msgid "Why stop there? <a href=\"/alert\">Set up more alerts</a> for free." msgstr "¿Por qué detenerse ahÃ? <a href=\"/alert\">Configure más alertas</a> gratis." @@ -3585,7 +3509,7 @@ msgstr "En las búsquedas de solicitudes, es también posible buscar por agency_ msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "¿Quieres contribuir a mejorar FixMyStreet? Nuestro código es abierto y está <a href=\"http://fixmystreet.org\">disponible en fixmystreet.org</a>." -#: templates/web/base/questionnaire/index.html:96 +#: templates/web/base/questionnaire/index.html:97 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "¿Quieres recibir otro cuestionario en 4 semanas, recordándote que debes comprobar el estado?" @@ -3615,8 +3539,8 @@ msgstr "Año" #: templates/web/base/admin/update_edit.html:24 #: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 +#: templates/web/base/questionnaire/index.html:100 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "SÃ" @@ -3736,19 +3660,19 @@ msgid "Your Reports" msgstr "Sus notificaciones" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/alert/updates.html:19 +#: templates/web/base/alert/updates.html:22 #: templates/web/base/contact/index.html:83 #: templates/web/base/report/display_tools.html:38 #: templates/web/base/report/display_tools.html:40 #: templates/web/base/report/new/form_user_loggedin.html:3 #: templates/web/base/report/new/form_user_loggedout_email.html:1 #: templates/web/base/report/update/form_user_loggedout_email.html:1 -#: templates/web/fixmystreet/alert/updates.html:19 -#: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/zurich/report/new/fill_in_details_form.html:76 +#: templates/web/zurich/report/new/fill_in_details_form.html:78 msgid "Your email" msgstr "Su email:" -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/general.html:55 #: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 @@ -3759,17 +3683,17 @@ msgstr "Su dirección de email" msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "Su información sólo será usada de acuerdo con nuestra <a href=\"/privacy\">polÃtica de privacidad</a>" -#: templates/web/base/auth/general.html:90 +#: templates/web/base/auth/general.html:100 #: templates/web/base/contact/index.html:76 #: templates/web/base/report/new/form_user_loggedin.html:18 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17 -#: templates/web/base/report/update/form_name.html:11 +#: templates/web/base/report/update/form_name.html:12 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:86 +#: templates/web/zurich/report/new/fill_in_details_form.html:88 msgid "Your name" msgstr "Su nombre" -#: templates/web/base/auth/general.html:75 +#: templates/web/base/auth/general.html:85 #: 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 @@ -3782,20 +3706,19 @@ msgstr "Su contraseña ha cambiado" #: templates/web/base/report/new/form_user_loggedin.html:27 #: templates/web/base/report/new/form_user_loggedout_by_email.html:26 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:94 msgid "Your phone number" msgstr "Su número de teléfono" #: templates/web/base/questionnaire/index.html:14 -#, fuzzy msgid "Your report" -msgstr "Sus notificaciones" +msgstr "" -#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 +#: templates/web/base/footer.html:29 msgid "Your reports" msgstr "Sus notificaciones" -#: templates/web/base/my/my.html:41 +#: templates/web/base/my/my.html:39 msgid "Your updates" msgstr "Sus actualizaciones" @@ -3821,7 +3744,7 @@ msgid "didn't use map" msgstr "no utilizó mapa" #: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/around/postcode_form.html:12 msgid "e.g. ‘%s’ or ‘%s’" msgstr "por ejemplo, '%s' o '%s'" @@ -3927,8 +3850,7 @@ msgstr "otras áreas:" msgid "reopened" msgstr "reabierto" -#: templates/web/base/header.html:33 templates/web/fixmystreet/header.html:64 -#: templates/web/zurich/footer.html:13 +#: templates/web/base/header.html:64 templates/web/zurich/footer.html:13 msgid "sign out" msgstr "salir" @@ -4006,7 +3928,7 @@ msgid_plural "<big>%s</big> updates on reports" msgstr[0] "<big>%s</big> notificaciones actualizadas" msgstr[1] "<big>%s</big> notificaciones actualizadas" -#: templates/web/emptyhomes/report/new/councils_text_none.html:3 +#: templates/web/base/report/new/councils_text_none.html:3 #, perl-format msgid "We do not yet have details for the council that covers this location." msgid_plural "We do not yet have details for the councils that cover this location." @@ -4048,86 +3970,47 @@ msgid_plural "We do <strong>not</strong> yet have details for the other councils msgstr[0] "TodavÃa <strong>no</strong> tenemos detalles para el Ayuntamiento que cubre esta zona." msgstr[1] "TodavÃa <strong>no</strong> tenemos información sobre el ayuntamiento que cubre este área." -#~ msgid "(we never show your email address or phone number)" -#~ msgstr "(nunca mostramos su email ni su número de teléfono públicamente)" - -#~ msgid "(we never show your email)" -#~ msgstr "(nunca mostramos su email públicamente)" - -#~ msgid "<strong>No</strong>, let me confirm my report by email:" -#~ msgstr "<strong>No</strong>- confirmar mi notificación por email:" - -#~ msgid "<strong>No</strong>, let me confirm my update by email:" -#~ msgstr "<strong>No</strong>- confirmar mi actualización por email:" - -#~ msgid "Email me updates" -#~ msgstr "Recibir por email actualizaciones" - -#~ msgid "Enter a new password:" -#~ msgstr "Introduzca una nueva contraseña:" - -#~ msgid "I'm afraid we couldn't validate that token. If you've copied the URL from an email, please check that you copied it exactly.\n" -#~ msgstr "No se ha podido verificar token. Si ha copiado la URL de un email, compruebe por favor que lo copió correctamente.\n" - -#~ msgid "If you use web-based email or have 'junk mail' filters, you may wish to check your bulk/spam mail folders: sometimes, our messages are marked that way." -#~ msgstr "Es recomendable que compruebe su carpeta de \"spam\", ya que a veces nuestros mensajes son identificados erróneamente como \"correo no deseado\"." - -#~ msgid "Message:" -#~ msgstr "Mensaje:" - -#~ msgid "More problems nearby" -#~ msgstr "Más problemas cercanos" - -#~ msgid "Nearly Done! Now check your email..." -#~ msgstr "¡Ya casi ha terminado! Busque ahora en su email el mensaje de confirmación..." - -#~ msgid "Offensive? Unsuitable? Tell us" -#~ msgstr "¿Ofensiva? ¿Inadecuada? AvÃsanos" - -#~ msgid "Photo:" -#~ msgstr "Foto:" - -#~ msgid "Please check your email" -#~ msgstr "Por favor, consulte su email" +#~ msgid "%s, reported at %s" +#~ msgstr "%s, reportado el %s" -#~ msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" -#~ msgstr "Tenga en cuenta que las actualizaciones no se envÃan al ayuntamiento. Si usted deja su nombre será público. Su información sólo será usada de acuerdo con nuestra <a href=\"/faq#privacy\">polÃtica de privacidad</a>" +#~ msgid "About us" +#~ msgstr "¿Quiénes somos?" -#~ msgid "This may be because the link is too old or already used, or the address was not copied correctly." -#~ msgstr "Esto puede deberse a que el enlace es demasiado antiguo o ya utilizado, o a que la dirección no se haya copiado correctamente." +#~ msgid "Email me new local problems" +#~ msgstr "Reciba por email notificaciones sobre los nuevos problemas" -#~ msgid "This problem has been closed" -#~ msgstr "Este problema ha sido cerrado" +#~ msgid "Empty flat or maisonette" +#~ msgstr "Piso o duplex vacÃo" -#~ msgid "This problem is in progress" -#~ msgstr "Este problema se encuentra en progreso" +#~ msgid "Empty house or bungalow" +#~ msgstr "Casa o bungalow vacÃo" -#~ msgid "This problem is old and of unknown status." -#~ msgstr "Este problema es antiguo y de estatus desconocido." +#~ msgid "Empty office or other commercial" +#~ msgstr "Oficina u otros establecimientos comerciales vacÃos" -#~ msgid "Update:" -#~ msgstr "Actualizar:" +#~ msgid "Empty pub or bar" +#~ msgstr "Pub o bar vacÃo" -#~ msgid "We have not been able to confirm your account - sorry." -#~ msgstr "No hemos podido confirmar su cuenta - lo sentimos." +#~ msgid "Empty public building - school, hospital, etc." +#~ msgstr "Edificio público vacÃo - escuela, hospital, etc" -#~ msgid "We have sent you an email containing a link to confirm your account." -#~ msgstr "Le hemos enviado un email con un enlace para confirmar su cuenta." +#~ msgid "Enter a nearby street name and area, postal code or district in Delhi" +#~ msgstr "Introduzca un nombre de calle cercana y área, código postal o distrito en Nueva Delhi" -#~ msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:" -#~ msgstr "Nos encantarÃa saber lo que piensa acerca de esta web. Sólo tienes que rellenar el formulario o enviar un correo electrónico a <a href='mailto:%s'>%s</a>:" +#~ msgid "FixMyStreet" +#~ msgstr "FixMyStreet" -#~ msgid "You have already attached a photo to this report, attaching another one will replace it." -#~ msgstr "Ya ha adjuntado una foto para esta notificación, adjuntando otra reemplazará la anterior." +#~ msgid "I am afraid you cannot confirm unconfirmed reports." +#~ msgstr "No puede confirmar alertas no confirmadas." -#~ msgid "You have already attached a photo to this update, attaching another one will replace it." -#~ msgstr "Ya ha adjuntado una foto para esta actualización, adjuntando otra reemplazará la anterior." +#~ msgid "Problems in this area" +#~ msgstr "Problemas en este área" -#~ msgid "Your email:" -#~ msgstr "Su email:" +#~ msgid "Property type:" +#~ msgstr "Tipo de propiedad:" -#~ msgid "Your name:" -#~ msgstr "Su nombre:" +#~ msgid "RSS feed of problems in this %s" +#~ msgstr "Listado RSS de los problemas en este %s" -#~ msgid "Your email:" -#~ msgstr "Su email:" +#~ msgid "Whole block of empty flats" +#~ msgstr "Bloque de pisos vacÃos" diff --git a/locale/fr_FR.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/fr_FR.UTF-8/LC_MESSAGES/FixMyStreet.po index 56dcbc1b0..01fb4d634 100644 --- a/locale/fr_FR.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/fr_FR.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -12,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2016-03-02 13:09+0000\n" -"PO-Revision-Date: 2015-12-22 22:34+0000\n" -"Last-Translator: fixmystreetfr <fixmystreet@fixmystreet.fr>\n" +"POT-Creation-Date: 2016-05-03 10:41+0100\n" +"PO-Revision-Date: 2016-03-23 12:43+0000\n" +"Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: French (France) (http://www.transifex.com/mysociety/fixmystreet/language/fr_FR/)\n" "Language: fr_FR\n" "MIME-Version: 1.0\n" @@ -22,7 +22,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/DB/Result/Problem.pm:618 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr " et " @@ -55,9 +55,8 @@ msgid "%s admin:" msgstr "%s admin:" #: templates/web/base/status/stats.html:26 -#, fuzzy msgid "%s bodies" -msgstr "Interlocuteurs" +msgstr "" #: templates/web/base/status/stats.html:24 msgid "%s confirmed alerts, %s unconfirmed" @@ -98,7 +97,7 @@ msgstr "%s mises à jour en temps réel" msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "%s questionnaires envoyés – %s complétés (%s%%)" -#: perllib/FixMyStreet/DB/Result/Problem.pm:683 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "%s ref: %s" msgstr "%s réf : %s" @@ -121,10 +120,6 @@ msgstr "" msgid "%s ward, %s" msgstr "Localité %s, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:552 -msgid "%s, reported at %s" -msgstr "%s, rapporté %s" - #: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "%s, dans la localité %s" @@ -179,7 +174,7 @@ msgstr "(comme des graffitis, immondices, trottoirs abimés ou éclairage public msgid "(not sent to council)" msgstr "(non signalé à l’administration)" -#: templates/web/zurich/report/new/fill_in_details_form.html:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "(optional)" msgstr "(facultatif)" @@ -191,12 +186,11 @@ msgstr "(public)" msgid "(sent to both)" msgstr "(envoyé aux deux)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Choisissez une catégorie --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Choisissez un type de propriété --" @@ -231,26 +225,21 @@ msgstr "<strong>Non</strong>, laissez-moi confirmer mon rapport par email :" msgid "<strong>No</strong> Let me confirm my update by email" msgstr "<strong>Non</strong>, laissez-moi confirmer ma mise à jour par email :" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:97 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>Non</strong>, laissez-moi m'authentifier par email :" -#: templates/web/base/auth/general.html:70 +#: templates/web/base/auth/general.html:80 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Oui</strong>, j'ai un mot de passe :" -#: templates/web/base/about/about-en-gb.html:1 -#: templates/web/base/about/about-en-gb.html:3 -msgid "About us" -msgstr "À propos" - #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Action Scheduled" msgstr "Action programmée" @@ -284,7 +273,7 @@ msgstr "Ajouter une nouvelle catégorie" msgid "Add user" msgstr "Ajouter un utilisateur" -#: templates/web/base/my/my.html:56 +#: templates/web/base/my/my.html:54 msgid "Added %s" msgstr "Ajouté %s" @@ -304,7 +293,7 @@ msgstr "Alerte %d créée pour %s, type %s, paramètres %s / %s" msgid "Alert %d disabled (created %s)" msgstr "Alerte %d désactivée (création %s)" -#: templates/web/base/report/update/form_name.html:20 +#: templates/web/base/report/update/form_name.html:21 msgid "Alert me to future updates" msgstr "M'alerter de futures mises à jour" @@ -317,7 +306,7 @@ msgstr "Tous les rapports" msgid "All Reports as CSV" msgstr "Tous les rapports au format CSV" -#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 +#: templates/web/base/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:20 @@ -416,7 +405,7 @@ msgstr "Retour" msgid "Ban email address" msgstr "Bannir l'adresse mail" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1273 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -447,7 +436,7 @@ msgstr "Vous ne pouvez pas voir le plan ? <em>Sautez cette étape</em>" #: templates/web/base/admin/body.html:68 #: templates/web/base/admin/index.html:54 -#: templates/web/base/report/new/category.html:10 +#: templates/web/base/report/new/category.html:7 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 @@ -462,7 +451,7 @@ msgstr "Catégorie" msgid "Category fix rate for problems > 4 weeks old" msgstr "Taux de résolution pour les problèmes > 4 semaines" -#: templates/web/base/admin/body.html:138 +#: templates/web/base/admin/body.html:137 #: templates/web/base/admin/category_edit.html:23 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/admin/body.html:43 @@ -482,7 +471,7 @@ msgstr "Catégorie : %s" msgid "Change password" msgstr "Changer le mot de passe" -#: templates/web/base/admin/body.html:160 +#: templates/web/base/admin/body.html:158 msgid "" "Check <strong>confirmed</strong> to indicate that this contact has been confirmed as correct.\n" " If you are not sure of the origin or validity of the contact, leave this unchecked." @@ -490,7 +479,7 @@ msgstr "" "Cochez <strong>confirmé</strong> pour signaler que ce contact a été confirmé comme correct.\n" "Si vous n'êtes pas sûr de l'origine ou de la validité du contact, laissez le décoché." -#: templates/web/base/admin/body.html:171 +#: templates/web/base/admin/body.html:169 msgid "" "Check <strong>deleted</strong> to remove the category from use. \n" " It will not appear as an available category in the drop-down menu on the report-a-problem page." @@ -498,7 +487,7 @@ msgstr "" "Cochez <strong>supprimé</strong> pour rendre la catégorie inutilisable. \n" "Elle n'apparaitra plus dans le menu déroulant de la page rapporter-un-problème." -#: templates/web/base/admin/body.html:191 +#: templates/web/base/admin/body.html:189 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -516,7 +505,7 @@ msgstr "" "à afficher le rapport. Au Royaume Uni, nous l'avons utilisé pour des services tels que demander une poubelle supplémentaire \n" "à une adresse donnée." -#: templates/web/base/admin/body.html:130 +#: templates/web/base/admin/body.html:129 msgid "" "Choose a <strong>category</strong> 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." @@ -560,8 +549,8 @@ msgstr "Cliquez sur le lien dans notre courriel de confirmation pour vous connec #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:15 #: templates/web/base/admin/report_blocks.html:25 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 @@ -570,7 +559,7 @@ msgstr "Cliquez sur le lien dans notre courriel de confirmation pour vous connec msgid "Closed" msgstr "Clos" -#: perllib/FixMyStreet/DB/Result/Problem.pm:779 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Closed by council" msgstr "Clos par l'administration" @@ -596,7 +585,7 @@ msgstr "Données de collaboration :" msgid "Cobrand:" msgstr "Collaboration :" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Configuration" @@ -615,9 +604,8 @@ msgstr "Confirmer le compte" #: templates/web/base/report/new/form_user_loggedout_password.html:21 #: templates/web/base/report/update/form_user_loggedout_password.html:20 -#, fuzzy msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." -msgstr "Confirmer par courriel ci-dessous, en fournissant un nouveau mot de passe à ce moment. Losque vous confirmerez, votre mot de passe sera mis à jour." +msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:1 #: templates/web/base/tokens/confirm_problem.html:1 @@ -627,7 +615,7 @@ msgstr "Confirmer par courriel ci-dessous, en fournissant un nouveau mot de pass msgid "Confirmation" msgstr "Confirmation" -#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:164 #: templates/web/base/admin/body.html:79 #: templates/web/base/admin/category_edit.html:37 #: templates/web/base/admin/category_edit.html:92 @@ -646,7 +634,7 @@ msgid "Confirmed:" msgstr "Confirmé :" #. ("%s is the site name") -#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 +#: templates/web/base/about/_sidebar.html:6 msgid "Contact %s" msgstr "Contacter %s" @@ -665,8 +653,8 @@ msgstr "Contacter l'équipe" msgid "Coordinates:" msgstr "Coordonnées:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1417 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1445 msgid "Could not find user" msgstr "Impossible de trouver l'utilisateur" @@ -684,7 +672,7 @@ msgstr "Administration" msgid "Council contacts for %s" msgstr "Contacts de l'administration pour %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:681 +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "Council ref: %s" msgstr "Ref. de la mairie : %s" @@ -703,7 +691,7 @@ msgstr "Nombre" msgid "Create a report" msgstr "Créer un rapport" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "Créer une catégorie" @@ -747,20 +735,20 @@ msgstr "Tableau de bord" msgid "Dealt with by subdivision within 5 working days" msgstr "Traité par la subdivision dans les 5 jours ouvrables" -#: perllib/FixMyStreet/App/Controller/Admin.pm:877 +#: perllib/FixMyStreet/App/Controller/Admin.pm:865 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "Supprimer le modèle" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:175 #: templates/web/base/admin/body.html:81 #: templates/web/base/admin/category_edit.html:42 #: templates/web/base/admin/category_edit.html:93 msgid "Deleted" msgstr "Effacé" -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:47 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -768,7 +756,7 @@ msgid "Description" msgstr "Description" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:68 +#: templates/web/zurich/report/new/fill_in_details_form.html:70 msgid "Details" msgstr "Détails :" @@ -793,11 +781,11 @@ msgid "Diligency prize league table" msgstr "Tableau d'honneur de la réactivité" #. ("%s is the site name") -#: templates/web/base/auth/general.html:48 -#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/auth/general.html:58 +#: templates/web/base/report/new/form_user_loggedout.html:28 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout.html:17 +#: templates/web/base/report/update/form_user_loggedout.html:27 msgid "Do you have a %s password?" msgstr "Avez-vous un mot de passe %s ?" @@ -815,8 +803,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "Duplicate" msgstr "Dupliqué" @@ -839,7 +827,7 @@ msgstr "" msgid "Edit" msgstr "Éditer" -#: templates/web/base/admin/body.html:220 +#: templates/web/base/admin/body.html:218 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "Editer les détails de l'intelocuteur" @@ -869,7 +857,7 @@ msgstr "Éditeur" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:39 +#: templates/web/base/auth/general.html:49 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -877,11 +865,11 @@ msgstr "Éditeur" msgid "Email" msgstr "Email" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 msgid "Email added to abuse list" msgstr "Email rajouté à la liste des abus" -#: templates/web/base/admin/body.html:155 +#: templates/web/base/admin/body.html:153 msgid "Email address:" msgstr "Adresse courriel:" @@ -893,19 +881,14 @@ msgstr "Alerte E-mail créé" msgid "Email alert deleted" msgstr "Alerte E-mail supprimé" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1390 msgid "Email already in abuse list" msgstr "Email déjà présent dans la liste des abus" -#: templates/web/base/around/_updates.html:5 -msgid "Email me new local problems" -msgstr "Envoyez-moi les nouveaux problèmes locaux" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 -#: templates/web/base/alert/updates.html:13 #: templates/web/zurich/admin/body.html:47 msgid "Email:" msgstr "Email :" @@ -914,26 +897,6 @@ msgstr "Email :" msgid "Email: %s" msgstr "Courriel: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 -msgid "Empty flat or maisonette" -msgstr "appartement ou maisonnette vide" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 -msgid "Empty house or bungalow" -msgstr "maison ou bungalow vide" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 -msgid "Empty office or other commercial" -msgstr "bureau ou commerce vide" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 -msgid "Empty pub or bar" -msgstr "pub ou bar vide" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 -msgid "Empty public building - school, hospital, etc." -msgstr "bâtiment public - école - hôpital, etc non renseigné." - #: templates/web/base/admin/body-form.html:162 #: templates/web/base/admin/body-form.html:163 msgid "" @@ -983,18 +946,14 @@ msgstr "Saisir un code postal proche, ou une rue et une localité" msgid "Enter a nearby street name and area" msgstr "Saisissez un nom de rue proche, la localité ou le code postal" -#: perllib/FixMyStreet/Cobrand/ZeroTB.pm:7 -msgid "Enter a nearby street name and area, postal code or district in Delhi" -msgstr "Saisissez un nom de rue proche et une localité, le code postal et le district de Delhi" - -#: templates/web/base/auth/general.html:99 +#: templates/web/base/auth/general.html:109 #: templates/web/base/report/new/form_user_loggedout_by_email.html:38 #: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Saisissez un mot de passe :" -#: templates/web/base/index-steps.html:26 +#: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "Saisissez les détails du problème" @@ -1020,7 +979,7 @@ msgstr "Exemple de code postal %s" msgid "Examples:" msgstr "Exemples :" -#: templates/web/base/report/new/form_report.html:49 +#: templates/web/base/report/new/form_report.html:51 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "Expliquez ce qui ne va pas, sa position exact, et depuis combien de temps..." @@ -1057,19 +1016,15 @@ msgstr "Première fois" msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." msgstr "Résoudre ceci en chosissant une <strong>zone couverte</strong> dans le formulaire <em>Saisie des détails interlocuteur</em> ci-dessous." -#: templates/web/base/header.html:26 -msgid "FixMyStreet" -msgstr "FixMyStreet" - #: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:38 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:40 msgid "Fixed" msgstr "Résolu" @@ -1096,7 +1051,7 @@ msgstr "Signaler comme supprimé" msgid "Flag user" msgstr "Signaler l'usager" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "Signalé" @@ -1118,8 +1073,7 @@ msgstr "Les utilisateurs signalés ne sont pas restreints en aucune façon. il s msgid "Flagged:" msgstr "Signalé :" -#: templates/web/base/reports/_ward-list.html:3 -#: templates/web/fixmystreet/reports/_ward-list.html:4 +#: templates/web/base/reports/_ward-list.html:4 msgid "Follow a ward link to view only reports within that ward." msgstr "Suivez un lien de localité pour voir uniquement les rapports à l'intérieur de cette localité" @@ -1150,18 +1104,18 @@ msgstr "Foire Aux Questions" msgid "GeoRSS on Google Maps" msgstr "GeoRSS sur Google Maps" +#: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:11 -#: templates/web/fixmystreet/around/_updates.html:3 msgid "Get updates" msgstr "Recevoir les mises à jour" -#: templates/web/fixmystreet/reports/_rss.html:3 -#: templates/web/fixmystreet/reports/_rss.html:9 +#: templates/web/base/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:9 msgid "Get updates of %s problems" msgstr "Recevoir les mises à jours de %s problèmes" -#: templates/web/fixmystreet/reports/_rss.html:11 -#: templates/web/fixmystreet/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:11 +#: templates/web/base/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "Recevez les mises à jour pour les problèmes dans cette %s" @@ -1174,7 +1128,7 @@ msgid "Glad to hear it’s been fixed!" msgstr "Heureux d'entendre qu'il a été résolu!" #: templates/web/base/alert/index.html:34 -#: templates/web/base/around/postcode_form.html:16 +#: templates/web/base/around/postcode_form.html:13 #: templates/web/base/reports/_list-filters.html:28 #: templates/web/zurich/admin/stats.html:26 msgid "Go" @@ -1200,7 +1154,7 @@ msgstr "Est-ce que le problème a été réglé ?" msgid "Have you ever reported a problem to a council before, or is this your first time?" msgstr "Est-ce que vous aviez déjà signalé un problème à une administration, ou est-ce que c'est votre première fois ?" -#: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:38 +#: templates/web/base/footer.html:38 #: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 @@ -1211,8 +1165,7 @@ msgstr "Aide" msgid "Here are the types of local problem alerts for ‘%s’." msgstr "Voici les types de problèmes locaux pour « %s »." -#: templates/web/base/header.html:32 templates/web/fixmystreet/header.html:63 -#: templates/web/zurich/footer.html:12 +#: templates/web/base/header.html:63 templates/web/zurich/footer.html:12 msgid "Hi %s" msgstr "Bienvenue %s" @@ -1228,11 +1181,11 @@ msgstr "Bienvenue %s" msgid "Hidden" msgstr "Caché(s)" -#: templates/web/base/around/display_location.html:65 +#: templates/web/base/around/display_location.html:64 msgid "Hide old" msgstr "Cachés anciens" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:59 msgid "Hide pins" msgstr "Cacher les épingles" @@ -1252,10 +1205,6 @@ msgstr "Comment signaler un problème" msgid "How to send successful reports" msgstr "Comment envoyer des rapports réussis" -#: perllib/FixMyStreet/App/Controller/Admin.pm:752 -msgid "I am afraid you cannot confirm unconfirmed reports." -msgstr "Je suis désolé, vous ne pouvez pas confirmer des rapports non validés" - #: templates/web/base/tokens/confirm_problem.html:23 #: templates/web/base/tokens/confirm_problem.html:27 msgid "I just reported a problem on @fixmystreet" @@ -1266,7 +1215,7 @@ msgstr "Je viens de signaler un problème sur @fixmystreet" msgid "I just updated a problem on @fixmystreet" msgstr "Je viens de mettre à jour un problème sur @fixmystreet" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88 msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "Je suis désolé, nous n'avons pas trouvé votre problème dans notre base de données.\n" @@ -1288,7 +1237,7 @@ msgid "" " For basic installations, you don't need to join bodies in this way." msgstr "Identifier un <strong>parent</strong> si cet interlocuteur fait lui-même partie d'un autre intelocuteur. Pour des installations basiques, vous n'avez pas besoin de joindre des interlocuteurs de cette manière." -#: templates/web/base/admin/body.html:133 +#: templates/web/base/admin/body.html:132 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." @@ -1311,7 +1260,7 @@ msgstr "" "Si vous souhaitez effectuer une mise à jour publique concernant ce problème, s'il vous plaît renseigné le ici\n" "(Veuillez noter qu'elle ne sera pas envoyée à l'administration)." -#: templates/web/base/admin/body.html:149 +#: templates/web/base/admin/body.html:147 msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." msgstr "Si vous utilisez <strong>une méthode d'envoi autre que le courriel</strong>, saisissez le service ID (Open311) ou un identifiant équivalent ici." @@ -1353,10 +1302,10 @@ msgstr "ID invalide" msgid "Illegal feed selection" msgstr "Sélection de flux invalide" +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "In Progress" msgstr "En cours" @@ -1407,7 +1356,7 @@ msgstr "Référence interne" msgid "Invalid agency_responsible value %s" msgstr "Valeur agency_responsible invalide \"%s\"" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 msgid "Invalid end date" msgstr "Date de fin invalide" @@ -1415,16 +1364,16 @@ msgstr "Date de fin invalide" msgid "Invalid format %s specified." msgstr "Format spécifié %s invalide" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 msgid "Invalid start date" msgstr "Date de début invalide" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:5 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Investigating" msgstr "En examen" @@ -1446,7 +1395,7 @@ msgstr "Zone d'administration Inconnue" msgid "Jurisdiction unknown" msgstr "Zone d'administration Inconnue" -#: templates/web/base/auth/general.html:80 +#: 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 @@ -1484,7 +1433,6 @@ msgstr "Chargement…" #: 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/fixmystreet/alert/updates.html:1 msgid "Local RSS feeds and email alerts" msgstr "Flux RSS et alertes email locaux" @@ -1493,11 +1441,11 @@ msgstr "Flux RSS et alertes email locaux" msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "Flux RSS et alertes email locales pour « %s »" -#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:35 +#: templates/web/base/footer.html:35 msgid "Local alerts" msgstr "Alertes locales" -#: templates/web/base/index-steps.html:25 +#: templates/web/base/index-steps.html:5 msgid "Locate the problem on a map of the area" msgstr "Localisez le problème sur un plan des alentours" @@ -1557,14 +1505,14 @@ msgstr "Mois" #: templates/web/base/admin/list_updates.html:7 #: templates/web/base/admin/reports.html:13 #: templates/web/base/admin/users.html:15 -#: templates/web/base/auth/general.html:89 +#: templates/web/base/auth/general.html:99 #: templates/web/base/report/new/form_user_loggedin.html:9 #: templates/web/base/report/new/form_user_loggedout_by_email.html:7 -#: templates/web/base/report/update/form_name.html:4 +#: templates/web/base/report/update/form_name.html:5 #: templates/web/base/reports/index.html:20 #: 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:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "Name" msgstr "Nom" @@ -1588,8 +1536,8 @@ 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:455 -#: perllib/FixMyStreet/Cobrand/Default.pm:495 +#: perllib/FixMyStreet/Cobrand/Default.pm:454 +#: perllib/FixMyStreet/Cobrand/Default.pm:494 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%s" @@ -1613,7 +1561,7 @@ msgstr "Nouveaux <br />problèmes" msgid "New body added" msgstr "Nouveau body ajouté" -#: perllib/FixMyStreet/App/Controller/Admin.pm:387 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 msgid "New category contact added" msgstr "Nouveau contact de catégorie rajouté" @@ -1678,7 +1626,7 @@ msgstr "Suivant" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 -#: templates/web/base/questionnaire/index.html:101 +#: templates/web/base/questionnaire/index.html:102 #: templates/web/base/questionnaire/index.html:53 msgid "No" msgstr "Non" @@ -1749,8 +1697,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Not Responsible" msgstr "Pas responsable" @@ -1783,7 +1731,7 @@ msgstr "Note" 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/base/admin/body.html:186 +#: templates/web/base/admin/body.html:184 #: templates/web/base/admin/category_edit.html:52 #: templates/web/zurich/admin/body.html:53 msgid "Note:" @@ -1797,15 +1745,15 @@ msgstr "Note : <strong>%s</strong>" msgid "Notes from SDM to DM" msgstr "Notes du SDM pour DM" -#: templates/web/base/report/new/form_user_loggedout.html:14 #: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/form_user_loggedout.html:24 #: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "Maintenant pour envoyer votre rapport…" #: templates/web/base/report/update-form.html:28 -#: templates/web/base/report/update/form_user_loggedout.html:13 #: templates/web/base/report/update/form_user_loggedout.html:2 +#: templates/web/base/report/update/form_user_loggedout.html:23 msgid "Now to submit your update…" msgstr "Now to submit your mise à jour…" @@ -1839,8 +1787,8 @@ msgstr "Résumé" #: templates/web/base/admin/report_blocks.html:23 #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/report/update/form_update.html:36 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1875,13 +1823,13 @@ msgstr "Ou problèmes signalés à  :" 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 :" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1055 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 -#: perllib/FixMyStreet/DB/Result/Problem.pm:558 -#: perllib/FixMyStreet/DB/Result/Problem.pm:568 -#: perllib/FixMyStreet/DB/Result/Problem.pm:578 -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1044 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:659 +#: perllib/FixMyStreet/DB/Result/Problem.pm:562 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 +#: perllib/FixMyStreet/DB/Result/Problem.pm:582 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 #: perllib/FixMyStreet/Script/Reports.pm:175 #: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" @@ -1906,7 +1854,7 @@ msgstr "Parent" msgid "Partial" msgstr "Partiel" -#: templates/web/base/auth/general.html:92 +#: templates/web/base/auth/general.html:102 #: templates/web/base/report/new/form_user_loggedout_by_email.html:31 #: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 @@ -1915,7 +1863,7 @@ msgid "Password (optional)" msgstr "Mot de passe (facultatif)" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:72 +#: templates/web/base/auth/general.html:82 msgid "Password:" msgstr "Mot de passe :" @@ -1923,7 +1871,7 @@ msgstr "Mot de passe :" msgid "Permalink" msgstr "Lien permanent" -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:90 msgid "Phone number" msgstr "Numéro de téléphone" @@ -1939,13 +1887,21 @@ msgid "Phone:" msgstr "Téléphone" #: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/questionnaire/index.html:89 +#: templates/web/base/questionnaire/index.html:91 #: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/new/form_report.html:38 +#: templates/web/base/report/new/form_report.html:40 +#: templates/web/base/report/update/form_update.html:20 +#: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:6 #: 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:45 +#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/zurich/report/new/fill_in_details_form.html:63 msgid "Photo" msgstr "Photo" @@ -1969,8 +1925,8 @@ msgstr "Placer l'épingle sur la carte" #: perllib/FixMyStreet/Cobrand/Zurich.pm:955 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:6 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 @@ -1986,16 +1942,16 @@ 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/general.html:27 -#: templates/web/base/auth/general.html:33 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:43 #: 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:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:856 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:921 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -2005,7 +1961,7 @@ msgstr "Merci de sélectionner une catégorie" msgid "Please choose a property type" msgstr "Merci de choisir un type de propriété" -#: perllib/FixMyStreet/App/Controller/Admin.pm:378 +#: perllib/FixMyStreet/App/Controller/Admin.pm:376 msgid "Please correct the errors below" msgstr "Merci de corriger les erreurs ci-dessous" @@ -2029,11 +1985,10 @@ msgstr "Merci de ne pas être injurieux — Calomnier l'administration msgid "Please enter a message" msgstr "Merci d'entrer un message" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Admin.pm:1079 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 msgid "Please enter a name" -msgstr "Merci de saisir votre nom" +msgstr "" #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 @@ -2047,10 +2002,10 @@ msgstr "Merci d'entrer un mot de passe :" msgid "Please enter a subject" msgstr "Merci d'enter un sujet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1075 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1130 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:133 +#: perllib/FixMyStreet/DB/Result/User.pm:143 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2067,9 +2022,9 @@ msgid "Please enter some details" msgstr "Merci d'entrer quelques détails" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:130 -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:32 +#: perllib/FixMyStreet/DB/Result/User.pm:140 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:42 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2078,7 +2033,7 @@ msgid "Please enter your email" msgstr "Merci d'entrer votre email" #: templates/web/base/report/new/form_user_loggedout_email.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:80 +#: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "Please enter your email address" msgstr "Merci d'entrer votre adresse email" @@ -2094,7 +2049,7 @@ msgstr "Merci de saisir votre nom complet, les administrations ont besoin de cet #: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:126 +#: perllib/FixMyStreet/DB/Result/User.pm:136 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "Merci de saisir votre nom" @@ -2121,7 +2076,7 @@ msgstr "Vous pouvez vous <a href=\"%s\">connecter à nouveau</a>, ou retourner à msgid "Please fill in details of the problem below." msgstr "Merci d'entrer les détails du problème ci-dessous" -#: templates/web/zurich/report/new/fill_in_details_form.html:72 +#: templates/web/zurich/report/new/fill_in_details_form.html:74 msgid "Please fill in details of the problem." msgstr "Merci d'entrer les détails du problème." @@ -2130,7 +2085,7 @@ msgstr "Merci d'entrer les détails du problème." msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "Merci de remplir le formulaire ci-dessous avec les détails du problème, et de décrir l'emplacement aussi précisément que possible dans les détails." -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Merci d'indiquer si vous souhaitez recevoir un autre questionnaire" @@ -2139,9 +2094,8 @@ msgid "Please note that updates are not sent to the council." msgstr "Nous vous informons que les mises à jour ne sont pas envoyées à l'administration." #: templates/web/base/report/new/oauth_email_form.html:4 -#, fuzzy msgid "Please note your report has <strong>not yet been sent</strong>." -msgstr "Merci de noter que votre rapport n'a <strong>pas</strong> été envoyé. Choisissez une catégorie et rajoutez des informations supplémentaires ci-dessous, puis envoyez." +msgstr "" #: templates/web/base/report/new/fill_in_details_form.html:20 #: templates/web/zurich/report/new/fill_in_details_form.html:11 @@ -2157,16 +2111,16 @@ msgstr "" msgid "Please note:" msgstr "Quelques remarques :" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please provide some explanation as to why you're reopening this report" msgstr "Merci d'expliquer pourquoi vous ré-ouvrez ce rapport" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250 msgid "Please provide some text as well as a photo" msgstr "Merci de fournir du texte ainsi qu'une photo." -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236 msgid "Please say whether you've ever reported a problem to your council before" msgstr "Merci de nous dire si vous avez signalé un problème à une administration auparavant." @@ -2182,22 +2136,23 @@ msgstr "Merci de sélectionner le type de flux que vous voulez" msgid "Please select the type of alert you want" msgstr "Merci de sélectionner le type d'alerte que vous voulez" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232 msgid "Please state whether or not the problem has been fixed" msgstr "Merci de préciser si le problème a été réglé ou non." -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:121 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 #: templates/web/base/js/translation_strings.html:53 -msgid "Please upload a JPEG image only" +#, fuzzy +msgid "Please upload an image only" msgstr "Merci de charger uniquement des images JPEG" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 msgid "Please write a message" msgstr "Merci de saisir un message" -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Please write your update here" msgstr "Merci d'écrire votre mise à jour ici" @@ -2228,7 +2183,7 @@ msgstr "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">F msgid "Previous" msgstr "Précédent" -#: templates/web/fixmystreet/footer.html:41 +#: templates/web/base/footer.html:41 msgid "Privacy" msgstr "Confidentialité" @@ -2238,7 +2193,7 @@ msgstr "Confidentialité" msgid "Privacy and cookies" msgstr "Vie privée et cookies" -#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:200 #: templates/web/base/admin/body.html:85 #: templates/web/base/admin/category_edit.html:45 #: templates/web/base/admin/report_edit.html:77 @@ -2267,7 +2222,7 @@ msgstr "Problème %d signalé à l’administration %s" msgid "Problem breakdown by state" msgstr "Répartition des problèmes par état" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1046 msgid "Problem marked as open." msgstr "Problème signalé comme ouvert." @@ -2279,10 +2234,6 @@ msgstr "Changement état des problèmes d'après résultats sondage" msgid "Problems" msgstr "Problèmes" -#: templates/web/base/around/_updates.html:1 -msgid "Problems in this area" -msgstr "Problèmes dans cette zone" - #: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "Problèmes aux alentours" @@ -2300,13 +2251,11 @@ msgid "Problems within %.1fkm of this location" msgstr "Problèmes à moins de %.1fkm de ce lieu" #: perllib/FixMyStreet/Cobrand/Default.pm:663 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 #: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "Problèmes à l'intérieur de %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "Problèmes dans la localité %s" @@ -2325,15 +2274,11 @@ msgstr "Problèmes à l'intérieur des limites de :" msgid "Property address:" msgstr "Adresse de propriété:" -#: templates/web/base/report/new/category.html:8 -msgid "Property type:" -msgstr "Type de propriété:" - #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Apporter une mise à jour" -#: templates/web/base/auth/general.html:95 +#: templates/web/base/auth/general.html:105 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." @@ -2367,16 +2312,15 @@ msgstr "Questionnaire %d rempli pour le problème %d, %s à %s" msgid "Questionnaire %d sent for problem %d" msgstr "Questionnaire %d envoyé pour le problème %s" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 msgid "Questionnaire filled in by problem reporter" msgstr "Questionnaire rempli par le requérant" #: templates/web/base/alert/_list.html:22 +#: templates/web/base/alert/updates.html:9 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display_tools.html:34 -#: templates/web/base/reports/_rss.html:1 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed" msgstr "Flux RSS" @@ -2404,18 +2348,12 @@ msgstr "Flux RSS de %s, dans la localité %s" msgid "RSS feed of nearby problems" msgstr "Flux RSS de problèmes à proximité" -#: templates/web/base/reports/_rss.html:1 -msgid "RSS feed of problems in this %s" -msgstr "Flux RSS des problèmes à l'intérieur de cette %s" - #: perllib/FixMyStreet/Cobrand/Default.pm:664 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 #: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "Flux RSS des problèmes à l'intérieur de %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 #: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "Flux RSS de problèmes à l'intérieur de la localité %s" @@ -2425,14 +2363,13 @@ msgstr "Flux RSS de problèmes à l'intérieur de la localité %s" msgid "RSS feed of recent local problems" msgstr "Flux RSS des problèmes locaux récents" +#: templates/web/base/alert/updates.html:9 #: templates/web/base/report/display_tools.html:34 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed of updates to this problem" msgstr "Flux RSS des mises à jour pour ce problème" -#: templates/web/base/alert/updates.html:9 +#: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:36 -#: templates/web/fixmystreet/alert/updates.html:14 msgid "Receive email when updates are left on this problem." msgstr "Etre informé par courriel lorsque ce problème est mis à jour." @@ -2468,12 +2405,11 @@ msgstr "Effacer la photo (ne peut pas être annulé !)" msgid "Reply to user:" msgstr "Répondre à l'utilisateur:" -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/header_logo.html:2 msgid "Report" msgstr "Rapport" -#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:26 -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/footer.html:26 templates/web/base/header_logo.html:2 #: templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2483,7 +2419,7 @@ msgstr "Signaler un problème" msgid "Report abuse" msgstr "Signaler un abus" -#: perllib/FixMyStreet/App/Controller/Rss.pm:291 +#: perllib/FixMyStreet/App/Controller/Rss.pm:297 msgid "Report on %s" msgstr "Signaler sur %s" @@ -2498,7 +2434,7 @@ 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:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:577 #: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "Signalé anonymement à %s" @@ -2508,7 +2444,7 @@ msgstr "Signalé anonymement à %s" msgid "Reported before" msgstr "Signalé avant" -#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 #: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "Signalé par %s à %s" @@ -2522,27 +2458,27 @@ msgstr "Rapporté par:" msgid "Reported in the %s category" msgstr "Rapporté dans la catégorie %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:569 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 msgid "Reported in the %s category anonymously at %s" msgstr "Signalé dans la catégorie %s anonymement à %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:591 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 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:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported via %s anonymously at %s" msgstr "Signalé par %s anonymement à %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported via %s by %s at %s" msgstr "Signalé par %s par %s à %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:561 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 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:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 msgid "Reported via %s in the %s category by %s at %s" msgstr "Signalé par %s dans la catégorie %s par %s" @@ -2563,7 +2499,7 @@ msgstr "Remis:" msgid "Reporting a problem" msgstr "Signalisation d'un problème" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1274 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" @@ -2606,15 +2542,15 @@ msgstr "L'opérateur pour cette route (déterminé à partir de la référence e msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "L'opérateur pour cette route (selon OpenStreetMAp): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1496 #: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "Pivoter à gauche" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 #: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 @@ -2629,7 +2565,7 @@ msgstr "La rotation de cette photo annulera les modifications non enregistrées msgid "Satellite" msgstr "Satellite" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/base/admin/category_edit.html:84 #: templates/web/zurich/admin/body.html:59 #: templates/web/zurich/admin/template_edit.html:29 @@ -2685,7 +2621,7 @@ msgstr "Sélectionnez le type d'alerte que vous souhaitez et cliquez sur le bout msgid "Sent report back" msgstr "Envoyé le rapport en retour" -#: perllib/FixMyStreet/DB/Result/Problem.pm:696 +#: perllib/FixMyStreet/DB/Result/Problem.pm:698 msgid "Sent to %s %s later" msgstr "Envoyé à %s %s plus tard)" @@ -2704,21 +2640,21 @@ msgstr "Partagez" #: templates/web/base/report/new/form_user_loggedin.html:23 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22 -#: templates/web/base/report/update/form_name.html:15 +#: templates/web/base/report/update/form_name.html:16 msgid "Show my name publicly" msgstr "Afficher mon nom publiquement" -#: templates/web/base/around/display_location.html:67 +#: templates/web/base/around/display_location.html:66 msgid "Show old" msgstr "Montrer les anciens" -#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:57 msgid "Show pins" msgstr "Montrer les épingles" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/general.html:110 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:76 +#: templates/web/base/auth/general.html:86 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2779,9 +2715,8 @@ msgstr "Désolé, nous n'avons pas pu trouver cet emplacement." #: templates/web/base/auth/general.html:9 #: templates/web/base/report/display.html:21 #: templates/web/base/report/new/fill_in_details_form.html:23 -#, fuzzy msgid "Sorry, we could not log you in. Please fill in the form below." -msgstr "Désolé, nous n'avons pas pu trouver cet emplacement. Merci de réessayer." +msgstr "" #: perllib/FixMyStreet/Geocode/Bing.pm:35 #: perllib/FixMyStreet/Geocode/Google.pm:45 @@ -2789,15 +2724,10 @@ msgstr "Désolé, nous n'avons pas pu trouver cet emplacement. Merci de réessay msgid "Sorry, we could not parse that location. Please try again." msgstr "Désolé, nous n'avons pas pu trouver cet emplacement. Merci de réessayer." -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:138 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "Désolé, nous ne pouvions pas enregistrer votre image(s), veuillez essayer à nouveau." -#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 -#, fuzzy -msgid "Sorry, you can not log in with Facebook. Please try again later." -msgstr "Il y a eu un problème pour afficher cette page. Merci de réessayer ultérieurement." - #: templates/web/base/admin/stats.html:64 msgid "Start Date:" msgstr "Date de début:" @@ -2806,7 +2736,7 @@ msgstr "Date de début:" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/report/update/form_update.html:32 +#: templates/web/base/report/update/form_update.html:34 msgid "State" msgstr "État actuel" @@ -2819,7 +2749,7 @@ msgstr "État actuel" msgid "State:" msgstr "État actuel :" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2859,10 +2789,10 @@ msgid "Subject:" msgstr "Sujet :" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/base/report/new/form_user_loggedout_by_email.html:39 #: templates/web/base/report/new/form_user_loggedout_password.html:11 -#: templates/web/zurich/report/new/fill_in_details_form.html:96 +#: templates/web/zurich/report/new/fill_in_details_form.html:98 msgid "Submit" msgstr "Envoyer" @@ -2890,9 +2820,8 @@ msgstr "Envoi du questionnaire" msgid "Submitted" msgstr "Soumis" -#: templates/web/base/alert/updates.html:17 +#: templates/web/base/alert/updates.html:23 #: templates/web/base/report/display_tools.html:41 -#: templates/web/fixmystreet/alert/updates.html:23 msgid "Subscribe" msgstr "S'abonner" @@ -2900,7 +2829,7 @@ msgstr "S'abonner" msgid "Subscribe me to an email alert" msgstr "Abonnez moi à une alerte par email" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -2919,7 +2848,7 @@ msgstr "Résumé" msgid "Summary reports" msgstr "Rapports résumés" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 msgid "Survey" msgstr "Enquête" @@ -2976,7 +2905,7 @@ msgstr "Merci d'avoir chargé votre photo. Nous avons besoin maintenant de local msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "Merci, heureux d'apprendre que cela a été résolu ! Pourrions-nous juste vous demander si vous aviez déjà signalé un problème à une administration auparavant ?" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:157 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "Cette image ne ​​semble pas avoir été chargée correctement (% s), réessayez s'il vous plaît." @@ -2984,7 +2913,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:126 +#: perllib/FixMyStreet/App/Controller/Location.pm:127 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." @@ -2994,11 +2923,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:724 +#: perllib/FixMyStreet/App/Controller/Admin.pm:722 msgid "That problem has been marked as sent." msgstr "Ce problème a été marqué comme envoyé." -#: perllib/FixMyStreet/App/Controller/Admin.pm:716 +#: perllib/FixMyStreet/App/Controller/Admin.pm:714 msgid "That problem will now be resent." msgstr "Ce problème va maintenant être renvoyé." @@ -3010,7 +2939,7 @@ msgstr "Ce rapport ne peut pas être vu sur %s." msgid "That report has been removed from FixMyStreet." msgstr "Ce rapport a été retiré de FixMyStreet.fr." -#: templates/web/base/admin/body.html:144 +#: templates/web/base/admin/body.html:142 msgid "" "The <strong>email address</strong> is the destination to which reports about this category will be sent. \n" " Other categories for this body may have the same email address." @@ -3162,9 +3091,9 @@ msgstr "Il y a eu un problème pour montrer la page tous les rapports. Réessaye 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:764 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:753 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 -#: templates/web/base/auth/general.html:43 +#: templates/web/base/auth/general.html:53 #: 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." @@ -3233,9 +3162,9 @@ msgstr "Cet email a été envoyé aux deux administrations couvrant l'emplacemen 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:920 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:898 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:935 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:977 #: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "Ces renseignements sont nécessaires" @@ -3248,11 +3177,11 @@ msgstr "Ceci est un site en développement, le service peut être interrompu à msgid "This is a summary of all reports on this site." msgstr "Ceci est un résumé de tous les rapports pour ce site." -#: templates/web/base/report/update/form_update.html:52 +#: templates/web/base/report/update/form_update.html:54 msgid "This problem has been fixed" msgstr "Ce problème a été résolu" -#: templates/web/base/report/update/form_update.html:46 +#: templates/web/base/report/update/form_update.html:48 msgid "This problem has not been fixed" msgstr "Ce problème n'a pas été résolu" @@ -3289,7 +3218,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/App/Controller/Admin.pm:1287 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Chronologie" @@ -3334,8 +3263,8 @@ msgstr "Essayez en nous envoyant un e-mail directement:" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Unable to fix" msgstr "Ne peut être résolu" @@ -3352,7 +3281,7 @@ msgstr "Non confirmé" msgid "Unknown" msgstr "Inconnu" -#: perllib/FixMyStreet/App/Controller/Rss.pm:173 +#: perllib/FixMyStreet/App/Controller/Rss.pm:174 msgid "Unknown alert type" msgstr "Type d'alerte inconnu" @@ -3367,7 +3296,7 @@ msgstr "erreur inconnue" msgid "Unknown problem ID" msgstr "ID de problème inconnu" -#: templates/web/base/report/update/form_update.html:25 +#: templates/web/base/report/update/form_update.html:27 msgid "Update" msgstr "Mise à jour" @@ -3419,10 +3348,10 @@ msgstr "Mettre à jour les statuts" msgid "Updated" msgstr "Mis à jour" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 -#: perllib/FixMyStreet/App/Controller/Admin.pm:821 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1096 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1144 +#: perllib/FixMyStreet/App/Controller/Admin.pm:809 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3449,7 +3378,7 @@ msgstr "Mises à jour sur {{title}}" msgid "Updates to this problem, %s" msgstr "Mises à jour de ce problème, %s" -#: templates/web/base/admin/body.html:182 +#: templates/web/base/admin/body.html:180 msgid "Use the <strong>note</strong> to record details that are only displayed in the admin. Notes are not shown publicly, and are not sent to the body." msgstr "Utiliser la <strong>note</strong> pour enregistrer des détails qui sont seulement affichée aux administrateurs. Les notes ne sont pas affichées publiquement, et ne sont pas envoyés à l'interlocuteur." @@ -3458,11 +3387,11 @@ msgstr "Utiliser la <strong>note</strong> pour enregistrer des détails qui sont msgid "Used map" msgstr "Carte utilisée" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 msgid "User flag removed" msgstr "Utilisateur dé–signalé" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1421 msgid "User flagged" msgstr "Utilisateur signalé" @@ -3470,16 +3399,16 @@ msgstr "Utilisateur signalé" msgid "User search finds matches in users' names and email addresses." msgstr "La recherche utilisateurs parcourt les noms et adresses courriel." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "Utilisateurs" -#: perllib/FixMyStreet/App/Controller/Admin.pm:382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:412 -#: perllib/FixMyStreet/App/Controller/Admin.pm:429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:380 +#: perllib/FixMyStreet/App/Controller/Admin.pm:410 +#: perllib/FixMyStreet/App/Controller/Admin.pm:427 msgid "Values updated" msgstr "Valeurs mises à jour" @@ -3516,16 +3445,15 @@ msgstr "Nous avons trouvé plus d'une correspondance pour cet endroit. Nous mont #: templates/web/base/auth/general.html:6 #: templates/web/base/report/display.html:27 #: templates/web/base/report/new/oauth_email_form.html:5 -#, fuzzy msgid "We need your email address, please give it below." -msgstr "Nous n’affichons jamais votre email ou numéro de téléphone." +msgstr "" #: templates/web/base/report/new/form_user_loggedout_email.html:2 #: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "Nous n’affichons jamais votre email" -#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedin.html:30 #: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "Nous n’affichons jamais votre email ou numéro de téléphone." @@ -3534,7 +3462,7 @@ msgstr "Nous n’affichons jamais votre email ou numéro de téléphone." 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." -#: templates/web/base/index-steps.html:31 +#: templates/web/base/index-steps.html:11 msgid "We send it to the council on your behalf" msgstr "Nous l'envoyons à l'administration en votre nom" @@ -3572,10 +3500,6 @@ msgstr "Envoyé le" msgid "Whoa there Testino! Three photos are enough." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 -msgid "Whole block of empty flats" -msgstr "Tout le bloc d'appartements vides" - #: templates/web/base/tokens/confirm_alert.html:7 msgid "Why stop there? <a href=\"/alert\">Set up more alerts</a> for free." msgstr "Pourquoi arrêter là ? <a href=\"/alert\"> déclarer plus d’alertes </a> gratuitement." @@ -3595,7 +3519,7 @@ msgstr "Avec les recherches à requètes, il est également possible de recherch msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "Aimeriez-vous contribuer à FixMyStreet? Notre code est open source et <a href=\"http://fixmystreetf.org\"> disponible sur fixmystreet.org </a>" -#: templates/web/base/questionnaire/index.html:96 +#: templates/web/base/questionnaire/index.html:97 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "Aimeriez-vous recevoir un autre questionnaire dans 4 semaines, pour vous rappeler de vérifier l'état?" @@ -3625,8 +3549,8 @@ msgstr "Année" #: templates/web/base/admin/update_edit.html:24 #: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 +#: templates/web/base/questionnaire/index.html:100 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "Oui" @@ -3696,9 +3620,8 @@ msgstr "Vous avez déjà joint les photos de ce rapport. Notez que vous pouvez j #: templates/web/base/questionnaire/index.html:83 #: templates/web/base/report/update/form_update.html:14 -#, fuzzy msgid "You have already attached photos to this update. Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)." -msgstr "Vous avez déjà joint les photos de ce rapport. Notez que vous pouvez joindre un maximum de 3 photos par déclaration (si vous en télécharger plus, le plus ancien est supprimé)." +msgstr "" #: templates/web/base/auth/sign_out.html:4 #: templates/web/zurich/auth/sign_out.html:3 @@ -3744,19 +3667,19 @@ msgid "Your Reports" msgstr "Vos rapports" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/alert/updates.html:19 +#: templates/web/base/alert/updates.html:22 #: templates/web/base/contact/index.html:83 #: templates/web/base/report/display_tools.html:38 #: templates/web/base/report/display_tools.html:40 #: templates/web/base/report/new/form_user_loggedin.html:3 #: templates/web/base/report/new/form_user_loggedout_email.html:1 #: templates/web/base/report/update/form_user_loggedout_email.html:1 -#: templates/web/fixmystreet/alert/updates.html:19 -#: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/zurich/report/new/fill_in_details_form.html:76 +#: templates/web/zurich/report/new/fill_in_details_form.html:78 msgid "Your email" msgstr "Votre email" -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/general.html:55 #: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 @@ -3767,17 +3690,17 @@ msgstr "Votre adresse email" msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "Votre information sera utilisée seulement en accord avec notre <a href=\"/privacy\">politique de confidentialité</a>" -#: templates/web/base/auth/general.html:90 +#: templates/web/base/auth/general.html:100 #: templates/web/base/contact/index.html:76 #: templates/web/base/report/new/form_user_loggedin.html:18 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17 -#: templates/web/base/report/update/form_name.html:11 +#: templates/web/base/report/update/form_name.html:12 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:86 +#: templates/web/zurich/report/new/fill_in_details_form.html:88 msgid "Your name" msgstr "Votre nom" -#: templates/web/base/auth/general.html:75 +#: templates/web/base/auth/general.html:85 #: 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 @@ -3790,20 +3713,19 @@ msgstr "Votre mot de passe a été changé" #: templates/web/base/report/new/form_user_loggedin.html:27 #: templates/web/base/report/new/form_user_loggedout_by_email.html:26 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:94 msgid "Your phone number" msgstr "Votre numéro de téléphone" #: templates/web/base/questionnaire/index.html:14 -#, fuzzy msgid "Your report" -msgstr "Vos rapports" +msgstr "" -#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 +#: templates/web/base/footer.html:29 msgid "Your reports" msgstr "Vos rapports" -#: templates/web/base/my/my.html:41 +#: templates/web/base/my/my.html:39 msgid "Your updates" msgstr "Vos mises à jour" @@ -3829,7 +3751,7 @@ 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:15 +#: templates/web/base/around/postcode_form.html:12 msgid "e.g. ‘%s’ or ‘%s’" msgstr "Par exemple '%s' ou '%s'" @@ -3935,8 +3857,7 @@ msgstr "autres lieux:" msgid "reopened" msgstr "réouvert" -#: templates/web/base/header.html:33 templates/web/fixmystreet/header.html:64 -#: templates/web/zurich/footer.html:13 +#: templates/web/base/header.html:64 templates/web/zurich/footer.html:13 msgid "sign out" msgstr "déconnexion" @@ -4014,7 +3935,7 @@ msgid_plural "<big>%s</big> updates on reports" msgstr[0] "<big>%s</big> mise à jour de rapport" msgstr[1] "<big>%s</big> mises à jour de rapports" -#: templates/web/emptyhomes/report/new/councils_text_none.html:3 +#: templates/web/base/report/new/councils_text_none.html:3 #, perl-format msgid "We do not yet have details for the council that covers this location." msgid_plural "We do not yet have details for the councils that cover this location." @@ -4056,86 +3977,47 @@ msgid_plural "We do <strong>not</strong> yet have details for the other councils msgstr[0] "Nous n'avons pas encore de détails pour l'autre administration responsable de ce lieu." msgstr[1] "Nous n'avons pas encore de détails pour les autres administrations responsables de ce lieu." -#~ msgid "(we never show your email address or phone number)" -#~ msgstr "(nous n’affichons jamais votre email ou numéro de téléphone)" - -#~ msgid "(we never show your email)" -#~ msgstr "(nous n’affichons jamais votre email)" - -#~ msgid "<strong>No</strong>, let me confirm my report by email:" -#~ msgstr "<strong>Non</strong>, laissez-moi confirmer mon rapport par email :" - -#~ msgid "<strong>No</strong>, let me confirm my update by email:" -#~ msgstr "<strong>Non</strong>, laissez-moi confirmer ma mise à jour par email :" - -#~ msgid "Email me updates" -#~ msgstr "Envoyez-moi les mises à jour" - -#~ msgid "Enter a new password:" -#~ msgstr "Saisissez un nouveau mot de passe :" - -#~ msgid "I'm afraid we couldn't validate that token. If you've copied the URL from an email, please check that you copied it exactly.\n" -#~ msgstr "Je suis désolé, nous n'avons pas pu valider cet accusé de réception. Si vous avez copié cette adresse d'un email, merci de vérifier que vous n'avez pas fait d'erreur.\n" - -#~ msgid "If you use web-based email or have 'junk mail' filters, you may wish to check your bulk/spam mail folders: sometimes, our messages are marked that way." -#~ msgstr "Si vous consultez vos emails sur un site web ou que vous utilisez un filtre antispam, vérifiez peut-être votre boîte Spam/Courrier indésirable : nos messages sont parfois filtrés par erreur." - -#~ msgid "Message:" -#~ msgstr "Message :" - -#~ msgid "More problems nearby" -#~ msgstr "Encore plus de problèmes aux alentours" - -#~ msgid "Nearly Done! Now check your email..." -#~ msgstr "Presque fini! Maintenant allez voir vos emails…" - -#~ msgid "Offensive? Unsuitable? Tell us" -#~ msgstr "Offensant ? Inapproprié ? Dites-le nous" - -#~ msgid "Photo:" -#~ msgstr "Photo :" - -#~ msgid "Please check your email" -#~ msgstr "Merci de consulter vos emails" +#~ msgid "%s, reported at %s" +#~ msgstr "%s, rapporté %s" -#~ msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" -#~ msgstr "Merci de bien noter que les mises à jour ne sont pas envoyées à l'administration. Si vous laissez votre nom, il sera public. Vos informations seront uniquement utilisées conformément à nore <a href=\"/faq#privacy\">politique de confidentialité</a>" +#~ msgid "About us" +#~ msgstr "À propos" -#~ msgid "This may be because the link is too old or already used, or the address was not copied correctly." -#~ msgstr "C'est peut-être parce que le lien est trop ancien ou déjà utilisé, ou l'adresse n'a pas été saisie correctement." +#~ msgid "Email me new local problems" +#~ msgstr "Envoyez-moi les nouveaux problèmes locaux" -#~ msgid "This problem has been closed" -#~ msgstr "Ce problème a été clos" +#~ msgid "Empty flat or maisonette" +#~ msgstr "appartement ou maisonnette vide" -#~ msgid "This problem is in progress" -#~ msgstr "Ce problème est en cours" +#~ msgid "Empty house or bungalow" +#~ msgstr "maison ou bungalow vide" -#~ msgid "This problem is old and of unknown status." -#~ msgstr "Ce problème est vieux et de statut inconnu." +#~ msgid "Empty office or other commercial" +#~ msgstr "bureau ou commerce vide" -#~ msgid "Update:" -#~ msgstr "Mise à jour :" +#~ msgid "Empty pub or bar" +#~ msgstr "pub ou bar vide" -#~ msgid "We have not been able to confirm your account - sorry." -#~ msgstr "Nous n'avons pas pu confirmé votre compte - désolé." +#~ msgid "Empty public building - school, hospital, etc." +#~ msgstr "bâtiment public - école - hôpital, etc non renseigné." -#~ msgid "We have sent you an email containing a link to confirm your account." -#~ msgstr "Nous vous avons envoyé un email contenant un lien pour confirmer votre compte." +#~ msgid "Enter a nearby street name and area, postal code or district in Delhi" +#~ msgstr "Saisissez un nom de rue proche et une localité, le code postal et le district de Delhi" -#~ msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:" -#~ msgstr "Nous aimerions beaucoup savoir ce que vous pensez de ce site. Il suffit de remplir ce formulaire, ou envoyez un email à <a href='mailto:%s'>%s</a>:" +#~ msgid "FixMyStreet" +#~ msgstr "FixMyStreet" -#~ msgid "You have already attached a photo to this report, attaching another one will replace it." -#~ msgstr "Vous avez déjà joint une photo à ce rapport, en joindre un autre la remplacera." +#~ msgid "I am afraid you cannot confirm unconfirmed reports." +#~ msgstr "Je suis désolé, vous ne pouvez pas confirmer des rapports non validés" -#~ msgid "You have already attached a photo to this update, attaching another one will replace it." -#~ msgstr "Vous avez déjà joint une photo à cette mise à jour, en joindre un autre la remplacera." +#~ msgid "Problems in this area" +#~ msgstr "Problèmes dans cette zone" -#~ msgid "Your email:" -#~ msgstr "Votre email:" +#~ msgid "Property type:" +#~ msgstr "Type de propriété:" -#~ msgid "Your name:" -#~ msgstr "Votre nom :" +#~ msgid "RSS feed of problems in this %s" +#~ msgstr "Flux RSS des problèmes à l'intérieur de cette %s" -#~ msgid "Your email:" -#~ msgstr "votre email :" +#~ msgid "Whole block of empty flats" +#~ msgstr "Tout le bloc d'appartements vides" diff --git a/locale/he_IL.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/he_IL.UTF-8/LC_MESSAGES/FixMyStreet.po index 53b96b578..944172a7f 100644 --- a/locale/he_IL.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/he_IL.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2016-03-02 13:09+0000\n" -"PO-Revision-Date: 2015-10-23 16:37+0000\n" +"POT-Creation-Date: 2016-05-03 10:41+0100\n" +"PO-Revision-Date: 2016-03-23 12:44+0000\n" "Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: Hebrew (Israel) (http://www.transifex.com/mysociety/fixmystreet/language/he_IL/)\n" "Language: he_IL\n" @@ -19,7 +19,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/DB/Result/Problem.pm:618 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr "" @@ -81,15 +81,14 @@ msgid "" msgstr "" #: templates/web/base/status/stats.html:23 -#, fuzzy msgid "%s live updates" -msgstr "שלח לי דו×ר ××œ×§×˜×¨×•× ×™ על ×¢×“×›×•× ×™×" +msgstr "" #: templates/web/base/status/stats.html:25 msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:683 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "%s ref: %s" msgstr "" @@ -108,10 +107,6 @@ msgstr "" msgid "%s ward, %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:552 -msgid "%s, reported at %s" -msgstr "" - #: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "" @@ -166,7 +161,7 @@ msgstr "" msgid "(not sent to council)" msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "(optional)" msgstr "" @@ -178,12 +173,11 @@ msgstr "" msgid "(sent to both)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "" @@ -215,26 +209,21 @@ msgstr "" msgid "<strong>No</strong> Let me confirm my update by email" msgstr "" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:97 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "" -#: templates/web/base/auth/general.html:70 +#: templates/web/base/auth/general.html:80 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "" -#: templates/web/base/about/about-en-gb.html:1 -#: templates/web/base/about/about-en-gb.html:3 -msgid "About us" -msgstr "" - #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Action Scheduled" msgstr "" @@ -265,7 +254,7 @@ msgstr "" msgid "Add user" msgstr "" -#: templates/web/base/my/my.html:56 +#: templates/web/base/my/my.html:54 msgid "Added %s" msgstr "" @@ -285,7 +274,7 @@ msgstr "" msgid "Alert %d disabled (created %s)" msgstr "" -#: templates/web/base/report/update/form_name.html:20 +#: templates/web/base/report/update/form_name.html:21 msgid "Alert me to future updates" msgstr "" @@ -298,7 +287,7 @@ msgstr "" msgid "All Reports as CSV" msgstr "" -#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 +#: templates/web/base/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:20 @@ -397,7 +386,7 @@ msgstr "" msgid "Ban email address" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1273 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -428,7 +417,7 @@ msgstr "" #: templates/web/base/admin/body.html:68 #: templates/web/base/admin/index.html:54 -#: templates/web/base/report/new/category.html:10 +#: templates/web/base/report/new/category.html:7 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 @@ -443,7 +432,7 @@ msgstr "" msgid "Category fix rate for problems > 4 weeks old" msgstr "" -#: templates/web/base/admin/body.html:138 +#: templates/web/base/admin/body.html:137 #: templates/web/base/admin/category_edit.html:23 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/admin/body.html:43 @@ -463,19 +452,19 @@ msgstr "קטגוריה: %s" msgid "Change password" msgstr "החלף ססמ×" -#: templates/web/base/admin/body.html:160 +#: templates/web/base/admin/body.html:158 msgid "" "Check <strong>confirmed</strong> to indicate that this contact has been confirmed as correct.\n" " If you are not sure of the origin or validity of the contact, leave this unchecked." msgstr "" -#: templates/web/base/admin/body.html:171 +#: templates/web/base/admin/body.html:169 msgid "" "Check <strong>deleted</strong> to remove the category from use. \n" " It will not appear as an available category in the drop-down menu on the report-a-problem page." msgstr "" -#: templates/web/base/admin/body.html:191 +#: templates/web/base/admin/body.html:189 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -486,7 +475,7 @@ msgid "" " at a specific address." msgstr "" -#: templates/web/base/admin/body.html:130 +#: templates/web/base/admin/body.html:129 msgid "" "Choose a <strong>category</strong> 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." @@ -527,8 +516,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:15 #: templates/web/base/admin/report_blocks.html:25 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 @@ -537,7 +526,7 @@ msgstr "" msgid "Closed" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:779 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Closed by council" msgstr "" @@ -563,7 +552,7 @@ msgstr "" msgid "Cobrand:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "תצורה" @@ -593,7 +582,7 @@ msgstr "" msgid "Confirmation" msgstr "×ישור" -#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:164 #: templates/web/base/admin/body.html:79 #: templates/web/base/admin/category_edit.html:37 #: templates/web/base/admin/category_edit.html:92 @@ -612,7 +601,7 @@ msgid "Confirmed:" msgstr "×ישר:" #. ("%s is the site name") -#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 +#: templates/web/base/about/_sidebar.html:6 msgid "Contact %s" msgstr "" @@ -631,8 +620,8 @@ msgstr "" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1417 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1445 msgid "Could not find user" msgstr "" @@ -650,7 +639,7 @@ msgstr "עירייה" msgid "Council contacts for %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:681 +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "Council ref: %s" msgstr "" @@ -669,7 +658,7 @@ msgstr "ספירה" msgid "Create a report" msgstr "צור דו\"×—" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "צור קטגוריה" @@ -713,20 +702,20 @@ msgstr "" msgid "Dealt with by subdivision within 5 working days" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:877 +#: perllib/FixMyStreet/App/Controller/Admin.pm:865 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:175 #: templates/web/base/admin/body.html:81 #: templates/web/base/admin/category_edit.html:42 #: templates/web/base/admin/category_edit.html:93 msgid "Deleted" msgstr "× ×ž×—×§" -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:47 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -734,7 +723,7 @@ msgid "Description" msgstr "תי×ור" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:68 +#: templates/web/zurich/report/new/fill_in_details_form.html:70 msgid "Details" msgstr "פרטי×" @@ -759,11 +748,11 @@ msgid "Diligency prize league table" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:48 -#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/auth/general.html:58 +#: templates/web/base/report/new/form_user_loggedout.html:28 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout.html:17 +#: templates/web/base/report/update/form_user_loggedout.html:27 msgid "Do you have a %s password?" msgstr "" @@ -781,8 +770,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "Duplicate" msgstr "כפול" @@ -802,7 +791,7 @@ msgstr "" msgid "Edit" msgstr "ערוך" -#: templates/web/base/admin/body.html:220 +#: templates/web/base/admin/body.html:218 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "ערוך פרטי גוף" @@ -832,7 +821,7 @@ msgstr "עורך" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:39 +#: templates/web/base/auth/general.html:49 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -840,11 +829,11 @@ msgstr "עורך" msgid "Email" msgstr "דו×ר ××œ×§×˜×¨×•× ×™" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 msgid "Email added to abuse list" msgstr "דו×ר ××œ×§×˜×¨×•× ×™ הוסף לרשימת ×”×ž×©×ª×ž×©×™× ×œ×¨×¢×”" -#: templates/web/base/admin/body.html:155 +#: templates/web/base/admin/body.html:153 msgid "Email address:" msgstr "כתובת דו×ר ××œ×§×˜×¨×•× ×™:" @@ -856,19 +845,14 @@ msgstr "" msgid "Email alert deleted" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1390 msgid "Email already in abuse list" msgstr "דו×ר ××œ×§×˜×¨×•× ×™ כבר ברשימת ×”×ž×©×ª×ž×©×™× ×œ×¨×¢×”" -#: templates/web/base/around/_updates.html:5 -msgid "Email me new local problems" -msgstr "שלח לי דו×ר ××œ×§×˜×¨×•× ×™ על בעיות מקומיות חדשות" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 -#: templates/web/base/alert/updates.html:13 #: templates/web/zurich/admin/body.html:47 msgid "Email:" msgstr "דו×ר ××œ×§×˜×¨×•× ×™:" @@ -877,26 +861,6 @@ msgstr "דו×ר ××œ×§×˜×¨×•× ×™:" msgid "Email: %s" msgstr "דו×ר ××œ×§×˜×¨×•× ×™: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 -msgid "Empty flat or maisonette" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 -msgid "Empty house or bungalow" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 -msgid "Empty office or other commercial" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 -msgid "Empty pub or bar" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 -msgid "Empty public building - school, hospital, etc." -msgstr "" - #: templates/web/base/admin/body-form.html:162 #: templates/web/base/admin/body-form.html:163 msgid "" @@ -940,18 +904,14 @@ msgstr "" msgid "Enter a nearby street name and area" msgstr "" -#: perllib/FixMyStreet/Cobrand/ZeroTB.pm:7 -msgid "Enter a nearby street name and area, postal code or district in Delhi" -msgstr "" - -#: templates/web/base/auth/general.html:99 +#: templates/web/base/auth/general.html:109 #: templates/web/base/report/new/form_user_loggedout_by_email.html:38 #: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "" -#: templates/web/base/index-steps.html:26 +#: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "" @@ -977,7 +937,7 @@ msgstr "" msgid "Examples:" msgstr "" -#: templates/web/base/report/new/form_report.html:49 +#: templates/web/base/report/new/form_report.html:51 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "" @@ -1014,19 +974,15 @@ msgstr "" msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." msgstr "" -#: templates/web/base/header.html:26 -msgid "FixMyStreet" -msgstr "" - #: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:38 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:40 msgid "Fixed" msgstr "" @@ -1053,7 +1009,7 @@ msgstr "" msgid "Flag user" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "" @@ -1075,8 +1031,7 @@ msgstr "" msgid "Flagged:" msgstr "" -#: templates/web/base/reports/_ward-list.html:3 -#: templates/web/fixmystreet/reports/_ward-list.html:4 +#: templates/web/base/reports/_ward-list.html:4 msgid "Follow a ward link to view only reports within that ward." msgstr "" @@ -1107,18 +1062,18 @@ msgstr "" msgid "GeoRSS on Google Maps" msgstr "" +#: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:11 -#: templates/web/fixmystreet/around/_updates.html:3 msgid "Get updates" msgstr "" -#: templates/web/fixmystreet/reports/_rss.html:3 -#: templates/web/fixmystreet/reports/_rss.html:9 +#: templates/web/base/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:9 msgid "Get updates of %s problems" msgstr "" -#: templates/web/fixmystreet/reports/_rss.html:11 -#: templates/web/fixmystreet/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:11 +#: templates/web/base/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "" @@ -1131,7 +1086,7 @@ msgid "Glad to hear it’s been fixed!" msgstr "" #: templates/web/base/alert/index.html:34 -#: templates/web/base/around/postcode_form.html:16 +#: templates/web/base/around/postcode_form.html:13 #: templates/web/base/reports/_list-filters.html:28 #: templates/web/zurich/admin/stats.html:26 msgid "Go" @@ -1157,7 +1112,7 @@ msgstr "" msgid "Have you ever reported a problem to a council before, or is this your first time?" msgstr "" -#: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:38 +#: templates/web/base/footer.html:38 #: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 @@ -1168,8 +1123,7 @@ msgstr "" msgid "Here are the types of local problem alerts for ‘%s’." msgstr "" -#: templates/web/base/header.html:32 templates/web/fixmystreet/header.html:63 -#: templates/web/zurich/footer.html:12 +#: templates/web/base/header.html:63 templates/web/zurich/footer.html:12 msgid "Hi %s" msgstr "" @@ -1185,11 +1139,11 @@ msgstr "" msgid "Hidden" msgstr "" -#: templates/web/base/around/display_location.html:65 +#: templates/web/base/around/display_location.html:64 msgid "Hide old" msgstr "" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:59 msgid "Hide pins" msgstr "" @@ -1209,10 +1163,6 @@ msgstr "" msgid "How to send successful reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:752 -msgid "I am afraid you cannot confirm unconfirmed reports." -msgstr "" - #: templates/web/base/tokens/confirm_problem.html:23 #: templates/web/base/tokens/confirm_problem.html:27 msgid "I just reported a problem on @fixmystreet" @@ -1223,7 +1173,7 @@ msgstr "" msgid "I just updated a problem on @fixmystreet" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88 msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "" @@ -1245,7 +1195,7 @@ msgid "" " For basic installations, you don't need to join bodies in this way." msgstr "" -#: templates/web/base/admin/body.html:133 +#: templates/web/base/admin/body.html:132 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." @@ -1266,7 +1216,7 @@ msgid "" "(please note it will not be sent to the council)." msgstr "" -#: templates/web/base/admin/body.html:149 +#: templates/web/base/admin/body.html:147 msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." msgstr "" @@ -1301,10 +1251,10 @@ msgstr "" msgid "Illegal feed selection" msgstr "" +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "In Progress" msgstr "" @@ -1355,7 +1305,7 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 msgid "Invalid end date" msgstr "" @@ -1363,16 +1313,16 @@ msgstr "" msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 msgid "Invalid start date" msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:5 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Investigating" msgstr "" @@ -1394,7 +1344,7 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:80 +#: 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 @@ -1432,7 +1382,6 @@ msgstr "" #: 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/fixmystreet/alert/updates.html:1 msgid "Local RSS feeds and email alerts" msgstr "" @@ -1441,11 +1390,11 @@ msgstr "" msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "" -#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:35 +#: templates/web/base/footer.html:35 msgid "Local alerts" msgstr "" -#: templates/web/base/index-steps.html:25 +#: templates/web/base/index-steps.html:5 msgid "Locate the problem on a map of the area" msgstr "" @@ -1505,14 +1454,14 @@ msgstr "" #: templates/web/base/admin/list_updates.html:7 #: templates/web/base/admin/reports.html:13 #: templates/web/base/admin/users.html:15 -#: templates/web/base/auth/general.html:89 +#: templates/web/base/auth/general.html:99 #: templates/web/base/report/new/form_user_loggedin.html:9 #: templates/web/base/report/new/form_user_loggedout_by_email.html:7 -#: templates/web/base/report/update/form_name.html:4 +#: templates/web/base/report/update/form_name.html:5 #: templates/web/base/reports/index.html:20 #: 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:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "Name" msgstr "" @@ -1536,8 +1485,8 @@ msgstr "" msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:455 -#: perllib/FixMyStreet/Cobrand/Default.pm:495 +#: perllib/FixMyStreet/Cobrand/Default.pm:454 +#: perllib/FixMyStreet/Cobrand/Default.pm:494 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" @@ -1559,7 +1508,7 @@ msgstr "" msgid "New body added" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:387 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 msgid "New category contact added" msgstr "" @@ -1624,7 +1573,7 @@ msgstr "" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 -#: templates/web/base/questionnaire/index.html:101 +#: templates/web/base/questionnaire/index.html:102 #: templates/web/base/questionnaire/index.html:53 msgid "No" msgstr "" @@ -1689,8 +1638,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Not Responsible" msgstr "" @@ -1723,7 +1672,7 @@ 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 "" -#: templates/web/base/admin/body.html:186 +#: templates/web/base/admin/body.html:184 #: templates/web/base/admin/category_edit.html:52 #: templates/web/zurich/admin/body.html:53 msgid "Note:" @@ -1737,15 +1686,15 @@ msgstr "" msgid "Notes from SDM to DM" msgstr "" -#: templates/web/base/report/new/form_user_loggedout.html:14 #: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/form_user_loggedout.html:24 #: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "" #: templates/web/base/report/update-form.html:28 -#: templates/web/base/report/update/form_user_loggedout.html:13 #: templates/web/base/report/update/form_user_loggedout.html:2 +#: templates/web/base/report/update/form_user_loggedout.html:23 msgid "Now to submit your update…" msgstr "" @@ -1779,8 +1728,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:23 #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/report/update/form_update.html:36 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1815,13 +1764,13 @@ msgstr "" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1055 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 -#: perllib/FixMyStreet/DB/Result/Problem.pm:558 -#: perllib/FixMyStreet/DB/Result/Problem.pm:568 -#: perllib/FixMyStreet/DB/Result/Problem.pm:578 -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1044 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:659 +#: perllib/FixMyStreet/DB/Result/Problem.pm:562 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 +#: perllib/FixMyStreet/DB/Result/Problem.pm:582 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 #: perllib/FixMyStreet/Script/Reports.pm:175 #: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" @@ -1846,7 +1795,7 @@ msgstr "" msgid "Partial" msgstr "" -#: templates/web/base/auth/general.html:92 +#: templates/web/base/auth/general.html:102 #: templates/web/base/report/new/form_user_loggedout_by_email.html:31 #: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 @@ -1855,7 +1804,7 @@ msgid "Password (optional)" msgstr "" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:72 +#: templates/web/base/auth/general.html:82 msgid "Password:" msgstr "" @@ -1863,7 +1812,7 @@ msgstr "" msgid "Permalink" msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:90 msgid "Phone number" msgstr "" @@ -1879,13 +1828,21 @@ msgid "Phone:" msgstr "" #: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/questionnaire/index.html:89 +#: templates/web/base/questionnaire/index.html:91 #: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/new/form_report.html:38 +#: templates/web/base/report/new/form_report.html:40 +#: templates/web/base/report/update/form_update.html:20 +#: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:6 #: 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:45 +#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/zurich/report/new/fill_in_details_form.html:63 msgid "Photo" msgstr "" @@ -1909,8 +1866,8 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:955 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:6 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 @@ -1926,16 +1883,16 @@ msgstr "" msgid "Please check the passwords and try again" msgstr "" -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:33 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:43 #: 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:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:856 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:921 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -1945,7 +1902,7 @@ msgstr "" msgid "Please choose a property type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:378 +#: perllib/FixMyStreet/App/Controller/Admin.pm:376 msgid "Please correct the errors below" msgstr "" @@ -1966,8 +1923,8 @@ msgstr "" msgid "Please enter a message" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1079 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 msgid "Please enter a name" msgstr "" @@ -1983,10 +1940,10 @@ msgstr "" msgid "Please enter a subject" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1075 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1130 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:133 +#: perllib/FixMyStreet/DB/Result/User.pm:143 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2003,9 +1960,9 @@ msgid "Please enter some details" msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:130 -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:32 +#: perllib/FixMyStreet/DB/Result/User.pm:140 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:42 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2014,7 +1971,7 @@ msgid "Please enter your email" msgstr "" #: templates/web/base/report/new/form_user_loggedout_email.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:80 +#: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "Please enter your email address" msgstr "" @@ -2030,7 +1987,7 @@ msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:126 +#: perllib/FixMyStreet/DB/Result/User.pm:136 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "" @@ -2057,7 +2014,7 @@ msgstr "" msgid "Please fill in details of the problem below." msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:72 +#: templates/web/zurich/report/new/fill_in_details_form.html:74 msgid "Please fill in details of the problem." msgstr "" @@ -2066,7 +2023,7 @@ msgstr "" msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" @@ -2092,16 +2049,16 @@ msgstr "" msgid "Please note:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please provide some explanation as to why you're reopening this report" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250 msgid "Please provide some text as well as a photo" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236 msgid "Please say whether you've ever reported a problem to your council before" msgstr "" @@ -2117,22 +2074,22 @@ msgstr "" msgid "Please select the type of alert you want" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232 msgid "Please state whether or not the problem has been fixed" msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:121 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 #: templates/web/base/js/translation_strings.html:53 -msgid "Please upload a JPEG image only" +msgid "Please upload an image only" msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 msgid "Please write a message" msgstr "" -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Please write your update here" msgstr "" @@ -2163,7 +2120,7 @@ msgstr "" msgid "Previous" msgstr "" -#: templates/web/fixmystreet/footer.html:41 +#: templates/web/base/footer.html:41 msgid "Privacy" msgstr "" @@ -2173,7 +2130,7 @@ msgstr "" msgid "Privacy and cookies" msgstr "" -#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:200 #: templates/web/base/admin/body.html:85 #: templates/web/base/admin/category_edit.html:45 #: templates/web/base/admin/report_edit.html:77 @@ -2202,7 +2159,7 @@ msgstr "" msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1046 msgid "Problem marked as open." msgstr "" @@ -2214,10 +2171,6 @@ msgstr "" msgid "Problems" msgstr "" -#: templates/web/base/around/_updates.html:1 -msgid "Problems in this area" -msgstr "" - #: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "" @@ -2235,13 +2188,11 @@ msgid "Problems within %.1fkm of this location" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:663 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 #: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "" @@ -2260,15 +2211,11 @@ msgstr "" msgid "Property address:" msgstr "" -#: templates/web/base/report/new/category.html:8 -msgid "Property type:" -msgstr "" - #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "" -#: templates/web/base/auth/general.html:95 +#: templates/web/base/auth/general.html:105 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 "" @@ -2302,16 +2249,15 @@ msgstr "" msgid "Questionnaire %d sent for problem %d" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 msgid "Questionnaire filled in by problem reporter" msgstr "" #: templates/web/base/alert/_list.html:22 +#: templates/web/base/alert/updates.html:9 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display_tools.html:34 -#: templates/web/base/reports/_rss.html:1 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed" msgstr "" @@ -2339,18 +2285,12 @@ msgstr "" msgid "RSS feed of nearby problems" msgstr "" -#: templates/web/base/reports/_rss.html:1 -msgid "RSS feed of problems in this %s" -msgstr "" - #: perllib/FixMyStreet/Cobrand/Default.pm:664 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 #: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 #: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "" @@ -2360,14 +2300,13 @@ msgstr "" msgid "RSS feed of recent local problems" msgstr "" +#: templates/web/base/alert/updates.html:9 #: templates/web/base/report/display_tools.html:34 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed of updates to this problem" msgstr "" -#: templates/web/base/alert/updates.html:9 +#: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:36 -#: templates/web/fixmystreet/alert/updates.html:14 msgid "Receive email when updates are left on this problem." msgstr "" @@ -2403,12 +2342,11 @@ msgstr "" msgid "Reply to user:" msgstr "" -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/header_logo.html:2 msgid "Report" msgstr "" -#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:26 -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/footer.html:26 templates/web/base/header_logo.html:2 #: templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2418,7 +2356,7 @@ msgstr "" msgid "Report abuse" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:291 +#: perllib/FixMyStreet/App/Controller/Rss.pm:297 msgid "Report on %s" msgstr "" @@ -2433,7 +2371,7 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:577 #: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "" @@ -2443,7 +2381,7 @@ msgstr "" msgid "Reported before" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 #: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "" @@ -2457,27 +2395,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:569 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 msgid "Reported in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:591 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 msgid "Reported in the %s category by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported via %s anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported via %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:561 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 msgid "Reported via %s in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 msgid "Reported via %s in the %s category by %s at %s" msgstr "" @@ -2498,7 +2436,7 @@ msgstr "" msgid "Reporting a problem" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1274 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" @@ -2541,15 +2479,15 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1496 #: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 #: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 @@ -2564,7 +2502,7 @@ msgstr "" msgid "Satellite" msgstr "" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/base/admin/category_edit.html:84 #: templates/web/zurich/admin/body.html:59 #: templates/web/zurich/admin/template_edit.html:29 @@ -2620,7 +2558,7 @@ msgstr "" msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:696 +#: perllib/FixMyStreet/DB/Result/Problem.pm:698 msgid "Sent to %s %s later" msgstr "" @@ -2639,21 +2577,21 @@ msgstr "" #: templates/web/base/report/new/form_user_loggedin.html:23 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22 -#: templates/web/base/report/update/form_name.html:15 +#: templates/web/base/report/update/form_name.html:16 msgid "Show my name publicly" msgstr "" -#: templates/web/base/around/display_location.html:67 +#: templates/web/base/around/display_location.html:66 msgid "Show old" msgstr "" -#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:57 msgid "Show pins" msgstr "" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/general.html:110 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:76 +#: templates/web/base/auth/general.html:86 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2721,14 +2659,10 @@ msgstr "" msgid "Sorry, we could not parse that location. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:138 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 -msgid "Sorry, you can not log in with Facebook. Please try again later." -msgstr "" - #: templates/web/base/admin/stats.html:64 msgid "Start Date:" msgstr "" @@ -2737,7 +2671,7 @@ msgstr "" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/report/update/form_update.html:32 +#: templates/web/base/report/update/form_update.html:34 msgid "State" msgstr "" @@ -2750,7 +2684,7 @@ msgstr "" msgid "State:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2790,10 +2724,10 @@ msgid "Subject:" msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/base/report/new/form_user_loggedout_by_email.html:39 #: templates/web/base/report/new/form_user_loggedout_password.html:11 -#: templates/web/zurich/report/new/fill_in_details_form.html:96 +#: templates/web/zurich/report/new/fill_in_details_form.html:98 msgid "Submit" msgstr "" @@ -2821,9 +2755,8 @@ msgstr "" msgid "Submitted" msgstr "" -#: templates/web/base/alert/updates.html:17 +#: templates/web/base/alert/updates.html:23 #: templates/web/base/report/display_tools.html:41 -#: templates/web/fixmystreet/alert/updates.html:23 msgid "Subscribe" msgstr "" @@ -2831,7 +2764,7 @@ msgstr "" msgid "Subscribe me to an email alert" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -2850,7 +2783,7 @@ msgstr "" msgid "Summary reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 msgid "Survey" msgstr "" @@ -2907,7 +2840,7 @@ msgstr "" msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:157 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" @@ -2915,7 +2848,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:126 +#: perllib/FixMyStreet/App/Controller/Location.pm:127 msgid "That location does not appear to be in the UK; please try again." msgstr "" @@ -2925,11 +2858,11 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:724 +#: perllib/FixMyStreet/App/Controller/Admin.pm:722 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:716 +#: perllib/FixMyStreet/App/Controller/Admin.pm:714 msgid "That problem will now be resent." msgstr "" @@ -2941,7 +2874,7 @@ msgstr "" msgid "That report has been removed from FixMyStreet." msgstr "" -#: templates/web/base/admin/body.html:144 +#: templates/web/base/admin/body.html:142 msgid "" "The <strong>email address</strong> is the destination to which reports about this category will be sent. \n" " Other categories for this body may have the same email address." @@ -3081,9 +3014,9 @@ msgstr "" msgid "There was a problem showing this page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:753 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 -#: templates/web/base/auth/general.html:43 +#: templates/web/base/auth/general.html:53 #: 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 "" @@ -3144,9 +3077,9 @@ msgstr "" 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:920 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:898 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:935 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:977 #: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "" @@ -3159,11 +3092,11 @@ msgstr "" msgid "This is a summary of all reports on this site." msgstr "" -#: templates/web/base/report/update/form_update.html:52 +#: templates/web/base/report/update/form_update.html:54 msgid "This problem has been fixed" msgstr "" -#: templates/web/base/report/update/form_update.html:46 +#: templates/web/base/report/update/form_update.html:48 msgid "This problem has not been fixed" msgstr "" @@ -3200,7 +3133,7 @@ msgstr "" msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -3245,8 +3178,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Unable to fix" msgstr "" @@ -3263,7 +3196,7 @@ msgstr "" msgid "Unknown" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:173 +#: perllib/FixMyStreet/App/Controller/Rss.pm:174 msgid "Unknown alert type" msgstr "" @@ -3278,7 +3211,7 @@ msgstr "" msgid "Unknown problem ID" msgstr "" -#: templates/web/base/report/update/form_update.html:25 +#: templates/web/base/report/update/form_update.html:27 msgid "Update" msgstr "" @@ -3330,10 +3263,10 @@ msgstr "" msgid "Updated" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 -#: perllib/FixMyStreet/App/Controller/Admin.pm:821 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1096 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1144 +#: perllib/FixMyStreet/App/Controller/Admin.pm:809 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3360,7 +3293,7 @@ msgstr "" msgid "Updates to this problem, %s" msgstr "" -#: templates/web/base/admin/body.html:182 +#: templates/web/base/admin/body.html:180 msgid "Use the <strong>note</strong> to record details that are only displayed in the admin. Notes are not shown publicly, and are not sent to the body." msgstr "" @@ -3369,11 +3302,11 @@ msgstr "" msgid "Used map" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1421 msgid "User flagged" msgstr "" @@ -3381,16 +3314,16 @@ msgstr "" msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:412 -#: perllib/FixMyStreet/App/Controller/Admin.pm:429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:380 +#: perllib/FixMyStreet/App/Controller/Admin.pm:410 +#: perllib/FixMyStreet/App/Controller/Admin.pm:427 msgid "Values updated" msgstr "" @@ -3435,7 +3368,7 @@ msgstr "" msgid "We never show your email" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedin.html:30 #: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "" @@ -3444,7 +3377,7 @@ msgstr "" 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 "" -#: templates/web/base/index-steps.html:31 +#: templates/web/base/index-steps.html:11 msgid "We send it to the council on your behalf" msgstr "" @@ -3482,10 +3415,6 @@ msgstr "" msgid "Whoa there Testino! Three photos are enough." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 -msgid "Whole block of empty flats" -msgstr "" - #: templates/web/base/tokens/confirm_alert.html:7 msgid "Why stop there? <a href=\"/alert\">Set up more alerts</a> for free." msgstr "" @@ -3505,7 +3434,7 @@ msgstr "" msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "" -#: templates/web/base/questionnaire/index.html:96 +#: templates/web/base/questionnaire/index.html:97 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "" @@ -3535,8 +3464,8 @@ msgstr "" #: templates/web/base/admin/update_edit.html:24 #: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 +#: templates/web/base/questionnaire/index.html:100 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "" @@ -3650,19 +3579,19 @@ msgid "Your Reports" msgstr "" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/alert/updates.html:19 +#: templates/web/base/alert/updates.html:22 #: templates/web/base/contact/index.html:83 #: templates/web/base/report/display_tools.html:38 #: templates/web/base/report/display_tools.html:40 #: templates/web/base/report/new/form_user_loggedin.html:3 #: templates/web/base/report/new/form_user_loggedout_email.html:1 #: templates/web/base/report/update/form_user_loggedout_email.html:1 -#: templates/web/fixmystreet/alert/updates.html:19 -#: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/zurich/report/new/fill_in_details_form.html:76 +#: templates/web/zurich/report/new/fill_in_details_form.html:78 msgid "Your email" msgstr "" -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/general.html:55 #: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 @@ -3673,17 +3602,17 @@ msgstr "" msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "" -#: templates/web/base/auth/general.html:90 +#: templates/web/base/auth/general.html:100 #: templates/web/base/contact/index.html:76 #: templates/web/base/report/new/form_user_loggedin.html:18 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17 -#: templates/web/base/report/update/form_name.html:11 +#: templates/web/base/report/update/form_name.html:12 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:86 +#: templates/web/zurich/report/new/fill_in_details_form.html:88 msgid "Your name" msgstr "" -#: templates/web/base/auth/general.html:75 +#: templates/web/base/auth/general.html:85 #: 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 @@ -3696,20 +3625,19 @@ msgstr "" #: templates/web/base/report/new/form_user_loggedin.html:27 #: templates/web/base/report/new/form_user_loggedout_by_email.html:26 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:94 msgid "Your phone number" msgstr "" #: templates/web/base/questionnaire/index.html:14 -#, fuzzy msgid "Your report" -msgstr "צור דו\"×—" +msgstr "" -#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 +#: templates/web/base/footer.html:29 msgid "Your reports" msgstr "" -#: templates/web/base/my/my.html:41 +#: templates/web/base/my/my.html:39 msgid "Your updates" msgstr "" @@ -3735,7 +3663,7 @@ msgid "didn't use map" msgstr "" #: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/around/postcode_form.html:12 msgid "e.g. ‘%s’ or ‘%s’" msgstr "" @@ -3841,8 +3769,7 @@ msgstr "" msgid "reopened" msgstr "" -#: templates/web/base/header.html:33 templates/web/fixmystreet/header.html:64 -#: templates/web/zurich/footer.html:13 +#: templates/web/base/header.html:64 templates/web/zurich/footer.html:13 msgid "sign out" msgstr "" @@ -3920,7 +3847,7 @@ msgid_plural "<big>%s</big> updates on reports" msgstr[0] "" msgstr[1] "" -#: templates/web/emptyhomes/report/new/councils_text_none.html:3 +#: templates/web/base/report/new/councils_text_none.html:3 #, perl-format msgid "We do not yet have details for the council that covers this location." msgid_plural "We do not yet have details for the councils that cover this location." @@ -3961,3 +3888,6 @@ msgid "We do <strong>not</strong> yet have details for the other council that co msgid_plural "We do <strong>not</strong> yet have details for the other councils that cover this location." msgstr[0] "" msgstr[1] "" + +#~ msgid "Email me new local problems" +#~ msgstr "שלח לי דו×ר ××œ×§×˜×¨×•× ×™ על בעיות מקומיות חדשות" diff --git a/locale/hr.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/hr.UTF-8/LC_MESSAGES/FixMyStreet.po index 71da5eca7..5f4c56f9f 100644 --- a/locale/hr.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/hr.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2016-03-02 13:09+0000\n" -"PO-Revision-Date: 2015-10-23 16:35+0000\n" +"POT-Creation-Date: 2016-05-03 10:41+0100\n" +"PO-Revision-Date: 2016-03-23 12:43+0000\n" "Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: Croatian (http://www.transifex.com/mysociety/fixmystreet/language/hr/)\n" "Language: hr\n" @@ -20,7 +20,7 @@ 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:616 +#: perllib/FixMyStreet/DB/Result/Problem.pm:618 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr "i" @@ -89,7 +89,7 @@ msgstr "%s ažuriranje uživo" msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "%s Upitnici poslani – %s odgovoreno (%s%%)" -#: perllib/FixMyStreet/DB/Result/Problem.pm:683 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "%s ref: %s" msgstr "%s ref: %s" @@ -108,10 +108,6 @@ msgstr "" msgid "%s ward, %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:552 -msgid "%s, reported at %s" -msgstr "" - #: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "" @@ -166,7 +162,7 @@ msgstr "(grafiti, ilegalno odlaganje otpada, oÅ¡tećeni kolnici, klupe, lampe... msgid "(not sent to council)" msgstr "(nije poslano odgovornom tijelu)" -#: templates/web/zurich/report/new/fill_in_details_form.html:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "(optional)" msgstr "(nije obavezno)" @@ -178,12 +174,11 @@ msgstr "" msgid "(sent to both)" msgstr "(poslano na obje adrese)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Izaberi kategoriju --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Izaberite vrstu posjeda --" @@ -215,26 +210,21 @@ msgstr "<strong>No</strong> Potvrdi moju prijavu e-mailom" msgid "<strong>No</strong> Let me confirm my update by email" msgstr "<strong>No</strong> Potvrdi moje ažuriranje e-mailom" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:97 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>No</strong> prijavi se e-mailom" -#: templates/web/base/auth/general.html:70 +#: templates/web/base/auth/general.html:80 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Da</strong> Imam password" -#: templates/web/base/about/about-en-gb.html:1 -#: templates/web/base/about/about-en-gb.html:3 -msgid "About us" -msgstr "O nama" - #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Action Scheduled" msgstr "" @@ -265,7 +255,7 @@ msgstr "Dodaj novu kategoriju" msgid "Add user" msgstr "" -#: templates/web/base/my/my.html:56 +#: templates/web/base/my/my.html:54 msgid "Added %s" msgstr "Dodano %s" @@ -285,7 +275,7 @@ msgstr "Upozorenje %d kreirano za %s, tip %s, parametri%s / %s" msgid "Alert %d disabled (created %s)" msgstr "Upozorenje %d onemogućeno (kreirano%s)" -#: templates/web/base/report/update/form_name.html:20 +#: templates/web/base/report/update/form_name.html:21 msgid "Alert me to future updates" msgstr "Javi mi buduće promjene" @@ -298,7 +288,7 @@ msgstr "Sve Prijave" msgid "All Reports as CSV" msgstr "" -#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 +#: templates/web/base/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:20 @@ -397,7 +387,7 @@ msgstr "" msgid "Ban email address" msgstr "Onemogući e-mail adrese" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1273 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -428,7 +418,7 @@ msgstr "Ne možete vidjeti mapu? <em>PreskoÄi ovaj korak</em>" #: templates/web/base/admin/body.html:68 #: templates/web/base/admin/index.html:54 -#: templates/web/base/report/new/category.html:10 +#: templates/web/base/report/new/category.html:7 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 @@ -443,7 +433,7 @@ msgstr "Kategorija" msgid "Category fix rate for problems > 4 weeks old" msgstr " Postotak popravaka za kategoriju > staro 4 tjedna" -#: templates/web/base/admin/body.html:138 +#: templates/web/base/admin/body.html:137 #: templates/web/base/admin/category_edit.html:23 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/admin/body.html:43 @@ -463,19 +453,19 @@ msgstr "Kategorija: %s" msgid "Change password" msgstr "Promijeni lozinku" -#: templates/web/base/admin/body.html:160 +#: templates/web/base/admin/body.html:158 msgid "" "Check <strong>confirmed</strong> to indicate that this contact has been confirmed as correct.\n" " If you are not sure of the origin or validity of the contact, leave this unchecked." msgstr "" -#: templates/web/base/admin/body.html:171 +#: templates/web/base/admin/body.html:169 msgid "" "Check <strong>deleted</strong> to remove the category from use. \n" " It will not appear as an available category in the drop-down menu on the report-a-problem page." msgstr "" -#: templates/web/base/admin/body.html:191 +#: templates/web/base/admin/body.html:189 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -486,7 +476,7 @@ msgid "" " at a specific address." msgstr "" -#: templates/web/base/admin/body.html:130 +#: templates/web/base/admin/body.html:129 msgid "" "Choose a <strong>category</strong> 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." @@ -527,8 +517,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:15 #: templates/web/base/admin/report_blocks.html:25 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 @@ -537,7 +527,7 @@ msgstr "" msgid "Closed" msgstr "Zatvoreno" -#: perllib/FixMyStreet/DB/Result/Problem.pm:779 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Closed by council" msgstr "Zatvorilo je odgovorno tijelo" @@ -563,7 +553,7 @@ msgstr "Cobrand podaci:" msgid "Cobrand:" msgstr "Cobrand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "" @@ -582,9 +572,8 @@ msgstr "Potvrdi raÄun" #: templates/web/base/report/new/form_user_loggedout_password.html:21 #: templates/web/base/report/update/form_user_loggedout_password.html:20 -#, fuzzy msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." -msgstr "Potvrdi pomoću dolje navedene e-mail adrese, a potom upiÅ¡i novu lozinku. Nakon potvrde tvoja će lozinka biti ažurirana. " +msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:1 #: templates/web/base/tokens/confirm_problem.html:1 @@ -594,7 +583,7 @@ msgstr "Potvrdi pomoću dolje navedene e-mail adrese, a potom upiÅ¡i novu lozink msgid "Confirmation" msgstr "Potvrda" -#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:164 #: templates/web/base/admin/body.html:79 #: templates/web/base/admin/category_edit.html:37 #: templates/web/base/admin/category_edit.html:92 @@ -613,7 +602,7 @@ msgid "Confirmed:" msgstr "PotvrÄ‘eno:" #. ("%s is the site name") -#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 +#: templates/web/base/about/_sidebar.html:6 msgid "Contact %s" msgstr "" @@ -632,8 +621,8 @@ msgstr "Kontaktiraj tim" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1417 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1445 msgid "Could not find user" msgstr "Nepoznati korisnik" @@ -651,7 +640,7 @@ msgstr "Vijeće" msgid "Council contacts for %s" msgstr "Kontakti vijeća za %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:681 +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "Council ref: %s" msgstr "odgovorno tijelo ref: %s" @@ -670,7 +659,7 @@ msgstr "BrojaÄ" msgid "Create a report" msgstr "Kreiraj izvješće" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "Kreiraj kategoriju" @@ -714,20 +703,20 @@ msgstr "Nadzorna ploÄa" msgid "Dealt with by subdivision within 5 working days" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:877 +#: perllib/FixMyStreet/App/Controller/Admin.pm:865 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:175 #: templates/web/base/admin/body.html:81 #: templates/web/base/admin/category_edit.html:42 #: templates/web/base/admin/category_edit.html:93 msgid "Deleted" msgstr "Izbrisano" -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:47 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -735,7 +724,7 @@ msgid "Description" msgstr "" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:68 +#: templates/web/zurich/report/new/fill_in_details_form.html:70 msgid "Details" msgstr "Detalji" @@ -760,11 +749,11 @@ msgid "Diligency prize league table" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:48 -#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/auth/general.html:58 +#: templates/web/base/report/new/form_user_loggedout.html:28 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout.html:17 +#: templates/web/base/report/update/form_user_loggedout.html:27 msgid "Do you have a %s password?" msgstr "" @@ -782,8 +771,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "Duplicate" msgstr "" @@ -803,7 +792,7 @@ msgstr "" msgid "Edit" msgstr "Uredi" -#: templates/web/base/admin/body.html:220 +#: templates/web/base/admin/body.html:218 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "" @@ -833,7 +822,7 @@ msgstr "Urednik" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:39 +#: templates/web/base/auth/general.html:49 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -841,11 +830,11 @@ msgstr "Urednik" msgid "Email" msgstr "E-mail" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 msgid "Email added to abuse list" msgstr "E-mail dodan na listu zloupotrebe" -#: templates/web/base/admin/body.html:155 +#: templates/web/base/admin/body.html:153 msgid "Email address:" msgstr "" @@ -857,19 +846,14 @@ msgstr "" msgid "Email alert deleted" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1390 msgid "Email already in abuse list" msgstr "E-mail je već na listi zloupotrebe" -#: templates/web/base/around/_updates.html:5 -msgid "Email me new local problems" -msgstr "PoÅ¡alji nam e-mail o novom lokalnom problemu" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 -#: templates/web/base/alert/updates.html:13 #: templates/web/zurich/admin/body.html:47 msgid "Email:" msgstr "E-mail:" @@ -878,26 +862,6 @@ msgstr "E-mail:" msgid "Email: %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 -msgid "Empty flat or maisonette" -msgstr "Prazan stan ili kućica" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 -msgid "Empty house or bungalow" -msgstr "Prazna kuća ili bungalov" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 -msgid "Empty office or other commercial" -msgstr "Prazan ured ili poslovni prostor" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 -msgid "Empty pub or bar" -msgstr "Prazan kafić ili bar" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 -msgid "Empty public building - school, hospital, etc." -msgstr "Prazne javne zgrade - Å¡kola, bolnica, itd." - #: templates/web/base/admin/body-form.html:162 #: templates/web/base/admin/body-form.html:163 msgid "" @@ -941,18 +905,14 @@ msgstr "Unesi obližnji poÅ¡tanski broj ili ime ulice i kvarta" msgid "Enter a nearby street name and area" msgstr "Unesi ime obližnje ulice i kvarta" -#: perllib/FixMyStreet/Cobrand/ZeroTB.pm:7 -msgid "Enter a nearby street name and area, postal code or district in Delhi" -msgstr "" - -#: templates/web/base/auth/general.html:99 +#: templates/web/base/auth/general.html:109 #: templates/web/base/report/new/form_user_loggedout_by_email.html:38 #: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Unesi lozinku" -#: templates/web/base/index-steps.html:26 +#: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "Unesi detalje o problemu" @@ -978,7 +938,7 @@ msgstr "Primjer poÅ¡tanskog broja %s" msgid "Examples:" msgstr "Primjeri:" -#: templates/web/base/report/new/form_report.html:49 +#: templates/web/base/report/new/form_report.html:51 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "" @@ -1015,19 +975,15 @@ msgstr "Prvi put" msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." msgstr "" -#: templates/web/base/header.html:26 -msgid "FixMyStreet" -msgstr "Popravi.to" - #: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:38 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:40 msgid "Fixed" msgstr "Popravljeno" @@ -1054,7 +1010,7 @@ msgstr "" msgid "Flag user" msgstr "OznaÄi korisnika" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "OznaÄen" @@ -1076,8 +1032,7 @@ msgstr "" msgid "Flagged:" msgstr "OznaÄen:" -#: templates/web/base/reports/_ward-list.html:3 -#: templates/web/fixmystreet/reports/_ward-list.html:4 +#: templates/web/base/reports/_ward-list.html:4 msgid "Follow a ward link to view only reports within that ward." msgstr "" @@ -1108,18 +1063,18 @@ msgstr "ÄŒesto postavljana pitanja" msgid "GeoRSS on Google Maps" msgstr "GeoRSS na Google Mapama" +#: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:11 -#: templates/web/fixmystreet/around/_updates.html:3 msgid "Get updates" msgstr "Primite ažuriranja" -#: templates/web/fixmystreet/reports/_rss.html:3 -#: templates/web/fixmystreet/reports/_rss.html:9 +#: templates/web/base/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:9 msgid "Get updates of %s problems" msgstr "Primite ažuriranja %s problema" -#: templates/web/fixmystreet/reports/_rss.html:11 -#: templates/web/fixmystreet/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:11 +#: templates/web/base/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "Primite ažuriranja problema u ovom %s" @@ -1132,7 +1087,7 @@ msgid "Glad to hear it’s been fixed!" msgstr "" #: templates/web/base/alert/index.html:34 -#: templates/web/base/around/postcode_form.html:16 +#: templates/web/base/around/postcode_form.html:13 #: templates/web/base/reports/_list-filters.html:28 #: templates/web/zurich/admin/stats.html:26 msgid "Go" @@ -1158,7 +1113,7 @@ msgstr "Je li ovaj problem popravljen?" msgid "Have you ever reported a problem to a council before, or is this your first time?" msgstr "Jeste li prije prijavljivali problem odgovornom tijelu ili je ovo prvi put?" -#: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:38 +#: templates/web/base/footer.html:38 #: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 @@ -1169,8 +1124,7 @@ msgstr "Pomoć" msgid "Here are the types of local problem alerts for ‘%s’." msgstr "Vrste upozorenja za lokalne probleme ‘%s’." -#: templates/web/base/header.html:32 templates/web/fixmystreet/header.html:63 -#: templates/web/zurich/footer.html:12 +#: templates/web/base/header.html:63 templates/web/zurich/footer.html:12 msgid "Hi %s" msgstr "Zdravo %s" @@ -1186,11 +1140,11 @@ msgstr "Zdravo %s" msgid "Hidden" msgstr "Skriveno" -#: templates/web/base/around/display_location.html:65 +#: templates/web/base/around/display_location.html:64 msgid "Hide old" msgstr "Sakrij staro" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:59 msgid "Hide pins" msgstr "Sakrij pinove" @@ -1210,10 +1164,6 @@ msgstr "Kako prijaviti problem" msgid "How to send successful reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:752 -msgid "I am afraid you cannot confirm unconfirmed reports." -msgstr "Nažalost, ne možeÅ¡ potvrditi nepotvrÄ‘ena izvješća" - #: templates/web/base/tokens/confirm_problem.html:23 #: templates/web/base/tokens/confirm_problem.html:27 msgid "I just reported a problem on @fixmystreet" @@ -1224,7 +1174,7 @@ msgstr "" msgid "I just updated a problem on @fixmystreet" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88 msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "Nažalost, ne možemo locirati tvoj problem u bazi podataka.âŽ\n" @@ -1246,7 +1196,7 @@ msgid "" " For basic installations, you don't need to join bodies in this way." msgstr "" -#: templates/web/base/admin/body.html:133 +#: templates/web/base/admin/body.html:132 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." @@ -1267,7 +1217,7 @@ msgid "" "(please note it will not be sent to the council)." msgstr "" -#: templates/web/base/admin/body.html:149 +#: templates/web/base/admin/body.html:147 msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." msgstr "" @@ -1302,10 +1252,10 @@ msgstr "Ilegalan ID" msgid "Illegal feed selection" msgstr "Ilegalan odabir izvora" +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "In Progress" msgstr "U tijeku" @@ -1356,7 +1306,7 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "Nevažeća odgovorna_vrijednost agencije %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 msgid "Invalid end date" msgstr "Nevažeći datum zavrÅ¡etka" @@ -1364,16 +1314,16 @@ msgstr "Nevažeći datum zavrÅ¡etka" msgid "Invalid format %s specified." msgstr "Naveden nevažeći %s format." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 msgid "Invalid start date" msgstr "Nevažeći datum poÄetka" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:5 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Investigating" msgstr "Istražujem" @@ -1395,7 +1345,7 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:80 +#: 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 @@ -1433,7 +1383,6 @@ msgstr "UÄitavanje" #: 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/fixmystreet/alert/updates.html:1 msgid "Local RSS feeds and email alerts" msgstr "Lokalni RSS izvori i e-mail upozorenja" @@ -1442,11 +1391,11 @@ msgstr "Lokalni RSS izvori i e-mail upozorenja" msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "Lokalni RSS izvori i e-mail upozorenja za‘%s’" -#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:35 +#: templates/web/base/footer.html:35 msgid "Local alerts" msgstr "Lokalna upozorenja" -#: templates/web/base/index-steps.html:25 +#: templates/web/base/index-steps.html:5 msgid "Locate the problem on a map of the area" msgstr "Lociraj problem na mapi podruÄja" @@ -1506,14 +1455,14 @@ msgstr "Mjesec" #: templates/web/base/admin/list_updates.html:7 #: templates/web/base/admin/reports.html:13 #: templates/web/base/admin/users.html:15 -#: templates/web/base/auth/general.html:89 +#: templates/web/base/auth/general.html:99 #: templates/web/base/report/new/form_user_loggedin.html:9 #: templates/web/base/report/new/form_user_loggedout_by_email.html:7 -#: templates/web/base/report/update/form_name.html:4 +#: templates/web/base/report/update/form_name.html:5 #: templates/web/base/reports/index.html:20 #: 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:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "Name" msgstr "Ime" @@ -1537,8 +1486,8 @@ 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:455 -#: perllib/FixMyStreet/Cobrand/Default.pm:495 +#: perllib/FixMyStreet/Cobrand/Default.pm:454 +#: perllib/FixMyStreet/Cobrand/Default.pm:494 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" @@ -1562,7 +1511,7 @@ msgstr "Novi <br>problemi" msgid "New body added" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:387 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 msgid "New category contact added" msgstr "Novi kontakt dodan u kategoriju" @@ -1627,7 +1576,7 @@ msgstr "" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 -#: templates/web/base/questionnaire/index.html:101 +#: templates/web/base/questionnaire/index.html:102 #: templates/web/base/questionnaire/index.html:53 msgid "No" msgstr "Ne" @@ -1692,8 +1641,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Not Responsible" msgstr "" @@ -1726,7 +1675,7 @@ msgstr "Napomena" 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/base/admin/body.html:186 +#: templates/web/base/admin/body.html:184 #: templates/web/base/admin/category_edit.html:52 #: templates/web/zurich/admin/body.html:53 msgid "Note:" @@ -1740,15 +1689,15 @@ msgstr "Napomena: <strong>%s</strong>" msgid "Notes from SDM to DM" msgstr "" -#: templates/web/base/report/new/form_user_loggedout.html:14 #: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/form_user_loggedout.html:24 #: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "Podnesite svoju prijavu…" #: templates/web/base/report/update-form.html:28 -#: templates/web/base/report/update/form_user_loggedout.html:13 #: templates/web/base/report/update/form_user_loggedout.html:2 +#: templates/web/base/report/update/form_user_loggedout.html:23 msgid "Now to submit your update…" msgstr "PoÅ¡aljite svoje ažuriranje…" @@ -1782,8 +1731,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:23 #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/report/update/form_update.html:36 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1818,13 +1767,13 @@ msgstr "Ili problemi prijavljeni:" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "Ili se možete pretplatiti na upozorenja unutar vaÅ¡eg vijeća ’:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1055 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 -#: perllib/FixMyStreet/DB/Result/Problem.pm:558 -#: perllib/FixMyStreet/DB/Result/Problem.pm:568 -#: perllib/FixMyStreet/DB/Result/Problem.pm:578 -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1044 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:659 +#: perllib/FixMyStreet/DB/Result/Problem.pm:562 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 +#: perllib/FixMyStreet/DB/Result/Problem.pm:582 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 #: perllib/FixMyStreet/Script/Reports.pm:175 #: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" @@ -1849,7 +1798,7 @@ msgstr "" msgid "Partial" msgstr "DjelomiÄno" -#: templates/web/base/auth/general.html:92 +#: templates/web/base/auth/general.html:102 #: templates/web/base/report/new/form_user_loggedout_by_email.html:31 #: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 @@ -1858,7 +1807,7 @@ msgid "Password (optional)" msgstr "Lozinka (neobvezno)" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:72 +#: templates/web/base/auth/general.html:82 msgid "Password:" msgstr "Lozinka:" @@ -1866,7 +1815,7 @@ msgstr "Lozinka:" msgid "Permalink" msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:90 msgid "Phone number" msgstr "" @@ -1882,13 +1831,21 @@ msgid "Phone:" msgstr "Telefon:" #: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/questionnaire/index.html:89 +#: templates/web/base/questionnaire/index.html:91 #: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/new/form_report.html:38 +#: templates/web/base/report/new/form_report.html:40 +#: templates/web/base/report/update/form_update.html:20 +#: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:6 #: 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:45 +#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/zurich/report/new/fill_in_details_form.html:63 msgid "Photo" msgstr "Slika" @@ -1912,8 +1869,8 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:955 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:6 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 @@ -1929,16 +1886,16 @@ 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/general.html:27 -#: templates/web/base/auth/general.html:33 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:43 #: 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:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:856 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:921 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -1948,7 +1905,7 @@ msgstr "Izaberi kategoriju" msgid "Please choose a property type" msgstr "Izaberi tip imovine" -#: perllib/FixMyStreet/App/Controller/Admin.pm:378 +#: perllib/FixMyStreet/App/Controller/Admin.pm:376 msgid "Please correct the errors below" msgstr "" @@ -1969,11 +1926,10 @@ msgstr "" msgid "Please enter a message" msgstr "Unesi poruku" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Admin.pm:1079 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 msgid "Please enter a name" -msgstr "Unesite svoje ime" +msgstr "" #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 @@ -1987,10 +1943,10 @@ msgstr "Unesi lozinku" msgid "Please enter a subject" msgstr "Unesi predmet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1075 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1130 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:133 +#: perllib/FixMyStreet/DB/Result/User.pm:143 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2007,9 +1963,9 @@ msgid "Please enter some details" msgstr "Unesi detalje" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:130 -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:32 +#: perllib/FixMyStreet/DB/Result/User.pm:140 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:42 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2018,7 +1974,7 @@ msgid "Please enter your email" msgstr "Unesi svoj e-mail" #: templates/web/base/report/new/form_user_loggedout_email.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:80 +#: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "Please enter your email address" msgstr "Unesi svoju e-mail adresu" @@ -2034,7 +1990,7 @@ msgstr "Molimo unesite svoje puno ime, odgovorno tijelo treba ovu informaciju †#: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:126 +#: perllib/FixMyStreet/DB/Result/User.pm:136 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "Unesite svoje ime" @@ -2061,7 +2017,7 @@ msgstr "" msgid "Please fill in details of the problem below." msgstr "Popunite detalje o problemu u nastavku." -#: templates/web/zurich/report/new/fill_in_details_form.html:72 +#: templates/web/zurich/report/new/fill_in_details_form.html:74 msgid "Please fill in details of the problem." msgstr "Popunite detalje o problemu u nastavku." @@ -2070,7 +2026,7 @@ msgstr "Popunite detalje o problemu u nastavku." msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "Popunite detalje o problemu u nastavku i opiÅ¡ite lokaciju Å¡to preciznije." -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Molimo navedite želite li primiti novi upitnik" @@ -2079,9 +2035,8 @@ msgid "Please note that updates are not sent to the council." msgstr "Napominjemo da se ažuriranja ne Å¡alju odgovornom tijelu." #: templates/web/base/report/new/oauth_email_form.html:4 -#, fuzzy msgid "Please note your report has <strong>not yet been sent</strong>." -msgstr "Napominjemo da vaÅ¡a prijava <strong>joÅ¡ nije poslana</strong>. Izaberite kategoriju i navedite dodatne informacije u nastavku te zatim potvrdite." +msgstr "" #: templates/web/base/report/new/fill_in_details_form.html:20 #: templates/web/zurich/report/new/fill_in_details_form.html:11 @@ -2097,16 +2052,16 @@ msgstr "" msgid "Please note:" msgstr "Napominjemo:" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please provide some explanation as to why you're reopening this report" msgstr "Molimo navedite obrazloženje ponovnog otvaranja ove prijave" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250 msgid "Please provide some text as well as a photo" msgstr "Molimo unesite tekst i fotografiju " -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236 msgid "Please say whether you've ever reported a problem to your council before" msgstr "Jeste li do sada ikada prijavljivali problem odgovoronom tijelu" @@ -2122,22 +2077,23 @@ msgstr "Izaberite izvor koji želite" msgid "Please select the type of alert you want" msgstr "Izaberite tip upozorenja koji želite" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232 msgid "Please state whether or not the problem has been fixed" msgstr "Navedite je li problem rjeÅ¡en " -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:121 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 #: templates/web/base/js/translation_strings.html:53 -msgid "Please upload a JPEG image only" +#, fuzzy +msgid "Please upload an image only" msgstr "Molimo uÄitajte samo JPEG slike" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 msgid "Please write a message" msgstr "NapiÅ¡i poruku" -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Please write your update here" msgstr "Ovdje ažurirajte" @@ -2168,7 +2124,7 @@ msgstr "" msgid "Previous" msgstr "" -#: templates/web/fixmystreet/footer.html:41 +#: templates/web/base/footer.html:41 msgid "Privacy" msgstr "" @@ -2178,7 +2134,7 @@ msgstr "" msgid "Privacy and cookies" msgstr "" -#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:200 #: templates/web/base/admin/body.html:85 #: templates/web/base/admin/category_edit.html:45 #: templates/web/base/admin/report_edit.html:77 @@ -2207,7 +2163,7 @@ msgstr "Problem %s poslan odgovornom tijelu %s" msgid "Problem breakdown by state" msgstr "Analiza problema prema stanju" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1046 msgid "Problem marked as open." msgstr "Problem oznaÄen kao otvoren." @@ -2219,10 +2175,6 @@ msgstr "Stanje problema izmijenjeno na temelju rezultata ankete" msgid "Problems" msgstr "Problemi" -#: templates/web/base/around/_updates.html:1 -msgid "Problems in this area" -msgstr "Problemi u ovom podruÄju" - #: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "Okolni problemi" @@ -2240,13 +2192,11 @@ msgid "Problems within %.1fkm of this location" msgstr "Problemi unutar%.1fkm od ove lokacije" #: perllib/FixMyStreet/Cobrand/Default.pm:663 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 #: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "Problemi unutar %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "Problemi unutar %s ward" @@ -2265,15 +2215,11 @@ msgstr "Problemi unutar granice:" msgid "Property address:" msgstr "" -#: templates/web/base/report/new/category.html:8 -msgid "Property type:" -msgstr "Tip objekta:" - #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Ažuriranje" -#: templates/web/base/auth/general.html:95 +#: templates/web/base/auth/general.html:105 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 "" @@ -2307,16 +2253,15 @@ msgstr " Upitnik %d odgovren za problem %d, %s za %s" msgid "Questionnaire %d sent for problem %d" msgstr "Upitnik %d poslan za problem %d" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 msgid "Questionnaire filled in by problem reporter" msgstr "Upitnik popunila osoba koja je prijavila problem" #: templates/web/base/alert/_list.html:22 +#: templates/web/base/alert/updates.html:9 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display_tools.html:34 -#: templates/web/base/reports/_rss.html:1 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed" msgstr "RSS izvor" @@ -2344,18 +2289,12 @@ msgstr "RSS izvor za %s, unutar %s ward" msgid "RSS feed of nearby problems" msgstr "RSS izvor za okolne probleme" -#: templates/web/base/reports/_rss.html:1 -msgid "RSS feed of problems in this %s" -msgstr "RSS izvor za probleme u ovom %s" - #: perllib/FixMyStreet/Cobrand/Default.pm:664 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 #: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "RSS izvor za probleme unutar %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 #: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "RSS izvor za probleme unutar %s ward" @@ -2365,14 +2304,13 @@ msgstr "RSS izvor za probleme unutar %s ward" msgid "RSS feed of recent local problems" msgstr "RSS izvor za nedavne lokalne probleme" +#: templates/web/base/alert/updates.html:9 #: templates/web/base/report/display_tools.html:34 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed of updates to this problem" msgstr "RSS izvor za ažuriranja ovog problema" -#: templates/web/base/alert/updates.html:9 +#: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:36 -#: templates/web/fixmystreet/alert/updates.html:14 msgid "Receive email when updates are left on this problem." msgstr "Primite e-mail s ažuriranjima ovog problema" @@ -2408,12 +2346,11 @@ msgstr "Ukloni fotografiju (nije moguće poniÅ¡titi!)" msgid "Reply to user:" msgstr "" -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/header_logo.html:2 msgid "Report" msgstr "" -#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:26 -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/footer.html:26 templates/web/base/header_logo.html:2 #: templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2423,7 +2360,7 @@ msgstr "Prijavi problem" msgid "Report abuse" msgstr "Prijavi zloupotrebu" -#: perllib/FixMyStreet/App/Controller/Rss.pm:291 +#: perllib/FixMyStreet/App/Controller/Rss.pm:297 msgid "Report on %s" msgstr "Prijava za %s" @@ -2438,7 +2375,7 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "Prijavi, pregledaj ili raspravljaj o lokalnim problemima" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:577 #: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "Prijavljeno anonimno %s" @@ -2448,7 +2385,7 @@ msgstr "Prijavljeno anonimno %s" msgid "Reported before" msgstr "Prije prijavljeno" -#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 #: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "Prijavio %s za %s" @@ -2462,27 +2399,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:569 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 msgid "Reported in the %s category anonymously at %s" msgstr "Prijavljeno %s u kategoriju anonimno u %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:591 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 msgid "Reported in the %s category by %s at %s" msgstr "Prijavio %s u kategoriju %s u %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported via %s anonymously at %s" msgstr "Prijavio %s anonimno %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported via %s by %s at %s" msgstr "Prijavio %s %s u %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:561 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 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:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 msgid "Reported via %s in the %s category by %s at %s" msgstr "Prijavio %s u %s kategoriju %s u %s" @@ -2503,7 +2440,7 @@ msgstr "" msgid "Reporting a problem" msgstr "Prijavljivanje problema" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1274 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" @@ -2546,15 +2483,15 @@ msgstr "Cestovni operater za ovu imenovanu cestu (izveden iz cestovnog referentn msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Cestovni operater za ovu imenovanu cestu (sa OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1496 #: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 #: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 @@ -2569,7 +2506,7 @@ msgstr "" msgid "Satellite" msgstr "" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/base/admin/category_edit.html:84 #: templates/web/zurich/admin/body.html:59 #: templates/web/zurich/admin/template_edit.html:29 @@ -2625,7 +2562,7 @@ msgstr "" msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:696 +#: perllib/FixMyStreet/DB/Result/Problem.pm:698 msgid "Sent to %s %s later" msgstr "PoÅ¡alji %s %s naknadno" @@ -2644,21 +2581,21 @@ msgstr "Podijeli" #: templates/web/base/report/new/form_user_loggedin.html:23 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22 -#: templates/web/base/report/update/form_name.html:15 +#: templates/web/base/report/update/form_name.html:16 msgid "Show my name publicly" msgstr "Prikaži moje ime javno" -#: templates/web/base/around/display_location.html:67 +#: templates/web/base/around/display_location.html:66 msgid "Show old" msgstr "Prikaži staro" -#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:57 msgid "Show pins" msgstr "Prikaži pinove" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/general.html:110 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:76 +#: templates/web/base/auth/general.html:86 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2717,9 +2654,8 @@ msgstr "Žao nam je, ne možemo pronaći tu lokaciju." #: templates/web/base/auth/general.html:9 #: templates/web/base/report/display.html:21 #: templates/web/base/report/new/fill_in_details_form.html:23 -#, fuzzy msgid "Sorry, we could not log you in. Please fill in the form below." -msgstr "Žao nam je, nije moguće analizirati tu lokaciju. Molimo pokuÅ¡ajte ponovno." +msgstr "" #: perllib/FixMyStreet/Geocode/Bing.pm:35 #: perllib/FixMyStreet/Geocode/Google.pm:45 @@ -2727,15 +2663,10 @@ msgstr "Žao nam je, nije moguće analizirati tu lokaciju. Molimo pokuÅ¡ajte pon msgid "Sorry, we could not parse that location. Please try again." msgstr "Žao nam je, nije moguće analizirati tu lokaciju. Molimo pokuÅ¡ajte ponovno." -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:138 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 -#, fuzzy -msgid "Sorry, you can not log in with Facebook. Please try again later." -msgstr "DoÅ¡lo je do problema pri uÄitavanju ove stranice. Molimo pokuÅ¡ajte ponovno." - #: templates/web/base/admin/stats.html:64 msgid "Start Date:" msgstr "" @@ -2744,7 +2675,7 @@ msgstr "" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/report/update/form_update.html:32 +#: templates/web/base/report/update/form_update.html:34 msgid "State" msgstr "Stanje" @@ -2757,7 +2688,7 @@ msgstr "Stanje" msgid "State:" msgstr "Stanje:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2797,10 +2728,10 @@ msgid "Subject:" msgstr "Predmet:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/base/report/new/form_user_loggedout_by_email.html:39 #: templates/web/base/report/new/form_user_loggedout_password.html:11 -#: templates/web/zurich/report/new/fill_in_details_form.html:96 +#: templates/web/zurich/report/new/fill_in_details_form.html:98 msgid "Submit" msgstr "PoÅ¡alji" @@ -2828,9 +2759,8 @@ msgstr "PoÅ¡alji upitnik" msgid "Submitted" msgstr "" -#: templates/web/base/alert/updates.html:17 +#: templates/web/base/alert/updates.html:23 #: templates/web/base/report/display_tools.html:41 -#: templates/web/fixmystreet/alert/updates.html:23 msgid "Subscribe" msgstr "Pretplati se" @@ -2838,7 +2768,7 @@ msgstr "Pretplati se" msgid "Subscribe me to an email alert" msgstr "Pretplati se na e-mail upozorenja" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -2857,7 +2787,7 @@ msgstr "Sažetak" msgid "Summary reports" msgstr "Sažetak prijava" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 msgid "Survey" msgstr "" @@ -2914,7 +2844,7 @@ msgstr "Hvala na uÄitavanju slike. Sada trebamo locirati problem pa vas molimo msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "Hvala, drago nam je Äuti da je problem rijeÅ¡en! Htjeli bismo vas joÅ¡ samo upitati jeste li dosada prijavljivali problem odgovornom tijelu?" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:157 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "Slika nije ispravno uÄitana (%s), molimo pokuÅ¡ajte ponovno." @@ -2922,7 +2852,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:126 +#: perllib/FixMyStreet/App/Controller/Location.pm:127 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." @@ -2932,11 +2862,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:724 +#: perllib/FixMyStreet/App/Controller/Admin.pm:722 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:716 +#: perllib/FixMyStreet/App/Controller/Admin.pm:714 msgid "That problem will now be resent." msgstr "Navedeni problem će biti ponovno poslan" @@ -2948,7 +2878,7 @@ msgstr "" msgid "That report has been removed from FixMyStreet." msgstr "Navedena prijava je uklonjena s Popravi.to" -#: templates/web/base/admin/body.html:144 +#: templates/web/base/admin/body.html:142 msgid "" "The <strong>email address</strong> is the destination to which reports about this category will be sent. \n" " Other categories for this body may have the same email address." @@ -3088,9 +3018,9 @@ msgstr "DoÅ¡lo je do problema pri uÄitavanju svih prijava. Molimo pokuÅ¡ajte po 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:764 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:753 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 -#: templates/web/base/auth/general.html:43 +#: templates/web/base/auth/general.html:53 #: 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 ’." @@ -3151,9 +3081,9 @@ msgstr "Kako korisnik nije kategorizirao problem ,ovaj e-mail poslan je oboma od 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:920 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:898 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:935 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:977 #: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "Potrebna informacija" @@ -3166,11 +3096,11 @@ msgstr "Ovo je stranica za razvojne programere; ovdje se sve može prekinuti u b msgid "This is a summary of all reports on this site." msgstr "" -#: templates/web/base/report/update/form_update.html:52 +#: templates/web/base/report/update/form_update.html:54 msgid "This problem has been fixed" msgstr "Problem je rijeÅ¡en" -#: templates/web/base/report/update/form_update.html:46 +#: templates/web/base/report/update/form_update.html:48 msgid "This problem has not been fixed" msgstr "Problem joÅ¡ nije rijeÅ¡en" @@ -3207,7 +3137,7 @@ msgstr "Stranica sadrži i fotografiju problem, dodanu od strane korisnika." msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Vremenska skala" @@ -3252,8 +3182,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Unable to fix" msgstr "" @@ -3270,7 +3200,7 @@ msgstr "NepotvrÄ‘eno" msgid "Unknown" msgstr "Nepoznato" -#: perllib/FixMyStreet/App/Controller/Rss.pm:173 +#: perllib/FixMyStreet/App/Controller/Rss.pm:174 msgid "Unknown alert type" msgstr "Nepoznat tip upozorenja" @@ -3285,7 +3215,7 @@ msgstr "" msgid "Unknown problem ID" msgstr "Nepoznat IB problema" -#: templates/web/base/report/update/form_update.html:25 +#: templates/web/base/report/update/form_update.html:27 msgid "Update" msgstr "Ažuriranje" @@ -3337,10 +3267,10 @@ msgstr "Status ažuriranja" msgid "Updated" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 -#: perllib/FixMyStreet/App/Controller/Admin.pm:821 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1096 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1144 +#: perllib/FixMyStreet/App/Controller/Admin.pm:809 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3367,7 +3297,7 @@ msgstr "Ažuriranja za {{naslov}}" msgid "Updates to this problem, %s" msgstr "" -#: templates/web/base/admin/body.html:182 +#: templates/web/base/admin/body.html:180 msgid "Use the <strong>note</strong> to record details that are only displayed in the admin. Notes are not shown publicly, and are not sent to the body." msgstr "" @@ -3376,11 +3306,11 @@ msgstr "" msgid "Used map" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 msgid "User flag removed" msgstr "KorisniÄka oznaka uklonjena" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1421 msgid "User flagged" msgstr "Korisnik oznaÄen" @@ -3388,16 +3318,16 @@ msgstr "Korisnik oznaÄen" msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "Korisnici" -#: perllib/FixMyStreet/App/Controller/Admin.pm:382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:412 -#: perllib/FixMyStreet/App/Controller/Admin.pm:429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:380 +#: perllib/FixMyStreet/App/Controller/Admin.pm:410 +#: perllib/FixMyStreet/App/Controller/Admin.pm:427 msgid "Values updated" msgstr "Vrijednosti ažurirane" @@ -3434,16 +3364,15 @@ msgstr "PronaÄ‘eno je viÅ¡e rezultata za tnavedenulokaciju. Prikazano je do dese #: templates/web/base/auth/general.html:6 #: templates/web/base/report/display.html:27 #: templates/web/base/report/new/oauth_email_form.html:5 -#, fuzzy msgid "We need your email address, please give it below." -msgstr "Nikada ne prikazujemo vaÅ¡u e-mail adresu ili telefonski broj." +msgstr "" #: templates/web/base/report/new/form_user_loggedout_email.html:2 #: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "Nikada ne prikazujemo vaÅ¡u e-mail adresu" -#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedin.html:30 #: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "Nikada ne prikazujemo vaÅ¡u e-mail adresu ili telefonski broj." @@ -3452,7 +3381,7 @@ msgstr "Nikada ne prikazujemo vaÅ¡u e-mail adresu ili telefonski broj." 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." -#: templates/web/base/index-steps.html:31 +#: templates/web/base/index-steps.html:11 msgid "We send it to the council on your behalf" msgstr "Poslan je odgovornom tijelu u VaÅ¡e ime" @@ -3490,10 +3419,6 @@ msgstr "Prilikom slanja" msgid "Whoa there Testino! Three photos are enough." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 -msgid "Whole block of empty flats" -msgstr "Cijeli blok praznih stanova" - #: templates/web/base/tokens/confirm_alert.html:7 msgid "Why stop there? <a href=\"/alert\">Set up more alerts</a> for free." msgstr "" @@ -3513,7 +3438,7 @@ msgstr "Osim pretraživanja prijava, moguće je pretražiti i odgovorne_agenc msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "" -#: templates/web/base/questionnaire/index.html:96 +#: templates/web/base/questionnaire/index.html:97 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "Želite li za 4 tjedna primiti joÅ¡ jedan upitnik koji bi Vas podsjetio da provjerite status?" @@ -3543,8 +3468,8 @@ msgstr "Godina" #: templates/web/base/admin/update_edit.html:24 #: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 +#: templates/web/base/questionnaire/index.html:100 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "Da" @@ -3658,19 +3583,19 @@ msgid "Your Reports" msgstr "VaÅ¡e prijave" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/alert/updates.html:19 +#: templates/web/base/alert/updates.html:22 #: templates/web/base/contact/index.html:83 #: templates/web/base/report/display_tools.html:38 #: templates/web/base/report/display_tools.html:40 #: templates/web/base/report/new/form_user_loggedin.html:3 #: templates/web/base/report/new/form_user_loggedout_email.html:1 #: templates/web/base/report/update/form_user_loggedout_email.html:1 -#: templates/web/fixmystreet/alert/updates.html:19 -#: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/zurich/report/new/fill_in_details_form.html:76 +#: templates/web/zurich/report/new/fill_in_details_form.html:78 msgid "Your email" msgstr "VaÅ¡ e-mail" -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/general.html:55 #: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 @@ -3681,17 +3606,17 @@ msgstr "VaÅ¡a e-mail adresa" msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "VaÅ¡e informacije će se koristiti iskljuÄivo u skladu s naÅ¡im<a href=\"/privacy\">pravilima o privatnosti</a>" -#: templates/web/base/auth/general.html:90 +#: templates/web/base/auth/general.html:100 #: templates/web/base/contact/index.html:76 #: templates/web/base/report/new/form_user_loggedin.html:18 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17 -#: templates/web/base/report/update/form_name.html:11 +#: templates/web/base/report/update/form_name.html:12 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:86 +#: templates/web/zurich/report/new/fill_in_details_form.html:88 msgid "Your name" msgstr "Ime" -#: templates/web/base/auth/general.html:75 +#: templates/web/base/auth/general.html:85 #: 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 @@ -3704,20 +3629,19 @@ msgstr "VaÅ¡a lozinka je promijenjena" #: templates/web/base/report/new/form_user_loggedin.html:27 #: templates/web/base/report/new/form_user_loggedout_by_email.html:26 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:94 msgid "Your phone number" msgstr "VaÅ¡ broj telefona" #: templates/web/base/questionnaire/index.html:14 -#, fuzzy msgid "Your report" -msgstr "VaÅ¡e prijave" +msgstr "" -#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 +#: templates/web/base/footer.html:29 msgid "Your reports" msgstr "VaÅ¡e prijave" -#: templates/web/base/my/my.html:41 +#: templates/web/base/my/my.html:39 msgid "Your updates" msgstr "VaÅ¡a ažuriranja" @@ -3743,7 +3667,7 @@ msgid "didn't use map" msgstr "nije koriÅ¡tena karta" #: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/around/postcode_form.html:12 msgid "e.g. ‘%s’ or ‘%s’" msgstr "npr. ‘%s’ ili‘%s’" @@ -3849,8 +3773,7 @@ msgstr "druga podruÄja:" msgid "reopened" msgstr "ponovno otvoreno" -#: templates/web/base/header.html:33 templates/web/fixmystreet/header.html:64 -#: templates/web/zurich/footer.html:13 +#: templates/web/base/header.html:64 templates/web/zurich/footer.html:13 msgid "sign out" msgstr "odjavi se" @@ -3933,7 +3856,7 @@ msgstr[0] "<big>%s</big> ažuriranje za prijavu" msgstr[1] "<big>%s</big> ažuriranja za prijavu" msgstr[2] "<big>%s</big> ažuriranja za prijavu" -#: templates/web/emptyhomes/report/new/councils_text_none.html:3 +#: templates/web/base/report/new/councils_text_none.html:3 #, perl-format msgid "We do not yet have details for the council that covers this location." msgid_plural "We do not yet have details for the councils that cover this location." @@ -3981,80 +3904,41 @@ msgstr[0] "JoÅ¡ <strong>nemamo</strong> podatke za drugo odgovorno tijelo koje j msgstr[1] "JoÅ¡ <strong>nemamo</strong> podatke za ostala odgovorna tijela koja su odgovorna za ovu lokaciju." msgstr[2] "JoÅ¡ <strong>nemamo</strong> podatke za ostala odgovorna tijela koja su odgovorna za ovu lokaciju." -#~ msgid "(we never show your email address or phone number)" -#~ msgstr "(vaÅ¡u email adresu i broj telefona držimo u tajnosti)" - -#~ msgid "(we never show your email)" -#~ msgstr "(vaÅ¡ email držimo u tajnosti)" - -#~ msgid "<strong>No</strong>, let me confirm my report by email:" -#~ msgstr "<strong>No</strong>, potvrdi moju prijavu e-mailom:" - -#~ msgid "<strong>No</strong>, let me confirm my update by email:" -#~ msgstr "<strong>No</strong>, potvrdi moje ažuriranje e-mailom:" - -#~ msgid "Email me updates" -#~ msgstr "PoÅ¡alji mi e-mail o ažuriranjima" - -#~ msgid "Enter a new password:" -#~ msgstr "Unesi novu lozinku:" - -#~ msgid "I'm afraid we couldn't validate that token. If you've copied the URL from an email, please check that you copied it exactly.\n" -#~ msgstr "Nažalost, ne možemo provjeriti token. Ako ste kopirali URL iz e-maila, molimo provjeriti da ste ga toÄno kopirali. \n" - -#~ msgid "If you use web-based email or have 'junk mail' filters, you may wish to check your bulk/spam mail folders: sometimes, our messages are marked that way." -#~ msgstr "Ako koristite e-mail na Webu ili 'junk mail' filtere, provjerite svoje bulk / spam mail mape: ponekad su naÅ¡e poruke oznaÄene na taj naÄin." - -#~ msgid "Message:" -#~ msgstr "Poruka:" - -#~ msgid "More problems nearby" -#~ msgstr "ViÅ¡e problema u blizini" - -#~ msgid "Nearly Done! Now check your email..." -#~ msgstr "Skoro uÄinjeno! Sada provjeri svoj e-mail..." - -#~ msgid "Offensive? Unsuitable? Tell us" -#~ msgstr "Uvredljivo? Neprikladno? Recite nam" - -#~ msgid "Photo:" -#~ msgstr "Slika:" - -#~ msgid "Please check your email" -#~ msgstr "Provjeri svoj e-mail" +#~ msgid "About us" +#~ msgstr "O nama" -#~ msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" -#~ msgstr "Napominjemo da se ažuriranja ne Å¡alju odgovornom tijelu. Ako navedete svoje ime, bit će vidljivo. VaÅ¡e informacije će biti koriÅ¡tene u skladu s naÅ¡im <a href=\"/faq#privacy\">pravilima o privatnosti</a>" +#~ msgid "Email me new local problems" +#~ msgstr "PoÅ¡alji nam e-mail o novom lokalnom problemu" -#~ msgid "This problem has been closed" -#~ msgstr "Problem je zatvoren" +#~ msgid "Empty flat or maisonette" +#~ msgstr "Prazan stan ili kućica" -#~ msgid "This problem is in progress" -#~ msgstr "Problem je i dalje aktualan" +#~ msgid "Empty house or bungalow" +#~ msgstr "Prazna kuća ili bungalov" -#~ msgid "This problem is old and of unknown status." -#~ msgstr "Odabrani problem je star i nismo upoznati s trenutnim stanjem." +#~ msgid "Empty office or other commercial" +#~ msgstr "Prazan ured ili poslovni prostor" -#~ msgid "Update:" -#~ msgstr "Ažuriranje:" +#~ msgid "Empty pub or bar" +#~ msgstr "Prazan kafić ili bar" -#~ msgid "We have sent you an email containing a link to confirm your account." -#~ msgstr "Poslali smo Vam e-mail s linkom za potvrdu korisniÄkog raÄuna." +#~ msgid "Empty public building - school, hospital, etc." +#~ msgstr "Prazne javne zgrade - Å¡kola, bolnica, itd." -#~ msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:" -#~ msgstr "Rado bismo Äuli VaÅ¡e miÅ¡ljenje o ovoj stranici. Da biste to uÄinili, dovoljno je ispuniti obrazac ili poslati e-mail na <a href='mailto:%s'>%s</a>:" +#~ msgid "FixMyStreet" +#~ msgstr "Popravi.to" -#~ msgid "You have already attached a photo to this report, attaching another one will replace it." -#~ msgstr "Već ste priložiti fotografiju ovoj prijavi, ako dodate novu, zamijenit će prethodno postojeću." +#~ msgid "I am afraid you cannot confirm unconfirmed reports." +#~ msgstr "Nažalost, ne možeÅ¡ potvrditi nepotvrÄ‘ena izvješća" -#~ msgid "You have already attached a photo to this update, attaching another one will replace it." -#~ msgstr "Već ste priložiti fotografiju ovom ažuriranju, ako dodate novu, zamijenit će prethodno postojeću." +#~ msgid "Problems in this area" +#~ msgstr "Problemi u ovom podruÄju" -#~ msgid "Your email:" -#~ msgstr "VaÅ¡ e-mail:" +#~ msgid "Property type:" +#~ msgstr "Tip objekta:" -#~ msgid "Your name:" -#~ msgstr "Ime:" +#~ msgid "RSS feed of problems in this %s" +#~ msgstr "RSS izvor za probleme u ovom %s" -#~ msgid "Your email:" -#~ msgstr "VaÅ¡ e-mail:" +#~ msgid "Whole block of empty flats" +#~ msgstr "Cijeli blok praznih stanova" diff --git a/locale/it.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/it.UTF-8/LC_MESSAGES/FixMyStreet.po index 10b78add4..4794ab12e 100644 --- a/locale/it.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/it.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2016-03-02 13:09+0000\n" -"PO-Revision-Date: 2015-10-23 16:36+0000\n" +"POT-Creation-Date: 2016-05-03 10:41+0100\n" +"PO-Revision-Date: 2016-03-23 12:43+0000\n" "Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: Italian (http://www.transifex.com/mysociety/fixmystreet/language/it/)\n" "Language: it\n" @@ -21,7 +21,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/DB/Result/Problem.pm:618 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr "e" @@ -54,9 +54,8 @@ msgid "%s admin:" msgstr "" #: templates/web/base/status/stats.html:26 -#, fuzzy msgid "%s bodies" -msgstr "Corpi" +msgstr "" #: templates/web/base/status/stats.html:24 msgid "%s confirmed alerts, %s unconfirmed" @@ -91,7 +90,7 @@ msgstr "%s aggiornamenti in tempo reale" msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "%s questionari inviati – %s compilati (%s%%)" -#: perllib/FixMyStreet/DB/Result/Problem.pm:683 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "%s ref: %s" msgstr "%s ref: %s" @@ -110,10 +109,6 @@ msgstr "" msgid "%s ward, %s" msgstr "%s quartiere, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:552 -msgid "%s, reported at %s" -msgstr "%s, segnalati al %s" - #: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "%s dentro al quartiere %s" @@ -168,7 +163,7 @@ msgstr "(come gli atti vandalici, le discariche abusive, la pavimentazione e l'i msgid "(not sent to council)" msgstr "(non inviato al Comune)" -#: templates/web/zurich/report/new/fill_in_details_form.html:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "(optional)" msgstr "(opzionale)" @@ -180,12 +175,11 @@ msgstr "(pubblico)" msgid "(sent to both)" msgstr "(inviato ad entrambi)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Scegli una categoria --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Scegli un tipo di proprietà --" @@ -217,26 +211,21 @@ msgstr "<strong>No</strong> Lasciami confermare la mia segnalazione via email" msgid "<strong>No</strong> Let me confirm my update by email" msgstr "<strong>No</strong> Lasciami confermare il mio aggiornamento via email" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:97 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>No</strong> lasciami entrare con l'email" -#: templates/web/base/auth/general.html:70 +#: templates/web/base/auth/general.html:80 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Si</strong> Ho già la password" -#: templates/web/base/about/about-en-gb.html:1 -#: templates/web/base/about/about-en-gb.html:3 -msgid "About us" -msgstr "Chi siamo" - #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Action Scheduled" msgstr "" @@ -267,7 +256,7 @@ msgstr "Aggiungi una nuova categoria" msgid "Add user" msgstr "Aggiungi un'utente" -#: templates/web/base/my/my.html:56 +#: templates/web/base/my/my.html:54 msgid "Added %s" msgstr "Aggiunti %s" @@ -287,7 +276,7 @@ msgstr "Segnalazione %d creata per %s tipo %s, parametri %s / %s" msgid "Alert %d disabled (created %s)" msgstr "Segnalazione %d disabilitata (creata %s)" -#: templates/web/base/report/update/form_name.html:20 +#: templates/web/base/report/update/form_name.html:21 msgid "Alert me to future updates" msgstr "Avvisami su futuri aggiornamenti" @@ -300,7 +289,7 @@ msgstr "Tutte le segnalazioni" msgid "All Reports as CSV" msgstr "" -#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 +#: templates/web/base/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:20 @@ -399,7 +388,7 @@ msgstr "Indietro" msgid "Ban email address" msgstr "Vietare l'indirizzo email" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1273 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -430,7 +419,7 @@ msgstr "Non puoi vedere la mappa? <em>Salta questo passaggio</em>" #: templates/web/base/admin/body.html:68 #: templates/web/base/admin/index.html:54 -#: templates/web/base/report/new/category.html:10 +#: templates/web/base/report/new/category.html:7 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 @@ -445,7 +434,7 @@ msgstr "Categoria" msgid "Category fix rate for problems > 4 weeks old" msgstr "" -#: templates/web/base/admin/body.html:138 +#: templates/web/base/admin/body.html:137 #: templates/web/base/admin/category_edit.html:23 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/admin/body.html:43 @@ -465,19 +454,19 @@ msgstr "Categoria: %s" msgid "Change password" msgstr "Cambia la Password" -#: templates/web/base/admin/body.html:160 +#: templates/web/base/admin/body.html:158 msgid "" "Check <strong>confirmed</strong> to indicate that this contact has been confirmed as correct.\n" " If you are not sure of the origin or validity of the contact, leave this unchecked." msgstr "" -#: templates/web/base/admin/body.html:171 +#: templates/web/base/admin/body.html:169 msgid "" "Check <strong>deleted</strong> to remove the category from use. \n" " It will not appear as an available category in the drop-down menu on the report-a-problem page." msgstr "" -#: templates/web/base/admin/body.html:191 +#: templates/web/base/admin/body.html:189 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -488,7 +477,7 @@ msgid "" " at a specific address." msgstr "" -#: templates/web/base/admin/body.html:130 +#: templates/web/base/admin/body.html:129 msgid "" "Choose a <strong>category</strong> 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." @@ -529,8 +518,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:15 #: templates/web/base/admin/report_blocks.html:25 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 @@ -539,7 +528,7 @@ msgstr "" msgid "Closed" msgstr "Chiuso" -#: perllib/FixMyStreet/DB/Result/Problem.pm:779 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Closed by council" msgstr "Chiuso dal comune" @@ -565,7 +554,7 @@ msgstr "Dati del Cobrand:" msgid "Cobrand:" msgstr "Cobrand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Configurazione" @@ -584,9 +573,8 @@ msgstr "Conferma l'account" #: templates/web/base/report/new/form_user_loggedout_password.html:21 #: templates/web/base/report/update/form_user_loggedout_password.html:20 -#, fuzzy msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." -msgstr "Conferma tramite l'email qui sotto ed una nuova password ti verrà fornita. Dopo aver confermato l'email che riceverai, la tua password verrà aggiornata." +msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:1 #: templates/web/base/tokens/confirm_problem.html:1 @@ -596,7 +584,7 @@ msgstr "Conferma tramite l'email qui sotto ed una nuova password ti verrà forni msgid "Confirmation" msgstr "Conferma" -#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:164 #: templates/web/base/admin/body.html:79 #: templates/web/base/admin/category_edit.html:37 #: templates/web/base/admin/category_edit.html:92 @@ -615,7 +603,7 @@ msgid "Confirmed:" msgstr "Confermato:" #. ("%s is the site name") -#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 +#: templates/web/base/about/_sidebar.html:6 msgid "Contact %s" msgstr "" @@ -634,8 +622,8 @@ msgstr "Contatta il team" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1417 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1445 msgid "Could not find user" msgstr "Non posso trovare l'utente" @@ -653,7 +641,7 @@ msgstr "Comune" msgid "Council contacts for %s" msgstr "I contatti del comune per %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:681 +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "Council ref: %s" msgstr "" @@ -672,7 +660,7 @@ msgstr "Contare" msgid "Create a report" msgstr "Crea una segnalazione" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "Crea una categoria" @@ -716,20 +704,20 @@ msgstr "Pannello di controllo" msgid "Dealt with by subdivision within 5 working days" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:877 +#: perllib/FixMyStreet/App/Controller/Admin.pm:865 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:175 #: templates/web/base/admin/body.html:81 #: templates/web/base/admin/category_edit.html:42 #: templates/web/base/admin/category_edit.html:93 msgid "Deleted" msgstr "Eliminato" -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:47 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -737,7 +725,7 @@ msgid "Description" msgstr "Descrizione" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:68 +#: templates/web/zurich/report/new/fill_in_details_form.html:70 msgid "Details" msgstr "Dettagli" @@ -762,11 +750,11 @@ msgid "Diligency prize league table" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:48 -#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/auth/general.html:58 +#: templates/web/base/report/new/form_user_loggedout.html:28 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout.html:17 +#: templates/web/base/report/update/form_user_loggedout.html:27 msgid "Do you have a %s password?" msgstr "" @@ -784,8 +772,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "Duplicate" msgstr "Duplica" @@ -805,7 +793,7 @@ msgstr "" msgid "Edit" msgstr "Modifica" -#: templates/web/base/admin/body.html:220 +#: templates/web/base/admin/body.html:218 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "Modifica dettagli corpo" @@ -835,7 +823,7 @@ msgstr "Editor" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:39 +#: templates/web/base/auth/general.html:49 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -843,11 +831,11 @@ msgstr "Editor" msgid "Email" msgstr "Email" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 msgid "Email added to abuse list" msgstr "Email aggiunta alla lista abusi" -#: templates/web/base/admin/body.html:155 +#: templates/web/base/admin/body.html:153 msgid "Email address:" msgstr "Indirizzo email:" @@ -859,19 +847,14 @@ msgstr "" msgid "Email alert deleted" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1390 msgid "Email already in abuse list" msgstr "Email già presente nella lista abusi" -#: templates/web/base/around/_updates.html:5 -msgid "Email me new local problems" -msgstr "Inviami via email i nuovi problemi locali" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 -#: templates/web/base/alert/updates.html:13 #: templates/web/zurich/admin/body.html:47 msgid "Email:" msgstr "Email:" @@ -880,26 +863,6 @@ msgstr "Email:" msgid "Email: %s" msgstr "Email: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 -msgid "Empty flat or maisonette" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 -msgid "Empty house or bungalow" -msgstr "Case o bungalow vuoti" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 -msgid "Empty office or other commercial" -msgstr "Uffici o altri locali commerciali vuoti" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 -msgid "Empty pub or bar" -msgstr "Pub o bar vuoti" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 -msgid "Empty public building - school, hospital, etc." -msgstr "Edifici pubblici - scuole, ospedali, ecc vuoti" - #: templates/web/base/admin/body-form.html:162 #: templates/web/base/admin/body-form.html:163 msgid "" @@ -943,18 +906,14 @@ msgstr "Inserisci il piu vicino codice postale UK o il nome di una strada e l'ar msgid "Enter a nearby street name and area" msgstr "Inserisci il nome di una strada nelle vicinanze e una città o solo in nome della città " -#: perllib/FixMyStreet/Cobrand/ZeroTB.pm:7 -msgid "Enter a nearby street name and area, postal code or district in Delhi" -msgstr "" - -#: templates/web/base/auth/general.html:99 +#: templates/web/base/auth/general.html:109 #: templates/web/base/report/new/form_user_loggedout_by_email.html:38 #: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Inserisci una password" -#: templates/web/base/index-steps.html:26 +#: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "Inserisci i dettagli del problema" @@ -980,7 +939,7 @@ msgstr "Esempio codice postale %s" msgid "Examples:" msgstr "Esempi:" -#: templates/web/base/report/new/form_report.html:49 +#: templates/web/base/report/new/form_report.html:51 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "" @@ -1017,19 +976,15 @@ msgstr "Prima volta" msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." msgstr "" -#: templates/web/base/header.html:26 -msgid "FixMyStreet" -msgstr "FixMyStreet" - #: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:38 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:40 msgid "Fixed" msgstr "Risolto" @@ -1056,7 +1011,7 @@ msgstr "" msgid "Flag user" msgstr "Utente segnalato" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "Segnalato" @@ -1078,8 +1033,7 @@ msgstr "" msgid "Flagged:" msgstr "Segnalato:" -#: templates/web/base/reports/_ward-list.html:3 -#: templates/web/fixmystreet/reports/_ward-list.html:4 +#: templates/web/base/reports/_ward-list.html:4 msgid "Follow a ward link to view only reports within that ward." msgstr "" @@ -1110,18 +1064,18 @@ msgstr "Domande Frequenti" msgid "GeoRSS on Google Maps" msgstr "GeoRSS su Google Maps" +#: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:11 -#: templates/web/fixmystreet/around/_updates.html:3 msgid "Get updates" msgstr "Ottieni aggiornamenti " -#: templates/web/fixmystreet/reports/_rss.html:3 -#: templates/web/fixmystreet/reports/_rss.html:9 +#: templates/web/base/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:9 msgid "Get updates of %s problems" msgstr "Ottieni gli aggiornamenti di %s problemi" -#: templates/web/fixmystreet/reports/_rss.html:11 -#: templates/web/fixmystreet/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:11 +#: templates/web/base/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "Ottieni gli aggiornamenti dei problemi in questo %s" @@ -1134,7 +1088,7 @@ msgid "Glad to hear it’s been fixed!" msgstr "" #: templates/web/base/alert/index.html:34 -#: templates/web/base/around/postcode_form.html:16 +#: templates/web/base/around/postcode_form.html:13 #: templates/web/base/reports/_list-filters.html:28 #: templates/web/zurich/admin/stats.html:26 msgid "Go" @@ -1160,7 +1114,7 @@ msgstr "E' stato risolto questo problema?" msgid "Have you ever reported a problem to a council before, or is this your first time?" msgstr "Avevi mai segnalato un problema ad un comune precedentemente, o questa è la tua prima volta?" -#: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:38 +#: templates/web/base/footer.html:38 #: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 @@ -1171,8 +1125,7 @@ msgstr "Aiuto" msgid "Here are the types of local problem alerts for ‘%s’." msgstr "Qui trovi i tipi di avvertimenti sui problemi locali per ‘%s’." -#: templates/web/base/header.html:32 templates/web/fixmystreet/header.html:63 -#: templates/web/zurich/footer.html:12 +#: templates/web/base/header.html:63 templates/web/zurich/footer.html:12 msgid "Hi %s" msgstr "Ciao %s" @@ -1188,11 +1141,11 @@ msgstr "Ciao %s" msgid "Hidden" msgstr "Nascosto" -#: templates/web/base/around/display_location.html:65 +#: templates/web/base/around/display_location.html:64 msgid "Hide old" msgstr "" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:59 msgid "Hide pins" msgstr "" @@ -1212,10 +1165,6 @@ msgstr "Come segnalare un problema" msgid "How to send successful reports" msgstr "Come inviare segnalazioni di successo" -#: perllib/FixMyStreet/App/Controller/Admin.pm:752 -msgid "I am afraid you cannot confirm unconfirmed reports." -msgstr "Mi spiace non puoi confermare le segnalazioni non confermate." - #: templates/web/base/tokens/confirm_problem.html:23 #: templates/web/base/tokens/confirm_problem.html:27 msgid "I just reported a problem on @fixmystreet" @@ -1226,7 +1175,7 @@ msgstr "" msgid "I just updated a problem on @fixmystreet" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88 msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "Mi spiace non possiamo localizzare il tuo problema nel database.\n" @@ -1248,7 +1197,7 @@ msgid "" " For basic installations, you don't need to join bodies in this way." msgstr "" -#: templates/web/base/admin/body.html:133 +#: templates/web/base/admin/body.html:132 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." @@ -1269,7 +1218,7 @@ msgid "" "(please note it will not be sent to the council)." msgstr "" -#: templates/web/base/admin/body.html:149 +#: templates/web/base/admin/body.html:147 msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." msgstr "" @@ -1304,10 +1253,10 @@ msgstr "ID illegale" msgid "Illegal feed selection" msgstr "Selezione feed illegale" +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "In Progress" msgstr "In progresso" @@ -1358,7 +1307,7 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 msgid "Invalid end date" msgstr "" @@ -1366,16 +1315,16 @@ msgstr "" msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 msgid "Invalid start date" msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:5 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Investigating" msgstr "Investigando" @@ -1397,7 +1346,7 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:80 +#: 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 @@ -1435,7 +1384,6 @@ msgstr "Caricando..." #: 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/fixmystreet/alert/updates.html:1 msgid "Local RSS feeds and email alerts" msgstr "RSS feed locali ed avvertimenti via email" @@ -1444,11 +1392,11 @@ msgstr "RSS feed locali ed avvertimenti via email" msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "RSS feed locali ed avvertimenti via email per ‘%s’" -#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:35 +#: templates/web/base/footer.html:35 msgid "Local alerts" msgstr "Segnalazioni locali" -#: templates/web/base/index-steps.html:25 +#: templates/web/base/index-steps.html:5 msgid "Locate the problem on a map of the area" msgstr "Localizza il problema nella mappa della zona" @@ -1508,14 +1456,14 @@ msgstr "Mese" #: templates/web/base/admin/list_updates.html:7 #: templates/web/base/admin/reports.html:13 #: templates/web/base/admin/users.html:15 -#: templates/web/base/auth/general.html:89 +#: templates/web/base/auth/general.html:99 #: templates/web/base/report/new/form_user_loggedin.html:9 #: templates/web/base/report/new/form_user_loggedout_by_email.html:7 -#: templates/web/base/report/update/form_name.html:4 +#: templates/web/base/report/update/form_name.html:5 #: templates/web/base/reports/index.html:20 #: 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:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "Name" msgstr "Nome" @@ -1539,8 +1487,8 @@ 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:455 -#: perllib/FixMyStreet/Cobrand/Default.pm:495 +#: perllib/FixMyStreet/Cobrand/Default.pm:454 +#: perllib/FixMyStreet/Cobrand/Default.pm:494 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" @@ -1562,7 +1510,7 @@ msgstr "Nuovi <br>problemi" msgid "New body added" msgstr "Nuovo corpo aggiunto" -#: perllib/FixMyStreet/App/Controller/Admin.pm:387 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 msgid "New category contact added" msgstr "Nuova categoria contatto aggiunta" @@ -1627,7 +1575,7 @@ msgstr "Prossimo" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 -#: templates/web/base/questionnaire/index.html:101 +#: templates/web/base/questionnaire/index.html:102 #: templates/web/base/questionnaire/index.html:53 msgid "No" msgstr "No" @@ -1692,8 +1640,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Not Responsible" msgstr "Non responsabile" @@ -1726,7 +1674,7 @@ msgstr "Nota" 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/base/admin/body.html:186 +#: templates/web/base/admin/body.html:184 #: templates/web/base/admin/category_edit.html:52 #: templates/web/zurich/admin/body.html:53 msgid "Note:" @@ -1740,15 +1688,15 @@ msgstr "Nota: <strong>%s</strong>" msgid "Notes from SDM to DM" msgstr "" -#: templates/web/base/report/new/form_user_loggedout.html:14 #: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/form_user_loggedout.html:24 #: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "Ora per inserire la tua segnalazione…" #: templates/web/base/report/update-form.html:28 -#: templates/web/base/report/update/form_user_loggedout.html:13 #: templates/web/base/report/update/form_user_loggedout.html:2 +#: templates/web/base/report/update/form_user_loggedout.html:23 msgid "Now to submit your update…" msgstr "Ora per inserire il tuo aggiornamento…" @@ -1782,8 +1730,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:23 #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/report/update/form_update.html:36 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1818,13 +1766,13 @@ msgstr "" 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:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1055 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 -#: perllib/FixMyStreet/DB/Result/Problem.pm:558 -#: perllib/FixMyStreet/DB/Result/Problem.pm:568 -#: perllib/FixMyStreet/DB/Result/Problem.pm:578 -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1044 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:659 +#: perllib/FixMyStreet/DB/Result/Problem.pm:562 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 +#: perllib/FixMyStreet/DB/Result/Problem.pm:582 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 #: perllib/FixMyStreet/Script/Reports.pm:175 #: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" @@ -1849,7 +1797,7 @@ msgstr "Parente" msgid "Partial" msgstr "Parziale" -#: templates/web/base/auth/general.html:92 +#: templates/web/base/auth/general.html:102 #: templates/web/base/report/new/form_user_loggedout_by_email.html:31 #: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 @@ -1858,7 +1806,7 @@ msgid "Password (optional)" msgstr "Password (opzionale)" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:72 +#: templates/web/base/auth/general.html:82 msgid "Password:" msgstr "Password:" @@ -1866,7 +1814,7 @@ msgstr "Password:" msgid "Permalink" msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:90 msgid "Phone number" msgstr "Numero di telefono" @@ -1882,13 +1830,21 @@ msgid "Phone:" msgstr "Telefono:" #: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/questionnaire/index.html:89 +#: templates/web/base/questionnaire/index.html:91 #: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/new/form_report.html:38 +#: templates/web/base/report/new/form_report.html:40 +#: templates/web/base/report/update/form_update.html:20 +#: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:6 #: 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:45 +#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/zurich/report/new/fill_in_details_form.html:63 msgid "Photo" msgstr "Foto" @@ -1912,8 +1868,8 @@ msgstr "Inserisci il cursore sulla mappa" #: perllib/FixMyStreet/Cobrand/Zurich.pm:955 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:6 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 @@ -1929,16 +1885,16 @@ 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/general.html:27 -#: templates/web/base/auth/general.html:33 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:43 #: 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:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:856 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:921 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -1948,7 +1904,7 @@ msgstr "Per favore scegli una categoria" msgid "Please choose a property type" msgstr "Per favore scegli un tipo di proprietà " -#: perllib/FixMyStreet/App/Controller/Admin.pm:378 +#: perllib/FixMyStreet/App/Controller/Admin.pm:376 msgid "Please correct the errors below" msgstr "" @@ -1969,11 +1925,10 @@ msgstr "Per favore non abusarne — abusandone il comune svaluterà il msgid "Please enter a message" msgstr "Per favore inserisci un messaggio" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Admin.pm:1079 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 msgid "Please enter a name" -msgstr "Per favore inserisci il tuo nome" +msgstr "" #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 @@ -1987,10 +1942,10 @@ msgstr "Per favore inserisci la password" msgid "Please enter a subject" msgstr "Per favore inserisci il soggetto" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1075 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1130 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:133 +#: perllib/FixMyStreet/DB/Result/User.pm:143 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2007,9 +1962,9 @@ msgid "Please enter some details" msgstr "Per favore inserire qualche dettaglio " #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:130 -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:32 +#: perllib/FixMyStreet/DB/Result/User.pm:140 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:42 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2018,7 +1973,7 @@ msgid "Please enter your email" msgstr "Per favore inserisci la tua email" #: templates/web/base/report/new/form_user_loggedout_email.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:80 +#: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "Please enter your email address" msgstr "Per favore inserisci il tuo indirizzo email" @@ -2034,7 +1989,7 @@ msgstr "Per favore inserisci il tuo nome completo, i comuni hanno bisogno di que #: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:126 +#: perllib/FixMyStreet/DB/Result/User.pm:136 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "Per favore inserisci il tuo nome" @@ -2061,7 +2016,7 @@ msgstr "Per favore <a href=\"%s\">entra di nuovo</a>, o torna indietro nella <a msgid "Please fill in details of the problem below." msgstr "Si prega di compilare i dettagli del problema qui di seguito." -#: templates/web/zurich/report/new/fill_in_details_form.html:72 +#: templates/web/zurich/report/new/fill_in_details_form.html:74 msgid "Please fill in details of the problem." msgstr "SI prega di inserire i dettagli del problema" @@ -2070,7 +2025,7 @@ msgstr "SI prega di inserire i dettagli del problema" msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "Si prega di compilare il modulo sottostante con i dettagli del problema, e descrivere la posizione nel modo più preciso possibile, nella casella dettagli." -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Per favore indicare se si vuole ricevere un altro questionario" @@ -2079,9 +2034,8 @@ msgid "Please note that updates are not sent to the council." msgstr "Gli aggiornamenti non verranno inviati al comune." #: templates/web/base/report/new/oauth_email_form.html:4 -#, fuzzy msgid "Please note your report has <strong>not yet been sent</strong>." -msgstr "La tua segnalazione <strong>non è stata inviata</strong>. Scegli una categoria e aggiungi ulteriori informazioni qui di seguito e infine inviala." +msgstr "" #: templates/web/base/report/new/fill_in_details_form.html:20 #: templates/web/zurich/report/new/fill_in_details_form.html:11 @@ -2097,16 +2051,16 @@ msgstr "" msgid "Please note:" msgstr "Attenzione:" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please provide some explanation as to why you're reopening this report" msgstr "Per favore provvedi ad alcune spiegazioni perché stai riaprendo questa segnalazione" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250 msgid "Please provide some text as well as a photo" msgstr "Per favore provvedi a del testo come ad una foto" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236 msgid "Please say whether you've ever reported a problem to your council before" msgstr "Per favore dicci se hai mai precedentemente riportato un problema al tuo comune " @@ -2122,22 +2076,23 @@ msgstr "Si prega di selezionare il feed che si vuole" msgid "Please select the type of alert you want" msgstr "Per favore seleziona il tipo di avvertimento che desideri" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232 msgid "Please state whether or not the problem has been fixed" msgstr "Si prega di indicare se il problema è stato risolto" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:121 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 #: templates/web/base/js/translation_strings.html:53 -msgid "Please upload a JPEG image only" +#, fuzzy +msgid "Please upload an image only" msgstr "Per favore utilizza soltanto il formato JPG" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 msgid "Please write a message" msgstr "Per favore scrivi un messaggio" -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Please write your update here" msgstr "Per favore scrivi il tuo aggiornamento qui" @@ -2168,7 +2123,7 @@ msgstr "" msgid "Previous" msgstr "Precedente" -#: templates/web/fixmystreet/footer.html:41 +#: templates/web/base/footer.html:41 msgid "Privacy" msgstr "Privacy" @@ -2178,7 +2133,7 @@ msgstr "Privacy" msgid "Privacy and cookies" msgstr "" -#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:200 #: templates/web/base/admin/body.html:85 #: templates/web/base/admin/category_edit.html:45 #: templates/web/base/admin/report_edit.html:77 @@ -2207,7 +2162,7 @@ msgstr "Problema %s inviato al comune %s" msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1046 msgid "Problem marked as open." msgstr "Problema marcato come aperto." @@ -2219,10 +2174,6 @@ msgstr "Il cambio di stato del problema è basato sui risultati del sondaggio" msgid "Problems" msgstr "Problemi" -#: templates/web/base/around/_updates.html:1 -msgid "Problems in this area" -msgstr "Problemi in questa area" - #: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "Problemi vicino" @@ -2240,13 +2191,11 @@ msgid "Problems within %.1fkm of this location" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:663 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 #: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "Problemi dentro %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "Problemi dentro %s quartiere" @@ -2265,15 +2214,11 @@ msgstr "Problemi dentro i confini di:" msgid "Property address:" msgstr "L'indirizzo della proprietà :" -#: templates/web/base/report/new/category.html:8 -msgid "Property type:" -msgstr "Tipo di proprietà :" - #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Fornisci un'aggiornamento" -#: templates/web/base/auth/general.html:95 +#: templates/web/base/auth/general.html:105 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 "" @@ -2307,16 +2252,15 @@ msgstr "Questionario %d e risposte per il problema %d, %s o %s" msgid "Questionnaire %d sent for problem %d" msgstr "Questionario %d inviato per il problema %d" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 msgid "Questionnaire filled in by problem reporter" msgstr "" #: templates/web/base/alert/_list.html:22 +#: templates/web/base/alert/updates.html:9 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display_tools.html:34 -#: templates/web/base/reports/_rss.html:1 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed" msgstr "RSS feed" @@ -2344,18 +2288,12 @@ msgstr "RSS feed di %s, dentro al quartiere %s " msgid "RSS feed of nearby problems" msgstr "RSS feed dei problemi vicino" -#: templates/web/base/reports/_rss.html:1 -msgid "RSS feed of problems in this %s" -msgstr "RSS feed per i problemi in questo %s" - #: perllib/FixMyStreet/Cobrand/Default.pm:664 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 #: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "RSS feed dei problemi dentro %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 #: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "RSS feed di problemi dentro al quartiere %s " @@ -2365,14 +2303,13 @@ msgstr "RSS feed di problemi dentro al quartiere %s " msgid "RSS feed of recent local problems" msgstr "RSS feed dei recenti problemi locali" +#: templates/web/base/alert/updates.html:9 #: templates/web/base/report/display_tools.html:34 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed of updates to this problem" msgstr "RSS feed degli aggiornamenti su questa segnalazione" -#: templates/web/base/alert/updates.html:9 +#: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:36 -#: templates/web/fixmystreet/alert/updates.html:14 msgid "Receive email when updates are left on this problem." msgstr "Ricevi un'email quando gli aggiornamenti sono aggiunti su questa segnalazione." @@ -2408,12 +2345,11 @@ msgstr "" msgid "Reply to user:" msgstr "" -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/header_logo.html:2 msgid "Report" msgstr "" -#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:26 -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/footer.html:26 templates/web/base/header_logo.html:2 #: templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2423,7 +2359,7 @@ msgstr "Segnala un problema" msgid "Report abuse" msgstr "Segnala un abuso" -#: perllib/FixMyStreet/App/Controller/Rss.pm:291 +#: perllib/FixMyStreet/App/Controller/Rss.pm:297 msgid "Report on %s" msgstr "" @@ -2438,7 +2374,7 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "Segnala, conosci e discuti sui problemi della tua città " -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:577 #: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "Riportati anonimamente al %s" @@ -2448,7 +2384,7 @@ msgstr "Riportati anonimamente al %s" msgid "Reported before" msgstr "Segnalati prima" -#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 #: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "Segnalato da %s al %s" @@ -2462,27 +2398,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "Riportato nella categoria %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:569 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 msgid "Reported in the %s category anonymously at %s" msgstr "Riportato nella categoria %s anonimamente alle %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:591 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 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:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported via %s anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported via %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:561 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 msgid "Reported via %s in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 msgid "Reported via %s in the %s category by %s at %s" msgstr "" @@ -2503,7 +2439,7 @@ msgstr "" msgid "Reporting a problem" msgstr "Stai segnalando un problema" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1274 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" @@ -2546,15 +2482,15 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1496 #: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 #: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 @@ -2569,7 +2505,7 @@ msgstr "" msgid "Satellite" msgstr "" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/base/admin/category_edit.html:84 #: templates/web/zurich/admin/body.html:59 #: templates/web/zurich/admin/template_edit.html:29 @@ -2625,7 +2561,7 @@ msgstr "" msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:696 +#: perllib/FixMyStreet/DB/Result/Problem.pm:698 msgid "Sent to %s %s later" msgstr "" @@ -2644,21 +2580,21 @@ msgstr "Condividi" #: templates/web/base/report/new/form_user_loggedin.html:23 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22 -#: templates/web/base/report/update/form_name.html:15 +#: templates/web/base/report/update/form_name.html:16 msgid "Show my name publicly" msgstr "Mostra il mio nome pubblicamente" -#: templates/web/base/around/display_location.html:67 +#: templates/web/base/around/display_location.html:66 msgid "Show old" msgstr "" -#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:57 msgid "Show pins" msgstr "" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/general.html:110 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:76 +#: templates/web/base/auth/general.html:86 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2717,9 +2653,8 @@ msgstr "Ci scusiamo, non possiamo trovare questa zona." #: templates/web/base/auth/general.html:9 #: templates/web/base/report/display.html:21 #: templates/web/base/report/new/fill_in_details_form.html:23 -#, fuzzy msgid "Sorry, we could not log you in. Please fill in the form below." -msgstr "Ci scusiamo, non possiamo analizzare questa zona. Per favore prova ancora." +msgstr "" #: perllib/FixMyStreet/Geocode/Bing.pm:35 #: perllib/FixMyStreet/Geocode/Google.pm:45 @@ -2727,15 +2662,10 @@ msgstr "Ci scusiamo, non possiamo analizzare questa zona. Per favore prova ancor msgid "Sorry, we could not parse that location. Please try again." msgstr "Ci scusiamo, non possiamo analizzare questa zona. Per favore prova ancora." -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:138 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 -#, fuzzy -msgid "Sorry, you can not log in with Facebook. Please try again later." -msgstr "E' accaduto un problema visualizzando questa pagine. Per favore riprova ancora più tardi" - #: templates/web/base/admin/stats.html:64 msgid "Start Date:" msgstr "Data di inizio:" @@ -2744,7 +2674,7 @@ msgstr "Data di inizio:" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/report/update/form_update.html:32 +#: templates/web/base/report/update/form_update.html:34 msgid "State" msgstr "Stato" @@ -2757,7 +2687,7 @@ msgstr "Stato" msgid "State:" msgstr "Stato:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2797,10 +2727,10 @@ msgid "Subject:" msgstr "Soggetto:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/base/report/new/form_user_loggedout_by_email.html:39 #: templates/web/base/report/new/form_user_loggedout_password.html:11 -#: templates/web/zurich/report/new/fill_in_details_form.html:96 +#: templates/web/zurich/report/new/fill_in_details_form.html:98 msgid "Submit" msgstr "Invia" @@ -2828,9 +2758,8 @@ msgstr "Invia questionario" msgid "Submitted" msgstr "Inviato" -#: templates/web/base/alert/updates.html:17 +#: templates/web/base/alert/updates.html:23 #: templates/web/base/report/display_tools.html:41 -#: templates/web/fixmystreet/alert/updates.html:23 msgid "Subscribe" msgstr "Sottoscrivi" @@ -2838,7 +2767,7 @@ msgstr "Sottoscrivi" msgid "Subscribe me to an email alert" msgstr "Iscrivimi alle email di avviso" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -2857,7 +2786,7 @@ msgstr "Sommario" msgid "Summary reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 msgid "Survey" msgstr "Sondaggio" @@ -2914,7 +2843,7 @@ msgstr "Grazie per aver aggiunto la tua foto. Abbiamo adesso bisogno di localizz msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "Grazie, è fantastico sapere che è stato risolto! Possiamo soltanto chiederti se avevi gia segnalato altri problemi al tuo comune precedentemente?" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:157 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" @@ -2922,7 +2851,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:126 +#: perllib/FixMyStreet/App/Controller/Location.pm:127 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." @@ -2932,11 +2861,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:724 +#: perllib/FixMyStreet/App/Controller/Admin.pm:722 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:716 +#: perllib/FixMyStreet/App/Controller/Admin.pm:714 msgid "That problem will now be resent." msgstr "" @@ -2948,7 +2877,7 @@ msgstr "La segnalazione non può essere vista su %s." msgid "That report has been removed from FixMyStreet." msgstr "Quella segnalazione è stata rimossa da FixMyStreet" -#: templates/web/base/admin/body.html:144 +#: templates/web/base/admin/body.html:142 msgid "" "The <strong>email address</strong> is the destination to which reports about this category will be sent. \n" " Other categories for this body may have the same email address." @@ -3088,9 +3017,9 @@ msgstr "" 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:764 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:753 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 -#: templates/web/base/auth/general.html:43 +#: templates/web/base/auth/general.html:53 #: 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" @@ -3151,9 +3080,9 @@ msgstr "Questa email è stata inviata ad entrambi i comuni che coprono la zona d 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:920 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:898 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:935 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:977 #: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "Questa informazione è richiesta" @@ -3166,11 +3095,11 @@ msgstr "" msgid "This is a summary of all reports on this site." msgstr "" -#: templates/web/base/report/update/form_update.html:52 +#: templates/web/base/report/update/form_update.html:54 msgid "This problem has been fixed" msgstr "Questo problema è stato risolto" -#: templates/web/base/report/update/form_update.html:46 +#: templates/web/base/report/update/form_update.html:48 msgid "This problem has not been fixed" msgstr "Questo problema non è stato risolto" @@ -3207,7 +3136,7 @@ msgstr "" msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -3252,8 +3181,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Unable to fix" msgstr "" @@ -3270,7 +3199,7 @@ msgstr "Non confermato" msgid "Unknown" msgstr "Sconosciuto" -#: perllib/FixMyStreet/App/Controller/Rss.pm:173 +#: perllib/FixMyStreet/App/Controller/Rss.pm:174 msgid "Unknown alert type" msgstr "" @@ -3285,7 +3214,7 @@ msgstr "Errore sconosciuto" msgid "Unknown problem ID" msgstr "" -#: templates/web/base/report/update/form_update.html:25 +#: templates/web/base/report/update/form_update.html:27 msgid "Update" msgstr "" @@ -3337,10 +3266,10 @@ msgstr "" msgid "Updated" msgstr "Aggiornato" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 -#: perllib/FixMyStreet/App/Controller/Admin.pm:821 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1096 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1144 +#: perllib/FixMyStreet/App/Controller/Admin.pm:809 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3367,7 +3296,7 @@ msgstr "" msgid "Updates to this problem, %s" msgstr "" -#: templates/web/base/admin/body.html:182 +#: templates/web/base/admin/body.html:180 msgid "Use the <strong>note</strong> to record details that are only displayed in the admin. Notes are not shown publicly, and are not sent to the body." msgstr "" @@ -3376,11 +3305,11 @@ msgstr "" msgid "Used map" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1421 msgid "User flagged" msgstr "" @@ -3388,16 +3317,16 @@ msgstr "" msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "Utenti" -#: perllib/FixMyStreet/App/Controller/Admin.pm:382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:412 -#: perllib/FixMyStreet/App/Controller/Admin.pm:429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:380 +#: perllib/FixMyStreet/App/Controller/Admin.pm:410 +#: perllib/FixMyStreet/App/Controller/Admin.pm:427 msgid "Values updated" msgstr "" @@ -3434,16 +3363,15 @@ msgstr "Abbiamo trovato più di una corrispondenza per questa posizione. Mostria #: templates/web/base/auth/general.html:6 #: templates/web/base/report/display.html:27 #: templates/web/base/report/new/oauth_email_form.html:5 -#, fuzzy msgid "We need your email address, please give it below." -msgstr "Non mostriamo mai il tuo indirizzo email e numero di telefono." +msgstr "" #: templates/web/base/report/new/form_user_loggedout_email.html:2 #: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedin.html:30 #: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "Non mostriamo mai il tuo indirizzo email e numero di telefono." @@ -3452,7 +3380,7 @@ msgstr "Non mostriamo mai il tuo indirizzo email e numero di telefono." 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 "" -#: templates/web/base/index-steps.html:31 +#: templates/web/base/index-steps.html:11 msgid "We send it to the council on your behalf" msgstr "Lo invieremo noi al comune responsabile a tuo nome" @@ -3490,10 +3418,6 @@ msgstr "" msgid "Whoa there Testino! Three photos are enough." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 -msgid "Whole block of empty flats" -msgstr "" - #: templates/web/base/tokens/confirm_alert.html:7 msgid "Why stop there? <a href=\"/alert\">Set up more alerts</a> for free." msgstr "" @@ -3513,7 +3437,7 @@ msgstr "" msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "" -#: templates/web/base/questionnaire/index.html:96 +#: templates/web/base/questionnaire/index.html:97 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "" @@ -3543,8 +3467,8 @@ msgstr "Anno" #: templates/web/base/admin/update_edit.html:24 #: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 +#: templates/web/base/questionnaire/index.html:100 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "Si" @@ -3658,19 +3582,19 @@ msgid "Your Reports" msgstr "Tue segnalazioni" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/alert/updates.html:19 +#: templates/web/base/alert/updates.html:22 #: templates/web/base/contact/index.html:83 #: templates/web/base/report/display_tools.html:38 #: templates/web/base/report/display_tools.html:40 #: templates/web/base/report/new/form_user_loggedin.html:3 #: templates/web/base/report/new/form_user_loggedout_email.html:1 #: templates/web/base/report/update/form_user_loggedout_email.html:1 -#: templates/web/fixmystreet/alert/updates.html:19 -#: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/zurich/report/new/fill_in_details_form.html:76 +#: templates/web/zurich/report/new/fill_in_details_form.html:78 msgid "Your email" msgstr "La tua email" -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/general.html:55 #: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 @@ -3681,17 +3605,17 @@ msgstr "Tuo indirizzo email" msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "" -#: templates/web/base/auth/general.html:90 +#: templates/web/base/auth/general.html:100 #: templates/web/base/contact/index.html:76 #: templates/web/base/report/new/form_user_loggedin.html:18 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17 -#: templates/web/base/report/update/form_name.html:11 +#: templates/web/base/report/update/form_name.html:12 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:86 +#: templates/web/zurich/report/new/fill_in_details_form.html:88 msgid "Your name" msgstr "Il tuo nome" -#: templates/web/base/auth/general.html:75 +#: templates/web/base/auth/general.html:85 #: 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 @@ -3704,20 +3628,19 @@ msgstr "La tua password è stata cambiata" #: templates/web/base/report/new/form_user_loggedin.html:27 #: templates/web/base/report/new/form_user_loggedout_by_email.html:26 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:94 msgid "Your phone number" msgstr "Il tuo numero di telefono" #: templates/web/base/questionnaire/index.html:14 -#, fuzzy msgid "Your report" -msgstr "Tue segnalazioni" +msgstr "" -#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 +#: templates/web/base/footer.html:29 msgid "Your reports" msgstr "Tue segnalazioni" -#: templates/web/base/my/my.html:41 +#: templates/web/base/my/my.html:39 msgid "Your updates" msgstr "" @@ -3743,7 +3666,7 @@ msgid "didn't use map" msgstr "mappa non usata" #: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/around/postcode_form.html:12 msgid "e.g. ‘%s’ or ‘%s’" msgstr "" @@ -3849,8 +3772,7 @@ msgstr "altre aree:" msgid "reopened" msgstr "riaperto" -#: templates/web/base/header.html:33 templates/web/fixmystreet/header.html:64 -#: templates/web/zurich/footer.html:13 +#: templates/web/base/header.html:64 templates/web/zurich/footer.html:13 msgid "sign out" msgstr "" @@ -3928,7 +3850,7 @@ msgid_plural "<big>%s</big> updates on reports" msgstr[0] "<big>%s</big> aggiornamento sulle segnalazioni" msgstr[1] "<big>%s</big> aggiornamenti sulle segnalazioni" -#: templates/web/emptyhomes/report/new/councils_text_none.html:3 +#: templates/web/base/report/new/councils_text_none.html:3 #, perl-format msgid "We do not yet have details for the council that covers this location." msgid_plural "We do not yet have details for the councils that cover this location." @@ -3970,62 +3892,38 @@ msgid_plural "We do <strong>not</strong> yet have details for the other councils msgstr[0] "<strong>Non</strong>abbiamo ancora dettagli per un'altro comune che copre questa zona." msgstr[1] "<strong>Non</strong>abbiamo ancora dettagli sugli altri comuni che coprono questa zona." -#~ msgid "(we never show your email address or phone number)" -#~ msgstr "(non mostreremo mai la tua email o il tuo numero di telefono)" - -#~ msgid "(we never show your email)" -#~ msgstr "(non mostreremo mai la tua email)" - -#~ msgid "<strong>No</strong>, let me confirm my report by email:" -#~ msgstr "<strong>No</strong>, lasciami confermare la mia segnalazione via email:" - -#~ msgid "<strong>No</strong>, let me confirm my update by email:" -#~ msgstr "<strong>No</strong>, lasciami confermare il mio aggiornamento via email:" - -#~ msgid "Email me updates" -#~ msgstr "Inviami via email gli aggiornamenti" - -#~ msgid "Enter a new password:" -#~ msgstr "Inserisci una nuova password:" - -#~ msgid "I'm afraid we couldn't validate that token. If you've copied the URL from an email, please check that you copied it exactly.\n" -#~ msgstr "Mi spiace non possiamo validare questo token. Se hai copiato l'URL dall'email, controlla se l'hai copiato correttamente.\n" - -#~ msgid "If you use web-based email or have 'junk mail' filters, you may wish to check your bulk/spam mail folders: sometimes, our messages are marked that way." -#~ msgstr "Se usi un' email su un sito web o hai un filtro per la posta indesiderata, dovresti controllare anche la cartella dello spam o posta indesiderata: qualche volta i nostri messaggi finiscono li." - -#~ msgid "Message:" -#~ msgstr "Messaggio:" +#~ msgid "%s, reported at %s" +#~ msgstr "%s, segnalati al %s" -#~ msgid "More problems nearby" -#~ msgstr "Più problemi vicini" +#~ msgid "About us" +#~ msgstr "Chi siamo" -#~ msgid "Nearly Done! Now check your email..." -#~ msgstr "Quasi fatto! Ora controlla la tua email..." +#~ msgid "Email me new local problems" +#~ msgstr "Inviami via email i nuovi problemi locali" -#~ msgid "Offensive? Unsuitable? Tell us" -#~ msgstr "Offensivo? Non adatto? Contattaci" +#~ msgid "Empty house or bungalow" +#~ msgstr "Case o bungalow vuoti" -#~ msgid "Photo:" -#~ msgstr "Foto:" +#~ msgid "Empty office or other commercial" +#~ msgstr "Uffici o altri locali commerciali vuoti" -#~ msgid "Please check your email" -#~ msgstr "Per favore controlla la tua email" +#~ msgid "Empty pub or bar" +#~ msgstr "Pub o bar vuoti" -#~ msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" -#~ msgstr "Gli aggiornamenti non vengono inviati al comune. Se lasci il tuo nome questo sarà pubblico. Le tue informazioni non verranno usate in accordo con la nostra <a href=\"/faq#privacy\">politica sulla privacy</a>" +#~ msgid "Empty public building - school, hospital, etc." +#~ msgstr "Edifici pubblici - scuole, ospedali, ecc vuoti" -#~ msgid "This problem has been closed" -#~ msgstr "Questo problema è stato chiuso" +#~ msgid "FixMyStreet" +#~ msgstr "FixMyStreet" -#~ msgid "Update:" -#~ msgstr "Aggiornamento:" +#~ msgid "I am afraid you cannot confirm unconfirmed reports." +#~ msgstr "Mi spiace non puoi confermare le segnalazioni non confermate." -#~ msgid "Your email:" -#~ msgstr "La tua email:" +#~ msgid "Problems in this area" +#~ msgstr "Problemi in questa area" -#~ msgid "Your name:" -#~ msgstr "Il tuo nome:" +#~ msgid "Property type:" +#~ msgstr "Tipo di proprietà :" -#~ msgid "Your email:" -#~ msgstr "La tua email:" +#~ msgid "RSS feed of problems in this %s" +#~ msgstr "RSS feed per i problemi in questo %s" diff --git a/locale/lt_LT.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/lt_LT.UTF-8/LC_MESSAGES/FixMyStreet.po index 808791113..f6bc231bf 100644 --- a/locale/lt_LT.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/lt_LT.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2016-03-02 13:09+0000\n" -"PO-Revision-Date: 2015-10-23 16:38+0000\n" +"POT-Creation-Date: 2016-05-03 10:41+0100\n" +"PO-Revision-Date: 2016-03-23 12:44+0000\n" "Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/mysociety/fixmystreet/language/lt_LT/)\n" "Language: lt_LT\n" @@ -19,7 +19,7 @@ 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:616 +#: perllib/FixMyStreet/DB/Result/Problem.pm:618 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr "ir" @@ -52,9 +52,8 @@ msgid "%s admin:" msgstr "" #: templates/web/base/status/stats.html:26 -#, fuzzy msgid "%s bodies" -msgstr "Institucijos" +msgstr "" #: templates/web/base/status/stats.html:24 msgid "%s confirmed alerts, %s unconfirmed" @@ -89,7 +88,7 @@ msgstr "%s tiesioginiai atnaujinimai" msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "%s klausimynai iÅ¡siųsti – %s atsakyti (%s%%)" -#: perllib/FixMyStreet/DB/Result/Problem.pm:683 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "%s ref: %s" msgstr "%s ref: %s" @@ -108,10 +107,6 @@ msgstr "" msgid "%s ward, %s" msgstr "%s rajonas, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:552 -msgid "%s, reported at %s" -msgstr "%s, praneÅ¡ta %s" - #: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "%s, viduje %s rajonas" @@ -166,7 +161,7 @@ msgstr "(pavyzdžiui, grafitis, Å¡iukÅ¡lÄ—s, duobÄ— kelyje ar gatvÄ—s apÅ¡vietim msgid "(not sent to council)" msgstr "(neiÅ¡siųsta savivaldybei)" -#: templates/web/zurich/report/new/fill_in_details_form.html:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "(optional)" msgstr "(pasirinktinai)" @@ -178,12 +173,11 @@ msgstr "(vieÅ¡as)" msgid "(sent to both)" msgstr "(iÅ¡siųsta į abu)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- IÅ¡sirinktite kategorija --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Pasirinkite nuosavybÄ—s tipÄ… --" @@ -218,26 +212,21 @@ msgstr "<strong>Ne</strong> Leisti patvirtinti mano praneÅ¡imÄ… el. paÅ¡tu" msgid "<strong>No</strong> Let me confirm my update by email" msgstr "<strong>Ne</strong> Leisti patvirtinti mano atnaujinimÄ… el. paÅ¡tu" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:97 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>Ne</strong> leisti man prisijungti el. paÅ¡tu" -#: templates/web/base/auth/general.html:70 +#: templates/web/base/auth/general.html:80 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Taip</strong> AÅ¡ turiu slaptažodį" -#: templates/web/base/about/about-en-gb.html:1 -#: templates/web/base/about/about-en-gb.html:3 -msgid "About us" -msgstr "Apie Mus" - #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Action Scheduled" msgstr "Veiksmas suplanuotas" @@ -271,7 +260,7 @@ msgstr "PridÄ—ti naujÄ… kategorijÄ…" msgid "Add user" msgstr "PridÄ—ti vartotojÄ…" -#: templates/web/base/my/my.html:56 +#: templates/web/base/my/my.html:54 msgid "Added %s" msgstr "PridÄ—ta %s" @@ -291,7 +280,7 @@ msgstr "" msgid "Alert %d disabled (created %s)" msgstr "" -#: templates/web/base/report/update/form_name.html:20 +#: templates/web/base/report/update/form_name.html:21 msgid "Alert me to future updates" msgstr "Ä®spÄ—ti mane apie atnaujinimus" @@ -304,7 +293,7 @@ msgstr "Visi PraneÅ¡imai" msgid "All Reports as CSV" msgstr "" -#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 +#: templates/web/base/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:20 @@ -405,7 +394,7 @@ msgstr "Atgal" msgid "Ban email address" msgstr "Drausti el. paÅ¡tÄ…" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1273 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -436,7 +425,7 @@ msgstr "Nematote žemÄ—lapio? <em>Praleiskite Å¡itÄ… žingsnį</em>" #: templates/web/base/admin/body.html:68 #: templates/web/base/admin/index.html:54 -#: templates/web/base/report/new/category.html:10 +#: templates/web/base/report/new/category.html:7 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 @@ -451,7 +440,7 @@ msgstr "Kategorija" msgid "Category fix rate for problems > 4 weeks old" msgstr "Problemų kategorijoje tvarkymo sparta > 4 savaitÄ—s senumo" -#: templates/web/base/admin/body.html:138 +#: templates/web/base/admin/body.html:137 #: templates/web/base/admin/category_edit.html:23 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/admin/body.html:43 @@ -471,7 +460,7 @@ msgstr "Kategorija: %s" msgid "Change password" msgstr "Pakeisti slaptažodį" -#: templates/web/base/admin/body.html:160 +#: templates/web/base/admin/body.html:158 msgid "" "Check <strong>confirmed</strong> to indicate that this contact has been confirmed as correct.\n" " If you are not sure of the origin or validity of the contact, leave this unchecked." @@ -479,7 +468,7 @@ msgstr "" "PažymÄ—ti <strong>patvirtinta</strong> norint nurodyti, kad kontaktas yra teisingas.\n" "Jeigu abejojate kontakto tikrumoÄ siÅ«lome palikti nežymÄ—ta." -#: templates/web/base/admin/body.html:171 +#: templates/web/base/admin/body.html:169 msgid "" "Check <strong>deleted</strong> to remove the category from use. \n" " It will not appear as an available category in the drop-down menu on the report-a-problem page." @@ -487,7 +476,7 @@ msgstr "" "Check <strong>deleted</strong> to remove the category from use. \n" "It will not appear as an available category in the drop-down menu on the report-a-problem page." -#: templates/web/base/admin/body.html:191 +#: templates/web/base/admin/body.html:189 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -505,7 +494,7 @@ msgstr "" "interest in displaying the report. In the UK, we've used this for services like requesting an extra rubbish bin\n" "at a specific address." -#: templates/web/base/admin/body.html:130 +#: templates/web/base/admin/body.html:129 msgid "" "Choose a <strong>category</strong> 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." @@ -548,8 +537,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:15 #: templates/web/base/admin/report_blocks.html:25 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 @@ -558,7 +547,7 @@ msgstr "" msgid "Closed" msgstr "Uždaryta" -#: perllib/FixMyStreet/DB/Result/Problem.pm:779 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Closed by council" msgstr "Uždaryta " @@ -584,7 +573,7 @@ msgstr "Cobrand informacija:" msgid "Cobrand:" msgstr "Cobrand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Nustatymai" @@ -603,9 +592,8 @@ msgstr "Patvirtinti paskyrÄ…" #: templates/web/base/report/new/form_user_loggedout_password.html:21 #: templates/web/base/report/update/form_user_loggedout_password.html:20 -#, fuzzy msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." -msgstr "Patvirtinti el. paÅ¡tu, nurodant naujÄ… slaptažodį. Slaptažodis bus atnaujintas jums patvirtinus." +msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:1 #: templates/web/base/tokens/confirm_problem.html:1 @@ -615,7 +603,7 @@ msgstr "Patvirtinti el. paÅ¡tu, nurodant naujÄ… slaptažodį. Slaptažodis bus a msgid "Confirmation" msgstr "Patvirtinimas" -#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:164 #: templates/web/base/admin/body.html:79 #: templates/web/base/admin/category_edit.html:37 #: templates/web/base/admin/category_edit.html:92 @@ -634,7 +622,7 @@ msgid "Confirmed:" msgstr "Patvirtinta:" #. ("%s is the site name") -#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 +#: templates/web/base/about/_sidebar.html:6 msgid "Contact %s" msgstr "" @@ -653,8 +641,8 @@ msgstr "Susisiekite su komanda" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1417 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1445 msgid "Could not find user" msgstr "Vartotojas nerastas" @@ -672,7 +660,7 @@ msgstr "SavivaldybÄ—" msgid "Council contacts for %s" msgstr "Tarybos kontaktai skirti %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:681 +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "Council ref: %s" msgstr "" @@ -691,7 +679,7 @@ msgstr "SkaiÄiavimas" msgid "Create a report" msgstr "Sukurti praneÅ¡imÄ…" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "Sukurti kategorijÄ…" @@ -735,20 +723,20 @@ msgstr "Ä®rankių juosta" msgid "Dealt with by subdivision within 5 working days" msgstr "Padalinys atliko per 5 darbo dienas" -#: perllib/FixMyStreet/App/Controller/Admin.pm:877 +#: perllib/FixMyStreet/App/Controller/Admin.pm:865 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:175 #: templates/web/base/admin/body.html:81 #: templates/web/base/admin/category_edit.html:42 #: templates/web/base/admin/category_edit.html:93 msgid "Deleted" msgstr "IÅ¡trinta" -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:47 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -756,7 +744,7 @@ msgid "Description" msgstr "ApraÅ¡ymas" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:68 +#: templates/web/zurich/report/new/fill_in_details_form.html:70 msgid "Details" msgstr "IÅ¡samiau" @@ -781,11 +769,11 @@ msgid "Diligency prize league table" msgstr "Diligency prize league table" #. ("%s is the site name") -#: templates/web/base/auth/general.html:48 -#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/auth/general.html:58 +#: templates/web/base/report/new/form_user_loggedout.html:28 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout.html:17 +#: templates/web/base/report/update/form_user_loggedout.html:27 msgid "Do you have a %s password?" msgstr "" @@ -803,8 +791,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "Duplicate" msgstr "Kopija" @@ -827,7 +815,7 @@ msgstr "" msgid "Edit" msgstr "Redaguoti" -#: templates/web/base/admin/body.html:220 +#: templates/web/base/admin/body.html:218 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "Redaguoti institucijos informacijÄ…" @@ -857,7 +845,7 @@ msgstr "Redaktorius" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:39 +#: templates/web/base/auth/general.html:49 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -865,11 +853,11 @@ msgstr "Redaktorius" msgid "Email" msgstr "El. paÅ¡tas" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 msgid "Email added to abuse list" msgstr "El. paÅ¡tas pridÄ—tas prie piktnaudžiavimo sÄ…raÅ¡o" -#: templates/web/base/admin/body.html:155 +#: templates/web/base/admin/body.html:153 msgid "Email address:" msgstr "El. paÅ¡to adresas:" @@ -881,19 +869,14 @@ msgstr "" msgid "Email alert deleted" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1390 msgid "Email already in abuse list" msgstr "El. paÅ¡tas jau yra piktnaudžiavimo sÄ…raÅ¡e" -#: templates/web/base/around/_updates.html:5 -msgid "Email me new local problems" -msgstr "Atsiųsti man naujas vietines problemas" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 -#: templates/web/base/alert/updates.html:13 #: templates/web/zurich/admin/body.html:47 msgid "Email:" msgstr "El. paÅ¡tas:" @@ -902,26 +885,6 @@ msgstr "El. paÅ¡tas:" msgid "Email: %s" msgstr "El. paÅ¡tas: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 -msgid "Empty flat or maisonette" -msgstr "Apleistas butas" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 -msgid "Empty house or bungalow" -msgstr "Apleistas namas" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 -msgid "Empty office or other commercial" -msgstr "Apleista įtaiga arba kitas komercinÄ—s paskirties objektas" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 -msgid "Empty pub or bar" -msgstr "Apleistas baras" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 -msgid "Empty public building - school, hospital, etc." -msgstr "Apleistas vieÅ¡osios paskirties pastatas - mokyklaÄ ligonine ir t.t" - #: templates/web/base/admin/body-form.html:162 #: templates/web/base/admin/body-form.html:163 msgid "" @@ -972,18 +935,14 @@ msgstr "Ä®veskite artimiausia paÅ¡to kodÄ… arba gatvÄ—s pavadinimÄ… ir rajonÄ…" msgid "Enter a nearby street name and area" msgstr "Ä®veskite artimiausios gatvÄ—s pavadinimÄ… ir rajonÄ…" -#: perllib/FixMyStreet/Cobrand/ZeroTB.pm:7 -msgid "Enter a nearby street name and area, postal code or district in Delhi" -msgstr "Ä®veskite artimiausia paÅ¡to kodÄ… arba gatvÄ—s pavadinimÄ… ir rajonÄ…" - -#: templates/web/base/auth/general.html:99 +#: templates/web/base/auth/general.html:109 #: templates/web/base/report/new/form_user_loggedout_by_email.html:38 #: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Ä®veskite slaptažodį" -#: templates/web/base/index-steps.html:26 +#: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "įveskite problemos detales" @@ -1009,7 +968,7 @@ msgstr "PaÅ¡to kodo pavyzdys %s" msgid "Examples:" msgstr "Pavyzdžiai:" -#: templates/web/base/report/new/form_report.html:49 +#: templates/web/base/report/new/form_report.html:51 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "ApibÅ«dinkite kas negerai, tiksliÄ… vietÄ… ir kiek ilgai tai tÄ™siasi..." @@ -1046,19 +1005,15 @@ msgstr "Pirmas kartas" msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." msgstr "Suvarkyti tai pasirenkant <strong>pažymÄ—ta vietovÄ™</strong> <em>Redaguoti informacijÄ…</em>formÄ…." -#: templates/web/base/header.html:26 -msgid "FixMyStreet" -msgstr "FixMyStreet" - #: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:38 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:40 msgid "Fixed" msgstr "Sutvarkyta" @@ -1085,7 +1040,7 @@ msgstr "Pažymeti kaip iÅ¡trinta" msgid "Flag user" msgstr "PažymÄ—ti vartotojÄ…" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "PažymÄ—ta" @@ -1107,8 +1062,7 @@ msgstr "Flagged users are not restricted in any way. This is just a list of user msgid "Flagged:" msgstr "PažymÄ—ta:" -#: templates/web/base/reports/_ward-list.html:3 -#: templates/web/fixmystreet/reports/_ward-list.html:4 +#: templates/web/base/reports/_ward-list.html:4 msgid "Follow a ward link to view only reports within that ward." msgstr "Follow a ward link to view only reports within that ward." @@ -1139,18 +1093,18 @@ msgstr "Dažniausiai Užduodami Klausimai" msgid "GeoRSS on Google Maps" msgstr "" +#: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:11 -#: templates/web/fixmystreet/around/_updates.html:3 msgid "Get updates" msgstr "Gauti atnaujinimus" -#: templates/web/fixmystreet/reports/_rss.html:3 -#: templates/web/fixmystreet/reports/_rss.html:9 +#: templates/web/base/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:9 msgid "Get updates of %s problems" msgstr "Gauti Å¡ių problemų %s atnaujinimus" -#: templates/web/fixmystreet/reports/_rss.html:11 -#: templates/web/fixmystreet/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:11 +#: templates/web/base/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "Gauti problemų atnaujinimus iÅ¡ %s" @@ -1163,7 +1117,7 @@ msgid "Glad to hear it’s been fixed!" msgstr "" #: templates/web/base/alert/index.html:34 -#: templates/web/base/around/postcode_form.html:16 +#: templates/web/base/around/postcode_form.html:13 #: templates/web/base/reports/_list-filters.html:28 #: templates/web/zurich/admin/stats.html:26 msgid "Go" @@ -1189,7 +1143,7 @@ msgstr "Ar Å¡i problema buvo sutvarkyta?" msgid "Have you ever reported a problem to a council before, or is this your first time?" msgstr "Ar esate praneÅ¡Ä™s apie problema anksÄiau, o gal tai pirmas kartas?" -#: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:38 +#: templates/web/base/footer.html:38 #: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 @@ -1200,8 +1154,7 @@ msgstr "Pagalba" msgid "Here are the types of local problem alerts for ‘%s’." msgstr "ÄŒia pateikti vietinių problemų tipų praneÅ¡imai skirti ‘%s’." -#: templates/web/base/header.html:32 templates/web/fixmystreet/header.html:63 -#: templates/web/zurich/footer.html:12 +#: templates/web/base/header.html:63 templates/web/zurich/footer.html:12 msgid "Hi %s" msgstr "Labas %s" @@ -1217,11 +1170,11 @@ msgstr "Labas %s" msgid "Hidden" msgstr "PaslÄ—pta" -#: templates/web/base/around/display_location.html:65 +#: templates/web/base/around/display_location.html:64 msgid "Hide old" msgstr "PaslÄ—pti senus" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:59 msgid "Hide pins" msgstr "PaslÄ—pti smeigtukus" @@ -1241,10 +1194,6 @@ msgstr "Kaip praneÅ¡ti apie problema" msgid "How to send successful reports" msgstr "Kaip iÅ¡siųsti sÄ—kminga praneÅ¡imÄ…" -#: perllib/FixMyStreet/App/Controller/Admin.pm:752 -msgid "I am afraid you cannot confirm unconfirmed reports." -msgstr "ApgailestaujameÄ bet jÅ«s negalite patvirtinti nepatvirtintų praneÅ¡imų." - #: templates/web/base/tokens/confirm_problem.html:23 #: templates/web/base/tokens/confirm_problem.html:27 msgid "I just reported a problem on @fixmystreet" @@ -1255,7 +1204,7 @@ msgstr "" msgid "I just updated a problem on @fixmystreet" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88 msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "Apgailestaujame, bet jÅ«sų problema nebuvo rasta duomenų bazÄ—je.\n" @@ -1279,7 +1228,7 @@ msgstr "" "Identify a <strong>parent</strong> if this body is itself part of another body.\n" "For basic installations, you don't need to join bodies in this way." -#: templates/web/base/admin/body.html:133 +#: templates/web/base/admin/body.html:132 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." @@ -1302,7 +1251,7 @@ msgid "" "(please note it will not be sent to the council)." msgstr "" -#: templates/web/base/admin/body.html:149 +#: templates/web/base/admin/body.html:147 msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." msgstr "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." @@ -1345,10 +1294,10 @@ msgstr "NeteisÄ—tas ID" msgid "Illegal feed selection" msgstr "NeteisÄ—tas srauto pasirinkimas" +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "In Progress" msgstr "Apdorojama" @@ -1399,7 +1348,7 @@ msgstr "Internal referral" msgid "Invalid agency_responsible value %s" msgstr "Invalid agency_responsible value %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 msgid "Invalid end date" msgstr "Klaidina pabaigos data" @@ -1407,16 +1356,16 @@ msgstr "Klaidina pabaigos data" msgid "Invalid format %s specified." msgstr "Pasirinktas klaidingas formatas %s." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 msgid "Invalid start date" msgstr "Klaidinga pradžios data" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:5 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Investigating" msgstr "Tyriama" @@ -1438,7 +1387,7 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:80 +#: 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 @@ -1476,7 +1425,6 @@ msgstr "Kraunama..." #: 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/fixmystreet/alert/updates.html:1 msgid "Local RSS feeds and email alerts" msgstr "Vietiniai RSS srautai ir el. paÅ¡to praneÅ¡imai" @@ -1485,11 +1433,11 @@ msgstr "Vietiniai RSS srautai ir el. paÅ¡to praneÅ¡imai" msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "Vietiniai RSS srautai ir el. paÅ¡to praneÅ¡imai skirti ‘%s’" -#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:35 +#: templates/web/base/footer.html:35 msgid "Local alerts" msgstr "Vietiniai praneÅ¡imai" -#: templates/web/base/index-steps.html:25 +#: templates/web/base/index-steps.html:5 msgid "Locate the problem on a map of the area" msgstr "Nustatytį problemos vietÄ… žemÄ—lapyje" @@ -1549,14 +1497,14 @@ msgstr "MÄ—nuo" #: templates/web/base/admin/list_updates.html:7 #: templates/web/base/admin/reports.html:13 #: templates/web/base/admin/users.html:15 -#: templates/web/base/auth/general.html:89 +#: templates/web/base/auth/general.html:99 #: templates/web/base/report/new/form_user_loggedin.html:9 #: templates/web/base/report/new/form_user_loggedout_by_email.html:7 -#: templates/web/base/report/update/form_name.html:4 +#: templates/web/base/report/update/form_name.html:5 #: templates/web/base/reports/index.html:20 #: 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:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "Name" msgstr "Vardas" @@ -1580,8 +1528,8 @@ 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:455 -#: perllib/FixMyStreet/Cobrand/Default.pm:495 +#: perllib/FixMyStreet/Cobrand/Default.pm:454 +#: perllib/FixMyStreet/Cobrand/Default.pm:494 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 " @@ -1605,7 +1553,7 @@ msgstr "Naujos <br>problemos" msgid "New body added" msgstr "Nauja dalis pridÄ—ta" -#: perllib/FixMyStreet/App/Controller/Admin.pm:387 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 msgid "New category contact added" msgstr "Naujas kategorijos kontaktas pridetas" @@ -1670,7 +1618,7 @@ msgstr "Kitas" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 -#: templates/web/base/questionnaire/index.html:101 +#: templates/web/base/questionnaire/index.html:102 #: templates/web/base/questionnaire/index.html:53 msgid "No" msgstr "Ne" @@ -1741,8 +1689,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Not Responsible" msgstr "Neatsakingas" @@ -1775,7 +1723,7 @@ msgstr "Pastaba" 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/base/admin/body.html:186 +#: templates/web/base/admin/body.html:184 #: templates/web/base/admin/category_edit.html:52 #: templates/web/zurich/admin/body.html:53 msgid "Note:" @@ -1789,15 +1737,15 @@ msgstr "Pastaba: <strong>%s</strong>" msgid "Notes from SDM to DM" msgstr "" -#: templates/web/base/report/new/form_user_loggedout.html:14 #: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/form_user_loggedout.html:24 #: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "Dabar patvirtinti jÅ«sų report…" #: templates/web/base/report/update-form.html:28 -#: templates/web/base/report/update/form_user_loggedout.html:13 #: templates/web/base/report/update/form_user_loggedout.html:2 +#: templates/web/base/report/update/form_user_loggedout.html:23 msgid "Now to submit your update…" msgstr "Dabar patvirtinti jÅ«sų update…" @@ -1831,8 +1779,8 @@ msgstr "Vieno eilutÄ—s santrauka" #: templates/web/base/admin/report_blocks.html:23 #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/report/update/form_update.html:36 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1867,13 +1815,13 @@ msgstr "Arba problemos praneÅ¡tos:" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "Arba jÅ«s galite prenumeruoti įspÄ—jimÄ… atsižvelgiant į jÅ«sų rajonÄ… arba savivaldybÄ™:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1055 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 -#: perllib/FixMyStreet/DB/Result/Problem.pm:558 -#: perllib/FixMyStreet/DB/Result/Problem.pm:568 -#: perllib/FixMyStreet/DB/Result/Problem.pm:578 -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1044 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:659 +#: perllib/FixMyStreet/DB/Result/Problem.pm:562 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 +#: perllib/FixMyStreet/DB/Result/Problem.pm:582 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 #: perllib/FixMyStreet/Script/Reports.pm:175 #: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" @@ -1898,7 +1846,7 @@ msgstr "Parent" msgid "Partial" msgstr "Dalinis" -#: templates/web/base/auth/general.html:92 +#: templates/web/base/auth/general.html:102 #: templates/web/base/report/new/form_user_loggedout_by_email.html:31 #: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 @@ -1907,7 +1855,7 @@ msgid "Password (optional)" msgstr "Slaptažodis (nebÅ«tina)" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:72 +#: templates/web/base/auth/general.html:82 msgid "Password:" msgstr "Slaptažodis:" @@ -1915,7 +1863,7 @@ msgstr "Slaptažodis:" msgid "Permalink" msgstr "Permalink" -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:90 msgid "Phone number" msgstr "Telefono numeris" @@ -1931,13 +1879,21 @@ msgid "Phone:" msgstr "Telefonas:" #: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/questionnaire/index.html:89 +#: templates/web/base/questionnaire/index.html:91 #: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/new/form_report.html:38 +#: templates/web/base/report/new/form_report.html:40 +#: templates/web/base/report/update/form_update.html:20 +#: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:6 #: 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:45 +#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/zurich/report/new/fill_in_details_form.html:63 msgid "Photo" msgstr "Nuotrauka" @@ -1961,8 +1917,8 @@ msgstr "PadÄ—kite smeigtukÄ… ant žemÄ—lapio" #: perllib/FixMyStreet/Cobrand/Zurich.pm:955 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:6 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 @@ -1978,16 +1934,16 @@ 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/general.html:27 -#: templates/web/base/auth/general.html:33 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:43 #: 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:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:856 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:921 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -1997,7 +1953,7 @@ msgstr "PraÅ¡ome pasirinkti kategorijÄ…" msgid "Please choose a property type" msgstr "PraÅ¡ome pasirinkti nuosavybÄ—s tipÄ…" -#: perllib/FixMyStreet/App/Controller/Admin.pm:378 +#: perllib/FixMyStreet/App/Controller/Admin.pm:376 msgid "Please correct the errors below" msgstr "PraÅ¡ome iÅ¡taisyti klaidas " @@ -2018,11 +1974,10 @@ msgstr "PraÅ¡ome neįžeidinÄ—ti — įžeidinÄ—jimai nuvertina paslaug msgid "Please enter a message" msgstr "PraÅ¡ome įvesti žinutÄ™" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Admin.pm:1079 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 msgid "Please enter a name" -msgstr "PraÅ¡ome įvesti savo vardÄ…" +msgstr "" #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 @@ -2036,10 +1991,10 @@ msgstr "PraÅ¡ome įvesti slaptažodį" msgid "Please enter a subject" msgstr "PraÅ¡ome įvesti temÄ…" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1075 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1130 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:133 +#: perllib/FixMyStreet/DB/Result/User.pm:143 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2056,9 +2011,9 @@ msgid "Please enter some details" msgstr "PraÅ¡ome įvesti daugiau informacijos" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:130 -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:32 +#: perllib/FixMyStreet/DB/Result/User.pm:140 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:42 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2067,7 +2022,7 @@ msgid "Please enter your email" msgstr "PraÅ¡ome įvesti savo el. paÅ¡tÄ…" #: templates/web/base/report/new/form_user_loggedout_email.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:80 +#: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "Please enter your email address" msgstr "PraÅ¡ome įvesti savo el. paÅ¡to adresÄ…" @@ -2083,7 +2038,7 @@ msgstr "PraÅ¡ome įvesti savo vardÄ… ir pavardÄ™, savivalldybei reikalinga jÅ«sÅ #: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:126 +#: perllib/FixMyStreet/DB/Result/User.pm:136 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "PraÅ¡ome įvesti savo vardÄ…" @@ -2110,7 +2065,7 @@ msgstr "Galite <a href=\"%s\">prisijungti iÅ¡ naujo</a>, arba grįžti atgal į msgid "Please fill in details of the problem below." msgstr "PraÅ¡ome žemiau užpildyti problemos detales." -#: templates/web/zurich/report/new/fill_in_details_form.html:72 +#: templates/web/zurich/report/new/fill_in_details_form.html:74 msgid "Please fill in details of the problem." msgstr "PraÅ¡ome užpildyti problemos detales." @@ -2119,7 +2074,7 @@ msgstr "PraÅ¡ome užpildyti problemos detales." msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "PraÅ¡ome pateikti problemos detales žemiau esanÄioje anketoje ir kuo tiksliau apibÅ«dinkite vietÄ…." -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "PraÅ¡ome nurodyti, ar norite gauti kitÄ… klausimynÄ…." @@ -2128,9 +2083,8 @@ msgid "Please note that updates are not sent to the council." msgstr "Atkreipkite dÄ—mesį, kad naujinimai nÄ—ra siunÄiama savivaldybei." #: templates/web/base/report/new/oauth_email_form.html:4 -#, fuzzy msgid "Please note your report has <strong>not yet been sent</strong>." -msgstr "Atkreipkite dÄ—mesį, kad jÅ«sų praneÅ¡imas dar <strong>nÄ—ra iÅ¡siųstas</strong>. Pasirinkite kategorija ir pridÄ—kite iÅ¡samesnÄ™ informacija, tada patvirtinkite." +msgstr "" #: templates/web/base/report/new/fill_in_details_form.html:20 #: templates/web/zurich/report/new/fill_in_details_form.html:11 @@ -2146,16 +2100,16 @@ msgstr "" msgid "Please note:" msgstr "Atkreipkite dÄ—mÄ—sį:" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please provide some explanation as to why you're reopening this report" msgstr "PraÅ¡ome pateikti priežastis, kodÄ—l jÅ«s naujinate šį praneÅ¡imÄ…" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250 msgid "Please provide some text as well as a photo" msgstr "PraÅ¡ome pateikti Å¡iek tiek teksto, taip pat nuotraukÄ…" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236 msgid "Please say whether you've ever reported a problem to your council before" msgstr "PraÅ¡ome pasakyti ar esate praneÅ¡Ä™s apie problemÄ… savo savivaldybei anksÄiau" @@ -2171,22 +2125,23 @@ msgstr "PraÅ¡ome pasirinkti jÅ«sų pageidaujama srautÄ…" msgid "Please select the type of alert you want" msgstr "PraÅ¡ome pasirinkti pageidaujama įspÄ—jimo tipÄ…" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232 msgid "Please state whether or not the problem has been fixed" msgstr "PraÅ¡ome nurodyti, ar problema buvo sutvarkyta" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:121 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 #: templates/web/base/js/translation_strings.html:53 -msgid "Please upload a JPEG image only" +#, fuzzy +msgid "Please upload an image only" msgstr "PraÅ¡ome įkelti tik JPEG formato nuotraukÄ…" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 msgid "Please write a message" msgstr "PraÅ¡ome įvesti žinutÄ™" -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Please write your update here" msgstr "PraÅ¡ome raÅ¡tyti savo naujinimÄ… Äia" @@ -2217,7 +2172,7 @@ msgstr "" msgid "Previous" msgstr "Ankstesnis" -#: templates/web/fixmystreet/footer.html:41 +#: templates/web/base/footer.html:41 msgid "Privacy" msgstr "Privatumas" @@ -2227,7 +2182,7 @@ msgstr "Privatumas" msgid "Privacy and cookies" msgstr "" -#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:200 #: templates/web/base/admin/body.html:85 #: templates/web/base/admin/category_edit.html:45 #: templates/web/base/admin/report_edit.html:77 @@ -2256,7 +2211,7 @@ msgstr "Problema %s iÅ¡siųsta savivaldybei %s" msgid "Problem breakdown by state" msgstr "Problemos pasiskirstymas pagal valstybÄ—s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1046 msgid "Problem marked as open." msgstr "Problema pažymÄ—ta kaip atidaryta" @@ -2268,10 +2223,6 @@ msgstr "Problemos bÅ«klÄ—s pakeitimas remiantis tyrimo rezultatais" msgid "Problems" msgstr "Problemos" -#: templates/web/base/around/_updates.html:1 -msgid "Problems in this area" -msgstr "Problemos Å¡ioje srityje" - #: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "Å alia esanÄios problemos" @@ -2289,13 +2240,11 @@ msgid "Problems within %.1fkm of this location" msgstr "Problemos %.1fkm atstumu aplink Å¡iÄ… vietovÄ™" #: perllib/FixMyStreet/Cobrand/Default.pm:663 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 #: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "Problemos viduje %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "Problemos %s rajone" @@ -2314,15 +2263,11 @@ msgstr "Problemos apibrėžtose ribose:" msgid "Property address:" msgstr "NuosavybÄ—s adresas:" -#: templates/web/base/report/new/category.html:8 -msgid "Property type:" -msgstr "NuosavybÄ—s tipas:" - #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Pateikti naujinimÄ…" -#: templates/web/base/auth/general.html:95 +#: templates/web/base/auth/general.html:105 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." @@ -2356,16 +2301,15 @@ msgstr "Atsakyta anketa %d skirta problemoms %d, %s to %s" msgid "Questionnaire %d sent for problem %d" msgstr "Anketa %d iÅ¡siųsta dÄ—l problemos %d" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 msgid "Questionnaire filled in by problem reporter" msgstr "Questionnaire filled in by problem reporter" #: templates/web/base/alert/_list.html:22 +#: templates/web/base/alert/updates.html:9 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display_tools.html:34 -#: templates/web/base/reports/_rss.html:1 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed" msgstr "RSS srautas" @@ -2393,18 +2337,12 @@ msgstr "RSS srautas %s, viduje %s rajono" msgid "RSS feed of nearby problems" msgstr "Å alia esanÄių problemų RSS srautas" -#: templates/web/base/reports/_rss.html:1 -msgid "RSS feed of problems in this %s" -msgstr "" - #: perllib/FixMyStreet/Cobrand/Default.pm:664 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 #: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 #: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "" @@ -2414,14 +2352,13 @@ msgstr "" msgid "RSS feed of recent local problems" msgstr "" +#: templates/web/base/alert/updates.html:9 #: templates/web/base/report/display_tools.html:34 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed of updates to this problem" msgstr "" -#: templates/web/base/alert/updates.html:9 +#: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:36 -#: templates/web/fixmystreet/alert/updates.html:14 msgid "Receive email when updates are left on this problem." msgstr "" @@ -2457,12 +2394,11 @@ msgstr "" msgid "Reply to user:" msgstr "" -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/header_logo.html:2 msgid "Report" msgstr "" -#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:26 -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/footer.html:26 templates/web/base/header_logo.html:2 #: templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2472,7 +2408,7 @@ msgstr "" msgid "Report abuse" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:291 +#: perllib/FixMyStreet/App/Controller/Rss.pm:297 msgid "Report on %s" msgstr "" @@ -2487,7 +2423,7 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:577 #: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "" @@ -2497,7 +2433,7 @@ msgstr "" msgid "Reported before" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 #: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "" @@ -2511,27 +2447,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:569 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 msgid "Reported in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:591 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 msgid "Reported in the %s category by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported via %s anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported via %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:561 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 msgid "Reported via %s in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 msgid "Reported via %s in the %s category by %s at %s" msgstr "" @@ -2552,7 +2488,7 @@ msgstr "" msgid "Reporting a problem" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1274 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" @@ -2595,15 +2531,15 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1496 #: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 #: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 @@ -2618,7 +2554,7 @@ msgstr "" msgid "Satellite" msgstr "" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/base/admin/category_edit.html:84 #: templates/web/zurich/admin/body.html:59 #: templates/web/zurich/admin/template_edit.html:29 @@ -2674,7 +2610,7 @@ msgstr "" msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:696 +#: perllib/FixMyStreet/DB/Result/Problem.pm:698 msgid "Sent to %s %s later" msgstr "" @@ -2693,21 +2629,21 @@ msgstr "" #: templates/web/base/report/new/form_user_loggedin.html:23 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22 -#: templates/web/base/report/update/form_name.html:15 +#: templates/web/base/report/update/form_name.html:16 msgid "Show my name publicly" msgstr "" -#: templates/web/base/around/display_location.html:67 +#: templates/web/base/around/display_location.html:66 msgid "Show old" msgstr "" -#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:57 msgid "Show pins" msgstr "" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/general.html:110 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:76 +#: templates/web/base/auth/general.html:86 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2775,14 +2711,10 @@ msgstr "" msgid "Sorry, we could not parse that location. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:138 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 -msgid "Sorry, you can not log in with Facebook. Please try again later." -msgstr "" - #: templates/web/base/admin/stats.html:64 msgid "Start Date:" msgstr "" @@ -2791,7 +2723,7 @@ msgstr "" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/report/update/form_update.html:32 +#: templates/web/base/report/update/form_update.html:34 msgid "State" msgstr "" @@ -2804,7 +2736,7 @@ msgstr "" msgid "State:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2844,10 +2776,10 @@ msgid "Subject:" msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/base/report/new/form_user_loggedout_by_email.html:39 #: templates/web/base/report/new/form_user_loggedout_password.html:11 -#: templates/web/zurich/report/new/fill_in_details_form.html:96 +#: templates/web/zurich/report/new/fill_in_details_form.html:98 msgid "Submit" msgstr "" @@ -2875,9 +2807,8 @@ msgstr "" msgid "Submitted" msgstr "" -#: templates/web/base/alert/updates.html:17 +#: templates/web/base/alert/updates.html:23 #: templates/web/base/report/display_tools.html:41 -#: templates/web/fixmystreet/alert/updates.html:23 msgid "Subscribe" msgstr "" @@ -2885,7 +2816,7 @@ msgstr "" msgid "Subscribe me to an email alert" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -2904,7 +2835,7 @@ msgstr "" msgid "Summary reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 msgid "Survey" msgstr "" @@ -2961,7 +2892,7 @@ msgstr "" msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:157 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" @@ -2969,7 +2900,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:126 +#: perllib/FixMyStreet/App/Controller/Location.pm:127 msgid "That location does not appear to be in the UK; please try again." msgstr "" @@ -2979,11 +2910,11 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:724 +#: perllib/FixMyStreet/App/Controller/Admin.pm:722 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:716 +#: perllib/FixMyStreet/App/Controller/Admin.pm:714 msgid "That problem will now be resent." msgstr "" @@ -2995,7 +2926,7 @@ msgstr "" msgid "That report has been removed from FixMyStreet." msgstr "" -#: templates/web/base/admin/body.html:144 +#: templates/web/base/admin/body.html:142 msgid "" "The <strong>email address</strong> is the destination to which reports about this category will be sent. \n" " Other categories for this body may have the same email address." @@ -3135,9 +3066,9 @@ msgstr "" msgid "There was a problem showing this page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:753 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 -#: templates/web/base/auth/general.html:43 +#: templates/web/base/auth/general.html:53 #: 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 "" @@ -3198,9 +3129,9 @@ msgstr "" 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:920 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:898 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:935 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:977 #: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "" @@ -3213,11 +3144,11 @@ msgstr "" msgid "This is a summary of all reports on this site." msgstr "" -#: templates/web/base/report/update/form_update.html:52 +#: templates/web/base/report/update/form_update.html:54 msgid "This problem has been fixed" msgstr "" -#: templates/web/base/report/update/form_update.html:46 +#: templates/web/base/report/update/form_update.html:48 msgid "This problem has not been fixed" msgstr "" @@ -3254,7 +3185,7 @@ msgstr "" msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -3299,8 +3230,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Unable to fix" msgstr "" @@ -3317,7 +3248,7 @@ msgstr "" msgid "Unknown" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:173 +#: perllib/FixMyStreet/App/Controller/Rss.pm:174 msgid "Unknown alert type" msgstr "" @@ -3332,7 +3263,7 @@ msgstr "" msgid "Unknown problem ID" msgstr "" -#: templates/web/base/report/update/form_update.html:25 +#: templates/web/base/report/update/form_update.html:27 msgid "Update" msgstr "" @@ -3384,10 +3315,10 @@ msgstr "" msgid "Updated" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 -#: perllib/FixMyStreet/App/Controller/Admin.pm:821 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1096 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1144 +#: perllib/FixMyStreet/App/Controller/Admin.pm:809 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3414,7 +3345,7 @@ msgstr "" msgid "Updates to this problem, %s" msgstr "" -#: templates/web/base/admin/body.html:182 +#: templates/web/base/admin/body.html:180 msgid "Use the <strong>note</strong> to record details that are only displayed in the admin. Notes are not shown publicly, and are not sent to the body." msgstr "" @@ -3423,11 +3354,11 @@ msgstr "" msgid "Used map" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1421 msgid "User flagged" msgstr "" @@ -3435,16 +3366,16 @@ msgstr "" msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:412 -#: perllib/FixMyStreet/App/Controller/Admin.pm:429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:380 +#: perllib/FixMyStreet/App/Controller/Admin.pm:410 +#: perllib/FixMyStreet/App/Controller/Admin.pm:427 msgid "Values updated" msgstr "" @@ -3481,16 +3412,15 @@ msgstr "" #: templates/web/base/auth/general.html:6 #: templates/web/base/report/display.html:27 #: templates/web/base/report/new/oauth_email_form.html:5 -#, fuzzy msgid "We need your email address, please give it below." -msgstr "(mes niekada nerodome jÅ«sų el. paÅ¡to arba telefono numerio)" +msgstr "" #: templates/web/base/report/new/form_user_loggedout_email.html:2 #: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedin.html:30 #: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "" @@ -3499,7 +3429,7 @@ msgstr "" 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 "" -#: templates/web/base/index-steps.html:31 +#: templates/web/base/index-steps.html:11 msgid "We send it to the council on your behalf" msgstr "" @@ -3537,10 +3467,6 @@ msgstr "" msgid "Whoa there Testino! Three photos are enough." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 -msgid "Whole block of empty flats" -msgstr "" - #: templates/web/base/tokens/confirm_alert.html:7 msgid "Why stop there? <a href=\"/alert\">Set up more alerts</a> for free." msgstr "" @@ -3560,7 +3486,7 @@ msgstr "" msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "" -#: templates/web/base/questionnaire/index.html:96 +#: templates/web/base/questionnaire/index.html:97 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "" @@ -3590,8 +3516,8 @@ msgstr "" #: templates/web/base/admin/update_edit.html:24 #: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 +#: templates/web/base/questionnaire/index.html:100 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "" @@ -3705,19 +3631,19 @@ msgid "Your Reports" msgstr "" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/alert/updates.html:19 +#: templates/web/base/alert/updates.html:22 #: templates/web/base/contact/index.html:83 #: templates/web/base/report/display_tools.html:38 #: templates/web/base/report/display_tools.html:40 #: templates/web/base/report/new/form_user_loggedin.html:3 #: templates/web/base/report/new/form_user_loggedout_email.html:1 #: templates/web/base/report/update/form_user_loggedout_email.html:1 -#: templates/web/fixmystreet/alert/updates.html:19 -#: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/zurich/report/new/fill_in_details_form.html:76 +#: templates/web/zurich/report/new/fill_in_details_form.html:78 msgid "Your email" msgstr "" -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/general.html:55 #: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 @@ -3728,17 +3654,17 @@ msgstr "" msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "" -#: templates/web/base/auth/general.html:90 +#: templates/web/base/auth/general.html:100 #: templates/web/base/contact/index.html:76 #: templates/web/base/report/new/form_user_loggedin.html:18 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17 -#: templates/web/base/report/update/form_name.html:11 +#: templates/web/base/report/update/form_name.html:12 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:86 +#: templates/web/zurich/report/new/fill_in_details_form.html:88 msgid "Your name" msgstr "" -#: templates/web/base/auth/general.html:75 +#: templates/web/base/auth/general.html:85 #: 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 @@ -3751,20 +3677,19 @@ msgstr "" #: templates/web/base/report/new/form_user_loggedin.html:27 #: templates/web/base/report/new/form_user_loggedout_by_email.html:26 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:94 msgid "Your phone number" msgstr "" #: templates/web/base/questionnaire/index.html:14 -#, fuzzy msgid "Your report" -msgstr "Visi praneÅ¡imai" +msgstr "" -#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 +#: templates/web/base/footer.html:29 msgid "Your reports" msgstr "" -#: templates/web/base/my/my.html:41 +#: templates/web/base/my/my.html:39 msgid "Your updates" msgstr "" @@ -3790,7 +3715,7 @@ msgid "didn't use map" msgstr "" #: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/around/postcode_form.html:12 msgid "e.g. ‘%s’ or ‘%s’" msgstr "" @@ -3896,8 +3821,7 @@ msgstr "" msgid "reopened" msgstr "" -#: templates/web/base/header.html:33 templates/web/fixmystreet/header.html:64 -#: templates/web/zurich/footer.html:13 +#: templates/web/base/header.html:64 templates/web/zurich/footer.html:13 msgid "sign out" msgstr "" @@ -3980,7 +3904,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: templates/web/emptyhomes/report/new/councils_text_none.html:3 +#: templates/web/base/report/new/councils_text_none.html:3 #, perl-format msgid "We do not yet have details for the council that covers this location." msgid_plural "We do not yet have details for the councils that cover this location." @@ -4028,44 +3952,41 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#~ msgid "(we never show your email)" -#~ msgstr "(mes niekada nerodome jÅ«sų el. paÅ¡to)" - -#~ msgid "<strong>No</strong>, let me confirm my report by email:" -#~ msgstr "<strong>Ne</strong>, leisti man patvirtinti mano praneÅ¡imÄ… el. paÅ¡tu:" +#~ msgid "%s, reported at %s" +#~ msgstr "%s, praneÅ¡ta %s" -#~ msgid "<strong>No</strong>, let me confirm my update by email:" -#~ msgstr "<strong>Ne</strong>Ä leisti patvirtinti mano atnaujinimÄ… el. paÅ¡tu:" +#~ msgid "About us" +#~ msgstr "Apie Mus" -#~ msgid "Email me updates" -#~ msgstr "Atsiųsti man atnaujinimus" +#~ msgid "Email me new local problems" +#~ msgstr "Atsiųsti man naujas vietines problemas" -#~ msgid "Enter a new password:" -#~ msgstr "Ä®veskite nauja slaptažodį:" +#~ msgid "Empty flat or maisonette" +#~ msgstr "Apleistas butas" -#~ msgid "I'm afraid we couldn't validate that token. If you've copied the URL from an email, please check that you copied it exactly.\n" -#~ msgstr "Apgailestaujame, bet žymÄ— nebuvo patvirtinta. PraÅ¡ome patikrinti ar jÅ«s teisingai nukopijavote adresÄ… iÅ¡ savo el. paÅ¡to.\n" +#~ msgid "Empty house or bungalow" +#~ msgstr "Apleistas namas" -#~ msgid "If you use web-based email or have 'junk mail' filters, you may wish to check your bulk/spam mail folders: sometimes, our messages are marked that way." -#~ msgstr "Patikrinkite savo el. paÅ¡to \"Junk mail\" arba \"Spam\" skyrius, nes kartais musų žinutÄ—s bÅ«na nusiųstos ten." +#~ msgid "Empty office or other commercial" +#~ msgstr "Apleista įtaiga arba kitas komercinÄ—s paskirties objektas" -#~ msgid "Message:" -#~ msgstr "ŽinutÄ—:" +#~ msgid "Empty pub or bar" +#~ msgstr "Apleistas baras" -#~ msgid "More problems nearby" -#~ msgstr "Daugiau Å¡alia esanÄių problemų" +#~ msgid "Empty public building - school, hospital, etc." +#~ msgstr "Apleistas vieÅ¡osios paskirties pastatas - mokyklaÄ ligonine ir t.t" -#~ msgid "Nearly Done! Now check your email..." -#~ msgstr "Beveik baigta! Dabar patikrinkite savo el. paÅ¡tÄ…..." +#~ msgid "Enter a nearby street name and area, postal code or district in Delhi" +#~ msgstr "Ä®veskite artimiausia paÅ¡to kodÄ… arba gatvÄ—s pavadinimÄ… ir rajonÄ…" -#~ msgid "Offensive? Unsuitable? Tell us" -#~ msgstr "Įžeidžiantis? Netinkamas? PraneÅ¡k mums" +#~ msgid "FixMyStreet" +#~ msgstr "FixMyStreet" -#~ msgid "Photo:" -#~ msgstr "Nuotrauka:" +#~ msgid "I am afraid you cannot confirm unconfirmed reports." +#~ msgstr "ApgailestaujameÄ bet jÅ«s negalite patvirtinti nepatvirtintų praneÅ¡imų." -#~ msgid "Please check your email" -#~ msgstr "PraÅ¡ome patikrinti savo el. paÅ¡tÄ…" +#~ msgid "Problems in this area" +#~ msgstr "Problemos Å¡ioje srityje" -#~ msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" -#~ msgstr "Atkreipkite dÄ—mesį, kad naujinimai nÄ—ra siunÄiama savivaldybei. Jeigu jÅ«s pateiksite savo vardÄ… jis bus vieÅ¡ai prieinamas. JÅ«sų asmeninÄ— informacija bus naudojama tiktai pagal mÅ«sų <a href=\"/faq#privacy\">privatumo politika</a>" +#~ msgid "Property type:" +#~ msgstr "NuosavybÄ—s tipas:" diff --git a/locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po index 471a81f2d..02960b577 100644 --- a/locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2016-03-02 13:09+0000\n" -"PO-Revision-Date: 2015-10-23 16:38+0000\n" +"POT-Creation-Date: 2016-05-03 10:41+0100\n" +"PO-Revision-Date: 2016-03-23 12:44+0000\n" "Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: Malay (http://www.transifex.com/mysociety/fixmystreet/language/ms/)\n" "Language: ms\n" @@ -19,7 +19,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/DB/Result/Problem.pm:618 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr " dan " @@ -52,9 +52,8 @@ msgid "%s admin:" msgstr "" #: templates/web/base/status/stats.html:26 -#, fuzzy msgid "%s bodies" -msgstr "Badan" +msgstr "" #: templates/web/base/status/stats.html:24 msgid "%s confirmed alerts, %s unconfirmed" @@ -89,7 +88,7 @@ msgstr "%s update secara langsung" msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "%s soalan selidik dihantar – %s dijawabi (%s%%)" -#: perllib/FixMyStreet/DB/Result/Problem.pm:683 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "%s ref: %s" msgstr "%s ruj; %s" @@ -108,10 +107,6 @@ msgstr "" msgid "%s ward, %s" msgstr "%s kawasan pentadbiran, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:552 -msgid "%s, reported at %s" -msgstr "%s, dilaporkan pada %s" - #: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "%s, dalam kawasan pentadbiran %s" @@ -166,7 +161,7 @@ msgstr "(seperti graffiti, fly tipping, paving slabs rosak, atau lampu jalan)" msgid "(not sent to council)" msgstr "(tidak dihantar kepada majlis)" -#: templates/web/zurich/report/new/fill_in_details_form.html:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "(optional)" msgstr "(tidak diwajibkan)" @@ -178,12 +173,11 @@ msgstr "" msgid "(sent to both)" msgstr "(hantar kepada kedua-dua)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Pilih kategori --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Pilih jenis harta --" @@ -218,26 +212,21 @@ msgstr "<strong>Tidak</strong> Benarkan aku mengesahkan laporanku dengan emel" msgid "<strong>No</strong> Let me confirm my update by email" msgstr "<strong>Tidak</strong> Benarkan aku mengesahkan kemas kiniku dengan emel" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:97 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>Tidak</strong> benarkan aku log masuk dengan emel" -#: templates/web/base/auth/general.html:70 +#: templates/web/base/auth/general.html:80 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Ya</strong> Aku ada kata laluan" -#: templates/web/base/about/about-en-gb.html:1 -#: templates/web/base/about/about-en-gb.html:3 -msgid "About us" -msgstr "Tentang kita" - #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Action Scheduled" msgstr "Jadual tindakan" @@ -268,7 +257,7 @@ msgstr "Tambah kategori baru" msgid "Add user" msgstr "Tambah pengguna" -#: templates/web/base/my/my.html:56 +#: templates/web/base/my/my.html:54 msgid "Added %s" msgstr "%s telah ditambahi" @@ -288,7 +277,7 @@ msgstr "Alert %d diciptakan untuk %s, jenis %s, parameter %s/%s" msgid "Alert %d disabled (created %s)" msgstr "Pemberitahuan %d dihenti (dibuat pada %s)" -#: templates/web/base/report/update/form_name.html:20 +#: templates/web/base/report/update/form_name.html:21 msgid "Alert me to future updates" msgstr "Maklumkan aku sebarang kemas kini masa depan" @@ -301,7 +290,7 @@ msgstr "Semua Laporan" msgid "All Reports as CSV" msgstr "" -#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 +#: templates/web/base/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:20 @@ -400,7 +389,7 @@ msgstr "Balik" msgid "Ban email address" msgstr "Melarang alamat emel" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1273 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -431,7 +420,7 @@ msgstr "" #: templates/web/base/admin/body.html:68 #: templates/web/base/admin/index.html:54 -#: templates/web/base/report/new/category.html:10 +#: templates/web/base/report/new/category.html:7 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 @@ -446,7 +435,7 @@ msgstr "Kategori" msgid "Category fix rate for problems > 4 weeks old" msgstr "Kategori rata masalah diselesai > 4 minggu" -#: templates/web/base/admin/body.html:138 +#: templates/web/base/admin/body.html:137 #: templates/web/base/admin/category_edit.html:23 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/admin/body.html:43 @@ -466,19 +455,19 @@ msgstr "Kategori: %s" msgid "Change password" msgstr "Menukar Kata Laluan" -#: templates/web/base/admin/body.html:160 +#: templates/web/base/admin/body.html:158 msgid "" "Check <strong>confirmed</strong> to indicate that this contact has been confirmed as correct.\n" " If you are not sure of the origin or validity of the contact, leave this unchecked." msgstr "" -#: templates/web/base/admin/body.html:171 +#: templates/web/base/admin/body.html:169 msgid "" "Check <strong>deleted</strong> to remove the category from use. \n" " It will not appear as an available category in the drop-down menu on the report-a-problem page." msgstr "" -#: templates/web/base/admin/body.html:191 +#: templates/web/base/admin/body.html:189 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -489,7 +478,7 @@ msgid "" " at a specific address." msgstr "" -#: templates/web/base/admin/body.html:130 +#: templates/web/base/admin/body.html:129 msgid "" "Choose a <strong>category</strong> 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." @@ -530,8 +519,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:15 #: templates/web/base/admin/report_blocks.html:25 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 @@ -540,7 +529,7 @@ msgstr "" msgid "Closed" msgstr "Ditutup" -#: perllib/FixMyStreet/DB/Result/Problem.pm:779 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Closed by council" msgstr "Ditutup oleh majlis" @@ -566,7 +555,7 @@ msgstr "Data Cobrand" msgid "Cobrand:" msgstr "Cobrand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Konfigurasi" @@ -596,7 +585,7 @@ msgstr "" msgid "Confirmation" msgstr "Pengesahan" -#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:164 #: templates/web/base/admin/body.html:79 #: templates/web/base/admin/category_edit.html:37 #: templates/web/base/admin/category_edit.html:92 @@ -615,7 +604,7 @@ msgid "Confirmed:" msgstr "Disahkan:" #. ("%s is the site name") -#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 +#: templates/web/base/about/_sidebar.html:6 msgid "Contact %s" msgstr "" @@ -634,8 +623,8 @@ msgstr "Menghubungi pasukan" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1417 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1445 msgid "Could not find user" msgstr "Tidak dapat mencari pengguna" @@ -653,7 +642,7 @@ msgstr "Majlis" msgid "Council contacts for %s" msgstr "Hubungan Majlis untuk %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:681 +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "Council ref: %s" msgstr "Rujukan majlis: %s" @@ -672,7 +661,7 @@ msgstr "Kiraan" msgid "Create a report" msgstr "Laporan baru" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "Kategori baru" @@ -716,20 +705,20 @@ msgstr "Papan pemuka" msgid "Dealt with by subdivision within 5 working days" msgstr "Diuruskan oleh bahagian bawah dalam 5 hari bekerja" -#: perllib/FixMyStreet/App/Controller/Admin.pm:877 +#: perllib/FixMyStreet/App/Controller/Admin.pm:865 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:175 #: templates/web/base/admin/body.html:81 #: templates/web/base/admin/category_edit.html:42 #: templates/web/base/admin/category_edit.html:93 msgid "Deleted" msgstr "Dipadam" -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:47 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -737,7 +726,7 @@ msgid "Description" msgstr "Huraian" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:68 +#: templates/web/zurich/report/new/fill_in_details_form.html:70 msgid "Details" msgstr "Perincian" @@ -762,11 +751,11 @@ msgid "Diligency prize league table" msgstr "Jadual liga hadiah ketekunan" #. ("%s is the site name") -#: templates/web/base/auth/general.html:48 -#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/auth/general.html:58 +#: templates/web/base/report/new/form_user_loggedout.html:28 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout.html:17 +#: templates/web/base/report/update/form_user_loggedout.html:27 msgid "Do you have a %s password?" msgstr "" @@ -784,8 +773,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "Duplicate" msgstr "Salinan" @@ -805,7 +794,7 @@ msgstr "" msgid "Edit" msgstr "Menyunting" -#: templates/web/base/admin/body.html:220 +#: templates/web/base/admin/body.html:218 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "Edit perincian badah" @@ -835,7 +824,7 @@ msgstr "Editor" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:39 +#: templates/web/base/auth/general.html:49 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -843,11 +832,11 @@ msgstr "Editor" msgid "Email" msgstr "Emel" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 msgid "Email added to abuse list" msgstr "Emel ditambahkan kepada senarai penyalahguna" -#: templates/web/base/admin/body.html:155 +#: templates/web/base/admin/body.html:153 msgid "Email address:" msgstr "Alamat emel:" @@ -859,19 +848,14 @@ msgstr "" msgid "Email alert deleted" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1390 msgid "Email already in abuse list" msgstr "Emel telah dalam senarai penyalahguna" -#: templates/web/base/around/_updates.html:5 -msgid "Email me new local problems" -msgstr "Emel aku masalah tempatan baru" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 -#: templates/web/base/alert/updates.html:13 #: templates/web/zurich/admin/body.html:47 msgid "Email:" msgstr "Emel:" @@ -880,26 +864,6 @@ msgstr "Emel:" msgid "Email: %s" msgstr "Emel: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 -msgid "Empty flat or maisonette" -msgstr "Flat atau apartmen lama" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 -msgid "Empty house or bungalow" -msgstr "Rumah kosong atau banglo" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 -msgid "Empty office or other commercial" -msgstr "Pejabat kosing atau komersial lain" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 -msgid "Empty pub or bar" -msgstr "Pub kosong atau bar" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 -msgid "Empty public building - school, hospital, etc." -msgstr "Bangunan awam kosong - sekolah, hospital, lain-lain" - #: templates/web/base/admin/body-form.html:162 #: templates/web/base/admin/body-form.html:163 msgid "" @@ -943,18 +907,14 @@ msgstr "Masukkan poskod terdekat, atau nama jalan dan kawasan" msgid "Enter a nearby street name and area" msgstr "Masukkan nama jalan dan kawasan terdekat" -#: perllib/FixMyStreet/Cobrand/ZeroTB.pm:7 -msgid "Enter a nearby street name and area, postal code or district in Delhi" -msgstr "" - -#: templates/web/base/auth/general.html:99 +#: templates/web/base/auth/general.html:109 #: templates/web/base/report/new/form_user_loggedout_by_email.html:38 #: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Masukkan kata laluan" -#: templates/web/base/index-steps.html:26 +#: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "Masukkan perincian masalah tersebut" @@ -980,7 +940,7 @@ msgstr "Contoh poskod %s" msgid "Examples:" msgstr "Contoh:" -#: templates/web/base/report/new/form_report.html:49 +#: templates/web/base/report/new/form_report.html:51 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "" @@ -1017,19 +977,15 @@ msgstr "Pertama kali" msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." msgstr "" -#: templates/web/base/header.html:26 -msgid "FixMyStreet" -msgstr "FixMyStreet" - #: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:38 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:40 msgid "Fixed" msgstr "Diselesai" @@ -1056,7 +1012,7 @@ msgstr "Tanda sebagai dipadam" msgid "Flag user" msgstr "Tanda pengguna" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "Ditanda" @@ -1078,8 +1034,7 @@ msgstr "" msgid "Flagged:" msgstr "Ditanda:" -#: templates/web/base/reports/_ward-list.html:3 -#: templates/web/fixmystreet/reports/_ward-list.html:4 +#: templates/web/base/reports/_ward-list.html:4 msgid "Follow a ward link to view only reports within that ward." msgstr "Ikuti link kawasan pentadbiran untuk melihat laporan dalam kawasan tersebut sahaja." @@ -1110,18 +1065,18 @@ msgstr "Soalan lazim" msgid "GeoRSS on Google Maps" msgstr "GeoRSS atas Google Maps" +#: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:11 -#: templates/web/fixmystreet/around/_updates.html:3 msgid "Get updates" msgstr "Dapatkan kemas kini" -#: templates/web/fixmystreet/reports/_rss.html:3 -#: templates/web/fixmystreet/reports/_rss.html:9 +#: templates/web/base/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:9 msgid "Get updates of %s problems" msgstr "Dapatkan kemas kini %s masalah" -#: templates/web/fixmystreet/reports/_rss.html:11 -#: templates/web/fixmystreet/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:11 +#: templates/web/base/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "Dapatkan kemas kini masalah di %" @@ -1134,7 +1089,7 @@ msgid "Glad to hear it’s been fixed!" msgstr "" #: templates/web/base/alert/index.html:34 -#: templates/web/base/around/postcode_form.html:16 +#: templates/web/base/around/postcode_form.html:13 #: templates/web/base/reports/_list-filters.html:28 #: templates/web/zurich/admin/stats.html:26 msgid "Go" @@ -1160,7 +1115,7 @@ msgstr "Adakan masalah ini telah diselesai?" msgid "Have you ever reported a problem to a council before, or is this your first time?" msgstr "Adakan anda pernah melaporkan masalah kepada majlis, atau inikah pertama kali anda?" -#: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:38 +#: templates/web/base/footer.html:38 #: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 @@ -1171,8 +1126,7 @@ msgstr "Bantuan" msgid "Here are the types of local problem alerts for ‘%s’." msgstr "" -#: templates/web/base/header.html:32 templates/web/fixmystreet/header.html:63 -#: templates/web/zurich/footer.html:12 +#: templates/web/base/header.html:63 templates/web/zurich/footer.html:12 msgid "Hi %s" msgstr "Hi %s" @@ -1188,11 +1142,11 @@ msgstr "Hi %s" msgid "Hidden" msgstr "Tersembunyi" -#: templates/web/base/around/display_location.html:65 +#: templates/web/base/around/display_location.html:64 msgid "Hide old" msgstr "Sembunyikan lama" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:59 msgid "Hide pins" msgstr "Sembunyikan pin" @@ -1212,10 +1166,6 @@ msgstr "Bagaimana melaporkan masalah" msgid "How to send successful reports" msgstr "Bagaimana untuk menghantar laporan berjaya" -#: perllib/FixMyStreet/App/Controller/Admin.pm:752 -msgid "I am afraid you cannot confirm unconfirmed reports." -msgstr "Anda tidak boleh mengesahkan laporan yang belum disahkan." - #: templates/web/base/tokens/confirm_problem.html:23 #: templates/web/base/tokens/confirm_problem.html:27 msgid "I just reported a problem on @fixmystreet" @@ -1226,7 +1176,7 @@ msgstr "" msgid "I just updated a problem on @fixmystreet" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88 msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "Masalah anda tidak dapat dijumpai dalam database.\n" @@ -1248,7 +1198,7 @@ msgid "" " For basic installations, you don't need to join bodies in this way." msgstr "" -#: templates/web/base/admin/body.html:133 +#: templates/web/base/admin/body.html:132 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." @@ -1269,7 +1219,7 @@ msgid "" "(please note it will not be sent to the council)." msgstr "" -#: templates/web/base/admin/body.html:149 +#: templates/web/base/admin/body.html:147 msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." msgstr "" @@ -1304,10 +1254,10 @@ msgstr "ID tak sah" msgid "Illegal feed selection" msgstr "Pilihan feed yang tak sah" +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "In Progress" msgstr "Dijalani" @@ -1358,7 +1308,7 @@ msgstr "Rujukan dalaman" msgid "Invalid agency_responsible value %s" msgstr "Nilai agency_responsible %s salah" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 msgid "Invalid end date" msgstr "Tarikh berakhir yang tak sah" @@ -1366,16 +1316,16 @@ msgstr "Tarikh berakhir yang tak sah" msgid "Invalid format %s specified." msgstr "Format dinyatakan %s salah" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 msgid "Invalid start date" msgstr "Tarikh mula yang tak sah" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:5 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Investigating" msgstr "Dalam siasatan" @@ -1397,7 +1347,7 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:80 +#: 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 @@ -1435,7 +1385,6 @@ msgstr "Loading..." #: 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/fixmystreet/alert/updates.html:1 msgid "Local RSS feeds and email alerts" msgstr "RSS feed tempatan dan pemberitahuan emel" @@ -1444,11 +1393,11 @@ msgstr "RSS feed tempatan dan pemberitahuan emel" msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "RSS feed tempatan dan pemberitahuan emel untuk '%s'" -#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:35 +#: templates/web/base/footer.html:35 msgid "Local alerts" msgstr "Pemberitahuan tempatan" -#: templates/web/base/index-steps.html:25 +#: templates/web/base/index-steps.html:5 msgid "Locate the problem on a map of the area" msgstr "Mengesan masalah dalam kawasan atas peta" @@ -1508,14 +1457,14 @@ msgstr "Bulan" #: templates/web/base/admin/list_updates.html:7 #: templates/web/base/admin/reports.html:13 #: templates/web/base/admin/users.html:15 -#: templates/web/base/auth/general.html:89 +#: templates/web/base/auth/general.html:99 #: templates/web/base/report/new/form_user_loggedin.html:9 #: templates/web/base/report/new/form_user_loggedout_by_email.html:7 -#: templates/web/base/report/update/form_name.html:4 +#: templates/web/base/report/update/form_name.html:5 #: templates/web/base/reports/index.html:20 #: 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:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "Name" msgstr "Nama" @@ -1539,8 +1488,8 @@ msgstr "" msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:455 -#: perllib/FixMyStreet/Cobrand/Default.pm:495 +#: perllib/FixMyStreet/Cobrand/Default.pm:454 +#: perllib/FixMyStreet/Cobrand/Default.pm:494 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" @@ -1562,7 +1511,7 @@ msgstr "Masalah<br>baru" msgid "New body added" msgstr "Badan baru ditambahi" -#: perllib/FixMyStreet/App/Controller/Admin.pm:387 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 msgid "New category contact added" msgstr "Kategori hubungan baru ditambahi" @@ -1627,7 +1576,7 @@ msgstr "Seterusnya" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 -#: templates/web/base/questionnaire/index.html:101 +#: templates/web/base/questionnaire/index.html:102 #: templates/web/base/questionnaire/index.html:53 msgid "No" msgstr "Tidak" @@ -1692,8 +1641,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Not Responsible" msgstr "Tidak Bertanggungjawab" @@ -1726,7 +1675,7 @@ msgstr "Nota" 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/base/admin/body.html:186 +#: templates/web/base/admin/body.html:184 #: templates/web/base/admin/category_edit.html:52 #: templates/web/zurich/admin/body.html:53 msgid "Note:" @@ -1740,15 +1689,15 @@ msgstr "Nota: <strong>%s</strong>" msgid "Notes from SDM to DM" msgstr "" -#: templates/web/base/report/new/form_user_loggedout.html:14 #: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/form_user_loggedout.html:24 #: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "" #: templates/web/base/report/update-form.html:28 -#: templates/web/base/report/update/form_user_loggedout.html:13 #: templates/web/base/report/update/form_user_loggedout.html:2 +#: templates/web/base/report/update/form_user_loggedout.html:23 msgid "Now to submit your update…" msgstr "Hantarkan kemas kini anda sekarang…" @@ -1784,8 +1733,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:23 #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/report/update/form_update.html:36 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1820,13 +1769,13 @@ msgstr "Atau masalah dilaporkan kepada:" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1055 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 -#: perllib/FixMyStreet/DB/Result/Problem.pm:558 -#: perllib/FixMyStreet/DB/Result/Problem.pm:568 -#: perllib/FixMyStreet/DB/Result/Problem.pm:578 -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1044 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:659 +#: perllib/FixMyStreet/DB/Result/Problem.pm:562 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 +#: perllib/FixMyStreet/DB/Result/Problem.pm:582 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 #: perllib/FixMyStreet/Script/Reports.pm:175 #: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" @@ -1851,7 +1800,7 @@ msgstr "Induk" msgid "Partial" msgstr "Separa" -#: templates/web/base/auth/general.html:92 +#: templates/web/base/auth/general.html:102 #: templates/web/base/report/new/form_user_loggedout_by_email.html:31 #: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 @@ -1860,7 +1809,7 @@ msgid "Password (optional)" msgstr "Kata Laluan (tidah diwajibkan)" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:72 +#: templates/web/base/auth/general.html:82 msgid "Password:" msgstr "Kata Laluan:" @@ -1868,7 +1817,7 @@ msgstr "Kata Laluan:" msgid "Permalink" msgstr "Permalink" -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:90 msgid "Phone number" msgstr "Nombor telefon" @@ -1884,13 +1833,21 @@ msgid "Phone:" msgstr "Telefon:" #: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/questionnaire/index.html:89 +#: templates/web/base/questionnaire/index.html:91 #: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/new/form_report.html:38 +#: templates/web/base/report/new/form_report.html:40 +#: templates/web/base/report/update/form_update.html:20 +#: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:6 #: 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:45 +#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/zurich/report/new/fill_in_details_form.html:63 msgid "Photo" msgstr "Foto" @@ -1914,8 +1871,8 @@ msgstr "Letakkan pin atas peta" #: perllib/FixMyStreet/Cobrand/Zurich.pm:955 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:6 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 @@ -1931,16 +1888,16 @@ 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/general.html:27 -#: templates/web/base/auth/general.html:33 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:43 #: 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:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:856 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:921 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -1950,7 +1907,7 @@ msgstr "Sila pilihkan kategori" msgid "Please choose a property type" msgstr "Sila pilihkan jenis bangunan" -#: perllib/FixMyStreet/App/Controller/Admin.pm:378 +#: perllib/FixMyStreet/App/Controller/Admin.pm:376 msgid "Please correct the errors below" msgstr "" @@ -1971,11 +1928,10 @@ msgstr "" msgid "Please enter a message" msgstr "Sila masukkan pesanan" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Admin.pm:1079 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 msgid "Please enter a name" -msgstr "Sila masukkan nama anda" +msgstr "" #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 @@ -1989,10 +1945,10 @@ msgstr "Sila masukkan kata laluan" msgid "Please enter a subject" msgstr "Sila masukkan tajuk" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1075 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1130 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:133 +#: perllib/FixMyStreet/DB/Result/User.pm:143 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2009,9 +1965,9 @@ msgid "Please enter some details" msgstr "Sila masukkan perincian" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:130 -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:32 +#: perllib/FixMyStreet/DB/Result/User.pm:140 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:42 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2020,7 +1976,7 @@ msgid "Please enter your email" msgstr "Sila masukkan emel anda" #: templates/web/base/report/new/form_user_loggedout_email.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:80 +#: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "Please enter your email address" msgstr "Sila masukkan alamat emel anda" @@ -2036,7 +1992,7 @@ msgstr "Sila masukkan nama penuh anda, majlis memerlukan maklumat ini - Jika and #: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:126 +#: perllib/FixMyStreet/DB/Result/User.pm:136 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "Sila masukkan nama anda" @@ -2063,7 +2019,7 @@ msgstr "Sila <a href=\"%s\">log masuk lagi</a>, atau balik ke <a href=\"/\">hala msgid "Please fill in details of the problem below." msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:72 +#: templates/web/zurich/report/new/fill_in_details_form.html:74 msgid "Please fill in details of the problem." msgstr "Sila isikan perincian untuk masalah tersebut" @@ -2072,7 +2028,7 @@ msgstr "Sila isikan perincian untuk masalah tersebut" msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" @@ -2098,16 +2054,16 @@ msgstr "" msgid "Please note:" msgstr "Sila nota:" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please provide some explanation as to why you're reopening this report" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250 msgid "Please provide some text as well as a photo" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236 msgid "Please say whether you've ever reported a problem to your council before" msgstr "" @@ -2123,22 +2079,23 @@ msgstr "" msgid "Please select the type of alert you want" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232 msgid "Please state whether or not the problem has been fixed" msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:121 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 #: templates/web/base/js/translation_strings.html:53 -msgid "Please upload a JPEG image only" +#, fuzzy +msgid "Please upload an image only" msgstr "Sila memuat naik imej JPEG sahaja" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 msgid "Please write a message" msgstr "Sila tuliskan pesanan" -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Please write your update here" msgstr "Sila tuliskan kemas kini anda di sini" @@ -2169,7 +2126,7 @@ msgstr "" msgid "Previous" msgstr "Sebelumnya" -#: templates/web/fixmystreet/footer.html:41 +#: templates/web/base/footer.html:41 msgid "Privacy" msgstr "" @@ -2179,7 +2136,7 @@ msgstr "" msgid "Privacy and cookies" msgstr "" -#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:200 #: templates/web/base/admin/body.html:85 #: templates/web/base/admin/category_edit.html:45 #: templates/web/base/admin/report_edit.html:77 @@ -2208,7 +2165,7 @@ msgstr "Masalah %s dihantar kepada majlis %s" msgid "Problem breakdown by state" msgstr "Pecahan masalah bagi negeri" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1046 msgid "Problem marked as open." msgstr "Masalah ditanda sebagai terbukan" @@ -2220,10 +2177,6 @@ msgstr "" msgid "Problems" msgstr "Masalah-masalah" -#: templates/web/base/around/_updates.html:1 -msgid "Problems in this area" -msgstr "Masalah dalam kawasan ini" - #: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "Masalah terdekat" @@ -2241,13 +2194,11 @@ msgid "Problems within %.1fkm of this location" msgstr "Masalah dalam %.1fkm dalam lokasi ini" #: perllib/FixMyStreet/Cobrand/Default.pm:663 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 #: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "Masalah dalam %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "Masalah dalam kawasan pentadbiran %s" @@ -2266,15 +2217,11 @@ msgstr "Masalah dalam sempadan" msgid "Property address:" msgstr "Alamat bangunan" -#: templates/web/base/report/new/category.html:8 -msgid "Property type:" -msgstr "Jenis bangunan:" - #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Sediakan kemas kini" -#: templates/web/base/auth/general.html:95 +#: templates/web/base/auth/general.html:105 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 "" @@ -2308,16 +2255,15 @@ msgstr "Soalan selidik %d dijawab untuk masalah %s, %s kepada %s" msgid "Questionnaire %d sent for problem %d" msgstr "Soalan selidik %d dihantar untuk masalah %d" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 msgid "Questionnaire filled in by problem reporter" msgstr "Soalan selidik diisikan oleh pelapor masalah" #: templates/web/base/alert/_list.html:22 +#: templates/web/base/alert/updates.html:9 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display_tools.html:34 -#: templates/web/base/reports/_rss.html:1 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed" msgstr "Feed RSS" @@ -2345,18 +2291,12 @@ msgstr "Feed RSS untuk %s, dalam kawasan pentadbiran %s" msgid "RSS feed of nearby problems" msgstr "Feed RSS untuk masalah berdekatan" -#: templates/web/base/reports/_rss.html:1 -msgid "RSS feed of problems in this %s" -msgstr "Feed RSS untuk masalah dalam %s ini" - #: perllib/FixMyStreet/Cobrand/Default.pm:664 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 #: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "Feed RSS untuk masalah dalam %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 #: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "Feed RSS untuk masalah dalam kawasan pentadbiran %s" @@ -2366,14 +2306,13 @@ msgstr "Feed RSS untuk masalah dalam kawasan pentadbiran %s" msgid "RSS feed of recent local problems" msgstr "Feed RSS untuk masalah tempatan baru-baru ini" +#: templates/web/base/alert/updates.html:9 #: templates/web/base/report/display_tools.html:34 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed of updates to this problem" msgstr "Feed RSS untuk kemas kini bagi masalah ini" -#: templates/web/base/alert/updates.html:9 +#: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:36 -#: templates/web/fixmystreet/alert/updates.html:14 msgid "Receive email when updates are left on this problem." msgstr "Terima emel semasa kemas kini ditinggalkan bagi masalah ini" @@ -2409,12 +2348,11 @@ msgstr "" msgid "Reply to user:" msgstr "" -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/header_logo.html:2 msgid "Report" msgstr "" -#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:26 -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/footer.html:26 templates/web/base/header_logo.html:2 #: templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2424,7 +2362,7 @@ msgstr "" msgid "Report abuse" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:291 +#: perllib/FixMyStreet/App/Controller/Rss.pm:297 msgid "Report on %s" msgstr "" @@ -2439,7 +2377,7 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:577 #: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "" @@ -2449,7 +2387,7 @@ msgstr "" msgid "Reported before" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 #: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "" @@ -2463,27 +2401,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:569 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 msgid "Reported in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:591 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 msgid "Reported in the %s category by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported via %s anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported via %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:561 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 msgid "Reported via %s in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 msgid "Reported via %s in the %s category by %s at %s" msgstr "" @@ -2504,7 +2442,7 @@ msgstr "" msgid "Reporting a problem" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1274 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" @@ -2547,15 +2485,15 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1496 #: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 #: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 @@ -2570,7 +2508,7 @@ msgstr "" msgid "Satellite" msgstr "" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/base/admin/category_edit.html:84 #: templates/web/zurich/admin/body.html:59 #: templates/web/zurich/admin/template_edit.html:29 @@ -2626,7 +2564,7 @@ msgstr "" msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:696 +#: perllib/FixMyStreet/DB/Result/Problem.pm:698 msgid "Sent to %s %s later" msgstr "Dihantar kepada %s %s kemudian" @@ -2645,21 +2583,21 @@ msgstr "Kongsi" #: templates/web/base/report/new/form_user_loggedin.html:23 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22 -#: templates/web/base/report/update/form_name.html:15 +#: templates/web/base/report/update/form_name.html:16 msgid "Show my name publicly" msgstr "Tunjukkan nama aku secara umum" -#: templates/web/base/around/display_location.html:67 +#: templates/web/base/around/display_location.html:66 msgid "Show old" msgstr "Tunjukkan lama" -#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:57 msgid "Show pins" msgstr "Tunjukkan pin" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/general.html:110 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:76 +#: templates/web/base/auth/general.html:86 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2727,14 +2665,10 @@ msgstr "" msgid "Sorry, we could not parse that location. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:138 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 -msgid "Sorry, you can not log in with Facebook. Please try again later." -msgstr "" - #: templates/web/base/admin/stats.html:64 msgid "Start Date:" msgstr "Tarikh bermula:" @@ -2743,7 +2677,7 @@ msgstr "Tarikh bermula:" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/report/update/form_update.html:32 +#: templates/web/base/report/update/form_update.html:34 msgid "State" msgstr "Negeri" @@ -2756,7 +2690,7 @@ msgstr "Negeri" msgid "State:" msgstr "Negeri:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2796,10 +2730,10 @@ msgid "Subject:" msgstr "Tajuk:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/base/report/new/form_user_loggedout_by_email.html:39 #: templates/web/base/report/new/form_user_loggedout_password.html:11 -#: templates/web/zurich/report/new/fill_in_details_form.html:96 +#: templates/web/zurich/report/new/fill_in_details_form.html:98 msgid "Submit" msgstr "Hantar" @@ -2827,9 +2761,8 @@ msgstr "Hantar soalan selidik" msgid "Submitted" msgstr "Dihantarkan" -#: templates/web/base/alert/updates.html:17 +#: templates/web/base/alert/updates.html:23 #: templates/web/base/report/display_tools.html:41 -#: templates/web/fixmystreet/alert/updates.html:23 msgid "Subscribe" msgstr "Melanggan" @@ -2837,7 +2770,7 @@ msgstr "Melanggan" msgid "Subscribe me to an email alert" msgstr "Langgankan pemberitahuan emel" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -2856,7 +2789,7 @@ msgstr "Ringkasan" msgid "Summary reports" msgstr "Laporan ringkasan" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 msgid "Survey" msgstr "Kajian" @@ -2913,7 +2846,7 @@ msgstr "" msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:157 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" @@ -2921,7 +2854,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:126 +#: perllib/FixMyStreet/App/Controller/Location.pm:127 msgid "That location does not appear to be in the UK; please try again." msgstr "" @@ -2931,11 +2864,11 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:724 +#: perllib/FixMyStreet/App/Controller/Admin.pm:722 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:716 +#: perllib/FixMyStreet/App/Controller/Admin.pm:714 msgid "That problem will now be resent." msgstr "" @@ -2947,7 +2880,7 @@ msgstr "" msgid "That report has been removed from FixMyStreet." msgstr "" -#: templates/web/base/admin/body.html:144 +#: templates/web/base/admin/body.html:142 msgid "" "The <strong>email address</strong> is the destination to which reports about this category will be sent. \n" " Other categories for this body may have the same email address." @@ -3087,9 +3020,9 @@ msgstr "" msgid "There was a problem showing this page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:753 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 -#: templates/web/base/auth/general.html:43 +#: templates/web/base/auth/general.html:53 #: 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 "" @@ -3150,9 +3083,9 @@ msgstr "" 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:920 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:898 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:935 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:977 #: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "" @@ -3165,11 +3098,11 @@ msgstr "" msgid "This is a summary of all reports on this site." msgstr "" -#: templates/web/base/report/update/form_update.html:52 +#: templates/web/base/report/update/form_update.html:54 msgid "This problem has been fixed" msgstr "Masalah ini telah diselesai" -#: templates/web/base/report/update/form_update.html:46 +#: templates/web/base/report/update/form_update.html:48 msgid "This problem has not been fixed" msgstr "Masalah ini belum diselesai" @@ -3206,7 +3139,7 @@ msgstr "Laman web tersebut juga mengandungi foto masalah, dibekalkan oleh penggu msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Garis masa" @@ -3251,8 +3184,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Unable to fix" msgstr "Tidak dapat diselesai" @@ -3269,7 +3202,7 @@ msgstr "Belum dipastikan" msgid "Unknown" msgstr "Tidak diketahui" -#: perllib/FixMyStreet/App/Controller/Rss.pm:173 +#: perllib/FixMyStreet/App/Controller/Rss.pm:174 msgid "Unknown alert type" msgstr "Jenis pemberitahuan tak diketahui" @@ -3284,7 +3217,7 @@ msgstr "Ralat tidak diketahui" msgid "Unknown problem ID" msgstr "ID masalah tidak diketahui" -#: templates/web/base/report/update/form_update.html:25 +#: templates/web/base/report/update/form_update.html:27 msgid "Update" msgstr "Kemas kini" @@ -3336,10 +3269,10 @@ msgstr "Status kemas kini" msgid "Updated" msgstr "Dikemas kinikan" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 -#: perllib/FixMyStreet/App/Controller/Admin.pm:821 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1096 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1144 +#: perllib/FixMyStreet/App/Controller/Admin.pm:809 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3366,7 +3299,7 @@ msgstr "Kemas kini atas {{title}}" msgid "Updates to this problem, %s" msgstr "" -#: templates/web/base/admin/body.html:182 +#: templates/web/base/admin/body.html:180 msgid "Use the <strong>note</strong> to record details that are only displayed in the admin. Notes are not shown publicly, and are not sent to the body." msgstr "Gunakan <strong>nota</strong> untuk melaporkan maklumat yang hanya dipaparkan kepada admin. Nota tidak akan dipapar secara awam dan tidak akan dihantar kepada badan." @@ -3375,11 +3308,11 @@ msgstr "Gunakan <strong>nota</strong> untuk melaporkan maklumat yang hanya dipap msgid "Used map" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 msgid "User flag removed" msgstr "Tanda pengguna dipadam" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1421 msgid "User flagged" msgstr "Pengguna ditanda" @@ -3387,16 +3320,16 @@ msgstr "Pengguna ditanda" msgid "User search finds matches in users' names and email addresses." msgstr "Carian pengguna mencari padanan dalam nama dan alamat emel pengguna." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "Pengguna" -#: perllib/FixMyStreet/App/Controller/Admin.pm:382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:412 -#: perllib/FixMyStreet/App/Controller/Admin.pm:429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:380 +#: perllib/FixMyStreet/App/Controller/Admin.pm:410 +#: perllib/FixMyStreet/App/Controller/Admin.pm:427 msgid "Values updated" msgstr "Nilai dikemaskinikan" @@ -3433,16 +3366,15 @@ msgstr "Kita mendapati lebih daripada satu bersesuaian bagi lokasi tersebut. Kit #: templates/web/base/auth/general.html:6 #: templates/web/base/report/display.html:27 #: templates/web/base/report/new/oauth_email_form.html:5 -#, fuzzy msgid "We need your email address, please give it below." -msgstr "Kita tidak akan mempaparkan alamat emel atau nombor telefon anda." +msgstr "" #: templates/web/base/report/new/form_user_loggedout_email.html:2 #: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "Kita tidak akan mempaprkan emel anda" -#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedin.html:30 #: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "Kita tidak akan mempaparkan alamat emel atau nombor telefon anda." @@ -3451,7 +3383,7 @@ msgstr "Kita tidak akan mempaparkan alamat emel atau nombor telefon anda." 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" -#: templates/web/base/index-steps.html:31 +#: templates/web/base/index-steps.html:11 msgid "We send it to the council on your behalf" msgstr "Kita menghantar kepada majlis bagi pihak anda" @@ -3489,10 +3421,6 @@ msgstr "Bila dihantar" msgid "Whoa there Testino! Three photos are enough." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 -msgid "Whole block of empty flats" -msgstr "Seluruh blok flat kosong" - #: templates/web/base/tokens/confirm_alert.html:7 msgid "Why stop there? <a href=\"/alert\">Set up more alerts</a> for free." msgstr "" @@ -3512,7 +3440,7 @@ msgstr "" msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "" -#: templates/web/base/questionnaire/index.html:96 +#: templates/web/base/questionnaire/index.html:97 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "" @@ -3542,8 +3470,8 @@ msgstr "Tahun" #: templates/web/base/admin/update_edit.html:24 #: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 +#: templates/web/base/questionnaire/index.html:100 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "Ya" @@ -3660,19 +3588,19 @@ msgid "Your Reports" msgstr "Laporan Anda" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/alert/updates.html:19 +#: templates/web/base/alert/updates.html:22 #: templates/web/base/contact/index.html:83 #: templates/web/base/report/display_tools.html:38 #: templates/web/base/report/display_tools.html:40 #: templates/web/base/report/new/form_user_loggedin.html:3 #: templates/web/base/report/new/form_user_loggedout_email.html:1 #: templates/web/base/report/update/form_user_loggedout_email.html:1 -#: templates/web/fixmystreet/alert/updates.html:19 -#: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/zurich/report/new/fill_in_details_form.html:76 +#: templates/web/zurich/report/new/fill_in_details_form.html:78 msgid "Your email" msgstr "Emel Anda" -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/general.html:55 #: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 @@ -3683,17 +3611,17 @@ msgstr "Alamat emel anda" msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "Maklumat anda akan digunakan mengikuti <a href=\"/privacy\">dasar privasi</a> kita" -#: templates/web/base/auth/general.html:90 +#: templates/web/base/auth/general.html:100 #: templates/web/base/contact/index.html:76 #: templates/web/base/report/new/form_user_loggedin.html:18 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17 -#: templates/web/base/report/update/form_name.html:11 +#: templates/web/base/report/update/form_name.html:12 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:86 +#: templates/web/zurich/report/new/fill_in_details_form.html:88 msgid "Your name" msgstr "Nama anda" -#: templates/web/base/auth/general.html:75 +#: templates/web/base/auth/general.html:85 #: 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 @@ -3706,20 +3634,19 @@ msgstr "Kata laluan anda telah diubahi" #: templates/web/base/report/new/form_user_loggedin.html:27 #: templates/web/base/report/new/form_user_loggedout_by_email.html:26 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:94 msgid "Your phone number" msgstr "Nombor telefon anda" #: templates/web/base/questionnaire/index.html:14 -#, fuzzy msgid "Your report" -msgstr "Laporan anda" +msgstr "" -#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 +#: templates/web/base/footer.html:29 msgid "Your reports" msgstr "Laporan anda" -#: templates/web/base/my/my.html:41 +#: templates/web/base/my/my.html:39 msgid "Your updates" msgstr "Kemas kini anda" @@ -3745,7 +3672,7 @@ msgid "didn't use map" msgstr "tidak mengguna peta" #: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/around/postcode_form.html:12 msgid "e.g. ‘%s’ or ‘%s’" msgstr "seperti ‘%s’ atau ‘%s’" @@ -3851,8 +3778,7 @@ msgstr "kawasan lain:" msgid "reopened" msgstr "dibuka semula" -#: templates/web/base/header.html:33 templates/web/fixmystreet/header.html:64 -#: templates/web/zurich/footer.html:13 +#: templates/web/base/header.html:64 templates/web/zurich/footer.html:13 msgid "sign out" msgstr "log keluar" @@ -3925,7 +3851,7 @@ msgid "<big>%s</big> update on reports" msgid_plural "<big>%s</big> updates on reports" msgstr[0] "<big>%s</big> laporan dikemaskini" -#: templates/web/emptyhomes/report/new/councils_text_none.html:3 +#: templates/web/base/report/new/councils_text_none.html:3 #, perl-format msgid "We do not yet have details for the council that covers this location." msgid_plural "We do not yet have details for the councils that cover this location." @@ -3961,71 +3887,44 @@ msgid "We do <strong>not</strong> yet have details for the other council that co msgid_plural "We do <strong>not</strong> yet have details for the other councils that cover this location." msgstr[0] "Kita <strong>belum</strong> ada maklumat tentang majlis lain yang menutupi lokasi ini." -#~ msgid "(we never show your email address or phone number)" -#~ msgstr "(kita tidak akan menunjukkan alamat emel atau nombor telefon anda)" - -#~ msgid "(we never show your email)" -#~ msgstr "(kita tidak akan menunjukkan alamat emel anda)" - -#~ msgid "<strong>No</strong>, let me confirm my report by email:" -#~ msgstr "<strong>Tidak</strong>, benarkan aku mengesahkan laporanku dengan emel:" - -#~ msgid "<strong>No</strong>, let me confirm my update by email:" -#~ msgstr "<strong>Tidak</strong> Benarkan aku mengesahkan kemas kiniku dengan emel" - -#~ msgid "Email me updates" -#~ msgstr "Emel aku kemas kini" - -#~ msgid "Enter a new password:" -#~ msgstr "Masukkan kata laluan baru" - -#~ msgid "Message:" -#~ msgstr "Pesanan:" - -#~ msgid "More problems nearby" -#~ msgstr "Lebih masalah terdekat" - -#~ msgid "Nearly Done! Now check your email..." -#~ msgstr "Hampir Dilakukan! Sila periksa emel anda sekarang..." - -#~ msgid "Offensive? Unsuitable? Tell us" -#~ msgstr "Serangan? Tidak sesuai? Beritahu kami" +#~ msgid "%s, reported at %s" +#~ msgstr "%s, dilaporkan pada %s" -#~ msgid "Photo:" -#~ msgstr "Foto:" +#~ msgid "About us" +#~ msgstr "Tentang kita" -#~ msgid "Please check your email" -#~ msgstr "Sila periksa emel anda" +#~ msgid "Email me new local problems" +#~ msgstr "Emel aku masalah tempatan baru" -#~ msgid "This problem has been closed" -#~ msgstr "Masalah ini telah ditutup" +#~ msgid "Empty flat or maisonette" +#~ msgstr "Flat atau apartmen lama" -#~ msgid "This problem is in progress" -#~ msgstr "Masalah ini dalam kemajuan" +#~ msgid "Empty house or bungalow" +#~ msgstr "Rumah kosong atau banglo" -#~ msgid "This problem is old and of unknown status." -#~ msgstr "Masalah ini lama dan dalam keadaan tidak diketahui." +#~ msgid "Empty office or other commercial" +#~ msgstr "Pejabat kosing atau komersial lain" -#~ msgid "Update:" -#~ msgstr "Kemas kini:" +#~ msgid "Empty pub or bar" +#~ msgstr "Pub kosong atau bar" -#~ msgid "We have not been able to confirm your account - sorry." -#~ msgstr "Kita belum dapat mengesahkan akaun anda - maaf." +#~ msgid "Empty public building - school, hospital, etc." +#~ msgstr "Bangunan awam kosong - sekolah, hospital, lain-lain" -#~ msgid "We have sent you an email containing a link to confirm your account." -#~ msgstr "Kita telah menghantarkan anda emel yang mengandungi link untuk mengesahkan akaun anda." +#~ msgid "FixMyStreet" +#~ msgstr "FixMyStreet" -#~ msgid "You have already attached a photo to this report, attaching another one will replace it." -#~ msgstr "Anda telah melampirkan foto untuk laporan ini, lampiran yang lain akan menggantikannya." +#~ msgid "I am afraid you cannot confirm unconfirmed reports." +#~ msgstr "Anda tidak boleh mengesahkan laporan yang belum disahkan." -#~ msgid "You have already attached a photo to this update, attaching another one will replace it." -#~ msgstr "Anda telah melampirkan foto untuk kemas kini ini, lampiran yang lain akan menggantikannya." +#~ msgid "Problems in this area" +#~ msgstr "Masalah dalam kawasan ini" -#~ msgid "Your email:" -#~ msgstr "Emel anda:" +#~ msgid "Property type:" +#~ msgstr "Jenis bangunan:" -#~ msgid "Your name:" -#~ msgstr "Nama anda:" +#~ msgid "RSS feed of problems in this %s" +#~ msgstr "Feed RSS untuk masalah dalam %s ini" -#~ msgid "Your email:" -#~ msgstr "Emel anda:" +#~ msgid "Whole block of empty flats" +#~ msgstr "Seluruh blok flat kosong" diff --git a/locale/my_MM.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/my_MM.UTF-8/LC_MESSAGES/FixMyStreet.po index d179c78d1..0678eba77 100644 --- a/locale/my_MM.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/my_MM.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2016-03-02 13:09+0000\n" -"PO-Revision-Date: 2015-10-23 16:38+0000\n" +"POT-Creation-Date: 2016-05-03 10:41+0100\n" +"PO-Revision-Date: 2016-03-23 12:44+0000\n" "Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: Burmese (Myanmar) (http://www.transifex.com/mysociety/fixmystreet/language/my_MM/)\n" "Language: my_MM\n" @@ -24,7 +24,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/DB/Result/Problem.pm:618 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr "á‚ွင့္" @@ -57,9 +57,8 @@ msgid "%s admin:" msgstr "" #: templates/web/base/status/stats.html:26 -#, fuzzy msgid "%s bodies" -msgstr "စာကá€á€¯á€šá€¹á€™á€ºá€¬á€¸" +msgstr "" #: templates/web/base/status/stats.html:24 msgid "%s confirmed alerts, %s unconfirmed" @@ -94,7 +93,7 @@ msgstr "%s á€á€á€¯á€€á€¹á€›á€á€¯á€€á€¹á€¡á€žá€…္ရယူျá€á€„္:" msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "%s စစ်á€á€™á€ºá€¸á€™á€±á€¸á€á€½á€”်းလွှာပá€á€¯á€·á€•á€¼á€®á€¸ – %s အဖြေ (%s%%)" -#: perllib/FixMyStreet/DB/Result/Problem.pm:683 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "%s ref: %s" msgstr "" @@ -113,10 +112,6 @@ msgstr "" msgid "%s ward, %s" msgstr "%sရပ္ကြက္አ%s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:552 -msgid "%s, reported at %s" -msgstr "%s သá€á€„္းပá€á€¯á‚”သည္မွာ %s" - #: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "%sአ%s ရပ္ကြက္အá€á€¼á€„္း" @@ -171,7 +166,7 @@ msgstr "(ဂရပ္ဖီá€á€®áŠ စည္းကမ္းမဲ့ အမဠmsgid "(not sent to council)" msgstr "(ေကာင္စီသá€á€¯á‚”မပá€á€¯á‚”ပါ)" -#: templates/web/zurich/report/new/fill_in_details_form.html:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "(optional)" msgstr "(ေရြးá€á€ºá€šá€¹á‚á€á€¯á€„္á€á€¼á€„့္)" @@ -183,12 +178,11 @@ msgstr "" msgid "(sent to both)" msgstr "(á‚ွစ္á€á€¯á€œá€¶á€¯á€¸á€žá€á€¯á‚”ပá€á€¯á‚”မည္)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- ေá€á€«á€„္းစဥ္á€á€…္á€á€¯á€±á€›á€¼á€¸á€•á€« --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- ပစá¥á€Šá€¹á€¸á€¡á€™á€ºá€á€³á€¸á€¡á€…ားကá€á€¯á€±á€›á€¼á€¸á€•á€« --" @@ -220,26 +214,21 @@ msgstr "<strong>မဟုá€á€¹á€•á€«</strong> ကá½á€¼á‚္ုပ္áအစ msgid "<strong>No</strong> Let me confirm my update by email" msgstr "<strong>မဟုá€á€¹á€•á€«</strong> ကá½á€¼á‚္ုပ္áအသစ္မြမ္းမံျá€á€„္းကá€á€¯á€¡á€®á€¸á€±á€™á€¸á€œá€¹á€»á€–င့္အá€á€Šá€¹á€»á€•á€³á€™á€Šá€¹" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:97 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>မဟုá€á€¹á€•á€«</strong> အီးေမးလ္ျဖင့္á€á€„္မည္" -#: templates/web/base/auth/general.html:70 +#: templates/web/base/auth/general.html:80 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>ဟုá€á€¹á€€á€²á€·</strong> ကá½á€¼á‚္ုပ္á€á€¼á€„္စကားá€á€½á€€á€¹á€á€…္á€á€¯á€›á€½á€á€žá€Šá€¹" -#: templates/web/base/about/about-en-gb.html:1 -#: templates/web/base/about/about-en-gb.html:3 -msgid "About us" -msgstr "ကá½á€¼á‚္ုပ္á€á€á€¯á‚”အေá¾á€€á€¬á€„္း" - #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Action Scheduled" msgstr "လုပ္ေဆာင္မႈကá€á€¯á€¡á€á€ºá€á€”္ဇယားျဖင့္ျပဳလုပ္ျပီး" @@ -270,7 +259,7 @@ msgstr "ေá€á€«á€„္းစဥ္အသစ္ထည့္မည္" msgid "Add user" msgstr "အသံုးျပဳသူထည့္မည္" -#: templates/web/base/my/my.html:56 +#: templates/web/base/my/my.html:54 msgid "Added %s" msgstr "%sကá€á€¯á€‘ည့္ျပီးျပီ" @@ -290,7 +279,7 @@ msgstr "Parameters %s/%s አအမ်á€á€³á€¸á€¡á€…ား %s አ%s အá€á€¼á msgid "Alert %d disabled (created %s)" msgstr "အသá€á€±á€•á€¸á€á€ºá€€á€¹%dကá€á€¯á€•á€á€á€¹á€‘ားသည္(%sကá€á€¯á€–န္á€á€®á€¸á€»á€•á€®á€¸)" -#: templates/web/base/report/update/form_name.html:20 +#: templates/web/base/report/update/form_name.html:21 msgid "Alert me to future updates" msgstr "ေနာက္ထပ္အသစ္မ်ားအá€á€¼á€€á€¹á€œá€Šá€¹á€¸á€€á½á€¼á‚္ုပ္ကá€á€¯á€¡á€žá€á€±á€•á€¸á€™á€Šá€¹" @@ -303,7 +292,7 @@ msgstr "အစီရင္á€á€¶á€…ာအားလံုး" msgid "All Reports as CSV" msgstr "" -#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 +#: templates/web/base/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:20 @@ -402,7 +391,7 @@ msgstr "ေနာက္သá€á€¯á‚”" msgid "Ban email address" msgstr "အီးေမးလ္လá€á€•á€¹á€…ာကá€á€¯á€•á€á€¹á€á€¹á€•á€„္မည္" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1273 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -433,7 +422,7 @@ msgstr "ေျမပံုကá€á€¯á€™á€»á€™á€„္ဘူးလားዠ<em>ဒá #: templates/web/base/admin/body.html:68 #: templates/web/base/admin/index.html:54 -#: templates/web/base/report/new/category.html:10 +#: templates/web/base/report/new/category.html:7 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 @@ -448,7 +437,7 @@ msgstr "အမ်á€á€³á€¸á€¡á€…ား" msgid "Category fix rate for problems > 4 weeks old" msgstr "" -#: templates/web/base/admin/body.html:138 +#: templates/web/base/admin/body.html:137 #: templates/web/base/admin/category_edit.html:23 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/admin/body.html:43 @@ -468,19 +457,19 @@ msgstr "အမ်á€á€³á€¸á€¡á€…ား - %s" msgid "Change password" msgstr "စကားá€á€½á€€á€¹á€±á€»á€•á€¬á€„္းမည္" -#: templates/web/base/admin/body.html:160 +#: templates/web/base/admin/body.html:158 msgid "" "Check <strong>confirmed</strong> to indicate that this contact has been confirmed as correct.\n" " If you are not sure of the origin or validity of the contact, leave this unchecked." msgstr "" -#: templates/web/base/admin/body.html:171 +#: templates/web/base/admin/body.html:169 msgid "" "Check <strong>deleted</strong> to remove the category from use. \n" " It will not appear as an available category in the drop-down menu on the report-a-problem page." msgstr "" -#: templates/web/base/admin/body.html:191 +#: templates/web/base/admin/body.html:189 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -491,7 +480,7 @@ msgid "" " at a specific address." msgstr "" -#: templates/web/base/admin/body.html:130 +#: templates/web/base/admin/body.html:129 msgid "" "Choose a <strong>category</strong> 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." @@ -532,8 +521,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:15 #: templates/web/base/admin/report_blocks.html:25 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 @@ -542,7 +531,7 @@ msgstr "" msgid "Closed" msgstr "ပá€á€á€¹á€™á€Šá€¹" -#: perllib/FixMyStreet/DB/Result/Problem.pm:779 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Closed by council" msgstr "ေကာင္စီမွပá€á€á€¹á€‘ားသည္" @@ -568,7 +557,7 @@ msgstr "" msgid "Cobrand:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "အစီအစဥ္သá€á€¹á€™á€½á€á€¹á€»á€á€„္း" @@ -598,7 +587,7 @@ msgstr "" msgid "Confirmation" msgstr "အá€á€Šá€¹á€»á€•á€³á€»á€á€„္း" -#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:164 #: templates/web/base/admin/body.html:79 #: templates/web/base/admin/category_edit.html:37 #: templates/web/base/admin/category_edit.html:92 @@ -617,7 +606,7 @@ msgid "Confirmed:" msgstr "အá€á€Šá€¹á€»á€•á€³á€á€²á€·á€á€ºá€á€”္-" #. ("%s is the site name") -#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 +#: templates/web/base/about/_sidebar.html:6 msgid "Contact %s" msgstr "" @@ -636,8 +625,8 @@ msgstr "အဖြဲ႕á‚ွင့္ဆက္သြယ္ပါ" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1417 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1445 msgid "Could not find user" msgstr "အသံုးျပဳသူရွာမေá€á€¼á‚•á€•á€«" @@ -655,7 +644,7 @@ msgstr "ေကာင္စီ" msgid "Council contacts for %s" msgstr "%sအá€á€¼á€€á€¹á€±á€€á€¬á€„္စီအဆက္အသြယ္" -#: perllib/FixMyStreet/DB/Result/Problem.pm:681 +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "Council ref: %s" msgstr "ေကာင္စီ ရည္ညႊန္းá€á€ºá€€á€¹" @@ -674,7 +663,7 @@ msgstr "အေရအá€á€¼á€€á€¹" msgid "Create a report" msgstr "အစီရင္á€á€¶á€…ာá€á€…္á€á€¯á€€á€á€¯á€–န္á€á€®á€¸á€™á€Šá€¹" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "အမ်á€á€³á€¸á€¡á€…ားဖန္á€á€®á€¸á€™á€Šá€¹" @@ -718,20 +707,20 @@ msgstr "" msgid "Dealt with by subdivision within 5 working days" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:877 +#: perllib/FixMyStreet/App/Controller/Admin.pm:865 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:175 #: templates/web/base/admin/body.html:81 #: templates/web/base/admin/category_edit.html:42 #: templates/web/base/admin/category_edit.html:93 msgid "Deleted" msgstr "ဖ်က္ျပီးျပီ" -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:47 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -739,7 +728,7 @@ msgid "Description" msgstr "ေဖာ္ျပá€á€ºá€€á€¹" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:68 +#: templates/web/zurich/report/new/fill_in_details_form.html:70 msgid "Details" msgstr "အေသးစá€á€á€¹á€¡á€á€ºá€€á€¹á€¡á€œá€€á€¹" @@ -764,11 +753,11 @@ msgid "Diligency prize league table" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:48 -#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/auth/general.html:58 +#: templates/web/base/report/new/form_user_loggedout.html:28 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout.html:17 +#: templates/web/base/report/update/form_user_loggedout.html:27 msgid "Do you have a %s password?" msgstr "" @@ -786,8 +775,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "Duplicate" msgstr "á‚ွစ္á€á€¯á€»á€•á€³á€œá€¯á€•á€¹á€™á€Šá€¹" @@ -807,7 +796,7 @@ msgstr "" msgid "Edit" msgstr "ျပင္ဆင္မည္" -#: templates/web/base/admin/body.html:220 +#: templates/web/base/admin/body.html:218 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "စာကá€á€¯á€šá€¹á€€á€á€¯á€¡á€±á€žá€¸á€…á€á€á€¹á€»á€•á€„္မည္" @@ -837,7 +826,7 @@ msgstr "အယ္ဒီá€á€¬" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:39 +#: templates/web/base/auth/general.html:49 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -845,11 +834,11 @@ msgstr "အယ္ဒီá€á€¬" msgid "Email" msgstr "အီးေမးလ္" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 msgid "Email added to abuse list" msgstr "အလြဲသံုးသည့္စာရင္းထဲá€á€¼á€„္အီးေမးလ္ထည့္ျပီး" -#: templates/web/base/admin/body.html:155 +#: templates/web/base/admin/body.html:153 msgid "Email address:" msgstr "အီးေမးလ္လá€á€•á€¹á€…ာ-" @@ -861,19 +850,14 @@ msgstr "" msgid "Email alert deleted" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1390 msgid "Email already in abuse list" msgstr "အလြဲသံုးသည့္စာရင္းထဲá€á€¼á€„္အီးေမးလ္ရွá€á€»á€•á€®á€¸" -#: templates/web/base/around/_updates.html:5 -msgid "Email me new local problems" -msgstr "ေဒသအá€á€¼á€„္းျပႆနာအသစ္မ်ားကá€á€¯á€€á½á€¼á‚္ုပ္ထံသá€á€¯á‚”အီးေမးလ္ပá€á€¯á‚”မည္" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 -#: templates/web/base/alert/updates.html:13 #: templates/web/zurich/admin/body.html:47 msgid "Email:" msgstr "အီးေမးလ္-" @@ -882,26 +866,6 @@ msgstr "အီးေမးလ္-" msgid "Email: %s" msgstr "အီးေမးလ္ -%s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 -msgid "Empty flat or maisonette" -msgstr "á€á€á€¯á€€á€¹á€á€”္းအလြá€á€¹á€žá€á€¯á‚”မဟုá€á€¹ maisonette" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 -msgid "Empty house or bungalow" -msgstr "အá€á€™á€¹á€¡á€œá€¼á€á€¹á€žá€á€¯á‚”မဟုá€á€¹á€˜á€”္ဂလá€á€¯á€¡á€œá€¼á€á€¹" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 -msgid "Empty office or other commercial" -msgstr "ရံုးအလြá€á€¹á€žá€á€¯á‚”မဟုá€á€¹á€á€»á€á€¬á€¸á€…ီးပြားေရးအလြá€á€¹" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 -msgid "Empty pub or bar" -msgstr "အလြá€á€¹á€¡á€›á€€á€¹á€†á€á€¯á€„္သá€á€¯á‚”မဟုá€á€¹á€˜á€¬á€¸" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 -msgid "Empty public building - school, hospital, etc." -msgstr "အမ်ားျပည္သူá‚ွင့္ဆá€á€¯á€„္ေသာá€á€á€¯á€€á€¹á€¡á€œá€¼á€á€¹-ေက်ာင္းáŠá€±á€†á€¸á€›á€¶á€¯á€…သည္ျဖင့္.." - #: templates/web/base/admin/body-form.html:162 #: templates/web/base/admin/body-form.html:163 msgid "" @@ -945,18 +909,14 @@ msgstr "အနီးနားရွဠစာá€á€á€¯á€€á€¹á€”ံပါá€á€¹á msgid "Enter a nearby street name and area" msgstr "အနီးနားရွá€á€œá€™á€¹á€¸á€¡á€™á€Šá€¹á‚ွင့္ဧရá€á€šá€¬á€€á€á€¯á€›á€á€¯á€€á€¹á€‘ည့္ပါ" -#: perllib/FixMyStreet/Cobrand/ZeroTB.pm:7 -msgid "Enter a nearby street name and area, postal code or district in Delhi" -msgstr "" - -#: templates/web/base/auth/general.html:99 +#: templates/web/base/auth/general.html:109 #: templates/web/base/report/new/form_user_loggedout_by_email.html:38 #: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "စကားá€á€½á€€á€¹á€›á€á€¯á€€á€¹á€‘ည့္ပါ" -#: templates/web/base/index-steps.html:26 +#: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "ျပႆနာáအေသးစá€á€á€¹á€¡á€á€ºá€€á€¹á€¡á€œá€€á€¹á€™á€ºá€¬á€¸á€€á€á€¯á€›á€á€¯á€€á€¹á€‘ည့္ပါ" @@ -982,7 +942,7 @@ msgstr "နမူနာစာá€á€á€¯á€€á€¹á€±á€žá€á±á€¬á€”ံပါá€á€¹ %s msgid "Examples:" msgstr "နမူနာမ်ား -" -#: templates/web/base/report/new/form_report.html:49 +#: templates/web/base/report/new/form_report.html:51 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "" @@ -1019,19 +979,15 @@ msgstr "ပထမအá¾á€€á€á€™á€¹" msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." msgstr "" -#: templates/web/base/header.html:26 -msgid "FixMyStreet" -msgstr "ကá½á€¼á‚ု္ပ္လမ္းကá€á€¯á€»á€•á€„္ေပးပါ" - #: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:38 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:40 msgid "Fixed" msgstr "ျပင္ျပီးျပီ" @@ -1058,7 +1014,7 @@ msgstr "ဖ်က္ျပီးျပီဟုသá€á€¹á€™á€½á€á€¹á€™á€Šá€¹" msgid "Flag user" msgstr "သá€á€¹á€™á€½á€á€¹á€žá€Šá€¹á€·á€¡á€žá€¶á€¯á€¸á€»á€•á€³á€žá€°" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "" @@ -1080,8 +1036,7 @@ msgstr "" msgid "Flagged:" msgstr "အမွá€á€¹á€¡á€žá€¬á€¸á€»á€•á€³á€œá€¯á€•á€¹á€‘ားျá€á€„္း" -#: templates/web/base/reports/_ward-list.html:3 -#: templates/web/fixmystreet/reports/_ward-list.html:4 +#: templates/web/base/reports/_ward-list.html:4 msgid "Follow a ward link to view only reports within that ward." msgstr "ရပ္ကြက္ထဲမွအစီရင္á€á€¶á€…ာမ်ားကá€á€¯á€žá€¬á¾á€€á€Šá€¹á€·á€›á€”္ရပ္ကြက္လင့္á€á€¹á€€á€á€¯á€œá€á€¯á€€á€¹á¾á€€á€Šá€¹á€·á€•á€«" @@ -1112,18 +1067,18 @@ msgstr "မá¾á€€á€¬á€á€á€±á€™á€¸á€±á€žá€¬á€±á€™á€¸á€á€¼á€”္းမ်ား msgid "GeoRSS on Google Maps" msgstr "Google Maps ေပášá€€ GeoRSS" +#: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:11 -#: templates/web/fixmystreet/around/_updates.html:3 msgid "Get updates" msgstr "မြမ္းမံထားေသာအသစ္မ်ားရယူရန္" -#: templates/web/fixmystreet/reports/_rss.html:3 -#: templates/web/fixmystreet/reports/_rss.html:9 +#: templates/web/base/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:9 msgid "Get updates of %s problems" msgstr "%ျပႆနာáအသစ္မြမ္းမံမႈမ်ားရယူရန္" -#: templates/web/fixmystreet/reports/_rss.html:11 -#: templates/web/fixmystreet/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:11 +#: templates/web/base/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "" @@ -1136,7 +1091,7 @@ msgid "Glad to hear it’s been fixed!" msgstr "" #: templates/web/base/alert/index.html:34 -#: templates/web/base/around/postcode_form.html:16 +#: templates/web/base/around/postcode_form.html:13 #: templates/web/base/reports/_list-filters.html:28 #: templates/web/zurich/admin/stats.html:26 msgid "Go" @@ -1162,7 +1117,7 @@ msgstr "ဒီျပႆနာကá€á€¯á€±á€»á€–ရွင္းျပီးျပ msgid "Have you ever reported a problem to a council before, or is this your first time?" msgstr "ယá€á€„္က ေကာင္စီထံ ျပႆနာမ်ား အစီရင္á€á€¶á€–ူးသလားዠသá€á€¯á‚”မဟုá€á€¹ ဒါက ပထမဦးဆံုး အႀကá€á€™á€¹á€œá€¬á€¸?" -#: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:38 +#: templates/web/base/footer.html:38 #: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 @@ -1173,8 +1128,7 @@ msgstr "အကူအညီ" msgid "Here are the types of local problem alerts for ‘%s’." msgstr "" -#: templates/web/base/header.html:32 templates/web/fixmystreet/header.html:63 -#: templates/web/zurich/footer.html:12 +#: templates/web/base/header.html:63 templates/web/zurich/footer.html:12 msgid "Hi %s" msgstr "မဂá¤á€œá€¬á€•á€«%s" @@ -1190,11 +1144,11 @@ msgstr "မဂá¤á€œá€¬á€•á€«%s" msgid "Hidden" msgstr "ေဖ်ာက္ထားေသာ" -#: templates/web/base/around/display_location.html:65 +#: templates/web/base/around/display_location.html:64 msgid "Hide old" msgstr "အေဟာင္းေဖ်ာက္ထားေသာ" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:59 msgid "Hide pins" msgstr "" @@ -1214,10 +1168,6 @@ msgstr "ျပႆနာကá€á€¯á€˜á€šá€¹á€œá€á€¯á€¡á€…ီရင္á€á€¶á€…ာ msgid "How to send successful reports" msgstr "ေကာင္းမြန္ေသာအစီရင္á€á€¶á€…ာကá€á€¯á€˜á€šá€¹á€œá€á€¯á€•á€á€¯á‚”မလဲ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:752 -msgid "I am afraid you cannot confirm unconfirmed reports." -msgstr "အá€á€Šá€¹á€™á€»á€•á€³á€›á€±á€žá€¸á€±á€žá€¬á€¡á€…ီရင္á€á€¶á€…ာကá€á€¯á€žá€„္အá€á€Šá€¹á€™á€»á€•á€³á€›á€±á€žá€¸á€•á€«" - #: templates/web/base/tokens/confirm_problem.html:23 #: templates/web/base/tokens/confirm_problem.html:27 msgid "I just reported a problem on @fixmystreet" @@ -1228,7 +1178,7 @@ msgstr "" msgid "I just updated a problem on @fixmystreet" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88 msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "" @@ -1250,7 +1200,7 @@ msgid "" " For basic installations, you don't need to join bodies in this way." msgstr "" -#: templates/web/base/admin/body.html:133 +#: templates/web/base/admin/body.html:132 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." @@ -1271,7 +1221,7 @@ msgid "" "(please note it will not be sent to the council)." msgstr "" -#: templates/web/base/admin/body.html:149 +#: templates/web/base/admin/body.html:147 msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." msgstr "" @@ -1306,10 +1256,10 @@ msgstr "á€á€›á€¬á€¸á€™á€á€„္ေသာအá€á€¯á€„္ဒီ" msgid "Illegal feed selection" msgstr "á€á€›á€¬á€¸á€™á€á€„္ေသာအá€á€¯á€„္ဒီ" +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "In Progress" msgstr "လုပ္ေဆာင္ေနဆဲ" @@ -1360,7 +1310,7 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 msgid "Invalid end date" msgstr "ေနာက္ဆံုးေန႔မမွန္ကန္ပါ" @@ -1368,16 +1318,16 @@ msgstr "ေနာက္ဆံုးေန႔မမွန္ကန္ပါ" msgid "Invalid format %s specified." msgstr "ပံုစံ %s သည္မမွန္ကန္ပါ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 msgid "Invalid start date" msgstr "စမည့္ရက္မမွန္ကန္ပါ" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:5 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Investigating" msgstr "စံုစမ္းစစ္ေဆးေနဆဲ" @@ -1399,7 +1349,7 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:80 +#: 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 @@ -1437,7 +1387,6 @@ msgstr "ဖြင့္ေနသည္" #: 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/fixmystreet/alert/updates.html:1 msgid "Local RSS feeds and email alerts" msgstr "ျပည္á€á€¼á€„္း RSS feed မ်ားá‚ွင့္ အီးေမးလ္ သá€á€á€±á€•á€¸á€á€ºá€€á€¹á€™á€ºá€¬á€¸" @@ -1446,11 +1395,11 @@ msgstr "ျပည္á€á€¼á€„္း RSS feed မ်ားá‚ွင့္ အီá msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "‘%s’ အá€á€¼á€€á€¹ ျပည္á€á€¼á€„္း RSS feed မ်ားá‚ွင့္ အီးေမးလ္ သá€á€á€±á€•á€¸á€á€ºá€€á€¹á€™á€ºá€¬á€¸" -#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:35 +#: templates/web/base/footer.html:35 msgid "Local alerts" msgstr "ေဒသá€á€¼á€„္းအသá€á€±á€•á€¸á€á€ºá€€á€¹" -#: templates/web/base/index-steps.html:25 +#: templates/web/base/index-steps.html:5 msgid "Locate the problem on a map of the area" msgstr "ဧရá€á€šá€¬áေျမပံုá€á€…္á€á€¯á€á€¼á€„္ျပႆနာကá€á€¯á€±á€”ရာသá€á€¹á€™á€½á€á€¹á€™á€Šá€¹" @@ -1510,14 +1459,14 @@ msgstr "လ" #: templates/web/base/admin/list_updates.html:7 #: templates/web/base/admin/reports.html:13 #: templates/web/base/admin/users.html:15 -#: templates/web/base/auth/general.html:89 +#: templates/web/base/auth/general.html:99 #: templates/web/base/report/new/form_user_loggedin.html:9 #: templates/web/base/report/new/form_user_loggedout_by_email.html:7 -#: templates/web/base/report/update/form_name.html:4 +#: templates/web/base/report/update/form_name.html:5 #: templates/web/base/reports/index.html:20 #: 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:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "Name" msgstr "အမည္" @@ -1541,8 +1490,8 @@ msgstr "" msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:455 -#: perllib/FixMyStreet/Cobrand/Default.pm:495 +#: perllib/FixMyStreet/Cobrand/Default.pm:454 +#: perllib/FixMyStreet/Cobrand/Default.pm:494 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" @@ -1564,7 +1513,7 @@ msgstr "အသစ္<br>ျပႆနာမ်ား" msgid "New body added" msgstr "စာကá€á€¯á€šá€¹á€¡á€žá€…္ထည့္ျပီးျပီ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:387 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 msgid "New category contact added" msgstr "ေá€á€«á€„္းစဥ္အသစ္အဆက္အသြယ္ထည့္ျပီးျပီ" @@ -1629,7 +1578,7 @@ msgstr "ေနာက္သá€á€¯á‚”" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 -#: templates/web/base/questionnaire/index.html:101 +#: templates/web/base/questionnaire/index.html:102 #: templates/web/base/questionnaire/index.html:53 msgid "No" msgstr "မရွá€á€•á€«" @@ -1694,8 +1643,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Not Responsible" msgstr "á€á€¬á€á€”္ယူမႈမရွá€á€»á€á€„္း" @@ -1728,7 +1677,7 @@ 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 "" -#: templates/web/base/admin/body.html:186 +#: templates/web/base/admin/body.html:184 #: templates/web/base/admin/category_edit.html:52 #: templates/web/zurich/admin/body.html:53 msgid "Note:" @@ -1742,15 +1691,15 @@ msgstr "မွá€á€¹á€…ု <strong> %s </strong>" msgid "Notes from SDM to DM" msgstr "" -#: templates/web/base/report/new/form_user_loggedout.html:14 #: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/form_user_loggedout.html:24 #: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "ယá€á€¯á€žá€„္áအစီရင္á€á€¶á€…ာကá€á€¯á€žá€¼á€„္းá‚á€á€¯á€„္ပါျပီ …" #: templates/web/base/report/update-form.html:28 -#: templates/web/base/report/update/form_user_loggedout.html:13 #: templates/web/base/report/update/form_user_loggedout.html:2 +#: templates/web/base/report/update/form_user_loggedout.html:23 msgid "Now to submit your update…" msgstr "" @@ -1784,8 +1733,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:23 #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/report/update/form_update.html:36 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1820,13 +1769,13 @@ msgstr "သá€á€¯á‚”မဟုá€á€¹ ျပႆနာမ်ားကá€á€¯á€á€„ဠmsgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1055 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 -#: perllib/FixMyStreet/DB/Result/Problem.pm:558 -#: perllib/FixMyStreet/DB/Result/Problem.pm:568 -#: perllib/FixMyStreet/DB/Result/Problem.pm:578 -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1044 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:659 +#: perllib/FixMyStreet/DB/Result/Problem.pm:562 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 +#: perllib/FixMyStreet/DB/Result/Problem.pm:582 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 #: perllib/FixMyStreet/Script/Reports.pm:175 #: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" @@ -1851,7 +1800,7 @@ msgstr "ပင္မ" msgid "Partial" msgstr "á€á€…္á€á€€á€¹" -#: templates/web/base/auth/general.html:92 +#: templates/web/base/auth/general.html:102 #: templates/web/base/report/new/form_user_loggedout_by_email.html:31 #: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 @@ -1860,7 +1809,7 @@ msgid "Password (optional)" msgstr "စကားá€á€½á€€á€¹(ထည့္á€á€ºá€„္မွထည့္ပါ)" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:72 +#: templates/web/base/auth/general.html:82 msgid "Password:" msgstr "စကားá€á€½á€€á€¹-" @@ -1868,7 +1817,7 @@ msgstr "စကားá€á€½á€€á€¹-" msgid "Permalink" msgstr "အျမဲá€á€™á€¹á€¸á€œá€„့္á€á€¹" -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:90 msgid "Phone number" msgstr "ဖုန္းနံပါá€á€¹" @@ -1884,13 +1833,21 @@ msgid "Phone:" msgstr "ဖုန္း-" #: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/questionnaire/index.html:89 +#: templates/web/base/questionnaire/index.html:91 #: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/new/form_report.html:38 +#: templates/web/base/report/new/form_report.html:40 +#: templates/web/base/report/update/form_update.html:20 +#: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:6 #: 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:45 +#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/zurich/report/new/fill_in_details_form.html:63 msgid "Photo" msgstr "ဓာá€á€¹á€•á€¶á€¯" @@ -1914,8 +1871,8 @@ msgstr "ေျမပံုá€á€¼á€„္ပင္á€á€…္á€á€¯á€‘ားမည္ #: perllib/FixMyStreet/Cobrand/Zurich.pm:955 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:6 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 @@ -1931,16 +1888,16 @@ msgstr "" msgid "Please check the passwords and try again" msgstr "စကားá€á€½á€€á€¹á€€á€á€¯á€»á€•á€”္စစ္ေဆးျပီးျပန္á¾á€€á€á€³á€¸á€…ားပါ" -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:33 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:43 #: 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:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:856 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:921 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -1950,7 +1907,7 @@ msgstr "ေá€á€«á€„္းစဥ္á€á€…္á€á€¯á€€á€á€¯á€±á€›á€¼á€¸á€•á€«" msgid "Please choose a property type" msgstr "ပစá¥á€Šá€¹á€¸á€¡á€™á€ºá€á€³á€¸á€¡á€…ားá€á€…္á€á€¯á€€á€á€¯á€±á€›á€¼á€¸á€•á€«" -#: perllib/FixMyStreet/App/Controller/Admin.pm:378 +#: perllib/FixMyStreet/App/Controller/Admin.pm:376 msgid "Please correct the errors below" msgstr "" @@ -1971,11 +1928,10 @@ msgstr "" msgid "Please enter a message" msgstr "စာá€á€…္á€á€¯á€›á€á€¯á€€á€¹á€‘ည့္ပါ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Admin.pm:1079 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 msgid "Please enter a name" -msgstr "သင္áအမည္ကá€á€¯á€›á€á€¯á€€á€¹á€‘ည့္ပါ" +msgstr "" #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 @@ -1989,10 +1945,10 @@ msgstr "စကားá€á€½á€€á€¹á€á€…္á€á€¯á€›á€á€¯á€€á€¹á€‘ည့္ပါ msgid "Please enter a subject" msgstr "ေá€á€«á€„္းစီးá€á€…္á€á€¯á€›á€á€¯á€€á€¹á€‘ည့္ပါ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1075 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1130 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:133 +#: perllib/FixMyStreet/DB/Result/User.pm:143 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2009,9 +1965,9 @@ msgid "Please enter some details" msgstr "á€á€…္á€á€ºá€á€³á‚•á€¡á€á€ºá€€á€¹á€¡á€œá€€á€¹á€™á€ºá€¬á€¸á€€á€á€¯á€›á€á€¯á€€á€¹á€‘ည့္ပါ" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:130 -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:32 +#: perllib/FixMyStreet/DB/Result/User.pm:140 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:42 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2020,7 +1976,7 @@ msgid "Please enter your email" msgstr "သင္áအီးေမးလ္ကá€á€¯á€›á€á€¯á€€á€¹á€‘ည့္ပါ" #: templates/web/base/report/new/form_user_loggedout_email.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:80 +#: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "Please enter your email address" msgstr "သင္áအီးေမးလ္လá€á€•á€¹á€…ာကá€á€¯á€›á€á€¯á€€á€¹á€‘ည့္ပါ" @@ -2036,7 +1992,7 @@ msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:126 +#: perllib/FixMyStreet/DB/Result/User.pm:136 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "သင္áအမည္ကá€á€¯á€›á€á€¯á€€á€¹á€‘ည့္ပါ" @@ -2063,7 +2019,7 @@ msgstr "ျပန္လည္ á€á€„္ေရာက္ပါ သá€á€¯á‚”မဟá msgid "Please fill in details of the problem below." msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:72 +#: templates/web/zurich/report/new/fill_in_details_form.html:74 msgid "Please fill in details of the problem." msgstr "" @@ -2072,7 +2028,7 @@ msgstr "" msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" @@ -2098,16 +2054,16 @@ msgstr "" msgid "Please note:" msgstr "ေက်းဇူးျပဳျပီးမွá€á€¹á€žá€¬á€¸á€•á€«-" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please provide some explanation as to why you're reopening this report" msgstr "သင္ဘာလá€á€¯á‚”ဒီသá€á€„္းပá€á€¯á‚”á€á€ºá€€á€¹á€€á€á€¯á€»á€•á€”္ဖြင့္ရသလဲဆá€á€¯á€žá€Šá€¹á€·á€›á€½á€„္းလင္းá€á€ºá€€á€¹á€€á€á€¯á€±á€»á€•á€¬á€»á€•á€±á€•á€¸á€•á€«" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250 msgid "Please provide some text as well as a photo" msgstr "စာအနည္းငယ္á‚ွင့္ဓာá€á€¹á€•á€¶á€¯á€á€…္ပံုကá€á€¯á€œá€Šá€¹á€¸á€±á€–ာ္ျပေပးပါ" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236 msgid "Please say whether you've ever reported a problem to your council before" msgstr "သင္áေကာင္စီသá€á€¯á‚”သင္ယá€á€„္ကသá€á€„္းပá€á€¯á‚”ဖူးေá¾á€€á€¬á€„္းေျပာျပေပးပါ" @@ -2123,22 +2079,23 @@ msgstr "သင္လá€á€¯á€á€ºá€„္ေသာ feed ကá€á€¯á€±á€›á€¼á€¸á€•á€« msgid "Please select the type of alert you want" msgstr "သင္လá€á€¯á€á€ºá€„္ေသာ အသá€á€±á€•á€¸á€á€ºá€€á€¹á€¡á€™á€ºá€á€³á€¸á€¡á€…ားမ်ားကá€á€¯á€±á€›á€¼á€¸á€•á€«" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232 msgid "Please state whether or not the problem has been fixed" msgstr "ျပႆနာေျဖရွင္းျပီးျပီáŠá€™á€›á€½á€„္းျပီးျပီကá€á€¯á€±á€–ာ္ျပပါ" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:121 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 #: templates/web/base/js/translation_strings.html:53 -msgid "Please upload a JPEG image only" +#, fuzzy +msgid "Please upload an image only" msgstr "JPEG ပံုá€á€…္ပံုသာá€á€„္ရန္" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 msgid "Please write a message" msgstr "စာá€á€…္ေá¾á€€á€¬á€„္းေရးပါ" -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Please write your update here" msgstr "သင္áအသစ္မြမ္းမံမႈကá€á€¯á€’ီေနရာမွာေရးပါ" @@ -2169,7 +2126,7 @@ msgstr "" msgid "Previous" msgstr "ယá€á€„္က" -#: templates/web/fixmystreet/footer.html:41 +#: templates/web/base/footer.html:41 msgid "Privacy" msgstr "" @@ -2179,7 +2136,7 @@ msgstr "" msgid "Privacy and cookies" msgstr "" -#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:200 #: templates/web/base/admin/body.html:85 #: templates/web/base/admin/category_edit.html:45 #: templates/web/base/admin/report_edit.html:77 @@ -2208,7 +2165,7 @@ msgstr "ေကာင္စီ %s သá€á€¯á‚” ျပႆနာ %s ကá€á€¯á€•á€ msgid "Problem breakdown by state" msgstr "ျပည္နယ္မွ ျပႆနာကá€á€¯á€‘ပ္မံá€á€¼á€²á€…á€á€á€¹á€œá€á€¯á€€á€¹á€žá€Šá€¹" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1046 msgid "Problem marked as open." msgstr "ျပႆနာကá€á€¯ ဖြင့္ထားသည္" @@ -2220,10 +2177,6 @@ msgstr "စစ္ေဆးမႈရလဒ္မ်ားအေပášá€á€¼á€„္ msgid "Problems" msgstr "ျပႆနာမ်ား" -#: templates/web/base/around/_updates.html:1 -msgid "Problems in this area" -msgstr "ဒီဧရá€á€šá€¬á€¡á€á€¼á€„္းရွá€á€»á€•á‚†á€”ာမ်ား" - #: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "အနီးနားရွá€á€»á€•á‚†á€”ာမ်ား" @@ -2241,13 +2194,11 @@ msgid "Problems within %.1fkm of this location" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:663 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 #: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "" @@ -2266,15 +2217,11 @@ msgstr "" msgid "Property address:" msgstr "" -#: templates/web/base/report/new/category.html:8 -msgid "Property type:" -msgstr "" - #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "" -#: templates/web/base/auth/general.html:95 +#: templates/web/base/auth/general.html:105 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 မ်ား ျပဳလုပ္ျá€á€„္းá‚ွင့္ အစီရင္á€á€¶á€…ာမ်ား စီမံá€á€”္႔á€á€¼á€²á€»á€á€„္းá€á€á€¯á‚”ကá€á€¯ ပá€á€¯á€™á€á€¯á€œá€¼á€šá€¹á€€á€°á€…ြာ ျပဳလုပ္á‚á€á€¯á€„္မည္á‹" @@ -2308,16 +2255,15 @@ msgstr "%d, %s ျပႆနာ အá€á€¼á€€á€¹ %d မွ %s ထံ ေျဖá¾á msgid "Questionnaire %d sent for problem %d" msgstr "%d ျပႆနာ အá€á€¼á€€á€¹ %d ေပးပá€á€¯á‚”သည့္ စစ္á€á€™á€¹á€¸á€±á€™á€¸á€á€¼á€”္းလႊာ" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 msgid "Questionnaire filled in by problem reporter" msgstr "ျပႆနာ အစီရင္á€á€¶á€žá€° ျဖည့္စြက္ရမည့္ စစ္á€á€™á€¹á€¸á€±á€™á€¸á€á€¼á€”္းလႊာ" #: templates/web/base/alert/_list.html:22 +#: templates/web/base/alert/updates.html:9 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display_tools.html:34 -#: templates/web/base/reports/_rss.html:1 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed" msgstr "RSS feed" @@ -2345,18 +2291,12 @@ msgstr "%s အုပ္á€á€ºá€³á€•á€¹á€±á€›á€¸á€Œá€¬á€” အá€á€¼á€„္းရဠmsgid "RSS feed of nearby problems" msgstr "အနီးအနားရá€á€½ ျပႆနာမ်ားá RSS feed" -#: templates/web/base/reports/_rss.html:1 -msgid "RSS feed of problems in this %s" -msgstr "ဒီ %s ရá€á€½ ျပႆနာမ်ားá RSS feed" - #: perllib/FixMyStreet/Cobrand/Default.pm:664 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 #: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "%s အá€á€¼á€„္းရá€á€½ ျပႆနာမ်ားá RSS feed" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 #: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "%s အုပ္á€á€ºá€³á€•á€¹á€±á€›á€¸á€Œá€¬á€” အá€á€¼á€„္းရá€á€½ ျပႆနာမ်ားá RSS feed" @@ -2366,14 +2306,13 @@ msgstr "%s အုပ္á€á€ºá€³á€•á€¹á€±á€›á€¸á€Œá€¬á€” အá€á€¼á€„္းရဠmsgid "RSS feed of recent local problems" msgstr "လá€á€¹á€á€±á€œá€¬ ျပည္á€á€¼á€„္း ျပႆနာမ်ား အá€á€¼á€€á€¹ RSS feed" +#: templates/web/base/alert/updates.html:9 #: templates/web/base/report/display_tools.html:34 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed of updates to this problem" msgstr "လက္ရá€á€½ ျပႆနာကá€á€¯ update ျပဳလုပ္ထားသည့္ RSS feed" -#: templates/web/base/alert/updates.html:9 +#: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:36 -#: templates/web/fixmystreet/alert/updates.html:14 msgid "Receive email when updates are left on this problem." msgstr "" @@ -2409,12 +2348,11 @@ msgstr "ဓာá€á€¹á€•á€¶á€¯ ဖယ္ရွားရန္ (မá¿á€•á€®á€¸á€± msgid "Reply to user:" msgstr "" -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/header_logo.html:2 msgid "Report" msgstr "" -#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:26 -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/footer.html:26 templates/web/base/header_logo.html:2 #: templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2424,7 +2362,7 @@ msgstr "ျပႆနာကá€á€¯ အစီရင္á€á€¶ á€á€„္ျပရနá msgid "Report abuse" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:291 +#: perllib/FixMyStreet/App/Controller/Rss.pm:297 msgid "Report on %s" msgstr "" @@ -2439,7 +2377,7 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "ေဒသá€á€¼á€„္း ျပႆနာမ်ားကá€á€¯ အစီရင္á€á€¶á€»á€á€„္းአá¾á€€á€Šá€¹á€·á‚ႈျá€á€„္းá‚ွင့္ ေဆြးေá‚ြးျá€á€„္း" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:577 #: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "" @@ -2449,7 +2387,7 @@ msgstr "" msgid "Reported before" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 #: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "" @@ -2463,27 +2401,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:569 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 msgid "Reported in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:591 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 msgid "Reported in the %s category by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported via %s anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported via %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:561 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 msgid "Reported via %s in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 msgid "Reported via %s in the %s category by %s at %s" msgstr "" @@ -2504,7 +2442,7 @@ msgstr "" msgid "Reporting a problem" msgstr "ျပႆနာကá€á€¯ အစီရင္á€á€¶ á€á€„္ျပျá€á€„္း" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1274 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" @@ -2547,15 +2485,15 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1496 #: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "ဘယ္ဘက္ကá€á€¯ လွည့္ပါ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 #: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 @@ -2570,7 +2508,7 @@ msgstr "" msgid "Satellite" msgstr "" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/base/admin/category_edit.html:84 #: templates/web/zurich/admin/body.html:59 #: templates/web/zurich/admin/template_edit.html:29 @@ -2626,7 +2564,7 @@ msgstr "" msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:696 +#: perllib/FixMyStreet/DB/Result/Problem.pm:698 msgid "Sent to %s %s later" msgstr "" @@ -2645,21 +2583,21 @@ msgstr "" #: templates/web/base/report/new/form_user_loggedin.html:23 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22 -#: templates/web/base/report/update/form_name.html:15 +#: templates/web/base/report/update/form_name.html:16 msgid "Show my name publicly" msgstr "" -#: templates/web/base/around/display_location.html:67 +#: templates/web/base/around/display_location.html:66 msgid "Show old" msgstr "" -#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:57 msgid "Show pins" msgstr "" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/general.html:110 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:76 +#: templates/web/base/auth/general.html:86 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2727,14 +2665,10 @@ msgstr "" msgid "Sorry, we could not parse that location. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:138 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 -msgid "Sorry, you can not log in with Facebook. Please try again later." -msgstr "" - #: templates/web/base/admin/stats.html:64 msgid "Start Date:" msgstr "" @@ -2743,7 +2677,7 @@ msgstr "" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/report/update/form_update.html:32 +#: templates/web/base/report/update/form_update.html:34 msgid "State" msgstr "" @@ -2756,7 +2690,7 @@ msgstr "" msgid "State:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2796,10 +2730,10 @@ msgid "Subject:" msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/base/report/new/form_user_loggedout_by_email.html:39 #: templates/web/base/report/new/form_user_loggedout_password.html:11 -#: templates/web/zurich/report/new/fill_in_details_form.html:96 +#: templates/web/zurich/report/new/fill_in_details_form.html:98 msgid "Submit" msgstr "" @@ -2827,9 +2761,8 @@ msgstr "" msgid "Submitted" msgstr "" -#: templates/web/base/alert/updates.html:17 +#: templates/web/base/alert/updates.html:23 #: templates/web/base/report/display_tools.html:41 -#: templates/web/fixmystreet/alert/updates.html:23 msgid "Subscribe" msgstr "" @@ -2837,7 +2770,7 @@ msgstr "" msgid "Subscribe me to an email alert" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -2856,7 +2789,7 @@ msgstr "အက်ဥ္းá€á€ºá€³á€•á€¹" msgid "Summary reports" msgstr "အစီရင္á€á€¶á€…ာအက်ဥ္းá€á€ºá€³á€•á€¹" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 msgid "Survey" msgstr "စစ္á€á€™á€¹á€¸" @@ -2913,7 +2846,7 @@ msgstr "" msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "ေက်းဇူးá€á€„္ပါသည္ዠျပင္ဆင္á¿á€•á€®á€¸ ျဖစ္ေá¾á€€á€¬á€„္း á¾á€€á€¬á€¸á€žá€á€›á á€á€™á€¹á€¸á€žá€¬á€™á€á€•á€«á€žá€Šá€¹á‹ သင့္အေနျဖင့္ ယá€á€„္က ေကာင္စီထံ ျပႆနာá€á€…္á€á€¯á€€á€á€¯ အစီရင္á€á€¶á€á€„္ျပဖူးပါသလား?" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:157 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" @@ -2921,7 +2854,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:126 +#: perllib/FixMyStreet/App/Controller/Location.pm:127 msgid "That location does not appear to be in the UK; please try again." msgstr "" @@ -2931,11 +2864,11 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:724 +#: perllib/FixMyStreet/App/Controller/Admin.pm:722 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:716 +#: perllib/FixMyStreet/App/Controller/Admin.pm:714 msgid "That problem will now be resent." msgstr "ထá€á€¯á€»á€•á‚†á€”ာကá€á€¯á€šá€á€¯á€•á€„္ျပန္ပá€á€¯á‚”ပါမည္" @@ -2947,7 +2880,7 @@ msgstr "ဒီအစီရင္á€á€¶á€…ာကá€á€¯ %s ေပášá€á€¼á€„္ဠmsgid "That report has been removed from FixMyStreet." msgstr "ကá½á€¼á‚္ုပ္လမ္းကá€á€¯á€»á€•á€„္ေပးပါ မွဒီအစီရင္á€á€¶á€…ာကá€á€¯á€–ယ္ျပီးပါျပီ" -#: templates/web/base/admin/body.html:144 +#: templates/web/base/admin/body.html:142 msgid "" "The <strong>email address</strong> is the destination to which reports about this category will be sent. \n" " Other categories for this body may have the same email address." @@ -3087,9 +3020,9 @@ msgstr "" msgid "There was a problem showing this page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:753 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 -#: templates/web/base/auth/general.html:43 +#: templates/web/base/auth/general.html:53 #: 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 "အီးေမးလ္á‚ွင့္ လ်ွá€á€³á‚•á€á€½á€€á€¹á€”ံပါá€á€¹á€á€¼á€„္ ျပႆနာ ျဖစ္ေပášá€á€²á€·á€•á€«á€žá€Šá€¹á‹ သင္á လွ်á€á€³á‚•á€á€½á€€á€¹á€”ံပါá€á€¹á€€á€á€¯ မမွá€á€¹á€™á€á€•á€«á€€ သá€á€¯á‚”မဟုá€á€¹ မရá€á€½á€±á€žá€¸á€•á€«á€€ ေလွ်က္လႊာá \"အီးေမးလ္ျဖင့္ á€á€„္ရန္\" ေနရာá€á€¼á€„္ ျဖည့္ပါá‹" @@ -3150,9 +3083,9 @@ msgstr "" 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:920 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:898 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:935 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:977 #: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "ဒီအá€á€ºá€€á€¹á€¡á€œá€€á€¹ ျဖည့္စြက္ရန္ လá€á€¯á€¡á€•á€¹á€žá€Šá€¹" @@ -3165,11 +3098,11 @@ msgstr "" msgid "This is a summary of all reports on this site." msgstr "" -#: templates/web/base/report/update/form_update.html:52 +#: templates/web/base/report/update/form_update.html:54 msgid "This problem has been fixed" msgstr "ဒီျပႆနာကá€á€¯á€±á€»á€–ရွင္းျပီးပါျပီ" -#: templates/web/base/report/update/form_update.html:46 +#: templates/web/base/report/update/form_update.html:48 msgid "This problem has not been fixed" msgstr "ဒီျပႆနာကá€á€¯á€™á€±á€»á€–ရွင္းရေသးပါ" @@ -3206,7 +3139,7 @@ msgstr "ဒီ web စာမ်က္á‚ွာသည္ အသံုးျပဳ msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -3251,8 +3184,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Unable to fix" msgstr "" @@ -3269,7 +3202,7 @@ msgstr "" msgid "Unknown" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:173 +#: perllib/FixMyStreet/App/Controller/Rss.pm:174 msgid "Unknown alert type" msgstr "" @@ -3284,7 +3217,7 @@ msgstr "" msgid "Unknown problem ID" msgstr "" -#: templates/web/base/report/update/form_update.html:25 +#: templates/web/base/report/update/form_update.html:27 msgid "Update" msgstr "" @@ -3336,10 +3269,10 @@ msgstr "" msgid "Updated" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 -#: perllib/FixMyStreet/App/Controller/Admin.pm:821 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1096 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1144 +#: perllib/FixMyStreet/App/Controller/Admin.pm:809 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3366,7 +3299,7 @@ msgstr "" msgid "Updates to this problem, %s" msgstr "" -#: templates/web/base/admin/body.html:182 +#: templates/web/base/admin/body.html:180 msgid "Use the <strong>note</strong> to record details that are only displayed in the admin. Notes are not shown publicly, and are not sent to the body." msgstr "စီမံသူá€á€¼á€„္သာ ေဖာ္ျပေပးသည့္ အေသးစá€á€á€¹á€€á€á€¯ မွá€á€¹á€á€™á€¹á€¸á€á€„္ရန္ မွá€á€¹á€…ုကá€á€¯ အသုံးျပဳပါዠမွá€á€¹á€…ုမ်ားကá€á€¯ လူအမ်ားမေá€á€¼á‚”ျမင္ရ သလá€á€¯ အဖြဲ႔ထံသá€á€¯á‚”လည္း မေပးပá€á€¯á‚”á‚á€á€¯á€„္ပါá‹" @@ -3375,11 +3308,11 @@ msgstr "စီမံသူá€á€¼á€„္သာ ေဖာ္ျပေပးသညဠmsgid "Used map" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 msgid "User flag removed" msgstr "သုံးစြဲသူ အမွá€á€¹á€¡á€žá€¬á€¸ ျပဳလုပ္ျá€á€„္းကá€á€¯ ဖယ္ရွားလá€á€¯á€€á€¹á€žá€Šá€¹á‹" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1421 msgid "User flagged" msgstr "သုုံးစြဲသူက အမွá€á€¹á€¡á€žá€¬á€¸ ျပဳလုပ္ျá€á€„္း" @@ -3387,16 +3320,16 @@ msgstr "သုုံးစြဲသူက အမွá€á€¹á€¡á€žá€¬á€¸ ျပဳá msgid "User search finds matches in users' names and email addresses." msgstr "သုံးစြဲသူရွာေဖြမႈသည္ áŽá€á€á€¯á‚”á အီးေမးလá€á€•á€¹á€…ာá‚ွင့္ နာမည္မ်ားရွဠá€á€°á€Šá€®á€™á‚ˆá€™á€ºá€¬á€¸á€€á€á€¯ ေá€á€¼á‚”ရွá€á‚á€á€¯á€„္သည္ዠ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "အသံုးျပဳသူမ်ား" -#: perllib/FixMyStreet/App/Controller/Admin.pm:382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:412 -#: perllib/FixMyStreet/App/Controller/Admin.pm:429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:380 +#: perllib/FixMyStreet/App/Controller/Admin.pm:410 +#: perllib/FixMyStreet/App/Controller/Admin.pm:427 msgid "Values updated" msgstr "" @@ -3433,16 +3366,15 @@ msgstr "ယá€á€¯á€á€Šá€¹á€±á€”ရာ အá€á€¼á€€á€¹ á€á€…္á€á€¯á€‘က္á #: templates/web/base/auth/general.html:6 #: templates/web/base/report/display.html:27 #: templates/web/base/report/new/oauth_email_form.html:5 -#, fuzzy msgid "We need your email address, please give it below." -msgstr "မá€á€™á€á€á€á€¯á‚”သည္ သင့္ဖုန္းနံပါá€á€¹ သá€á€¯á‚”မဟုá€á€¹ အီးေမးလá€á€•á€¹á€…ာကá€á€¯ ျပသသြားမည္ မဟုá€á€¹á€•á€«" +msgstr "" #: templates/web/base/report/new/form_user_loggedout_email.html:2 #: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "သင့္အီးေမးလá€á€•á€¹á€…ာကá€á€¯ ျပသ သြားမည္မဟုá€á€¹á€•á€«á‹" -#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedin.html:30 #: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "မá€á€™á€á€á€á€¯á‚”သည္ သင့္ဖုန္းနံပါá€á€¹ သá€á€¯á‚”မဟုá€á€¹ အီးေမးလá€á€•á€¹á€…ာကá€á€¯ ျပသသြားမည္ မဟုá€á€¹á€•á€«" @@ -3451,7 +3383,7 @@ msgstr "မá€á€™á€á€á€á€¯á‚”သည္ သင့္ဖုန္းနံပဠ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; áá€á€¬á€á€”္ျဖစ္ေá¾á€€á€¬á€„္း သá€á€á€»á€•á€³á€™á€á€±á€žá€¬á€¹á€œá€Šá€¹á€¸ မá€á€™á€á€á€á€¯á‚”á€á€¼á€„္ áŽá€á€á€¯á‚”ကá€á€¯ ဆက္သြယ္ရန္ အေသးစá€á€á€¹ မရွá€á€±á€žá€¸á€•á€«á‹ အကယ္á သင့္ေá€á€¬á€¹á€žá€Šá€¹á€· လá€á€•á€¹á€…ာရွá€á€•á€«á€€ ေက်းဇူးျပဳá¿á€•á€®á€¸ ဆက္သြယ္ေပးပါá‹" -#: templates/web/base/index-steps.html:31 +#: templates/web/base/index-steps.html:11 msgid "We send it to the council on your behalf" msgstr "သင္áကá€á€¯á€šá€¹á€…ား ေကာင္စီထံ ကá½á€¼á€”္ေá€á€¬á€¹á€á€á€¯á‚” ေပးပá€á€¯á‚”ပါမည္" @@ -3489,10 +3421,6 @@ msgstr "ေပးပá€á€¯á‚”á€á€²á€·á€žá€Šá€¹á€· အá€á€ºá€á€”္" msgid "Whoa there Testino! Three photos are enough." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 -msgid "Whole block of empty flats" -msgstr "á€á€á€¯á€€á€¹á€á€”္းလြá€á€¹á€™á€ºá€¬á€¸ ရွá€á€›á€¬ ဘေလာက္" - #: templates/web/base/tokens/confirm_alert.html:7 msgid "Why stop there? <a href=\"/alert\">Set up more alerts</a> for free." msgstr "" @@ -3514,7 +3442,7 @@ msgstr "" msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "" -#: templates/web/base/questionnaire/index.html:96 +#: templates/web/base/questionnaire/index.html:97 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "သင့္အေနျဖင့္ ေလးပá€á€¹á€¡á€á€¼á€„္း အျá€á€¬á€¸á€±á€™á€¸á€á€¼á€”္းမ်ား ရရွá€á€œá€á€¯á¿á€•á€®á€¸ အေျá€á€¡á€±á€”ကá€á€¯ သá€á€á€›á€±á€…ရန္ သá€á€á€±á€•á€¸á€œá€á€¯á€•á€«á€žá€œá€¬á€¸á‹" @@ -3544,8 +3472,8 @@ msgstr "á€á€¯á‚ွစ္" #: templates/web/base/admin/update_edit.html:24 #: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 +#: templates/web/base/questionnaire/index.html:100 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "ဟုá€á€¹á€žá€Šá€¹á‹" @@ -3664,19 +3592,19 @@ msgid "Your Reports" msgstr "သင္á အစီရင္á€á€¶á€…ာမ်ား" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/alert/updates.html:19 +#: templates/web/base/alert/updates.html:22 #: templates/web/base/contact/index.html:83 #: templates/web/base/report/display_tools.html:38 #: templates/web/base/report/display_tools.html:40 #: templates/web/base/report/new/form_user_loggedin.html:3 #: templates/web/base/report/new/form_user_loggedout_email.html:1 #: templates/web/base/report/update/form_user_loggedout_email.html:1 -#: templates/web/fixmystreet/alert/updates.html:19 -#: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/zurich/report/new/fill_in_details_form.html:76 +#: templates/web/zurich/report/new/fill_in_details_form.html:78 msgid "Your email" msgstr "သင္á အီးေမးလ္" -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/general.html:55 #: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 @@ -3687,17 +3615,17 @@ msgstr "သင္á အီးေမးလ္လá€á€•á€¹á€…ာ" msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "သင့္áအá€á€ºá€€á€¹á€¡á€œá€€á€¹á€™á€ºá€¬á€¸á€€á€á€¯ ကá½á€¼á‚ု္ပ္á€á€á€¯á‚”á သီးသန္႔á€á€Šá€¹á€›á€½á€á€™á‚ˆ ေပášá€œá€…ီ á‚ွင့္အညီ အသုံးျပဳသြားမည္ ျဖစ္သည္á‹" -#: templates/web/base/auth/general.html:90 +#: templates/web/base/auth/general.html:100 #: templates/web/base/contact/index.html:76 #: templates/web/base/report/new/form_user_loggedin.html:18 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17 -#: templates/web/base/report/update/form_name.html:11 +#: templates/web/base/report/update/form_name.html:12 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:86 +#: templates/web/zurich/report/new/fill_in_details_form.html:88 msgid "Your name" msgstr "သင့္အမည္" -#: templates/web/base/auth/general.html:75 +#: templates/web/base/auth/general.html:85 #: 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 @@ -3710,20 +3638,19 @@ msgstr "သင္á စကားá€á€½á€€á€¹á€€á€á€¯ ေျပာင္းလá #: templates/web/base/report/new/form_user_loggedin.html:27 #: templates/web/base/report/new/form_user_loggedout_by_email.html:26 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:94 msgid "Your phone number" msgstr "သင္á ဖုန္းနံပါá€á€¹" #: templates/web/base/questionnaire/index.html:14 -#, fuzzy msgid "Your report" -msgstr "သင္á အစီရင္á€á€¶á€…ာမ်ား" +msgstr "" -#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 +#: templates/web/base/footer.html:29 msgid "Your reports" msgstr "သင္á အစီရင္á€á€¶á€…ာမ်ား" -#: templates/web/base/my/my.html:41 +#: templates/web/base/my/my.html:39 msgid "Your updates" msgstr "သင္á မြမ္းမံျပင္ဆင္ထားမႈမ်ား" @@ -3749,7 +3676,7 @@ msgid "didn't use map" msgstr "ေျမပံု မသံုးá€á€²á€·á€•á€«" #: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/around/postcode_form.html:12 msgid "e.g. ‘%s’ or ‘%s’" msgstr "ဥပမာ ‘%s’ သá€á€¯á‚”မဟုá€á€¹ ‘%s’" @@ -3855,8 +3782,7 @@ msgstr "အျá€á€¬á€¸ ဧရá€á€šá€¬á€™á€ºá€¬á€¸" msgid "reopened" msgstr "ျပန္ဖြင့္ပါ" -#: templates/web/base/header.html:33 templates/web/fixmystreet/header.html:64 -#: templates/web/zurich/footer.html:13 +#: templates/web/base/header.html:64 templates/web/zurich/footer.html:13 msgid "sign out" msgstr "ထြက္ရန္" @@ -3929,7 +3855,7 @@ msgid "<big>%s</big> update on reports" msgid_plural "<big>%s</big> updates on reports" msgstr[0] "<big>%s</big> ျပဳျပင္မြမ္းမံထားသည့္ အစီရင္á€á€¶á€…ာမ်ား" -#: templates/web/emptyhomes/report/new/councils_text_none.html:3 +#: templates/web/base/report/new/councils_text_none.html:3 #, perl-format msgid "We do not yet have details for the council that covers this location." msgid_plural "We do not yet have details for the councils that cover this location." @@ -3965,71 +3891,41 @@ msgid "We do <strong>not</strong> yet have details for the other council that co msgid_plural "We do <strong>not</strong> yet have details for the other councils that cover this location." msgstr[0] "ကá½á€¼á‚ု္ပ္á€á€á€¯á‚”á€á€¼á€„္ ဒီá€á€Šá€¹á€±á€”ရာá‚ွင့္ ပá€á€¹á€žá€€á€¹á€žá€Šá€¹á€· အျá€á€¬á€¸á€±á€€á€¬á€„္အá€á€¼á€€á€¹ အေသးစá€á€á€¹á€™á€›á€½á€á€±á€žá€¸á€•á€«á‹" -#~ msgid "(we never show your email address or phone number)" -#~ msgstr "(သင္áအီးေမလ္လá€á€•á€¹á€…ာ သá€á€¯á‚”မဟုá€á€¹ ဖုန္းနံပါá€á€¹á€€á€á€¯á€€á½á€¼á‚္ုပ္á€á€á€¯á‚”မွ ဘယ္ေá€á€¬á€·á€™á€½á€™á€±á€–ာ္ျပပါ)" - -#~ msgid "(we never show your email)" -#~ msgstr "(သင္áအီးေမးလ္ကá€á€¯á€€á½á€¼á‚္ုပ္á€á€á€¯á‚”မွဘယ္ေá€á€¬á€·á€™á€½á€™á€±á€–ာ္ျပပါ)" - -#~ msgid "<strong>No</strong>, let me confirm my report by email:" -#~ msgstr "<strong>မဟုá€á€¹á€•á€«</strong>ကá½á€¼á‚္ုပ္áအစီရင္á€á€¶á€…ာကá€á€¯á€¡á€®á€¸á€±á€™á€¸á€œá€¹á€»á€–င့္အá€á€Šá€¹á€»á€•á€³á€™á€Šá€¹ -" - -#~ msgid "<strong>No</strong>, let me confirm my update by email:" -#~ msgstr "<strong>မဟုá€á€¹á€•á€«</strong>ကá½á€¼á‚္ုပ္áအသစ္မြမ္းမံျá€á€„္းကá€á€¯á€¡á€®á€¸á€±á€™á€œá€¹á€»á€–င့္အá€á€Šá€¹á€»á€•á€³á€™á€Šá€¹ -" - -#~ msgid "Email me updates" -#~ msgstr "အသစ္မြမ္းမံမႈမ်ားကá€á€¯á€€á½á€¼á‚္ုပ္ထံသá€á€¯á‚•á€¡á€®á€¸á€±á€™á€¸á€œá€¹á€•á€á€¯á‚”မည္" - -#~ msgid "Enter a new password:" -#~ msgstr "စကားá€á€½á€€á€¹á€¡á€žá€…္á€á€…္á€á€¯á€›á€á€¯á€€á€¹á€‘ည့္ပါ-" - -#~ msgid "Message:" -#~ msgstr "စာ-" - -#~ msgid "More problems nearby" -#~ msgstr "အနီးနားရွá€á€»á€•á‚†á€”ာမ်ားစြာ" - -#~ msgid "Nearly Done! Now check your email..." -#~ msgstr "လုပ္ေဆာင္မႈနီးပါးျပီးပါျပီአသင္áအီးေမးလ္ကá€á€¯á€…စ္ေဆးပါ" - -#~ msgid "Offensive? Unsuitable? Tell us" -#~ msgstr "ထá€á€á€á€¯á€€á€¹á€±á€…á‚á€á€¯á€„္ေသာáŠá€™á€žá€„့္ေá€á€¬á€¹á€˜á€°á€¸á€œá€¬á€¸áŠ ကá½á€¼á‚္ုပ္á€á€á€¯á‚”ကá€á€¯á€±á€»á€•á€¬á€•á€«" - -#~ msgid "Photo:" -#~ msgstr "ဓာá€á€¹á€•á€¶á€¯-" +#~ msgid "%s, reported at %s" +#~ msgstr "%s သá€á€„္းပá€á€¯á‚”သည္မွာ %s" -#~ msgid "Please check your email" -#~ msgstr "သင္áအီးေမးလ္ကá€á€¯á€…စ္ပါ" +#~ msgid "About us" +#~ msgstr "ကá½á€¼á‚္ုပ္á€á€á€¯á‚”အေá¾á€€á€¬á€„္း" -#~ msgid "This problem has been closed" -#~ msgstr "ဒီျပႆနာကá€á€¯á€•á€á€á€¹á€‘ားျပီးျဖစ္သည္á‹" +#~ msgid "Email me new local problems" +#~ msgstr "ေဒသအá€á€¼á€„္းျပႆနာအသစ္မ်ားကá€á€¯á€€á½á€¼á‚္ုပ္ထံသá€á€¯á‚”အီးေမးလ္ပá€á€¯á‚”မည္" -#~ msgid "This problem is in progress" -#~ msgstr "ဒီျပႆနာကá€á€¯á€±á€»á€–ရွင္းေနဆဲျဖစ္သည္" +#~ msgid "Empty flat or maisonette" +#~ msgstr "á€á€á€¯á€€á€¹á€á€”္းအလြá€á€¹á€žá€á€¯á‚”မဟုá€á€¹ maisonette" -#~ msgid "This problem is old and of unknown status." -#~ msgstr "ဒီျပႆနာသည္အရမ္းá¾á€€á€¬á€»á€•á€®á€»á€–စ္ျပီး အေျá€á€¡á€±á€”ကá€á€¯á€™á€žá€á€›á€•á€«" +#~ msgid "Empty house or bungalow" +#~ msgstr "အá€á€™á€¹á€¡á€œá€¼á€á€¹á€žá€á€¯á‚”မဟုá€á€¹á€˜á€”္ဂလá€á€¯á€¡á€œá€¼á€á€¹" -#~ msgid "We have not been able to confirm your account - sorry." -#~ msgstr "သင့္ account ကá€á€¯á€¡á€á€Šá€¹ မျပဳá‚á€á€¯á€„္ေသးပါ- á€á€™á€¹á€¸á€”ည္းပါá€á€šá€¹á‹" +#~ msgid "Empty office or other commercial" +#~ msgstr "ရံုးအလြá€á€¹á€žá€á€¯á‚”မဟုá€á€¹á€á€»á€á€¬á€¸á€…ီးပြားေရးအလြá€á€¹" -#~ msgid "We have sent you an email containing a link to confirm your account." -#~ msgstr "မá€á€™á€á€á€á€¯á‚”သည္ သင့္ account ကá€á€¯á€¡á€á€Šá€¹á€»á€•á€³á€±á€•á€¸á€™á€Šá€¹á€· လင့္á€á€¹á€•á€«á€á€„္ေသာ အီးေမးကá€á€¯ ေပးပá€á€¯á‚”ထားပါသည္á‹" +#~ msgid "Empty pub or bar" +#~ msgstr "အလြá€á€¹á€¡á€›á€€á€¹á€†á€á€¯á€„္သá€á€¯á‚”မဟုá€á€¹á€˜á€¬á€¸" -#~ msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:" -#~ msgstr "မá€á€™á€á€á€á€¯á‚”အေနနဲ႔ ယá€á€¯á€†á€á€¯á€€á€¹á€”ဲ႔ ပá€á€¹á€žá€€á€¹á€žá€Šá€¹á€· အႀကံဥာá€á€¹á€™á€ºá€¬á€¸ သá€á€œá€á€¯á€•á€«á€žá€Šá€¹á‹ ပုံစံá€á€¼á€„္ျဖည့္ျá€á€„္း သá€á€¯á‚”မဟုá€á€¹ <a href='mailto:%s'>%s</a>: သá€á€¯á‚” အီးေမး ေပးပá€á€¯á‚”á‚á€á€¯á€„္ပါသည္á‹" +#~ msgid "Empty public building - school, hospital, etc." +#~ msgstr "အမ်ားျပည္သူá‚ွင့္ဆá€á€¯á€„္ေသာá€á€á€¯á€€á€¹á€¡á€œá€¼á€á€¹-ေက်ာင္းáŠá€±á€†á€¸á€›á€¶á€¯á€…သည္ျဖင့္.." -#~ msgid "You have already attached a photo to this report, attaching another one will replace it." -#~ msgstr "ဒီအစီရင္á€á€¶á€…ာá€á€¼á€„္ ဓာá€á€¹á€•á€¯á€¶á€á€¼á€²á€á€„္ထားá¿á€•á€® ျဖစ္á¿á€•á€®á€¸ အျá€á€¬á€¸á€á€…္á€á€¯ á€á€¼á€²á€á€„္ျá€á€„္းသည္ အရင္ေနရာá€á€¼á€„္ အစားထá€á€¯á€¸á€žá€¼á€¬á€¸á€•á€«á€™á€Šá€¹á‹" +#~ msgid "FixMyStreet" +#~ msgstr "ကá½á€¼á‚ု္ပ္လမ္းကá€á€¯á€»á€•á€„္ေပးပါ" -#~ msgid "You have already attached a photo to this update, attaching another one will replace it." -#~ msgstr "ယá€á€¯ ျပင္ဆင္မြမ္းမံမႈကá€á€¯ ဓာá€á€¹á€•á€¯á€¶á€»á€–င့္ á€á€¼á€²á€á€„္ထားá¿á€•á€®á€¸ ျဖစ္á¿á€•á€®á€¸ အျá€á€¬á€¸á€á€…္á€á€¯á€á€¼á€²á€á€„္လွ်င္ အရင္ေနရာá€á€¼á€„္ အစားထá€á€¯á€¸á€±á€•á€¸á€žá€¼á€¬á€¸á€™á€Šá€¹ ျဖစ္သည္á‹" +#~ msgid "I am afraid you cannot confirm unconfirmed reports." +#~ msgstr "အá€á€Šá€¹á€™á€»á€•á€³á€›á€±á€žá€¸á€±á€žá€¬á€¡á€…ီရင္á€á€¶á€…ာကá€á€¯á€žá€„္အá€á€Šá€¹á€™á€»á€•á€³á€›á€±á€žá€¸á€•á€«" -#~ msgid "Your email:" -#~ msgstr "သင္á အီးေမးလ္" +#~ msgid "Problems in this area" +#~ msgstr "ဒီဧရá€á€šá€¬á€¡á€á€¼á€„္းရွá€á€»á€•á‚†á€”ာမ်ား" -#~ msgid "Your name:" -#~ msgstr "သင့္အမည္" +#~ msgid "RSS feed of problems in this %s" +#~ msgstr "ဒီ %s ရá€á€½ ျပႆနာမ်ားá RSS feed" -#~ msgid "Your email:" -#~ msgstr "သင္á အီးေမးလ္" +#~ msgid "Whole block of empty flats" +#~ msgstr "á€á€á€¯á€€á€¹á€á€”္းလြá€á€¹á€™á€ºá€¬á€¸ ရွá€á€›á€¬ ဘေလာက္" diff --git a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po index d9daeb663..31fd59846 100644 --- a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -9,15 +9,14 @@ # Ole-Erik Yrvin <oeyrvin@gmail.com>, 2015 # Ørjan Vøllestad <orjanv@gmail.com>, 2014 # pere <pere-transifex@hungry.com>, 2012,2015 -# pere <pere-transifex@hungry.com>, 2015 # Petter Reinholdtsen <pere@hungry.com>, 2011 msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2016-03-02 13:09+0000\n" -"PO-Revision-Date: 2016-01-06 11:44+0000\n" -"Last-Translator: Jan Høydahl <jh@cominvent.com>\n" +"POT-Creation-Date: 2016-05-03 10:41+0100\n" +"PO-Revision-Date: 2016-03-23 12:44+0000\n" +"Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: Norwegian BokmÃ¥l (Norway) (http://www.transifex.com/mysociety/fixmystreet/language/nb_NO/)\n" "Language: nb_NO\n" "MIME-Version: 1.0\n" @@ -25,7 +24,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/DB/Result/Problem.pm:618 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr " og " @@ -58,9 +57,8 @@ msgid "%s admin:" msgstr "%s administrator:" #: templates/web/base/status/stats.html:26 -#, fuzzy msgid "%s bodies" -msgstr "Administrasjoner" +msgstr "" #: templates/web/base/status/stats.html:24 msgid "%s confirmed alerts, %s unconfirmed" @@ -99,7 +97,7 @@ msgstr "%s aktive oppdateringer" msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "%s spørreskjema sendt – %s besvart (%s%%)" -#: perllib/FixMyStreet/DB/Result/Problem.pm:683 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "%s ref: %s" msgstr "%s ref: %s" @@ -118,10 +116,6 @@ msgstr "" msgid "%s ward, %s" msgstr "%s bydel, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:552 -msgid "%s, reported at %s" -msgstr "%s, rapportert %s" - #: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "%s, innefor bydel %s" @@ -176,7 +170,7 @@ msgstr "(som tagging, søppel, hull i veien, eller ødelagte gatelys)" msgid "(not sent to council)" msgstr "(ikke rapportert til administrasjonen)" -#: templates/web/zurich/report/new/fill_in_details_form.html:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "(optional)" msgstr "(valgfritt)" @@ -188,12 +182,11 @@ msgstr "(offentlig)" msgid "(sent to both)" msgstr "(sendt til begge)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Velg en kategori --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Velg en eiendomsstype --" @@ -225,26 +218,21 @@ msgstr "<strong>Nei</strong> La meg bekrefte min rapport med e-post" msgid "<strong>No</strong> Let me confirm my update by email" msgstr "<strong>Nei</strong> La meg bekrefte min oppdatering med e-post" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:97 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>Nei</strong>, la meg logge inn med e-post:" -#: templates/web/base/auth/general.html:70 +#: templates/web/base/auth/general.html:80 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Ja</strong>, jeg har et passord" -#: templates/web/base/about/about-en-gb.html:1 -#: templates/web/base/about/about-en-gb.html:3 -msgid "About us" -msgstr "Om oss" - #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Action Scheduled" msgstr "Handling planlagt" @@ -275,7 +263,7 @@ msgstr "Legg til ny kategori" msgid "Add user" msgstr "Legg til bruker" -#: templates/web/base/my/my.html:56 +#: templates/web/base/my/my.html:54 msgid "Added %s" msgstr "La til %s" @@ -295,7 +283,7 @@ msgstr "Varsel %d opprettet for %s, type %s, parameter %s / %s" msgid "Alert %d disabled (created %s)" msgstr "Varsel %d koblet ut (opprettet %s)" -#: templates/web/base/report/update/form_name.html:20 +#: templates/web/base/report/update/form_name.html:21 msgid "Alert me to future updates" msgstr "Send meg varsel ved fremtidige oppdateringer" @@ -308,7 +296,7 @@ msgstr "Alle rapporter" msgid "All Reports as CSV" msgstr "Alle rapporter som CSV" -#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 +#: templates/web/base/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:20 @@ -407,7 +395,7 @@ msgstr "Tilbake" msgid "Ban email address" msgstr "Bannlys epostadresse" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1273 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -438,7 +426,7 @@ msgstr "Hvis du ikke kan se kartet, <em>hopp over dette steget</em>." #: templates/web/base/admin/body.html:68 #: templates/web/base/admin/index.html:54 -#: templates/web/base/report/new/category.html:10 +#: templates/web/base/report/new/category.html:7 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 @@ -453,7 +441,7 @@ msgstr "Kategori" msgid "Category fix rate for problems > 4 weeks old" msgstr "Løsningsrate fordelt pÃ¥ kategori for problemer > 4 uker gamle" -#: templates/web/base/admin/body.html:138 +#: templates/web/base/admin/body.html:137 #: templates/web/base/admin/category_edit.html:23 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/admin/body.html:43 @@ -473,7 +461,7 @@ msgstr "Kategori: %s" msgid "Change password" msgstr "Bytt passord" -#: templates/web/base/admin/body.html:160 +#: templates/web/base/admin/body.html:158 msgid "" "Check <strong>confirmed</strong> to indicate that this contact has been confirmed as correct.\n" " If you are not sure of the origin or validity of the contact, leave this unchecked." @@ -481,7 +469,7 @@ msgstr "" "Marker <strong>bekreftet</strong> for Ã¥ indikere at dette kontaktpunktet har blitt bekreftet som korrekt.\n" "Hvis du ikke er sikker pÃ¥ opprinnelsen eller gyldigheten til kontaktpunktet, ikke marker feltet." -#: templates/web/base/admin/body.html:171 +#: templates/web/base/admin/body.html:169 msgid "" "Check <strong>deleted</strong> to remove the category from use. \n" " It will not appear as an available category in the drop-down menu on the report-a-problem page." @@ -489,7 +477,7 @@ msgstr "" "Marker <strong>slettet</strong> for Ã¥ ikke lenger bruke kategorien\n" "Den vil ikke lenger dukke opp som en tilgjengelig kategori i nedtrekksmenyen pÃ¥ rapporter-et-problem-siden." -#: templates/web/base/admin/body.html:191 +#: templates/web/base/admin/body.html:189 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -505,7 +493,7 @@ msgstr "" "Dette passer nÃ¥r du ønsker Ã¥ tillate brukere Ã¥ sende inn melding til administrasjonen, men ikke vil vise\n" "den utad. I UK, har de brukt dette for oppgaver som Ã¥ be om en ekstra papirkurv pÃ¥ et bestemt sted." -#: templates/web/base/admin/body.html:130 +#: templates/web/base/admin/body.html:129 msgid "" "Choose a <strong>category</strong> 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." @@ -546,8 +534,8 @@ msgstr "Klikk lenken i bekreftelses-eposten for Ã¥ logge inn." #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:15 #: templates/web/base/admin/report_blocks.html:25 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 @@ -556,7 +544,7 @@ msgstr "Klikk lenken i bekreftelses-eposten for Ã¥ logge inn." msgid "Closed" msgstr "Lukket" -#: perllib/FixMyStreet/DB/Result/Problem.pm:779 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Closed by council" msgstr "(ikke rapportert til administrasjonen)" @@ -582,7 +570,7 @@ msgstr "Merkevaresamarbeidsdata:" msgid "Cobrand:" msgstr "Merkevaresamarbeid:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Oppsett" @@ -601,9 +589,8 @@ msgstr "Bekreft konto" #: templates/web/base/report/new/form_user_loggedout_password.html:21 #: templates/web/base/report/update/form_user_loggedout_password.html:20 -#, fuzzy msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." -msgstr "Bekreft via epost under, og oppgi et nytt passord der. NÃ¥r du har bekreftet vil passordet ditt bli oppdatert." +msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:1 #: templates/web/base/tokens/confirm_problem.html:1 @@ -613,7 +600,7 @@ msgstr "Bekreft via epost under, og oppgi et nytt passord der. NÃ¥r du har bekre msgid "Confirmation" msgstr "Bekreftelse" -#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:164 #: templates/web/base/admin/body.html:79 #: templates/web/base/admin/category_edit.html:37 #: templates/web/base/admin/category_edit.html:92 @@ -632,7 +619,7 @@ msgid "Confirmed:" msgstr "Bekreftet:" #. ("%s is the site name") -#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 +#: templates/web/base/about/_sidebar.html:6 msgid "Contact %s" msgstr "Kontakt %s" @@ -651,8 +638,8 @@ msgstr "Kontakt prosjektgruppen" msgid "Coordinates:" msgstr "Koordinater:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1417 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1445 msgid "Could not find user" msgstr "Kunne ikke finne bruker" @@ -670,7 +657,7 @@ msgstr "Administrasjon" msgid "Council contacts for %s" msgstr "Administrasjonskontakter for %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:681 +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "Council ref: %s" msgstr "administrasjonsreferanse: %s" @@ -689,7 +676,7 @@ msgstr "Antall" msgid "Create a report" msgstr "Lag en rapport" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "Lag kategori" @@ -733,20 +720,20 @@ msgstr "Oversikt" msgid "Dealt with by subdivision within 5 working days" msgstr "Behandlet av underavdeling innen 5 arbeidsdager" -#: perllib/FixMyStreet/App/Controller/Admin.pm:877 +#: perllib/FixMyStreet/App/Controller/Admin.pm:865 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "Slett mal" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:175 #: templates/web/base/admin/body.html:81 #: templates/web/base/admin/category_edit.html:42 #: templates/web/base/admin/category_edit.html:93 msgid "Deleted" msgstr "Slettet" -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:47 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -754,7 +741,7 @@ msgid "Description" msgstr "Beskrivelse" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:68 +#: templates/web/zurich/report/new/fill_in_details_form.html:70 msgid "Details" msgstr "Detaljer" @@ -779,11 +766,11 @@ msgid "Diligency prize league table" msgstr "Arbeidshester" #. ("%s is the site name") -#: templates/web/base/auth/general.html:48 -#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/auth/general.html:58 +#: templates/web/base/report/new/form_user_loggedout.html:28 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout.html:17 +#: templates/web/base/report/update/form_user_loggedout.html:27 msgid "Do you have a %s password?" msgstr "Har du et FiksGataMi-passord?" @@ -801,8 +788,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "Duplicate" msgstr "Duplikat" @@ -825,7 +812,7 @@ msgstr "" msgid "Edit" msgstr "Rediger" -#: templates/web/base/admin/body.html:220 +#: templates/web/base/admin/body.html:218 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "Rediger detaljer for administrasjon" @@ -855,7 +842,7 @@ msgstr "Oppdatert av" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:39 +#: templates/web/base/auth/general.html:49 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -863,11 +850,11 @@ msgstr "Oppdatert av" msgid "Email" msgstr "E-post" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 msgid "Email added to abuse list" msgstr "Epost lagt til misbruksliste" -#: templates/web/base/admin/body.html:155 +#: templates/web/base/admin/body.html:153 msgid "Email address:" msgstr "E-postadresse:" @@ -879,19 +866,14 @@ msgstr "Epostvarsel laget" msgid "Email alert deleted" msgstr "Epostvarsel slettet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1390 msgid "Email already in abuse list" msgstr "Epost allerede i misbrukslisten" -#: templates/web/base/around/_updates.html:5 -msgid "Email me new local problems" -msgstr "Send meg e-post om lokale problemer" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 -#: templates/web/base/alert/updates.html:13 #: templates/web/zurich/admin/body.html:47 msgid "Email:" msgstr "E-post:" @@ -900,26 +882,6 @@ msgstr "E-post:" msgid "Email: %s" msgstr "E-post: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 -msgid "Empty flat or maisonette" -msgstr "Tom leilighet" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 -msgid "Empty house or bungalow" -msgstr "Tomt hus eller bungalow" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 -msgid "Empty office or other commercial" -msgstr "Tomt kontor eller forretningsbygg" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 -msgid "Empty pub or bar" -msgstr "Tom pub eller bar" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 -msgid "Empty public building - school, hospital, etc." -msgstr "Tom offentlig bygning - skole, sykehus, etc." - #: templates/web/base/admin/body-form.html:162 #: templates/web/base/admin/body-form.html:163 msgid "" @@ -969,18 +931,14 @@ msgstr "Skriv inn postnummer i nærheten, eller veinavn og sted" msgid "Enter a nearby street name and area" msgstr "Skriv inn et veinavn og sted" -#: perllib/FixMyStreet/Cobrand/ZeroTB.pm:7 -msgid "Enter a nearby street name and area, postal code or district in Delhi" -msgstr "Velg et nærliggende gatenavn og omrÃ¥de, postnummer eller distrikt i Delhi" - -#: templates/web/base/auth/general.html:99 +#: templates/web/base/auth/general.html:109 #: templates/web/base/report/new/form_user_loggedout_by_email.html:38 #: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Skriv inn et nytt passord" -#: templates/web/base/index-steps.html:26 +#: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "Legg inn detaljer om problemet" @@ -1006,7 +964,7 @@ msgstr "Eksempel-postnummer %s" msgid "Examples:" msgstr "Eksempler:" -#: templates/web/base/report/new/form_report.html:49 +#: templates/web/base/report/new/form_report.html:51 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "Forklar hva som er galt, nøyaktig hvor det er og hvor lenge det har vært galt..." @@ -1043,19 +1001,15 @@ msgstr "Første gang" msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." msgstr "Fiks dette ved Ã¥ velge en <strong>area covered</strong> i <em> Edit body details</em>-skjemaet nedenfor." -#: templates/web/base/header.html:26 -msgid "FixMyStreet" -msgstr "FiksGataMi" - #: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:38 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:40 msgid "Fixed" msgstr "Løst" @@ -1082,7 +1036,7 @@ msgstr "Merk som slettet" msgid "Flag user" msgstr "Flag bruker" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "Flagget:" @@ -1104,8 +1058,7 @@ msgstr "Flaggede brukere er ikke begrenset pÃ¥ noe mÃ¥te. Dette er bare en list msgid "Flagged:" msgstr "Flagget:" -#: templates/web/base/reports/_ward-list.html:3 -#: templates/web/fixmystreet/reports/_ward-list.html:4 +#: templates/web/base/reports/_ward-list.html:4 msgid "Follow a ward link to view only reports within that ward." msgstr "Følg en bydelslenke for Ã¥ kun se rapporter innenfor den bydelen." @@ -1136,18 +1089,18 @@ msgstr "Ofte spurte spørsmÃ¥l" msgid "GeoRSS on Google Maps" msgstr "GeoRSS pÃ¥ Google Maps" +#: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:11 -#: templates/web/fixmystreet/around/_updates.html:3 msgid "Get updates" msgstr "FÃ¥ oppdateringer" -#: templates/web/fixmystreet/reports/_rss.html:3 -#: templates/web/fixmystreet/reports/_rss.html:9 +#: templates/web/base/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:9 msgid "Get updates of %s problems" msgstr "FÃ¥ oppdateringer for problemer i denne %s" -#: templates/web/fixmystreet/reports/_rss.html:11 -#: templates/web/fixmystreet/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:11 +#: templates/web/base/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "FÃ¥ oppdateringer for problemer i denne %s" @@ -1160,7 +1113,7 @@ msgid "Glad to hear it’s been fixed!" msgstr "Glad for Ã¥ høre at det er i orden!" #: templates/web/base/alert/index.html:34 -#: templates/web/base/around/postcode_form.html:16 +#: templates/web/base/around/postcode_form.html:13 #: templates/web/base/reports/_list-filters.html:28 #: templates/web/zurich/admin/stats.html:26 msgid "Go" @@ -1186,7 +1139,7 @@ msgstr "Har dette problemet blitt løst?" msgid "Have you ever reported a problem to a council before, or is this your first time?" msgstr "Har du rapportert et problem til en administrasjon før, eller er dette første gangen?" -#: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:38 +#: templates/web/base/footer.html:38 #: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 @@ -1197,8 +1150,7 @@ msgstr "Hjelp" msgid "Here are the types of local problem alerts for ‘%s’." msgstr "Her er de forskjellige typene lokale problemvarsler for ‘%s’." -#: templates/web/base/header.html:32 templates/web/fixmystreet/header.html:63 -#: templates/web/zurich/footer.html:12 +#: templates/web/base/header.html:63 templates/web/zurich/footer.html:12 msgid "Hi %s" msgstr "Hei, %s" @@ -1214,11 +1166,11 @@ msgstr "Hei, %s" msgid "Hidden" msgstr "Skjul" -#: templates/web/base/around/display_location.html:65 +#: templates/web/base/around/display_location.html:64 msgid "Hide old" msgstr "Skjul gamle" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:59 msgid "Hide pins" msgstr "Skjul nÃ¥ler" @@ -1238,10 +1190,6 @@ msgstr "Hvordan rapportere et problem" msgid "How to send successful reports" msgstr "Hvordan sende inn rapporter som løses" -#: perllib/FixMyStreet/App/Controller/Admin.pm:752 -msgid "I am afraid you cannot confirm unconfirmed reports." -msgstr "Jeg er redd du ikke kan bekrefte ubekreftede rapporter." - #: templates/web/base/tokens/confirm_problem.html:23 #: templates/web/base/tokens/confirm_problem.html:27 msgid "I just reported a problem on @fixmystreet" @@ -1252,7 +1200,7 @@ msgstr "Jeg rapporterte akkurat et problem pÃ¥ @fiksgatami" msgid "I just updated a problem on @fixmystreet" msgstr "Jeg oppdaterte akkurat et problem pÃ¥ @fiksgatami" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88 msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "Jeg er redd vi ikke klarte Ã¥ finne ditt problem i databasen.\n" @@ -1274,7 +1222,7 @@ msgid "" " For basic installations, you don't need to join bodies in this way." msgstr "Identifiser en <strong>parent</strong> hvis instansen selv er en del av en annen administrasjon." -#: templates/web/base/admin/body.html:133 +#: templates/web/base/admin/body.html:132 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." @@ -1295,7 +1243,7 @@ msgid "" "(please note it will not be sent to the council)." msgstr "Hvis du ønsker Ã¥ legge til en offentlig kommentar pÃ¥ problemet, legg den til her (denne blir ikke sendt til administrasjonen)." -#: templates/web/base/admin/body.html:149 +#: templates/web/base/admin/body.html:147 msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." msgstr "Hvis du bruker <strong>en sendemetode som ikke er e-post</strong>, skriv inn tjeneste-ID (Open311) eller ekvivalent identifikator her." @@ -1337,10 +1285,10 @@ msgstr "Ugyldig ID" msgid "Illegal feed selection" msgstr "Ugyldig valg av feed" +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "In Progress" msgstr "Under arbeid" @@ -1391,7 +1339,7 @@ msgstr "Interne referanser" msgid "Invalid agency_responsible value %s" msgstr "Ugyldig agency_responsible-verdi %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 msgid "Invalid end date" msgstr "Ugyldig slutt-dato" @@ -1399,16 +1347,16 @@ msgstr "Ugyldig slutt-dato" msgid "Invalid format %s specified." msgstr "Ugyldig format %s oppgitt." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 msgid "Invalid start date" msgstr "Ugyldig startdato" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:5 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Investigating" msgstr "Undersøkes" @@ -1430,7 +1378,7 @@ msgstr "Ukjent omrÃ¥de" msgid "Jurisdiction unknown" msgstr "Ukjent omrÃ¥de" -#: templates/web/base/auth/general.html:80 +#: 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 @@ -1468,7 +1416,6 @@ msgstr "Laster..." #: 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/fixmystreet/alert/updates.html:1 msgid "Local RSS feeds and email alerts" msgstr "Lokal RSS-strøm og e-postvarsel" @@ -1477,11 +1424,11 @@ msgstr "Lokal RSS-strøm og e-postvarsel" msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "Lokal RSS-strøm og e-postvarsel for ‘%s’" -#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:35 +#: templates/web/base/footer.html:35 msgid "Local alerts" msgstr "Lokale varsler" -#: templates/web/base/index-steps.html:25 +#: templates/web/base/index-steps.html:5 msgid "Locate the problem on a map of the area" msgstr "Lokaliser problemet pÃ¥ kartet over omrÃ¥det" @@ -1541,14 +1488,14 @@ msgstr "MÃ¥ned" #: templates/web/base/admin/list_updates.html:7 #: templates/web/base/admin/reports.html:13 #: templates/web/base/admin/users.html:15 -#: templates/web/base/auth/general.html:89 +#: templates/web/base/auth/general.html:99 #: templates/web/base/report/new/form_user_loggedin.html:9 #: templates/web/base/report/new/form_user_loggedout_by_email.html:7 -#: templates/web/base/report/update/form_name.html:4 +#: templates/web/base/report/update/form_name.html:5 #: templates/web/base/reports/index.html:20 #: 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:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "Name" msgstr "Navn" @@ -1572,8 +1519,8 @@ 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:455 -#: perllib/FixMyStreet/Cobrand/Default.pm:495 +#: perllib/FixMyStreet/Cobrand/Default.pm:454 +#: perllib/FixMyStreet/Cobrand/Default.pm:494 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" @@ -1597,7 +1544,7 @@ msgstr "Nye <br>problemer" msgid "New body added" msgstr "Ny administrasjon lagt til" -#: perllib/FixMyStreet/App/Controller/Admin.pm:387 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 msgid "New category contact added" msgstr "Ny kategorikontakt lagt til" @@ -1662,7 +1609,7 @@ msgstr "Neste" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 -#: templates/web/base/questionnaire/index.html:101 +#: templates/web/base/questionnaire/index.html:102 #: templates/web/base/questionnaire/index.html:53 msgid "No" msgstr "Nei" @@ -1734,8 +1681,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Not Responsible" msgstr "Ikke ansvarlig" @@ -1768,7 +1715,7 @@ msgstr "Merk" 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/base/admin/body.html:186 +#: templates/web/base/admin/body.html:184 #: templates/web/base/admin/category_edit.html:52 #: templates/web/zurich/admin/body.html:53 msgid "Note:" @@ -1782,15 +1729,15 @@ msgstr "Note: <strong>%d</strong>" msgid "Notes from SDM to DM" msgstr "" -#: templates/web/base/report/new/form_user_loggedout.html:14 #: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/form_user_loggedout.html:24 #: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "PÃ¥ tide Ã¥ sende din rapport…" #: templates/web/base/report/update-form.html:28 -#: templates/web/base/report/update/form_user_loggedout.html:13 #: templates/web/base/report/update/form_user_loggedout.html:2 +#: templates/web/base/report/update/form_user_loggedout.html:23 msgid "Now to submit your update…" msgstr "PÃ¥ tide Ã¥ registrere din oppdatering…" @@ -1824,8 +1771,8 @@ msgstr "Enlinjers oppsummering" #: templates/web/base/admin/report_blocks.html:23 #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/report/update/form_update.html:36 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1860,13 +1807,13 @@ msgstr "Eller problemer meldt til:" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "Eller du kan abonnere pÃ¥ varsel basert pÃ¥ bydel eller administrasjon du hører inn under:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1055 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 -#: perllib/FixMyStreet/DB/Result/Problem.pm:558 -#: perllib/FixMyStreet/DB/Result/Problem.pm:568 -#: perllib/FixMyStreet/DB/Result/Problem.pm:578 -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1044 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:659 +#: perllib/FixMyStreet/DB/Result/Problem.pm:562 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 +#: perllib/FixMyStreet/DB/Result/Problem.pm:582 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 #: perllib/FixMyStreet/Script/Reports.pm:175 #: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" @@ -1891,7 +1838,7 @@ msgstr "Forelder" msgid "Partial" msgstr "Delvis" -#: templates/web/base/auth/general.html:92 +#: templates/web/base/auth/general.html:102 #: templates/web/base/report/new/form_user_loggedout_by_email.html:31 #: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 @@ -1900,7 +1847,7 @@ msgid "Password (optional)" msgstr "Passord (valgfritt)" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:72 +#: templates/web/base/auth/general.html:82 msgid "Password:" msgstr "Passord:" @@ -1908,7 +1855,7 @@ msgstr "Passord:" msgid "Permalink" msgstr "Permalink" -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:90 msgid "Phone number" msgstr "Telefonnummer" @@ -1924,13 +1871,21 @@ msgid "Phone:" msgstr "Telefon:" #: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/questionnaire/index.html:89 +#: templates/web/base/questionnaire/index.html:91 #: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/new/form_report.html:38 +#: templates/web/base/report/new/form_report.html:40 +#: templates/web/base/report/update/form_update.html:20 +#: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:6 #: 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:45 +#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/zurich/report/new/fill_in_details_form.html:63 msgid "Photo" msgstr "Bilde" @@ -1954,8 +1909,8 @@ msgstr "Plasser tegnestiften pÃ¥ kartet" #: perllib/FixMyStreet/Cobrand/Zurich.pm:955 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:6 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 @@ -1971,16 +1926,16 @@ 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/general.html:27 -#: templates/web/base/auth/general.html:33 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:43 #: 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:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:856 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:921 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -1990,7 +1945,7 @@ msgstr "Velg en kategori" msgid "Please choose a property type" msgstr "Velg en type egenskap" -#: perllib/FixMyStreet/App/Controller/Admin.pm:378 +#: perllib/FixMyStreet/App/Controller/Admin.pm:376 msgid "Please correct the errors below" msgstr "Husk Ã¥ rette opp feilene nedenfor." @@ -2014,11 +1969,10 @@ msgstr "Ikke vær ufin — Ã¥ kjefte pÃ¥ din administrasjon skader verdien a msgid "Please enter a message" msgstr "Vennligst legg til en melding" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Admin.pm:1079 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 msgid "Please enter a name" -msgstr "Legg inn ditt navn" +msgstr "" #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 @@ -2032,10 +1986,10 @@ msgstr "Skriv inn et passord" msgid "Please enter a subject" msgstr "Vennligst legg inn et emne" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1075 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1130 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:133 +#: perllib/FixMyStreet/DB/Result/User.pm:143 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2052,9 +2006,9 @@ msgid "Please enter some details" msgstr "Legg inn opplysninger om problemet" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:130 -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:32 +#: perllib/FixMyStreet/DB/Result/User.pm:140 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:42 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2063,7 +2017,7 @@ msgid "Please enter your email" msgstr "Legg inn din e-post" #: templates/web/base/report/new/form_user_loggedout_email.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:80 +#: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "Please enter your email address" msgstr "Vennligst tast inn din e-postadresse" @@ -2079,7 +2033,7 @@ msgstr "Vennligst legg inn ditt fulle navn, administrasjoner som mottar ditt pro #: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:126 +#: perllib/FixMyStreet/DB/Result/User.pm:136 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "Legg inn ditt navn" @@ -2106,7 +2060,7 @@ msgstr "Du kan ogsÃ¥ <a href=\"%s\">logge inn igjen</a> eller gÃ¥ tilbake til <a msgid "Please fill in details of the problem below." msgstr "Vennligst fyll ut detaljer om problemet under" -#: templates/web/zurich/report/new/fill_in_details_form.html:72 +#: templates/web/zurich/report/new/fill_in_details_form.html:74 msgid "Please fill in details of the problem." msgstr "Vennligst fyll ut detaljer om problemet." @@ -2117,7 +2071,7 @@ msgstr "" "Vennligst fyll inn skjemaet under med detaljene om problemet,\n" "og beskriv plasseringen sÃ¥ nøyaktig som mulig i boksen for detaljer." -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Vennligst indiker om du ønsker Ã¥ motta et nytt spørreskjema" @@ -2126,9 +2080,8 @@ msgid "Please note that updates are not sent to the council." msgstr "Vær oppmerksom pÃ¥ at oppdateringer ikke blir videresendt til administrasjonen." #: templates/web/base/report/new/oauth_email_form.html:4 -#, fuzzy msgid "Please note your report has <strong>not yet been sent</strong>." -msgstr "Merk at din rapport <strong>ennÃ¥ ikke er sendt</strong. Velg en kategori og legg til mer informasjon under før du sender inn." +msgstr "" #: templates/web/base/report/new/fill_in_details_form.html:20 #: templates/web/zurich/report/new/fill_in_details_form.html:11 @@ -2144,16 +2097,16 @@ msgstr "" msgid "Please note:" msgstr "Vennligst merk deg:" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please provide some explanation as to why you're reopening this report" msgstr "Vennligst bidra med en forklaring for hvorfor du gjenÃ¥pner denne problemrapporten" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250 msgid "Please provide some text as well as a photo" msgstr "Vennligst bidra med litt tekst i tillegg til et bilde" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236 msgid "Please say whether you've ever reported a problem to your council before" msgstr "Vennligst opplys om du har rapportert et problem til din administrasjon tidligere" @@ -2169,22 +2122,23 @@ msgstr "Velg den kilden du ønsker" msgid "Please select the type of alert you want" msgstr "Vennligst velg hvilken type varsel du ønsker" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232 msgid "Please state whether or not the problem has been fixed" msgstr "Vennligs oppgi om dette problemet er blitt fikset eller ikke" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:121 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 #: templates/web/base/js/translation_strings.html:53 -msgid "Please upload a JPEG image only" +#, fuzzy +msgid "Please upload an image only" msgstr "Vennligst last opp kun JPEG-bilder" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 msgid "Please write a message" msgstr "Skriv inn en melding" -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Please write your update here" msgstr "Vennligst skriv inn din oppdatering her" @@ -2215,7 +2169,7 @@ msgstr "Drevet av <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">Fi msgid "Previous" msgstr "Forrige" -#: templates/web/fixmystreet/footer.html:41 +#: templates/web/base/footer.html:41 msgid "Privacy" msgstr "Personvern" @@ -2225,7 +2179,7 @@ msgstr "Personvern" msgid "Privacy and cookies" msgstr "Personvern og cookies" -#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:200 #: templates/web/base/admin/body.html:85 #: templates/web/base/admin/category_edit.html:45 #: templates/web/base/admin/report_edit.html:77 @@ -2254,7 +2208,7 @@ msgstr "Problem %s sendt til administrasjon %s" msgid "Problem breakdown by state" msgstr "Tilstandsfordeling av problemer" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1046 msgid "Problem marked as open." msgstr "Problem markert som Ã¥pent." @@ -2266,10 +2220,6 @@ msgstr "Problemtilstandsendring basert pÃ¥ spørreundersøkelsesresultater" msgid "Problems" msgstr "Problemer" -#: templates/web/base/around/_updates.html:1 -msgid "Problems in this area" -msgstr "Problemer i dette omrÃ¥det" - #: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "Problemer i nærheten" @@ -2287,13 +2237,11 @@ msgid "Problems within %.1fkm of this location" msgstr "Problemer innenfor %.1fkm av denne posisjonen" #: perllib/FixMyStreet/Cobrand/Default.pm:663 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 #: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "Problemer innenfor %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "Problemer innenfor %s bydel" @@ -2312,15 +2260,11 @@ msgstr "Problemer innenfor grensene av:" msgid "Property address:" msgstr "Eiendomsadresse:" -#: templates/web/base/report/new/category.html:8 -msgid "Property type:" -msgstr "Type egenskap:" - #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Bidra med en oppdatering" -#: templates/web/base/auth/general.html:95 +#: templates/web/base/auth/general.html:105 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." @@ -2354,16 +2298,15 @@ msgstr "Spørreskjema %d fylt inn for problem %d, %s til %s" msgid "Questionnaire %d sent for problem %d" msgstr "Spørreskjema %d sendt for problem %d" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 msgid "Questionnaire filled in by problem reporter" msgstr "Spørreskjema fylt inn av feilrapportøren" #: templates/web/base/alert/_list.html:22 +#: templates/web/base/alert/updates.html:9 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display_tools.html:34 -#: templates/web/base/reports/_rss.html:1 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed" msgstr "RSS-strøm" @@ -2391,18 +2334,12 @@ msgstr "RSS-strøm av %s, innenfor %s bydel" msgid "RSS feed of nearby problems" msgstr "RSS-strøm med problemer i nærheten" -#: templates/web/base/reports/_rss.html:1 -msgid "RSS feed of problems in this %s" -msgstr "RSS-strøm for problemer i denne %s" - #: perllib/FixMyStreet/Cobrand/Default.pm:664 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 #: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "RSS-strøm for problemer innenfor %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 #: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "RSS-strøm for problemer innenfor %s bydel" @@ -2412,14 +2349,13 @@ msgstr "RSS-strøm for problemer innenfor %s bydel" msgid "RSS feed of recent local problems" msgstr "RSS-strøm med nylige lokale problemer" +#: templates/web/base/alert/updates.html:9 #: templates/web/base/report/display_tools.html:34 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed of updates to this problem" msgstr "RSS-strøm med oppdateringer for dette problemet" -#: templates/web/base/alert/updates.html:9 +#: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:36 -#: templates/web/fixmystreet/alert/updates.html:14 msgid "Receive email when updates are left on this problem." msgstr "Motta e-post nÃ¥r det er oppdateringer pÃ¥ dette problemet" @@ -2455,12 +2391,11 @@ msgstr "Fjern bilde (kan ikke gjøres om!)" msgid "Reply to user:" msgstr "Svar til bruker:" -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/header_logo.html:2 msgid "Report" msgstr "Rapport" -#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:26 -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/footer.html:26 templates/web/base/header_logo.html:2 #: templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2470,7 +2405,7 @@ msgstr "Rapporter et problem" msgid "Report abuse" msgstr "Rapporter misbruk" -#: perllib/FixMyStreet/App/Controller/Rss.pm:291 +#: perllib/FixMyStreet/App/Controller/Rss.pm:297 msgid "Report on %s" msgstr "Rapport pÃ¥ %s" @@ -2485,7 +2420,7 @@ msgstr "Rapporter problemet ditt" msgid "Report, view, or discuss local problems" msgstr "Rapporter, finn eller diskuter lokale problemer" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:577 #: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "Rapportert anonymt %s" @@ -2495,7 +2430,7 @@ msgstr "Rapportert anonymt %s" msgid "Reported before" msgstr "Rapportert tidligere" -#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 #: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "Publisert av %s %s" @@ -2509,27 +2444,27 @@ msgstr "Rapportert av:" msgid "Reported in the %s category" msgstr "Rapportert i kategorien %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:569 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 msgid "Reported in the %s category anonymously at %s" msgstr "Rapportert i kategorien %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:591 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 msgid "Reported in the %s category by %s at %s" msgstr "Rapportert i kategorien %s av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported via %s anonymously at %s" msgstr "Publisert av %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported via %s by %s at %s" msgstr "Rapportert av %s av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:561 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 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:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 msgid "Reported via %s in the %s category by %s at %s" msgstr "Rapportert av %s i kategorien %s av %s %s" @@ -2550,7 +2485,7 @@ msgstr "Rapportert:" msgid "Reporting a problem" msgstr "Legger til et problem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1274 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" @@ -2593,15 +2528,15 @@ msgstr "Veioperatør for denne navngitte veien (utledet fra veiens referansenumm msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Veioperatør for denne navngitte veien (fra OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1496 #: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "Roter til venstre" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 #: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 @@ -2616,7 +2551,7 @@ msgstr "Hvis du roterer dette bildet, mister du ikke lagrede endringer til rappo msgid "Satellite" msgstr "Satelitt" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/base/admin/category_edit.html:84 #: templates/web/zurich/admin/body.html:59 #: templates/web/zurich/admin/template_edit.html:29 @@ -2672,7 +2607,7 @@ msgstr "" msgid "Sent report back" msgstr "Rapport sendt tilbake" -#: perllib/FixMyStreet/DB/Result/Problem.pm:696 +#: perllib/FixMyStreet/DB/Result/Problem.pm:698 msgid "Sent to %s %s later" msgstr "Sendt til %s %s senere" @@ -2691,21 +2626,21 @@ msgstr "Dele" #: templates/web/base/report/new/form_user_loggedin.html:23 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22 -#: templates/web/base/report/update/form_name.html:15 +#: templates/web/base/report/update/form_name.html:16 msgid "Show my name publicly" msgstr "Vis mitt navn offentlig" -#: templates/web/base/around/display_location.html:67 +#: templates/web/base/around/display_location.html:66 msgid "Show old" msgstr "Vis gamle" -#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:57 msgid "Show pins" msgstr "Vis nÃ¥ler" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/general.html:110 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:76 +#: templates/web/base/auth/general.html:86 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2767,9 +2702,8 @@ msgstr "Beklager, vi kunne ikke finne det stedet." #: templates/web/base/auth/general.html:9 #: templates/web/base/report/display.html:21 #: templates/web/base/report/new/fill_in_details_form.html:23 -#, fuzzy msgid "Sorry, we could not log you in. Please fill in the form below." -msgstr "Beklager, vi kunne ikke tolke den posisjonen. Vennligst prøv pÃ¥ nytt." +msgstr "" #: perllib/FixMyStreet/Geocode/Bing.pm:35 #: perllib/FixMyStreet/Geocode/Google.pm:45 @@ -2777,15 +2711,10 @@ msgstr "Beklager, vi kunne ikke tolke den posisjonen. Vennligst prøv pÃ¥ nytt. msgid "Sorry, we could not parse that location. Please try again." msgstr "Beklager, vi kunne ikke tolke den posisjonen. Vennligst prøv pÃ¥ nytt." -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:138 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "Beklager, vi kunne ikke lagre bildet ditt. Forsøk igjen." -#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 -#, fuzzy -msgid "Sorry, you can not log in with Facebook. Please try again later." -msgstr "Det var problemer med Ã¥ vise denne siden. Vennligst prøv igjen senere." - #: templates/web/base/admin/stats.html:64 msgid "Start Date:" msgstr "Start-dato:" @@ -2794,7 +2723,7 @@ msgstr "Start-dato:" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/report/update/form_update.html:32 +#: templates/web/base/report/update/form_update.html:34 msgid "State" msgstr "Tilstand" @@ -2807,7 +2736,7 @@ msgstr "Tilstand" msgid "State:" msgstr "Tilstand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2847,10 +2776,10 @@ msgid "Subject:" msgstr "Emne:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/base/report/new/form_user_loggedout_by_email.html:39 #: templates/web/base/report/new/form_user_loggedout_password.html:11 -#: templates/web/zurich/report/new/fill_in_details_form.html:96 +#: templates/web/zurich/report/new/fill_in_details_form.html:98 msgid "Submit" msgstr "Send inn" @@ -2878,9 +2807,8 @@ msgstr "Send inn spørreskjema" msgid "Submitted" msgstr "Sendt inn" -#: templates/web/base/alert/updates.html:17 +#: templates/web/base/alert/updates.html:23 #: templates/web/base/report/display_tools.html:41 -#: templates/web/fixmystreet/alert/updates.html:23 msgid "Subscribe" msgstr "Abonner" @@ -2888,7 +2816,7 @@ msgstr "Abonner" msgid "Subscribe me to an email alert" msgstr "Jeg ønsker Ã¥ abonnere pÃ¥ e-postvarsel" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -2907,7 +2835,7 @@ msgstr "Oppsummering" msgid "Summary reports" msgstr "Oppsummeringsrapporter" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 msgid "Survey" msgstr "Spørreundersøkelse" @@ -2964,7 +2892,7 @@ msgstr "Takk for at du lastet opp ditt bilde. Vi mÃ¥ nÃ¥ plassere ditt problem, msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "Takk, glad for Ã¥ høre at problemet er fikset! Vi vil gjerne spørre deg om du har rapportert et problem til en administrasjon tidligere?" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:157 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "Bildet ser ikke ut til Ã¥ ha blitt lastet opp riktig (%s), prøv pÃ¥ nytt." @@ -2972,7 +2900,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:126 +#: perllib/FixMyStreet/App/Controller/Location.pm:127 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." @@ -2982,11 +2910,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:724 +#: perllib/FixMyStreet/App/Controller/Admin.pm:722 msgid "That problem has been marked as sent." msgstr "Det problemer har blitt markert som sendt." -#: perllib/FixMyStreet/App/Controller/Admin.pm:716 +#: perllib/FixMyStreet/App/Controller/Admin.pm:714 msgid "That problem will now be resent." msgstr "Det problemet vil nÃ¥ bli sendt pÃ¥ nytt." @@ -2998,7 +2926,7 @@ msgstr "Den rapporten kan ikke ses pÃ¥ %s." msgid "That report has been removed from FixMyStreet." msgstr "Den rapporten har blitt fjernet fra FiksGataMi." -#: templates/web/base/admin/body.html:144 +#: templates/web/base/admin/body.html:142 msgid "" "The <strong>email address</strong> is the destination to which reports about this category will be sent. \n" " Other categories for this body may have the same email address." @@ -3154,9 +3082,9 @@ msgstr "Det var problemer med Ã¥ vise 'Alle rapporter'-siden. Vennligst prøv i 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:764 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:753 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 -#: templates/web/base/auth/general.html:43 +#: templates/web/base/auth/general.html:53 #: 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" @@ -3226,9 +3154,9 @@ msgstr "Denne e-posten har blitt sendt til begge administrasjonene som dekker st 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:920 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:898 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:935 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:977 #: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "Denne informasjonen er pÃ¥krevd" @@ -3241,11 +3169,11 @@ msgstr "Dette er et utviklernettsted. Ting kan knekke nÃ¥r som helst og database msgid "This is a summary of all reports on this site." msgstr "Dette er en opplisting av alle problemene i denne tjenesten." -#: templates/web/base/report/update/form_update.html:52 +#: templates/web/base/report/update/form_update.html:54 msgid "This problem has been fixed" msgstr "Dette problemet er løst" -#: templates/web/base/report/update/form_update.html:46 +#: templates/web/base/report/update/form_update.html:48 msgid "This problem has not been fixed" msgstr "Dette problemet har ikke blitt løst" @@ -3282,7 +3210,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/App/Controller/Admin.pm:1287 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Tidslinje" @@ -3327,8 +3255,8 @@ msgstr "Forsøk Ã¥ sende epost direkte til oss:" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Unable to fix" msgstr "Kan ikke fikses" @@ -3345,7 +3273,7 @@ msgstr "Ubekreftet" msgid "Unknown" msgstr "Ukjent" -#: perllib/FixMyStreet/App/Controller/Rss.pm:173 +#: perllib/FixMyStreet/App/Controller/Rss.pm:174 msgid "Unknown alert type" msgstr "Ukjent varsel-type" @@ -3360,7 +3288,7 @@ msgstr "Ukjent feil" msgid "Unknown problem ID" msgstr "Ukjent problem-Id" -#: templates/web/base/report/update/form_update.html:25 +#: templates/web/base/report/update/form_update.html:27 msgid "Update" msgstr "Oppdatering" @@ -3412,10 +3340,10 @@ msgstr "Oppdater tilstanden" msgid "Updated" msgstr "Oppdatert" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 -#: perllib/FixMyStreet/App/Controller/Admin.pm:821 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1096 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1144 +#: perllib/FixMyStreet/App/Controller/Admin.pm:809 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3442,7 +3370,7 @@ msgstr "Oppdateringer av {{title}}" msgid "Updates to this problem, %s" msgstr "Oppdateringer til dette problemet, FiksGataMi" -#: templates/web/base/admin/body.html:182 +#: templates/web/base/admin/body.html:180 msgid "Use the <strong>note</strong> to record details that are only displayed in the admin. Notes are not shown publicly, and are not sent to the body." msgstr "Bruk <strong>notater</strong> for Ã¥ notere detaljer som skal vises frem i admin-grensesnittet. Notater vises ikke offentlig og blir ikke sendt til myndigheten." @@ -3451,11 +3379,11 @@ msgstr "Bruk <strong>notater</strong> for Ã¥ notere detaljer som skal vises frem msgid "Used map" msgstr "Brukte kart" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 msgid "User flag removed" msgstr "Brukerflagg fjernet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1421 msgid "User flagged" msgstr "Bruker flagget" @@ -3463,16 +3391,16 @@ msgstr "Bruker flagget" msgid "User search finds matches in users' names and email addresses." msgstr "Brukersøk leter etter treff gjennom brukernavn og epostadresser. " -#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "Brukere" -#: perllib/FixMyStreet/App/Controller/Admin.pm:382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:412 -#: perllib/FixMyStreet/App/Controller/Admin.pm:429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:380 +#: perllib/FixMyStreet/App/Controller/Admin.pm:410 +#: perllib/FixMyStreet/App/Controller/Admin.pm:427 msgid "Values updated" msgstr "Verdier oppdatert" @@ -3509,16 +3437,15 @@ msgstr "Vi fant mer en ett treff for den plassen. Vi viser opp til ti treff, sà #: templates/web/base/auth/general.html:6 #: templates/web/base/report/display.html:27 #: templates/web/base/report/new/oauth_email_form.html:5 -#, fuzzy msgid "We need your email address, please give it below." -msgstr "Vi viser aldri din e-postadresse eller ditt telefonnummer" +msgstr "" #: templates/web/base/report/new/form_user_loggedout_email.html:2 #: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "Vi viser aldri din e-postadresse" -#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedin.html:30 #: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "Vi viser aldri din e-postadresse eller ditt telefonnummer" @@ -3527,7 +3454,7 @@ msgstr "Vi viser aldri din e-postadresse eller ditt telefonnummer" 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." -#: templates/web/base/index-steps.html:31 +#: templates/web/base/index-steps.html:11 msgid "We send it to the council on your behalf" msgstr "Vi sender til administrasjon pÃ¥ dine vegne" @@ -3565,10 +3492,6 @@ msgstr "NÃ¥r sendt" msgid "Whoa there Testino! Three photos are enough." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 -msgid "Whole block of empty flats" -msgstr "Hel blokk med tomme leiligheter" - #: templates/web/base/tokens/confirm_alert.html:7 msgid "Why stop there? <a href=\"/alert\">Set up more alerts</a> for free." msgstr "Hvorfor stoppe der? <a href=\"/alert\">Sett opp flere varsler</a> gratis." @@ -3588,7 +3511,7 @@ msgstr "NÃ¥r du søker etter forespørsler, sÃ¥ er det ogsÃ¥ mulig Ã¥ søke ette msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "Kunne du tenke deg Ã¥ bidra til FiksGataMi? Kildekoden vÃ¥r er fri programvare og <a href=\"http://fixmystreet.org\">tilgjengelig via fixmystreet.org</a>." -#: templates/web/base/questionnaire/index.html:96 +#: templates/web/base/questionnaire/index.html:97 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "Kunne du tenke deg Ã¥ motta en ny forespørsel om 4 uker, som minner deg om Ã¥ sjekke status?" @@ -3618,8 +3541,8 @@ msgstr "Ã…r" #: templates/web/base/admin/update_edit.html:24 #: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 +#: templates/web/base/questionnaire/index.html:100 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "Ja" @@ -3688,9 +3611,8 @@ msgstr "Du har allerede lagt ved bilder til denne rapporten. Merk at du kan maks #: templates/web/base/questionnaire/index.html:83 #: templates/web/base/report/update/form_update.html:14 -#, fuzzy msgid "You have already attached photos to this update. Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)." -msgstr "Du har allerede lagt ved bilder til denne rapporten. Merk at du kan maksimalt legge ved 3 til rapporten (hvis du laster opp flere blir det eldste slettet)." +msgstr "" #: templates/web/base/auth/sign_out.html:4 #: templates/web/zurich/auth/sign_out.html:3 @@ -3738,19 +3660,19 @@ msgid "Your Reports" msgstr "Dine rapporter" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/alert/updates.html:19 +#: templates/web/base/alert/updates.html:22 #: templates/web/base/contact/index.html:83 #: templates/web/base/report/display_tools.html:38 #: templates/web/base/report/display_tools.html:40 #: templates/web/base/report/new/form_user_loggedin.html:3 #: templates/web/base/report/new/form_user_loggedout_email.html:1 #: templates/web/base/report/update/form_user_loggedout_email.html:1 -#: templates/web/fixmystreet/alert/updates.html:19 -#: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/zurich/report/new/fill_in_details_form.html:76 +#: templates/web/zurich/report/new/fill_in_details_form.html:78 msgid "Your email" msgstr "Din e-post" -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/general.html:55 #: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 @@ -3761,17 +3683,17 @@ msgstr "Din e-postadresse" msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "Vi vil kun bruke personlig informasjon om deg i henhold til vÃ¥re <a href=\"/faq#privacy\">personvernsregler.</a>" -#: templates/web/base/auth/general.html:90 +#: templates/web/base/auth/general.html:100 #: templates/web/base/contact/index.html:76 #: templates/web/base/report/new/form_user_loggedin.html:18 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17 -#: templates/web/base/report/update/form_name.html:11 +#: templates/web/base/report/update/form_name.html:12 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:86 +#: templates/web/zurich/report/new/fill_in_details_form.html:88 msgid "Your name" msgstr "Ditt navn" -#: templates/web/base/auth/general.html:75 +#: templates/web/base/auth/general.html:85 #: 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 @@ -3784,20 +3706,19 @@ msgstr "Ditt passord har blitt endret" #: templates/web/base/report/new/form_user_loggedin.html:27 #: templates/web/base/report/new/form_user_loggedout_by_email.html:26 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:94 msgid "Your phone number" msgstr "Ditt telefonnummer" #: templates/web/base/questionnaire/index.html:14 -#, fuzzy msgid "Your report" -msgstr "Dine oppdateringer" +msgstr "" -#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 +#: templates/web/base/footer.html:29 msgid "Your reports" msgstr "Dine oppdateringer" -#: templates/web/base/my/my.html:41 +#: templates/web/base/my/my.html:39 msgid "Your updates" msgstr "Dine oppdateringer" @@ -3823,7 +3744,7 @@ msgid "didn't use map" msgstr "brukte ikke kart" #: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/around/postcode_form.html:12 msgid "e.g. ‘%s’ or ‘%s’" msgstr "for eksempel «%s» eller «%s»" @@ -3929,8 +3850,7 @@ msgstr "andre omrÃ¥der:" msgid "reopened" msgstr "Ã¥pnet pÃ¥ nytt" -#: templates/web/base/header.html:33 templates/web/fixmystreet/header.html:64 -#: templates/web/zurich/footer.html:13 +#: templates/web/base/header.html:64 templates/web/zurich/footer.html:13 msgid "sign out" msgstr "logg ut" @@ -4008,7 +3928,7 @@ msgid_plural "<big>%s</big> updates on reports" msgstr[0] "<big>%s</big> rapport-<br>oppdatering" msgstr[1] "<big>%s</big> rapport-<br>oppdateringer" -#: templates/web/emptyhomes/report/new/councils_text_none.html:3 +#: templates/web/base/report/new/councils_text_none.html:3 #, perl-format msgid "We do not yet have details for the council that covers this location." msgid_plural "We do not yet have details for the councils that cover this location." @@ -4050,86 +3970,47 @@ msgid_plural "We do <strong>not</strong> yet have details for the other councils msgstr[0] "Vi har ennÃ¥ <strong>ikke</strong> detaljene for den andre administrasjonen som dekker dette stedet." msgstr[1] "Vi har ennÃ¥ <strong>ikke</strong> detaljene for de andre administrasjonene som dekker dette stedet." -#~ msgid "(we never show your email address or phone number)" -#~ msgstr "(vi viser aldri din e-postadresse eller telefonnummer)" - -#~ msgid "(we never show your email)" -#~ msgstr "(vi viser aldri din e-postadresse)" - -#~ msgid "<strong>No</strong>, let me confirm my report by email:" -#~ msgstr "<strong>Nei</strong>, la meg bekrefte min rapport med e-post:" - -#~ msgid "<strong>No</strong>, let me confirm my update by email:" -#~ msgstr "<strong>Nei</strong>, la meg bekrefte min oppdatering med e-post:" - -#~ msgid "Email me updates" -#~ msgstr "Send meg oppdateringer" - -#~ msgid "Enter a new password:" -#~ msgstr "Skriv inn et nytt passord:" - -#~ msgid "I'm afraid we couldn't validate that token. If you've copied the URL from an email, please check that you copied it exactly.\n" -#~ msgstr "Jeg er redd vi ikke kunne verifisere den referansen. Hvis du kopierte webadressen fra en e-post, sjekk at du har kopiert den korrekt.\n" - -#~ msgid "If you use web-based email or have 'junk mail' filters, you may wish to check your bulk/spam mail folders: sometimes, our messages are marked that way." -#~ msgstr "Hvis du bruker web-basert e-post eller har filtre for søppel-e-post pÃ¥ din e-postkonto, kan du i noen tilfellet mÃ¥tte se etter vÃ¥re meldinger der." - -#~ msgid "Message:" -#~ msgstr "Melding:" - -#~ msgid "More problems nearby" -#~ msgstr "Flere problemer i nærheten" - -#~ msgid "Nearly Done! Now check your email..." -#~ msgstr "Nesten ferdig! NÃ¥ mÃ¥ du sjekke e-posten din..." - -#~ msgid "Offensive? Unsuitable? Tell us" -#~ msgstr "Støtende? Upassende? Gi oss beskjed" - -#~ msgid "Photo:" -#~ msgstr "Bilde:" - -#~ msgid "Please check your email" -#~ msgstr "Vennligst sjekk e-posten du oppgav" +#~ msgid "%s, reported at %s" +#~ msgstr "%s, rapportert %s" -#~ msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" -#~ msgstr "Vennligst merk at oppdateringer ikke blir sendt til administrasjonen. Hvis du legger igjen navnet ditt sÃ¥ vil det være offentlig tilgjengelig. Din informasjon vil kun bli brukt i henhold til vÃ¥re <a href=\"/faq#privacy\">personvernpolicy</a>" +#~ msgid "About us" +#~ msgstr "Om oss" -#~ msgid "This may be because the link is too old or already used, or the address was not copied correctly." -#~ msgstr "Dette kan være fordi lenken er for gammel eller allerede brukt, eller at lenken ikke ble kopiert riktig." +#~ msgid "Email me new local problems" +#~ msgstr "Send meg e-post om lokale problemer" -#~ msgid "This problem has been closed" -#~ msgstr "Dette problemet er lukket" +#~ msgid "Empty flat or maisonette" +#~ msgstr "Tom leilighet" -#~ msgid "This problem is in progress" -#~ msgstr "Dette problemet er under arbeid" +#~ msgid "Empty house or bungalow" +#~ msgstr "Tomt hus eller bungalow" -#~ msgid "This problem is old and of unknown status." -#~ msgstr "Dette problemet er gammelt og med ukjent status." +#~ msgid "Empty office or other commercial" +#~ msgstr "Tomt kontor eller forretningsbygg" -#~ msgid "Update:" -#~ msgstr "Oppdatering:" +#~ msgid "Empty pub or bar" +#~ msgstr "Tom pub eller bar" -#~ msgid "We have not been able to confirm your account - sorry." -#~ msgstr "Vi har ikke klart Ã¥ bekrefte din konto - beklager." +#~ msgid "Empty public building - school, hospital, etc." +#~ msgstr "Tom offentlig bygning - skole, sykehus, etc." -#~ msgid "We have sent you an email containing a link to confirm your account." -#~ msgstr "Vi har sendt deg en epost som inneholder link for Ã¥ bekrefte din konto." +#~ msgid "Enter a nearby street name and area, postal code or district in Delhi" +#~ msgstr "Velg et nærliggende gatenavn og omrÃ¥de, postnummer eller distrikt i Delhi" -#~ msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:" -#~ msgstr "Vi ønsker Ã¥ fÃ¥ din tilbakemelding om hva du mener om denne tjenesten. Bare fyll ut skjemaet, eller send en e-post <a href='mailto:%s'>%s</a>:" +#~ msgid "FixMyStreet" +#~ msgstr "FiksGataMi" -#~ msgid "You have already attached a photo to this report, attaching another one will replace it." -#~ msgstr "Du har allerede lagt ved et bilde til dette problemet. Ã… legge ved et annet vil bytte ut dette." +#~ msgid "I am afraid you cannot confirm unconfirmed reports." +#~ msgstr "Jeg er redd du ikke kan bekrefte ubekreftede rapporter." -#~ msgid "You have already attached a photo to this update, attaching another one will replace it." -#~ msgstr "Du har allerede lagt ved et bilde til denne oppdateringen. Ã… legge ved et annet vil bytte ut dette." +#~ msgid "Problems in this area" +#~ msgstr "Problemer i dette omrÃ¥det" -#~ msgid "Your email:" -#~ msgstr "Din e-post" +#~ msgid "Property type:" +#~ msgstr "Type egenskap:" -#~ msgid "Your name:" -#~ msgstr "Ditt navn:" +#~ msgid "RSS feed of problems in this %s" +#~ msgstr "RSS-strøm for problemer i denne %s" -#~ msgid "Your email:" -#~ msgstr "Din e-post:" +#~ msgid "Whole block of empty flats" +#~ msgstr "Hel blokk med tomme leiligheter" diff --git a/locale/nl_NL.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nl_NL.UTF-8/LC_MESSAGES/FixMyStreet.po index 83fea7b83..e244530ae 100644 --- a/locale/nl_NL.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/nl_NL.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2016-03-02 13:09+0000\n" -"PO-Revision-Date: 2015-12-04 12:53+0000\n" -"Last-Translator: Milo van der Linden <milo@dogodigi.net>\n" +"POT-Creation-Date: 2016-05-03 10:41+0100\n" +"PO-Revision-Date: 2016-03-23 12:43+0000\n" +"Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: Dutch (Netherlands) (http://www.transifex.com/mysociety/fixmystreet/language/nl_NL/)\n" "Language: nl_NL\n" "MIME-Version: 1.0\n" @@ -20,7 +20,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/DB/Result/Problem.pm:618 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr "en" @@ -89,7 +89,7 @@ msgstr "%s live updates" msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "%s vragenlijsten verzonden – %s beantwoord (%s%%)" -#: perllib/FixMyStreet/DB/Result/Problem.pm:683 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "%s ref: %s" msgstr "%s ref: %s" @@ -108,10 +108,6 @@ msgstr "" msgid "%s ward, %s" msgstr "%s district, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:552 -msgid "%s, reported at %s" -msgstr "%s, gemeld aan %s" - #: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "%s, in %s district" @@ -166,7 +162,7 @@ msgstr "(zoals graffiti, zwerfafval, losliggende tegels of straatverlichting) " msgid "(not sent to council)" msgstr "(niet verstuurd naar de gemeente)" -#: templates/web/zurich/report/new/fill_in_details_form.html:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "(optional)" msgstr "(optioneel)" @@ -178,12 +174,11 @@ msgstr "(publiek)" msgid "(sent to both)" msgstr "(verstuurd naar beide)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Kies een categorie --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Kies een woning type --" @@ -215,26 +210,21 @@ msgstr "<strong>Nee</strong> Laat me mijn melding per e-mail bevestigen" msgid "<strong>No</strong> Let me confirm my update by email" msgstr "<strong>Nee</strong> Laat me mijn update per e-mail bevestigen" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:97 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>Nee</strong> Laat me inloggen per e-mail" -#: templates/web/base/auth/general.html:70 +#: templates/web/base/auth/general.html:80 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Ja</strong, ik heb een wachtwoord" -#: templates/web/base/about/about-en-gb.html:1 -#: templates/web/base/about/about-en-gb.html:3 -msgid "About us" -msgstr "Over ons" - #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Action Scheduled" msgstr "Actie ingepland" @@ -265,7 +255,7 @@ msgstr "Voeg een nieuwe categorie toe" msgid "Add user" msgstr "Gebruiker toevoegen" -#: templates/web/base/my/my.html:56 +#: templates/web/base/my/my.html:54 msgid "Added %s" msgstr "%s toegevoegd" @@ -285,7 +275,7 @@ msgstr "Melding %d gemaakt voor %s, type %s, parameters %s / %s" msgid "Alert %d disabled (created %s)" msgstr "Melding %d inactief gemaakt (gemaakt %s)" -#: templates/web/base/report/update/form_name.html:20 +#: templates/web/base/report/update/form_name.html:21 msgid "Alert me to future updates" msgstr "Meld het me als er updates zijn" @@ -298,7 +288,7 @@ msgstr "Alle meldingen" msgid "All Reports as CSV" msgstr "Alle rapporten als CSV" -#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 +#: templates/web/base/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:20 @@ -397,7 +387,7 @@ msgstr "Vorige" msgid "Ban email address" msgstr "Verban e-mailadres" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1273 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -428,7 +418,7 @@ msgstr "Kan je de kaart niet zien? <em>Sla deze stap over</em>" #: templates/web/base/admin/body.html:68 #: templates/web/base/admin/index.html:54 -#: templates/web/base/report/new/category.html:10 +#: templates/web/base/report/new/category.html:7 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 @@ -443,7 +433,7 @@ msgstr "Categorie" msgid "Category fix rate for problems > 4 weeks old" msgstr "Doorloopsnelheid voor problemen in categorie >4 weken oud" -#: templates/web/base/admin/body.html:138 +#: templates/web/base/admin/body.html:137 #: templates/web/base/admin/category_edit.html:23 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/admin/body.html:43 @@ -463,19 +453,19 @@ msgstr "Categorie: %s" msgid "Change password" msgstr "Verander Wachtwoord" -#: templates/web/base/admin/body.html:160 +#: templates/web/base/admin/body.html:158 msgid "" "Check <strong>confirmed</strong> to indicate that this contact has been confirmed as correct.\n" " If you are not sure of the origin or validity of the contact, leave this unchecked." msgstr "" -#: templates/web/base/admin/body.html:171 +#: templates/web/base/admin/body.html:169 msgid "" "Check <strong>deleted</strong> to remove the category from use. \n" " It will not appear as an available category in the drop-down menu on the report-a-problem page." msgstr "" -#: templates/web/base/admin/body.html:191 +#: templates/web/base/admin/body.html:189 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -486,7 +476,7 @@ msgid "" " at a specific address." msgstr "" -#: templates/web/base/admin/body.html:130 +#: templates/web/base/admin/body.html:129 msgid "" "Choose a <strong>category</strong> 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." @@ -527,8 +517,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:15 #: templates/web/base/admin/report_blocks.html:25 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 @@ -537,7 +527,7 @@ msgstr "" msgid "Closed" msgstr "Gesloten" -#: perllib/FixMyStreet/DB/Result/Problem.pm:779 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Closed by council" msgstr "Gesloten door gemeente" @@ -563,7 +553,7 @@ msgstr "Cobrand data:" msgid "Cobrand:" msgstr "Cobrand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "" @@ -582,9 +572,8 @@ msgstr "Bevestig account" #: templates/web/base/report/new/form_user_loggedout_password.html:21 #: templates/web/base/report/update/form_user_loggedout_password.html:20 -#, fuzzy msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." -msgstr "Bevestig door e-mail beneden en kies een wachtwoord. Als je bevestigd wordt je wachtwoord bijgewerkt." +msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:1 #: templates/web/base/tokens/confirm_problem.html:1 @@ -594,7 +583,7 @@ msgstr "Bevestig door e-mail beneden en kies een wachtwoord. Als je bevestigd wo msgid "Confirmation" msgstr "Bevestiging" -#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:164 #: templates/web/base/admin/body.html:79 #: templates/web/base/admin/category_edit.html:37 #: templates/web/base/admin/category_edit.html:92 @@ -613,7 +602,7 @@ msgid "Confirmed:" msgstr "Bevestigd:" #. ("%s is the site name") -#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 +#: templates/web/base/about/_sidebar.html:6 msgid "Contact %s" msgstr "" @@ -632,8 +621,8 @@ msgstr "Neem contact op met het team" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1417 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1445 msgid "Could not find user" msgstr "Kan de gebruiker niet vinden" @@ -651,7 +640,7 @@ msgstr "Gemeente" msgid "Council contacts for %s" msgstr "Gemeente contactpersongen voor %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:681 +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "Council ref: %s" msgstr "gemeente ref.: %s" @@ -670,7 +659,7 @@ msgstr "Aantal" msgid "Create a report" msgstr "Maak een melding" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "Maak een categorie" @@ -714,20 +703,20 @@ msgstr "Dashboard" msgid "Dealt with by subdivision within 5 working days" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:877 +#: perllib/FixMyStreet/App/Controller/Admin.pm:865 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:175 #: templates/web/base/admin/body.html:81 #: templates/web/base/admin/category_edit.html:42 #: templates/web/base/admin/category_edit.html:93 msgid "Deleted" msgstr "Verwijderd" -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:47 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -735,7 +724,7 @@ msgid "Description" msgstr "" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:68 +#: templates/web/zurich/report/new/fill_in_details_form.html:70 msgid "Details" msgstr "Details" @@ -760,11 +749,11 @@ msgid "Diligency prize league table" msgstr "Toewijdingsranglijst" #. ("%s is the site name") -#: templates/web/base/auth/general.html:48 -#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/auth/general.html:58 +#: templates/web/base/report/new/form_user_loggedout.html:28 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout.html:17 +#: templates/web/base/report/update/form_user_loggedout.html:27 msgid "Do you have a %s password?" msgstr "" @@ -782,8 +771,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "Duplicate" msgstr "" @@ -803,7 +792,7 @@ msgstr "" msgid "Edit" msgstr "Bewerk" -#: templates/web/base/admin/body.html:220 +#: templates/web/base/admin/body.html:218 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "" @@ -833,7 +822,7 @@ msgstr "Redacteur" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:39 +#: templates/web/base/auth/general.html:49 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -841,11 +830,11 @@ msgstr "Redacteur" msgid "Email" msgstr "Email" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 msgid "Email added to abuse list" msgstr "Email toegevoegd aan zwarte lijst" -#: templates/web/base/admin/body.html:155 +#: templates/web/base/admin/body.html:153 msgid "Email address:" msgstr "" @@ -857,19 +846,14 @@ msgstr "" msgid "Email alert deleted" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1390 msgid "Email already in abuse list" msgstr "Email staat al op zwarte lijst" -#: templates/web/base/around/_updates.html:5 -msgid "Email me new local problems" -msgstr "Email me nieuwe lokale meldingen" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 -#: templates/web/base/alert/updates.html:13 #: templates/web/zurich/admin/body.html:47 msgid "Email:" msgstr "Email:" @@ -878,26 +862,6 @@ msgstr "Email:" msgid "Email: %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 -msgid "Empty flat or maisonette" -msgstr "Lege flat of maisonette" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 -msgid "Empty house or bungalow" -msgstr "Leeg huis of bungalow" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 -msgid "Empty office or other commercial" -msgstr "Leeg kantoor of ander commercieel" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 -msgid "Empty pub or bar" -msgstr "Lege kroeg of bar" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 -msgid "Empty public building - school, hospital, etc." -msgstr "Leeg publiek gebouw - school, ziekenhuis etc." - #: templates/web/base/admin/body-form.html:162 #: templates/web/base/admin/body-form.html:163 msgid "" @@ -941,18 +905,14 @@ msgstr "Geef dichtstbijzijnde postcode, of straatnaam en plaats" msgid "Enter a nearby street name and area" msgstr "Geef dichtstbijzijnde straatnaam en plaats" -#: perllib/FixMyStreet/Cobrand/ZeroTB.pm:7 -msgid "Enter a nearby street name and area, postal code or district in Delhi" -msgstr "" - -#: templates/web/base/auth/general.html:99 +#: templates/web/base/auth/general.html:109 #: templates/web/base/report/new/form_user_loggedout_by_email.html:38 #: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Geef wachtwoord " -#: templates/web/base/index-steps.html:26 +#: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "Geef details van het probleem" @@ -978,7 +938,7 @@ msgstr "Voorbeeld van postcode %s" msgid "Examples:" msgstr "Voorbeelden:" -#: templates/web/base/report/new/form_report.html:49 +#: templates/web/base/report/new/form_report.html:51 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "" @@ -1015,19 +975,15 @@ msgstr "Eerste keer" msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." msgstr "" -#: templates/web/base/header.html:26 -msgid "FixMyStreet" -msgstr "FixMyStreet" - #: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:38 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:40 msgid "Fixed" msgstr "Opgelost" @@ -1054,7 +1010,7 @@ msgstr "" msgid "Flag user" msgstr "Gemarkeerde gebruikr" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "Gemarkeerd" @@ -1076,8 +1032,7 @@ msgstr "" msgid "Flagged:" msgstr "Gemarkeerd:" -#: templates/web/base/reports/_ward-list.html:3 -#: templates/web/fixmystreet/reports/_ward-list.html:4 +#: templates/web/base/reports/_ward-list.html:4 msgid "Follow a ward link to view only reports within that ward." msgstr "Klik op de link voor een wijk om alleen problemen in die wijk te bekijken." @@ -1108,18 +1063,18 @@ msgstr "Veelgestelde Vragen" msgid "GeoRSS on Google Maps" msgstr "GeoRSS op Google Maps" +#: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:11 -#: templates/web/fixmystreet/around/_updates.html:3 msgid "Get updates" msgstr "Updates ontvangen" -#: templates/web/fixmystreet/reports/_rss.html:3 -#: templates/web/fixmystreet/reports/_rss.html:9 +#: templates/web/base/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:9 msgid "Get updates of %s problems" msgstr "Updates over %s problemen ontvangen" -#: templates/web/fixmystreet/reports/_rss.html:11 -#: templates/web/fixmystreet/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:11 +#: templates/web/base/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "Updates in deze %s ontvangen" @@ -1132,7 +1087,7 @@ msgid "Glad to hear it’s been fixed!" msgstr "" #: templates/web/base/alert/index.html:34 -#: templates/web/base/around/postcode_form.html:16 +#: templates/web/base/around/postcode_form.html:13 #: templates/web/base/reports/_list-filters.html:28 #: templates/web/zurich/admin/stats.html:26 msgid "Go" @@ -1158,7 +1113,7 @@ msgstr "Is dit probleem opgelost?" msgid "Have you ever reported a problem to a council before, or is this your first time?" msgstr "Heb je al eens eerder een probleem aan de gemeente gemeld, of is dit jouw eerste keer?" -#: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:38 +#: templates/web/base/footer.html:38 #: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 @@ -1169,8 +1124,7 @@ msgstr "Help" msgid "Here are the types of local problem alerts for ‘%s’." msgstr "Hier zijn de soorten meldingen van lokale problemen voor '%s'." -#: templates/web/base/header.html:32 templates/web/fixmystreet/header.html:63 -#: templates/web/zurich/footer.html:12 +#: templates/web/base/header.html:63 templates/web/zurich/footer.html:12 msgid "Hi %s" msgstr "Hoi %s" @@ -1186,11 +1140,11 @@ msgstr "Hoi %s" msgid "Hidden" msgstr "Verborgen" -#: templates/web/base/around/display_location.html:65 +#: templates/web/base/around/display_location.html:64 msgid "Hide old" msgstr "Verberg oud" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:59 msgid "Hide pins" msgstr "Verberg spelden" @@ -1210,10 +1164,6 @@ msgstr "Hoe een melding maken" msgid "How to send successful reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:752 -msgid "I am afraid you cannot confirm unconfirmed reports." -msgstr "Ik ben bang dat je geen ongeverifieerde meldingen kunt bevestigen." - #: templates/web/base/tokens/confirm_problem.html:23 #: templates/web/base/tokens/confirm_problem.html:27 msgid "I just reported a problem on @fixmystreet" @@ -1224,7 +1174,7 @@ msgstr "" msgid "I just updated a problem on @fixmystreet" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88 msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "Ik ben bang dat we je melding niet kunnen vinden in onze database.\n" @@ -1246,7 +1196,7 @@ msgid "" " For basic installations, you don't need to join bodies in this way." msgstr "" -#: templates/web/base/admin/body.html:133 +#: templates/web/base/admin/body.html:132 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." @@ -1267,7 +1217,7 @@ msgid "" "(please note it will not be sent to the council)." msgstr "" -#: templates/web/base/admin/body.html:149 +#: templates/web/base/admin/body.html:147 msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." msgstr "" @@ -1302,10 +1252,10 @@ msgstr "Illegaal ID" msgid "Illegal feed selection" msgstr "Illegale RSS feed selectie" +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "In Progress" msgstr "In Behandeling" @@ -1356,7 +1306,7 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "Ongeldige agency_responsible waarde %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 msgid "Invalid end date" msgstr "Ongeldige einddatum" @@ -1364,16 +1314,16 @@ msgstr "Ongeldige einddatum" msgid "Invalid format %s specified." msgstr "Ongeldig formaat %s gespecifieerd" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 msgid "Invalid start date" msgstr "Ongeldige startdatum" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:5 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Investigating" msgstr "Onderzoeken" @@ -1395,7 +1345,7 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:80 +#: 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 @@ -1433,7 +1383,6 @@ msgstr "Laden..." #: 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/fixmystreet/alert/updates.html:1 msgid "Local RSS feeds and email alerts" msgstr "Lokale RSS feeds en e-mail meldingen" @@ -1442,11 +1391,11 @@ msgstr "Lokale RSS feeds en e-mail meldingen" msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "Lokale RSS feeds en e-mail meldingen voor '%s'" -#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:35 +#: templates/web/base/footer.html:35 msgid "Local alerts" msgstr "Lokale melding" -#: templates/web/base/index-steps.html:25 +#: templates/web/base/index-steps.html:5 msgid "Locate the problem on a map of the area" msgstr "Vind het probleem op de kaart van de omgeving" @@ -1506,14 +1455,14 @@ msgstr "Maand" #: templates/web/base/admin/list_updates.html:7 #: templates/web/base/admin/reports.html:13 #: templates/web/base/admin/users.html:15 -#: templates/web/base/auth/general.html:89 +#: templates/web/base/auth/general.html:99 #: templates/web/base/report/new/form_user_loggedin.html:9 #: templates/web/base/report/new/form_user_loggedout_by_email.html:7 -#: templates/web/base/report/update/form_name.html:4 +#: templates/web/base/report/update/form_name.html:5 #: templates/web/base/reports/index.html:20 #: 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:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "Name" msgstr "Naam" @@ -1537,8 +1486,8 @@ 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:455 -#: perllib/FixMyStreet/Cobrand/Default.pm:495 +#: perllib/FixMyStreet/Cobrand/Default.pm:454 +#: perllib/FixMyStreet/Cobrand/Default.pm:494 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" @@ -1562,7 +1511,7 @@ msgstr "Nieuw <br>problemen" msgid "New body added" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:387 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 msgid "New category contact added" msgstr "Nieuw contactpersonen voor categorie toegevoegd" @@ -1627,7 +1576,7 @@ msgstr "Volgende" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 -#: templates/web/base/questionnaire/index.html:101 +#: templates/web/base/questionnaire/index.html:102 #: templates/web/base/questionnaire/index.html:53 msgid "No" msgstr "Nee" @@ -1692,8 +1641,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Not Responsible" msgstr "" @@ -1726,7 +1675,7 @@ msgstr "Opmerking" 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/base/admin/body.html:186 +#: templates/web/base/admin/body.html:184 #: templates/web/base/admin/category_edit.html:52 #: templates/web/zurich/admin/body.html:53 msgid "Note:" @@ -1740,15 +1689,15 @@ msgstr "Opmerking: <strong>%s</strong>" msgid "Notes from SDM to DM" msgstr "" -#: templates/web/base/report/new/form_user_loggedout.html:14 #: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/form_user_loggedout.html:24 #: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "Nu om je melding te verzend…" #: templates/web/base/report/update-form.html:28 -#: templates/web/base/report/update/form_user_loggedout.html:13 #: templates/web/base/report/update/form_user_loggedout.html:2 +#: templates/web/base/report/update/form_user_loggedout.html:23 msgid "Now to submit your update…" msgstr "Nu om je update te verzend…" @@ -1782,8 +1731,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:23 #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/report/update/form_update.html:36 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1818,13 +1767,13 @@ msgstr "Of problemen gemeld aan:" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "Of je kan je abonneren op een melding gebaseerd op welke gemeente je woont:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1055 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 -#: perllib/FixMyStreet/DB/Result/Problem.pm:558 -#: perllib/FixMyStreet/DB/Result/Problem.pm:568 -#: perllib/FixMyStreet/DB/Result/Problem.pm:578 -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1044 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:659 +#: perllib/FixMyStreet/DB/Result/Problem.pm:562 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 +#: perllib/FixMyStreet/DB/Result/Problem.pm:582 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 #: perllib/FixMyStreet/Script/Reports.pm:175 #: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" @@ -1849,7 +1798,7 @@ msgstr "" msgid "Partial" msgstr "Gedeeltelijk" -#: templates/web/base/auth/general.html:92 +#: templates/web/base/auth/general.html:102 #: templates/web/base/report/new/form_user_loggedout_by_email.html:31 #: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 @@ -1858,7 +1807,7 @@ msgid "Password (optional)" msgstr "Wachtwoord (optioneel)" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:72 +#: templates/web/base/auth/general.html:82 msgid "Password:" msgstr "Wachtwoord:" @@ -1866,7 +1815,7 @@ msgstr "Wachtwoord:" msgid "Permalink" msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:90 msgid "Phone number" msgstr "" @@ -1882,13 +1831,21 @@ msgid "Phone:" msgstr "Telefoonnummer:" #: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/questionnaire/index.html:89 +#: templates/web/base/questionnaire/index.html:91 #: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/new/form_report.html:38 +#: templates/web/base/report/new/form_report.html:40 +#: templates/web/base/report/update/form_update.html:20 +#: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:6 #: 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:45 +#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/zurich/report/new/fill_in_details_form.html:63 msgid "Photo" msgstr "Foto" @@ -1912,8 +1869,8 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:955 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:6 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 @@ -1929,16 +1886,16 @@ 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/general.html:27 -#: templates/web/base/auth/general.html:33 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:43 #: 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:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:856 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:921 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -1948,7 +1905,7 @@ msgstr "Kies een categorie" msgid "Please choose a property type" msgstr "Kies een pand type" -#: perllib/FixMyStreet/App/Controller/Admin.pm:378 +#: perllib/FixMyStreet/App/Controller/Admin.pm:376 msgid "Please correct the errors below" msgstr "" @@ -1969,11 +1926,10 @@ msgstr "" msgid "Please enter a message" msgstr "Geef bericht in" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Admin.pm:1079 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 msgid "Please enter a name" -msgstr "Geef je naam" +msgstr "" #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 @@ -1987,10 +1943,10 @@ msgstr "Geef wachtwoord" msgid "Please enter a subject" msgstr "Geef onderwerp" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1075 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1130 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:133 +#: perllib/FixMyStreet/DB/Result/User.pm:143 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2007,9 +1963,9 @@ msgid "Please enter some details" msgstr "Geef details" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:130 -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:32 +#: perllib/FixMyStreet/DB/Result/User.pm:140 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:42 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2018,7 +1974,7 @@ msgid "Please enter your email" msgstr "Geef een geldig e-mailadres" #: templates/web/base/report/new/form_user_loggedout_email.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:80 +#: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "Please enter your email address" msgstr "Geef een geldig e-mailadres" @@ -2034,7 +1990,7 @@ msgstr "Geef je volledige naam, gemeentes hebben deze informatie nodig. Mocht je #: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:126 +#: perllib/FixMyStreet/DB/Result/User.pm:136 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "Geef je naam" @@ -2061,7 +2017,7 @@ msgstr "" msgid "Please fill in details of the problem below." msgstr "Vul de details van het probleem beneden in." -#: templates/web/zurich/report/new/fill_in_details_form.html:72 +#: templates/web/zurich/report/new/fill_in_details_form.html:74 msgid "Please fill in details of the problem." msgstr "Vul de details van het probleem in." @@ -2070,7 +2026,7 @@ msgstr "Vul de details van het probleem in." msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "Vul zoveel mogelijk details in het veld beneden in. Vermeld ook de locatie zo precies mogelijk." -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Geef aan of je een vragenlijst wilt ontvangen" @@ -2079,9 +2035,8 @@ msgid "Please note that updates are not sent to the council." msgstr "Let op, updates worden niet aan de gemeente verzonden." #: templates/web/base/report/new/oauth_email_form.html:4 -#, fuzzy msgid "Please note your report has <strong>not yet been sent</strong>." -msgstr "Let op dat je melding <strong>nog niet is verzonden</strong>. Kies een categorie en vermeld verdere informatie hierbeneden en klik op insturen." +msgstr "" #: templates/web/base/report/new/fill_in_details_form.html:20 #: templates/web/zurich/report/new/fill_in_details_form.html:11 @@ -2097,16 +2052,16 @@ msgstr "" msgid "Please note:" msgstr "Let op:" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please provide some explanation as to why you're reopening this report" msgstr "Geef een reden op waarom je deze melding heropent" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250 msgid "Please provide some text as well as a photo" msgstr "Vermeld wat tekst en een foto" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236 msgid "Please say whether you've ever reported a problem to your council before" msgstr "Geef aan of je het probleem al eerder hebt doorgegeven aan de gemeente" @@ -2122,22 +2077,23 @@ msgstr "Kies de feed die je wilt" msgid "Please select the type of alert you want" msgstr "Kies de melding die je wilt" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232 msgid "Please state whether or not the problem has been fixed" msgstr "Geef aan of het probleem is verholpen" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:121 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 #: templates/web/base/js/translation_strings.html:53 -msgid "Please upload a JPEG image only" +#, fuzzy +msgid "Please upload an image only" msgstr "Je kan alleen een JPEG foto insturen" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 msgid "Please write a message" msgstr "Schrijf een bericht" -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Please write your update here" msgstr "Schrijf je update hier" @@ -2168,7 +2124,7 @@ msgstr "" msgid "Previous" msgstr "Vorige" -#: templates/web/fixmystreet/footer.html:41 +#: templates/web/base/footer.html:41 msgid "Privacy" msgstr "" @@ -2178,7 +2134,7 @@ msgstr "" msgid "Privacy and cookies" msgstr "" -#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:200 #: templates/web/base/admin/body.html:85 #: templates/web/base/admin/category_edit.html:45 #: templates/web/base/admin/report_edit.html:77 @@ -2207,7 +2163,7 @@ msgstr "Probleem %s verzonden naar gemeente %s" msgid "Problem breakdown by state" msgstr "Probleem verdeeld per status" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1046 msgid "Problem marked as open." msgstr "Probleem gemarkeerd als open" @@ -2219,10 +2175,6 @@ msgstr "Probleem status gewijzigd op basis van onderzoeksresultaten" msgid "Problems" msgstr "Problemen" -#: templates/web/base/around/_updates.html:1 -msgid "Problems in this area" -msgstr "Problemen in dit gebied" - #: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "Problemen dichtbij" @@ -2240,13 +2192,11 @@ msgid "Problems within %.1fkm of this location" msgstr "Problemen binnen een straal van %.1fkm van deze lokatie" #: perllib/FixMyStreet/Cobrand/Default.pm:663 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 #: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "Problemen binnen %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "Problemen binnen wijk %s" @@ -2265,15 +2215,11 @@ msgstr "Problemen binnen de grenzen van:" msgid "Property address:" msgstr "" -#: templates/web/base/report/new/category.html:8 -msgid "Property type:" -msgstr "Pand soort:" - #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Geef een update" -#: templates/web/base/auth/general.html:95 +#: templates/web/base/auth/general.html:105 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 "" @@ -2307,16 +2253,15 @@ msgstr "Vragenlijst %d beantwoord voor probleem %d, %s tot %s" msgid "Questionnaire %d sent for problem %d" msgstr "Vragenlijst %d verzonden voor probleem %d" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 msgid "Questionnaire filled in by problem reporter" msgstr "Vragenlijst ingevuld door melder" #: templates/web/base/alert/_list.html:22 +#: templates/web/base/alert/updates.html:9 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display_tools.html:34 -#: templates/web/base/reports/_rss.html:1 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed" msgstr "RSS feed" @@ -2344,18 +2289,12 @@ msgstr "RSS feed van %s, binnen wijk %s" msgid "RSS feed of nearby problems" msgstr "RSS feed van nabije problemen" -#: templates/web/base/reports/_rss.html:1 -msgid "RSS feed of problems in this %s" -msgstr "RSS feed van problemen in dit %s" - #: perllib/FixMyStreet/Cobrand/Default.pm:664 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 #: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "RSS feed van problemen binnen %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 #: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "RSS feed van problemen in wijk %s" @@ -2365,14 +2304,13 @@ msgstr "RSS feed van problemen in wijk %s" msgid "RSS feed of recent local problems" msgstr "RSS feed van recente lokale problemen" +#: templates/web/base/alert/updates.html:9 #: templates/web/base/report/display_tools.html:34 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed of updates to this problem" msgstr "RSS feed van updates voor dit probleem" -#: templates/web/base/alert/updates.html:9 +#: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:36 -#: templates/web/fixmystreet/alert/updates.html:14 msgid "Receive email when updates are left on this problem." msgstr "Ontvang een e-mail als updates worden achtergelaten bij dit probleem." @@ -2408,12 +2346,11 @@ msgstr "Verwijder foto (kan niet ongedaan worden!)" msgid "Reply to user:" msgstr "Beantwoord" -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/header_logo.html:2 msgid "Report" msgstr "Melding" -#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:26 -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/footer.html:26 templates/web/base/header_logo.html:2 #: templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2423,7 +2360,7 @@ msgstr "Meld een probleem" msgid "Report abuse" msgstr "Meld misbruik" -#: perllib/FixMyStreet/App/Controller/Rss.pm:291 +#: perllib/FixMyStreet/App/Controller/Rss.pm:297 msgid "Report on %s" msgstr "Meld op %s" @@ -2438,7 +2375,7 @@ msgstr "Probleem melden" msgid "Report, view, or discuss local problems" msgstr "Meld, bekijk of discussier over lokale problemen" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:577 #: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "Anoniem gemeld bij %s" @@ -2448,7 +2385,7 @@ msgstr "Anoniem gemeld bij %s" msgid "Reported before" msgstr "Eerder gemeld" -#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 #: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "Gemeld door %s bij %s" @@ -2462,27 +2399,27 @@ msgstr "Gemeld door:" msgid "Reported in the %s category" msgstr "Toegewezen aan categorie %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:569 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 msgid "Reported in the %s category anonymously at %s" msgstr "Anoniem gemeld in de categorie %s bij %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:591 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 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:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported via %s anonymously at %s" msgstr "Anoniem door %s gemeld bij %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported via %s by %s at %s" msgstr "Gemeld door %s door %s bij %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:561 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 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:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 msgid "Reported via %s in the %s category by %s at %s" msgstr "Gemeld door %s in de categorie %s door %s bij %s" @@ -2503,7 +2440,7 @@ msgstr "Gemeld:" msgid "Reporting a problem" msgstr "Meld een probleem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1274 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" @@ -2546,15 +2483,15 @@ msgstr "Wegbeheerder voor deze straat (afgeleid van wegnummer en type): %s" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Wegbeheerder voor deze straat (uit OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1496 #: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "Linksom roteren" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 #: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 @@ -2569,7 +2506,7 @@ msgstr "" msgid "Satellite" msgstr "" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/base/admin/category_edit.html:84 #: templates/web/zurich/admin/body.html:59 #: templates/web/zurich/admin/template_edit.html:29 @@ -2625,7 +2562,7 @@ msgstr "" msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:696 +#: perllib/FixMyStreet/DB/Result/Problem.pm:698 msgid "Sent to %s %s later" msgstr "Verzonden aan %s %s later" @@ -2644,21 +2581,21 @@ msgstr "Deel" #: templates/web/base/report/new/form_user_loggedin.html:23 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22 -#: templates/web/base/report/update/form_name.html:15 +#: templates/web/base/report/update/form_name.html:16 msgid "Show my name publicly" msgstr "Toon mijn naam publiekelijk" -#: templates/web/base/around/display_location.html:67 +#: templates/web/base/around/display_location.html:66 msgid "Show old" msgstr "Toon oud" -#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:57 msgid "Show pins" msgstr "Toon spelden" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/general.html:110 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:76 +#: templates/web/base/auth/general.html:86 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2726,15 +2663,10 @@ msgstr "" msgid "Sorry, we could not parse that location. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:138 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 -#, fuzzy -msgid "Sorry, you can not log in with Facebook. Please try again later." -msgstr "Er was een probleem bij het tonen van deze pagina. Probeer het later nog eens." - #: templates/web/base/admin/stats.html:64 msgid "Start Date:" msgstr "Startdatum:" @@ -2743,7 +2675,7 @@ msgstr "Startdatum:" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/report/update/form_update.html:32 +#: templates/web/base/report/update/form_update.html:34 msgid "State" msgstr "Staat" @@ -2756,7 +2688,7 @@ msgstr "Staat" msgid "State:" msgstr "Staat:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2796,10 +2728,10 @@ msgid "Subject:" msgstr "Onderwerp:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/base/report/new/form_user_loggedout_by_email.html:39 #: templates/web/base/report/new/form_user_loggedout_password.html:11 -#: templates/web/zurich/report/new/fill_in_details_form.html:96 +#: templates/web/zurich/report/new/fill_in_details_form.html:98 msgid "Submit" msgstr "Opslaan" @@ -2827,9 +2759,8 @@ msgstr "Vragenlijst opslaan" msgid "Submitted" msgstr "Opgeslagen" -#: templates/web/base/alert/updates.html:17 +#: templates/web/base/alert/updates.html:23 #: templates/web/base/report/display_tools.html:41 -#: templates/web/fixmystreet/alert/updates.html:23 msgid "Subscribe" msgstr "" @@ -2837,7 +2768,7 @@ msgstr "" msgid "Subscribe me to an email alert" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -2856,7 +2787,7 @@ msgstr "Samenvatting" msgid "Summary reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 msgid "Survey" msgstr "" @@ -2913,7 +2844,7 @@ msgstr "" msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:157 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" @@ -2921,7 +2852,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:126 +#: perllib/FixMyStreet/App/Controller/Location.pm:127 msgid "That location does not appear to be in the UK; please try again." msgstr "" @@ -2931,11 +2862,11 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "De postcode is niet geldig." -#: perllib/FixMyStreet/App/Controller/Admin.pm:724 +#: perllib/FixMyStreet/App/Controller/Admin.pm:722 msgid "That problem has been marked as sent." msgstr "Het probleem is gemarkeerd als verzonden." -#: perllib/FixMyStreet/App/Controller/Admin.pm:716 +#: perllib/FixMyStreet/App/Controller/Admin.pm:714 msgid "That problem will now be resent." msgstr "Het probleem wordt opnieuw verzonden." @@ -2947,7 +2878,7 @@ msgstr "" msgid "That report has been removed from FixMyStreet." msgstr "" -#: templates/web/base/admin/body.html:144 +#: templates/web/base/admin/body.html:142 msgid "" "The <strong>email address</strong> is the destination to which reports about this category will be sent. \n" " Other categories for this body may have the same email address." @@ -3087,9 +3018,9 @@ msgstr "Er was een probleem bij het tonen van de Alle Meldingen pagina. Probeer 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:764 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:753 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 -#: templates/web/base/auth/general.html:43 +#: templates/web/base/auth/general.html:53 #: 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." @@ -3150,9 +3081,9 @@ msgstr "Deze e-mail is naar meerdere contactpersonen gestuurd die mogelijk geïn 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:920 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:898 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:935 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:977 #: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "Deze informatie is verplicht" @@ -3165,11 +3096,11 @@ msgstr "Dit is een ontwikkelingssite; er kunnen mogelijk problemen optreden, en msgid "This is a summary of all reports on this site." msgstr "Dit is een samenvatting van alle meldingen op deze site." -#: templates/web/base/report/update/form_update.html:52 +#: templates/web/base/report/update/form_update.html:54 msgid "This problem has been fixed" msgstr "Dit probleem is opgelost" -#: templates/web/base/report/update/form_update.html:46 +#: templates/web/base/report/update/form_update.html:48 msgid "This problem has not been fixed" msgstr "Dit probleem is niet opgelost" @@ -3206,7 +3137,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/App/Controller/Admin.pm:1287 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Tijdslijn" @@ -3251,8 +3182,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Unable to fix" msgstr "" @@ -3269,7 +3200,7 @@ msgstr "" msgid "Unknown" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:173 +#: perllib/FixMyStreet/App/Controller/Rss.pm:174 msgid "Unknown alert type" msgstr "" @@ -3284,7 +3215,7 @@ msgstr "" msgid "Unknown problem ID" msgstr "" -#: templates/web/base/report/update/form_update.html:25 +#: templates/web/base/report/update/form_update.html:27 msgid "Update" msgstr "" @@ -3336,10 +3267,10 @@ msgstr "" msgid "Updated" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 -#: perllib/FixMyStreet/App/Controller/Admin.pm:821 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1096 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1144 +#: perllib/FixMyStreet/App/Controller/Admin.pm:809 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3366,7 +3297,7 @@ msgstr "" msgid "Updates to this problem, %s" msgstr "" -#: templates/web/base/admin/body.html:182 +#: templates/web/base/admin/body.html:180 msgid "Use the <strong>note</strong> to record details that are only displayed in the admin. Notes are not shown publicly, and are not sent to the body." msgstr "" @@ -3375,11 +3306,11 @@ msgstr "" msgid "Used map" msgstr "Gebruikte kaart" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1421 msgid "User flagged" msgstr "" @@ -3387,16 +3318,16 @@ msgstr "" msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "Gebruikers" -#: perllib/FixMyStreet/App/Controller/Admin.pm:382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:412 -#: perllib/FixMyStreet/App/Controller/Admin.pm:429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:380 +#: perllib/FixMyStreet/App/Controller/Admin.pm:410 +#: perllib/FixMyStreet/App/Controller/Admin.pm:427 msgid "Values updated" msgstr "" @@ -3433,16 +3364,15 @@ msgstr "" #: templates/web/base/auth/general.html:6 #: templates/web/base/report/display.html:27 #: templates/web/base/report/new/oauth_email_form.html:5 -#, fuzzy msgid "We need your email address, please give it below." -msgstr "(we zullen je telefoonnummer of e-mailadres niet tonen)" +msgstr "" #: templates/web/base/report/new/form_user_loggedout_email.html:2 #: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedin.html:30 #: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "" @@ -3451,7 +3381,7 @@ msgstr "" 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 "" -#: templates/web/base/index-steps.html:31 +#: templates/web/base/index-steps.html:11 msgid "We send it to the council on your behalf" msgstr "" @@ -3489,10 +3419,6 @@ msgstr "" msgid "Whoa there Testino! Three photos are enough." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 -msgid "Whole block of empty flats" -msgstr "" - #: templates/web/base/tokens/confirm_alert.html:7 msgid "Why stop there? <a href=\"/alert\">Set up more alerts</a> for free." msgstr "" @@ -3512,7 +3438,7 @@ msgstr "" msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "" -#: templates/web/base/questionnaire/index.html:96 +#: templates/web/base/questionnaire/index.html:97 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "" @@ -3542,8 +3468,8 @@ msgstr "Jaar" #: templates/web/base/admin/update_edit.html:24 #: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 +#: templates/web/base/questionnaire/index.html:100 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "Ja" @@ -3657,19 +3583,19 @@ msgid "Your Reports" msgstr "Jouw meldingen" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/alert/updates.html:19 +#: templates/web/base/alert/updates.html:22 #: templates/web/base/contact/index.html:83 #: templates/web/base/report/display_tools.html:38 #: templates/web/base/report/display_tools.html:40 #: templates/web/base/report/new/form_user_loggedin.html:3 #: templates/web/base/report/new/form_user_loggedout_email.html:1 #: templates/web/base/report/update/form_user_loggedout_email.html:1 -#: templates/web/fixmystreet/alert/updates.html:19 -#: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/zurich/report/new/fill_in_details_form.html:76 +#: templates/web/zurich/report/new/fill_in_details_form.html:78 msgid "Your email" msgstr "Jouw e-mail" -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/general.html:55 #: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 @@ -3680,17 +3606,17 @@ msgstr "Jouw e-mailadres" msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "Je informatie wordt alleen gebruikt zoals vermeld in onze <a href=\"/privacy\">privacy policy</a>" -#: templates/web/base/auth/general.html:90 +#: templates/web/base/auth/general.html:100 #: templates/web/base/contact/index.html:76 #: templates/web/base/report/new/form_user_loggedin.html:18 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17 -#: templates/web/base/report/update/form_name.html:11 +#: templates/web/base/report/update/form_name.html:12 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:86 +#: templates/web/zurich/report/new/fill_in_details_form.html:88 msgid "Your name" msgstr "Jouw naam" -#: templates/web/base/auth/general.html:75 +#: templates/web/base/auth/general.html:85 #: 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 @@ -3703,20 +3629,19 @@ msgstr "Je wachtwoord is gewijzigd" #: templates/web/base/report/new/form_user_loggedin.html:27 #: templates/web/base/report/new/form_user_loggedout_by_email.html:26 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:94 msgid "Your phone number" msgstr "Je telefoonnummer" #: templates/web/base/questionnaire/index.html:14 -#, fuzzy msgid "Your report" -msgstr "Jouw meldingen" +msgstr "" -#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 +#: templates/web/base/footer.html:29 msgid "Your reports" msgstr "Jouw meldingen" -#: templates/web/base/my/my.html:41 +#: templates/web/base/my/my.html:39 msgid "Your updates" msgstr "Jouw updates" @@ -3742,7 +3667,7 @@ msgid "didn't use map" msgstr "kaart niet gebruikt" #: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/around/postcode_form.html:12 msgid "e.g. ‘%s’ or ‘%s’" msgstr "bv. '%s' of '%s'" @@ -3848,8 +3773,7 @@ msgstr "" msgid "reopened" msgstr "" -#: templates/web/base/header.html:33 templates/web/fixmystreet/header.html:64 -#: templates/web/zurich/footer.html:13 +#: templates/web/base/header.html:64 templates/web/zurich/footer.html:13 msgid "sign out" msgstr "" @@ -3927,7 +3851,7 @@ msgid_plural "<big>%s</big> updates on reports" msgstr[0] "" msgstr[1] "" -#: templates/web/emptyhomes/report/new/councils_text_none.html:3 +#: templates/web/base/report/new/councils_text_none.html:3 #, perl-format msgid "We do not yet have details for the council that covers this location." msgid_plural "We do not yet have details for the councils that cover this location." @@ -3969,68 +3893,41 @@ msgid_plural "We do <strong>not</strong> yet have details for the other councils msgstr[0] "" msgstr[1] "" -#~ msgid "(we never show your email)" -#~ msgstr "(we zullen je e-mailadres niet tonen)" - -#~ msgid "<strong>No</strong>, let me confirm my report by email:" -#~ msgstr "<strong>Nee</strong> Laat me mijn melding per e-mail bevestigen" - -#~ msgid "<strong>No</strong>, let me confirm my update by email:" -#~ msgstr "<strong>Nee</strong> Laat me mijn update per e-mail bevestigen" - -#~ msgid "Email me updates" -#~ msgstr "Email me updates" - -#~ msgid "Enter a new password:" -#~ msgstr "Geef nieuw wachtwoord:" - -#~ msgid "I'm afraid we couldn't validate that token. If you've copied the URL from an email, please check that you copied it exactly.\n" -#~ msgstr "Ik ben bang dat we je token niet kunnen valideren. Als je de URL uit een e-mail hebt gekopieerd kan je controleren of je hem volledig hebt gekopieerd.\n" - -#~ msgid "If you use web-based email or have 'junk mail' filters, you may wish to check your bulk/spam mail folders: sometimes, our messages are marked that way." -#~ msgstr "Als je een gratis e-mailadres of spamfilter hebt kan het voorkomen dat deze de e-mail tegenhoud. " - -#~ msgid "Message:" -#~ msgstr "Bericht:" - -#~ msgid "More problems nearby" -#~ msgstr "Meer problemen dichtbij" - -#~ msgid "Nearly Done! Now check your email..." -#~ msgstr "Bijna klaar! Kijk nu in je e-mail..." +#~ msgid "%s, reported at %s" +#~ msgstr "%s, gemeld aan %s" -#~ msgid "Offensive? Unsuitable? Tell us" -#~ msgstr "Beledigend? Ongeschikt? Meld het ons" +#~ msgid "About us" +#~ msgstr "Over ons" -#~ msgid "Photo:" -#~ msgstr "Foto:" +#~ msgid "Email me new local problems" +#~ msgstr "Email me nieuwe lokale meldingen" -#~ msgid "Please check your email" -#~ msgstr "Controleer je e-mail" +#~ msgid "Empty flat or maisonette" +#~ msgstr "Lege flat of maisonette" -#~ msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" -#~ msgstr "Let op, updates worden niet aan de gemeente verzonden. Als je je naam achterlaat zal het publiekelijk getoond worden. Jouw gegevens worden alleen gebruikt volgens de vermeldingen van onze <a href=\"/faq#privacy\">privacy policy</a>" +#~ msgid "Empty house or bungalow" +#~ msgstr "Leeg huis of bungalow" -#~ msgid "This problem has been closed" -#~ msgstr "Dit probleem is gesloten" +#~ msgid "Empty office or other commercial" +#~ msgstr "Leeg kantoor of ander commercieel" -#~ msgid "This problem is in progress" -#~ msgstr "Aan dit probleem wordt gewerkt" +#~ msgid "Empty pub or bar" +#~ msgstr "Lege kroeg of bar" -#~ msgid "This problem is old and of unknown status." -#~ msgstr "Dit probleem is oud, en de status is onbekend." +#~ msgid "Empty public building - school, hospital, etc." +#~ msgstr "Leeg publiek gebouw - school, ziekenhuis etc." -#~ msgid "You have already attached a photo to this report, attaching another one will replace it." -#~ msgstr "Je hebt al een foto toegevoegd aan deze melding, als je nog een foto toevoegt overschrijft deze die." +#~ msgid "FixMyStreet" +#~ msgstr "FixMyStreet" -#~ msgid "You have already attached a photo to this update, attaching another one will replace it." -#~ msgstr "Je hebt al een foto toegevoegd aan deze update, als je nog een foto toevoegt overschrijft deze die." +#~ msgid "I am afraid you cannot confirm unconfirmed reports." +#~ msgstr "Ik ben bang dat je geen ongeverifieerde meldingen kunt bevestigen." -#~ msgid "Your email:" -#~ msgstr "Jouw e-mail:" +#~ msgid "Problems in this area" +#~ msgstr "Problemen in dit gebied" -#~ msgid "Your name:" -#~ msgstr "Jouw naam:" +#~ msgid "Property type:" +#~ msgstr "Pand soort:" -#~ msgid "Your email:" -#~ msgstr "Jouw e-mail" +#~ msgid "RSS feed of problems in this %s" +#~ msgstr "RSS feed van problemen in dit %s" diff --git a/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po index af7a6fe98..bc6b0ffb8 100644 --- a/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2016-03-02 13:09+0000\n" -"PO-Revision-Date: 2015-10-23 16:36+0000\n" +"POT-Creation-Date: 2016-05-03 10:41+0100\n" +"PO-Revision-Date: 2016-03-23 12:43+0000\n" "Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/mysociety/fixmystreet/language/nn_NO/)\n" "Language: nn_NO\n" @@ -21,7 +21,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/DB/Result/Problem.pm:618 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr " og " @@ -90,7 +90,7 @@ msgstr "%s aktive oppdateringar" msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "%s spørjeskjema sendt – %s svart (%s%%)" -#: perllib/FixMyStreet/DB/Result/Problem.pm:683 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "%s ref: %s" msgstr "%s ref: %s" @@ -109,10 +109,6 @@ msgstr "" msgid "%s ward, %s" msgstr "%s bydel, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:552 -msgid "%s, reported at %s" -msgstr "" - #: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "%s, innanfor bydelen %s" @@ -167,7 +163,7 @@ msgstr "(som tagging, søppel, hol i vegen, eller øydelagte gatelys)" msgid "(not sent to council)" msgstr "(ikkje rapportert til administrasjonen)" -#: templates/web/zurich/report/new/fill_in_details_form.html:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "(optional)" msgstr "(valfritt)" @@ -179,12 +175,11 @@ msgstr "" msgid "(sent to both)" msgstr "(sendt til begge)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Vel ein kategori --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Vel ein eigedomstype --" @@ -216,26 +211,21 @@ msgstr "" msgid "<strong>No</strong> Let me confirm my update by email" msgstr "" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:97 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "" -#: templates/web/base/auth/general.html:70 +#: templates/web/base/auth/general.html:80 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Ja</strong>, eg har eit passord" -#: templates/web/base/about/about-en-gb.html:1 -#: templates/web/base/about/about-en-gb.html:3 -msgid "About us" -msgstr "Om oss" - #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Action Scheduled" msgstr "" @@ -266,7 +256,7 @@ msgstr "Legg til ny kategori" msgid "Add user" msgstr "" -#: templates/web/base/my/my.html:56 +#: templates/web/base/my/my.html:54 msgid "Added %s" msgstr "La til %s" @@ -286,7 +276,7 @@ msgstr "Varsel %d oppretta for %s, type %s, parameter %s / %s" msgid "Alert %d disabled (created %s)" msgstr "Varsel %d kobla ut (oppretta %s)" -#: templates/web/base/report/update/form_name.html:20 +#: templates/web/base/report/update/form_name.html:21 msgid "Alert me to future updates" msgstr "Send meg varsel ved framtidige oppdateringar" @@ -299,7 +289,7 @@ msgstr "" msgid "All Reports as CSV" msgstr "" -#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 +#: templates/web/base/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:20 @@ -398,7 +388,7 @@ msgstr "" msgid "Ban email address" msgstr "Bannlys e-postadresse" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1273 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -429,7 +419,7 @@ msgstr "" #: templates/web/base/admin/body.html:68 #: templates/web/base/admin/index.html:54 -#: templates/web/base/report/new/category.html:10 +#: templates/web/base/report/new/category.html:7 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 @@ -444,7 +434,7 @@ msgstr "Kategori" msgid "Category fix rate for problems > 4 weeks old" msgstr "Løysingsrate fordelt pÃ¥ kategori for problem > 4 veker gamle" -#: templates/web/base/admin/body.html:138 +#: templates/web/base/admin/body.html:137 #: templates/web/base/admin/category_edit.html:23 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/admin/body.html:43 @@ -464,19 +454,19 @@ msgstr "Kategori: %s" msgid "Change password" msgstr "Byt passord" -#: templates/web/base/admin/body.html:160 +#: templates/web/base/admin/body.html:158 msgid "" "Check <strong>confirmed</strong> to indicate that this contact has been confirmed as correct.\n" " If you are not sure of the origin or validity of the contact, leave this unchecked." msgstr "" -#: templates/web/base/admin/body.html:171 +#: templates/web/base/admin/body.html:169 msgid "" "Check <strong>deleted</strong> to remove the category from use. \n" " It will not appear as an available category in the drop-down menu on the report-a-problem page." msgstr "" -#: templates/web/base/admin/body.html:191 +#: templates/web/base/admin/body.html:189 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -487,7 +477,7 @@ msgid "" " at a specific address." msgstr "" -#: templates/web/base/admin/body.html:130 +#: templates/web/base/admin/body.html:129 msgid "" "Choose a <strong>category</strong> 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." @@ -528,8 +518,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:15 #: templates/web/base/admin/report_blocks.html:25 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 @@ -538,7 +528,7 @@ msgstr "" msgid "Closed" msgstr "Lukka" -#: perllib/FixMyStreet/DB/Result/Problem.pm:779 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Closed by council" msgstr "(ikkje rapportert til administrasjonen)" @@ -564,7 +554,7 @@ msgstr "Data om merkevaresamarbeid:" msgid "Cobrand:" msgstr "Merkevaresamarbeid:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "" @@ -594,7 +584,7 @@ msgstr "" msgid "Confirmation" msgstr "Stadfesting" -#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:164 #: templates/web/base/admin/body.html:79 #: templates/web/base/admin/category_edit.html:37 #: templates/web/base/admin/category_edit.html:92 @@ -613,7 +603,7 @@ msgid "Confirmed:" msgstr "Stadfesta:" #. ("%s is the site name") -#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 +#: templates/web/base/about/_sidebar.html:6 msgid "Contact %s" msgstr "" @@ -632,8 +622,8 @@ msgstr "Kontakt prosjektgruppa" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1417 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1445 msgid "Could not find user" msgstr "Kunne ikkje finna brukaren" @@ -651,7 +641,7 @@ msgstr "Administrasjon" msgid "Council contacts for %s" msgstr "Administrasjonskontaktar for %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:681 +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "Council ref: %s" msgstr "" @@ -670,7 +660,7 @@ msgstr "Mengd" msgid "Create a report" msgstr "Lag ein rapport" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "Lag kategori" @@ -714,20 +704,20 @@ msgstr "" msgid "Dealt with by subdivision within 5 working days" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:877 +#: perllib/FixMyStreet/App/Controller/Admin.pm:865 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:175 #: templates/web/base/admin/body.html:81 #: templates/web/base/admin/category_edit.html:42 #: templates/web/base/admin/category_edit.html:93 msgid "Deleted" msgstr "Sletta" -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:47 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -735,7 +725,7 @@ msgid "Description" msgstr "" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:68 +#: templates/web/zurich/report/new/fill_in_details_form.html:70 msgid "Details" msgstr "" @@ -760,11 +750,11 @@ msgid "Diligency prize league table" msgstr "Arbeidshestar" #. ("%s is the site name") -#: templates/web/base/auth/general.html:48 -#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/auth/general.html:58 +#: templates/web/base/report/new/form_user_loggedout.html:28 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout.html:17 +#: templates/web/base/report/update/form_user_loggedout.html:27 msgid "Do you have a %s password?" msgstr "" @@ -782,8 +772,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "Duplicate" msgstr "" @@ -803,7 +793,7 @@ msgstr "" msgid "Edit" msgstr "Rediger" -#: templates/web/base/admin/body.html:220 +#: templates/web/base/admin/body.html:218 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "" @@ -833,7 +823,7 @@ msgstr "Oppdatert av" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:39 +#: templates/web/base/auth/general.html:49 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -841,11 +831,11 @@ msgstr "Oppdatert av" msgid "Email" msgstr "E-post" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 msgid "Email added to abuse list" msgstr "E-post lagd til misbrukliste" -#: templates/web/base/admin/body.html:155 +#: templates/web/base/admin/body.html:153 msgid "Email address:" msgstr "" @@ -857,19 +847,14 @@ msgstr "" msgid "Email alert deleted" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1390 msgid "Email already in abuse list" msgstr "E-post allereie i misbruklista" -#: templates/web/base/around/_updates.html:5 -msgid "Email me new local problems" -msgstr "Send meg e-post om lokale problem" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 -#: templates/web/base/alert/updates.html:13 #: templates/web/zurich/admin/body.html:47 msgid "Email:" msgstr "E-post:" @@ -878,26 +863,6 @@ msgstr "E-post:" msgid "Email: %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 -msgid "Empty flat or maisonette" -msgstr "Tom leilegheit" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 -msgid "Empty house or bungalow" -msgstr "Tomt hus eller bungalow" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 -msgid "Empty office or other commercial" -msgstr "Tomt kontor eller forretningsbygg" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 -msgid "Empty pub or bar" -msgstr "Tom pub eller bar" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 -msgid "Empty public building - school, hospital, etc." -msgstr "Tom offentleg bygning – skule, sjukehus, osb." - #: templates/web/base/admin/body-form.html:162 #: templates/web/base/admin/body-form.html:163 msgid "" @@ -941,18 +906,14 @@ msgstr "Skriv inn postnummer i nærleiken, eller vegnamn og stad" msgid "Enter a nearby street name and area" msgstr "" -#: perllib/FixMyStreet/Cobrand/ZeroTB.pm:7 -msgid "Enter a nearby street name and area, postal code or district in Delhi" -msgstr "" - -#: templates/web/base/auth/general.html:99 +#: templates/web/base/auth/general.html:109 #: templates/web/base/report/new/form_user_loggedout_by_email.html:38 #: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Enter a password" -#: templates/web/base/index-steps.html:26 +#: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "Legg inn detaljar om problemet" @@ -978,7 +939,7 @@ msgstr "Postnummerdøme %s" msgid "Examples:" msgstr "Døme:" -#: templates/web/base/report/new/form_report.html:49 +#: templates/web/base/report/new/form_report.html:51 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "" @@ -1015,19 +976,15 @@ msgstr "Første gong" msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." msgstr "" -#: templates/web/base/header.html:26 -msgid "FixMyStreet" -msgstr "" - #: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:38 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:40 msgid "Fixed" msgstr "Løyst" @@ -1054,7 +1011,7 @@ msgstr "" msgid "Flag user" msgstr "Flagg brukar" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "Flagga:" @@ -1076,8 +1033,7 @@ msgstr "" msgid "Flagged:" msgstr "Flagga:" -#: templates/web/base/reports/_ward-list.html:3 -#: templates/web/fixmystreet/reports/_ward-list.html:4 +#: templates/web/base/reports/_ward-list.html:4 msgid "Follow a ward link to view only reports within that ward." msgstr "Følg ei bydellenkje for Ã¥ berre sjÃ¥ rapportar innanfor den bydelen." @@ -1108,18 +1064,18 @@ msgstr "Ofte spurde spurnader" msgid "GeoRSS on Google Maps" msgstr "GeoRSS pÃ¥ Google Maps" +#: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:11 -#: templates/web/fixmystreet/around/_updates.html:3 msgid "Get updates" msgstr "" -#: templates/web/fixmystreet/reports/_rss.html:3 -#: templates/web/fixmystreet/reports/_rss.html:9 +#: templates/web/base/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:9 msgid "Get updates of %s problems" msgstr "" -#: templates/web/fixmystreet/reports/_rss.html:11 -#: templates/web/fixmystreet/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:11 +#: templates/web/base/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "" @@ -1132,7 +1088,7 @@ msgid "Glad to hear it’s been fixed!" msgstr "" #: templates/web/base/alert/index.html:34 -#: templates/web/base/around/postcode_form.html:16 +#: templates/web/base/around/postcode_form.html:13 #: templates/web/base/reports/_list-filters.html:28 #: templates/web/zurich/admin/stats.html:26 msgid "Go" @@ -1158,7 +1114,7 @@ msgstr "Har dette problemet vorte løyst?" msgid "Have you ever reported a problem to a council before, or is this your first time?" msgstr "Har du rapportert eit problem til ein administrasjon før, eller er dette første gongen?" -#: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:38 +#: templates/web/base/footer.html:38 #: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 @@ -1169,8 +1125,7 @@ msgstr "Hjelp" msgid "Here are the types of local problem alerts for ‘%s’." msgstr "Her er dei ulike typane lokale problemvarsel for «%s»." -#: templates/web/base/header.html:32 templates/web/fixmystreet/header.html:63 -#: templates/web/zurich/footer.html:12 +#: templates/web/base/header.html:63 templates/web/zurich/footer.html:12 msgid "Hi %s" msgstr "" @@ -1186,11 +1141,11 @@ msgstr "" msgid "Hidden" msgstr "Skjult" -#: templates/web/base/around/display_location.html:65 +#: templates/web/base/around/display_location.html:64 msgid "Hide old" msgstr "" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:59 msgid "Hide pins" msgstr "Skjul nÃ¥ler" @@ -1210,10 +1165,6 @@ msgstr "Korleis rapportera eit problem" msgid "How to send successful reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:752 -msgid "I am afraid you cannot confirm unconfirmed reports." -msgstr "Eg er redd du ikkje kan stadfesta ustadfesta rapportar." - #: templates/web/base/tokens/confirm_problem.html:23 #: templates/web/base/tokens/confirm_problem.html:27 msgid "I just reported a problem on @fixmystreet" @@ -1224,7 +1175,7 @@ msgstr "" msgid "I just updated a problem on @fixmystreet" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88 msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "Eg er redd vi ikkje klarte Ã¥ finna problemet ditt i databasen.\n" @@ -1246,7 +1197,7 @@ msgid "" " For basic installations, you don't need to join bodies in this way." msgstr "" -#: templates/web/base/admin/body.html:133 +#: templates/web/base/admin/body.html:132 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." @@ -1267,7 +1218,7 @@ msgid "" "(please note it will not be sent to the council)." msgstr "" -#: templates/web/base/admin/body.html:149 +#: templates/web/base/admin/body.html:147 msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." msgstr "" @@ -1302,10 +1253,10 @@ msgstr "Ugyldig ID" msgid "Illegal feed selection" msgstr "Ugyldig val av straum" +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "In Progress" msgstr "Under arbeid" @@ -1356,7 +1307,7 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "Ugyldig agency_responsible-verdi %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 msgid "Invalid end date" msgstr "Ugyldig slutt-dato" @@ -1364,16 +1315,16 @@ msgstr "Ugyldig slutt-dato" msgid "Invalid format %s specified." msgstr "Ugyldig format %s oppgjeve." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 msgid "Invalid start date" msgstr "Ugyldig startdato" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:5 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Investigating" msgstr "Undersøkjer" @@ -1395,7 +1346,7 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:80 +#: 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 @@ -1433,7 +1384,6 @@ msgstr "Lastar …" #: 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/fixmystreet/alert/updates.html:1 msgid "Local RSS feeds and email alerts" msgstr "Lokal RSS-straum og e-postvarsel" @@ -1442,11 +1392,11 @@ msgstr "Lokal RSS-straum og e-postvarsel" msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "Lokal RSS-straum og e-postvarsel for «%s»" -#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:35 +#: templates/web/base/footer.html:35 msgid "Local alerts" msgstr "Lokale varsel" -#: templates/web/base/index-steps.html:25 +#: templates/web/base/index-steps.html:5 msgid "Locate the problem on a map of the area" msgstr "Lokaliser problemet pÃ¥ kartet over omrÃ¥det" @@ -1506,14 +1456,14 @@ msgstr "MÃ¥nad" #: templates/web/base/admin/list_updates.html:7 #: templates/web/base/admin/reports.html:13 #: templates/web/base/admin/users.html:15 -#: templates/web/base/auth/general.html:89 +#: templates/web/base/auth/general.html:99 #: templates/web/base/report/new/form_user_loggedin.html:9 #: templates/web/base/report/new/form_user_loggedout_by_email.html:7 -#: templates/web/base/report/update/form_name.html:4 +#: templates/web/base/report/update/form_name.html:5 #: templates/web/base/reports/index.html:20 #: 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:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "Name" msgstr "Namn" @@ -1537,8 +1487,8 @@ 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:455 -#: perllib/FixMyStreet/Cobrand/Default.pm:495 +#: perllib/FixMyStreet/Cobrand/Default.pm:454 +#: perllib/FixMyStreet/Cobrand/Default.pm:494 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" @@ -1560,7 +1510,7 @@ msgstr "" msgid "New body added" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:387 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 msgid "New category contact added" msgstr "Ny kategorikontakt lagt til" @@ -1625,7 +1575,7 @@ msgstr "" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 -#: templates/web/base/questionnaire/index.html:101 +#: templates/web/base/questionnaire/index.html:102 #: templates/web/base/questionnaire/index.html:53 msgid "No" msgstr "Nei" @@ -1690,8 +1640,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Not Responsible" msgstr "" @@ -1724,7 +1674,7 @@ msgstr "Merk" 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/base/admin/body.html:186 +#: templates/web/base/admin/body.html:184 #: templates/web/base/admin/category_edit.html:52 #: templates/web/zurich/admin/body.html:53 msgid "Note:" @@ -1738,15 +1688,15 @@ msgstr "Merk: <strong>%s</strong>" msgid "Notes from SDM to DM" msgstr "" -#: templates/web/base/report/new/form_user_loggedout.html:14 #: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/form_user_loggedout.html:24 #: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "" #: templates/web/base/report/update-form.html:28 -#: templates/web/base/report/update/form_user_loggedout.html:13 #: templates/web/base/report/update/form_user_loggedout.html:2 +#: templates/web/base/report/update/form_user_loggedout.html:23 msgid "Now to submit your update…" msgstr "" @@ -1780,8 +1730,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:23 #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/report/update/form_update.html:36 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1816,13 +1766,13 @@ msgstr "Eller problem meldt til:" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "Eller du kan abonnera pÃ¥ varsel basert pÃ¥ bydel eller administrasjon du høyrer til under:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1055 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 -#: perllib/FixMyStreet/DB/Result/Problem.pm:558 -#: perllib/FixMyStreet/DB/Result/Problem.pm:568 -#: perllib/FixMyStreet/DB/Result/Problem.pm:578 -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1044 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:659 +#: perllib/FixMyStreet/DB/Result/Problem.pm:562 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 +#: perllib/FixMyStreet/DB/Result/Problem.pm:582 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 #: perllib/FixMyStreet/Script/Reports.pm:175 #: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" @@ -1847,7 +1797,7 @@ msgstr "" msgid "Partial" msgstr "Delvis" -#: templates/web/base/auth/general.html:92 +#: templates/web/base/auth/general.html:102 #: templates/web/base/report/new/form_user_loggedout_by_email.html:31 #: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 @@ -1856,7 +1806,7 @@ msgid "Password (optional)" msgstr "" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:72 +#: templates/web/base/auth/general.html:82 msgid "Password:" msgstr "Passord:" @@ -1864,7 +1814,7 @@ msgstr "Passord:" msgid "Permalink" msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:90 msgid "Phone number" msgstr "" @@ -1880,13 +1830,21 @@ msgid "Phone:" msgstr "Telefon:" #: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/questionnaire/index.html:89 +#: templates/web/base/questionnaire/index.html:91 #: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/new/form_report.html:38 +#: templates/web/base/report/new/form_report.html:40 +#: templates/web/base/report/update/form_update.html:20 +#: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:6 #: 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:45 +#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/zurich/report/new/fill_in_details_form.html:63 msgid "Photo" msgstr "" @@ -1910,8 +1868,8 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:955 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:6 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 @@ -1927,16 +1885,16 @@ 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/general.html:27 -#: templates/web/base/auth/general.html:33 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:43 #: 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:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:856 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:921 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -1946,7 +1904,7 @@ msgstr "Vel ein kategori" msgid "Please choose a property type" msgstr "Vel ein type eigenskap" -#: perllib/FixMyStreet/App/Controller/Admin.pm:378 +#: perllib/FixMyStreet/App/Controller/Admin.pm:376 msgid "Please correct the errors below" msgstr "" @@ -1967,11 +1925,10 @@ msgstr "" msgid "Please enter a message" msgstr "Ver venleg og skriv ei melding" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Admin.pm:1079 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 msgid "Please enter a name" -msgstr "Ver venleg og legg inn namnet ditt" +msgstr "" #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 @@ -1985,10 +1942,10 @@ msgstr "Skriv inn eit passord" msgid "Please enter a subject" msgstr "Ver venleg og legg inn eit emne" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1075 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1130 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:133 +#: perllib/FixMyStreet/DB/Result/User.pm:143 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2005,9 +1962,9 @@ msgid "Please enter some details" msgstr "Ver venleg og legg inn opplysningar om problemet" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:130 -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:32 +#: perllib/FixMyStreet/DB/Result/User.pm:140 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:42 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2016,7 +1973,7 @@ msgid "Please enter your email" msgstr "Ver venleg og legg inn e-posten din" #: templates/web/base/report/new/form_user_loggedout_email.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:80 +#: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "Please enter your email address" msgstr "" @@ -2032,7 +1989,7 @@ msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:126 +#: perllib/FixMyStreet/DB/Result/User.pm:136 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "Ver venleg og legg inn namnet ditt" @@ -2059,7 +2016,7 @@ msgstr "" msgid "Please fill in details of the problem below." msgstr "Ver venleg og fyll ut detaljar om problemet under." -#: templates/web/zurich/report/new/fill_in_details_form.html:72 +#: templates/web/zurich/report/new/fill_in_details_form.html:74 msgid "Please fill in details of the problem." msgstr "" @@ -2070,7 +2027,7 @@ msgstr "" "Ver venleg og fyll inn skjemaet under med detaljane om problemet,\n" "og skildra plasseringa sÃ¥ nøyaktig som mogleg i boksen for detaljar." -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Ver venleg og indiker om du ynskjer Ã¥ motta eit nytt spørjeskjema" @@ -2079,9 +2036,8 @@ msgid "Please note that updates are not sent to the council." msgstr "" #: templates/web/base/report/new/oauth_email_form.html:4 -#, fuzzy msgid "Please note your report has <strong>not yet been sent</strong>." -msgstr "Merk at rapporten din <strong>enno ikkje er send</strong. Vel ein kategori og legg til meir informasjon under før du sender inn." +msgstr "" #: templates/web/base/report/new/fill_in_details_form.html:20 #: templates/web/zurich/report/new/fill_in_details_form.html:11 @@ -2097,16 +2053,16 @@ msgstr "" msgid "Please note:" msgstr "Merk:" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please provide some explanation as to why you're reopening this report" msgstr "Ver venleg og bidra med ei forklaring pÃ¥ kvifor du gjenopnar denne problemrapporten" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250 msgid "Please provide some text as well as a photo" msgstr "Ver venleg og bidra med litt tekst i tillegg til eit bilete" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236 msgid "Please say whether you've ever reported a problem to your council before" msgstr "Ver venleg og opplys om du har rapportert eit problem til administrasjonen din tidlegare" @@ -2122,22 +2078,23 @@ msgstr "Vel den kjelda du ynskjer" msgid "Please select the type of alert you want" msgstr "Ver venleg og vel kva for ein type varsel du ynskjer" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232 msgid "Please state whether or not the problem has been fixed" msgstr "Ver venleg og oppgje om dette problemet har vorte fiksa eller ikkje" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:121 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 #: templates/web/base/js/translation_strings.html:53 -msgid "Please upload a JPEG image only" +#, fuzzy +msgid "Please upload an image only" msgstr "Ver venleg og berre last opp JPEG-bilete" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 msgid "Please write a message" msgstr "Skriv inn ei melding" -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Please write your update here" msgstr "" @@ -2168,7 +2125,7 @@ msgstr "" msgid "Previous" msgstr "" -#: templates/web/fixmystreet/footer.html:41 +#: templates/web/base/footer.html:41 msgid "Privacy" msgstr "" @@ -2178,7 +2135,7 @@ msgstr "" msgid "Privacy and cookies" msgstr "" -#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:200 #: templates/web/base/admin/body.html:85 #: templates/web/base/admin/category_edit.html:45 #: templates/web/base/admin/report_edit.html:77 @@ -2207,7 +2164,7 @@ msgstr "Problem %s sendt til administrasjon %s" msgid "Problem breakdown by state" msgstr "Tilstandsfordeling av problem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1046 msgid "Problem marked as open." msgstr "Problem markert som ope." @@ -2219,10 +2176,6 @@ msgstr "Endring av problemtilstand basert pÃ¥ spørjeundersøkingsresultat" msgid "Problems" msgstr "Problem" -#: templates/web/base/around/_updates.html:1 -msgid "Problems in this area" -msgstr "Problem i dette omrÃ¥det" - #: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "" @@ -2240,13 +2193,11 @@ msgid "Problems within %.1fkm of this location" msgstr "Problem innanfor %.1fkm av denne posisjonen" #: perllib/FixMyStreet/Cobrand/Default.pm:663 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 #: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "Problem innanfor %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "Problem innanfor %s bydel" @@ -2265,15 +2216,11 @@ msgstr "Problem innanfor grensene av:" msgid "Property address:" msgstr "" -#: templates/web/base/report/new/category.html:8 -msgid "Property type:" -msgstr "Type eigenskap:" - #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Bidra med ei oppdatering" -#: templates/web/base/auth/general.html:95 +#: templates/web/base/auth/general.html:105 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 "" @@ -2307,16 +2254,15 @@ msgstr "Spørjeskjema %d fylt inn for problem %d, %s til %s" msgid "Questionnaire %d sent for problem %d" msgstr "Spørjeskjema %d sendt for problem %d" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 msgid "Questionnaire filled in by problem reporter" msgstr "Spørjeskjema fylt inn av feilrapportøren" #: templates/web/base/alert/_list.html:22 +#: templates/web/base/alert/updates.html:9 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display_tools.html:34 -#: templates/web/base/reports/_rss.html:1 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed" msgstr "RSS-straum" @@ -2344,18 +2290,12 @@ msgstr "RSS-straum av %s, innanfor %s bydel" msgid "RSS feed of nearby problems" msgstr "RSS-straum med problem i nærleiken" -#: templates/web/base/reports/_rss.html:1 -msgid "RSS feed of problems in this %s" -msgstr "RSS-straum for problem i denne %s-en" - #: perllib/FixMyStreet/Cobrand/Default.pm:664 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 #: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "RSS-straum for problem innanfor %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 #: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "RSS-straum for problem innanfor %s bydel" @@ -2365,14 +2305,13 @@ msgstr "RSS-straum for problem innanfor %s bydel" msgid "RSS feed of recent local problems" msgstr "RSS-straum med nye lokale problem" +#: templates/web/base/alert/updates.html:9 #: templates/web/base/report/display_tools.html:34 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed of updates to this problem" msgstr "RSS-straum med oppdateringar for dette problemet" -#: templates/web/base/alert/updates.html:9 +#: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:36 -#: templates/web/fixmystreet/alert/updates.html:14 msgid "Receive email when updates are left on this problem." msgstr "Motta e-post nÃ¥r det er oppdateringar pÃ¥ dette problemet" @@ -2408,12 +2347,11 @@ msgstr "Fjern bilete (kan ikkje gjerast om!)" msgid "Reply to user:" msgstr "" -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/header_logo.html:2 msgid "Report" msgstr "" -#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:26 -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/footer.html:26 templates/web/base/header_logo.html:2 #: templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2423,7 +2361,7 @@ msgstr "Rapporter eit problem" msgid "Report abuse" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:291 +#: perllib/FixMyStreet/App/Controller/Rss.pm:297 msgid "Report on %s" msgstr "Rapport pÃ¥ %s" @@ -2438,7 +2376,7 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "Rapporter, finn eller diskuter lokale problem" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:577 #: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "Rapportert anonymt %s" @@ -2448,7 +2386,7 @@ msgstr "Rapportert anonymt %s" msgid "Reported before" msgstr "Rapportert tidlegare" -#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 #: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "Publisert av %s %s" @@ -2462,27 +2400,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:569 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 msgid "Reported in the %s category anonymously at %s" msgstr "Rapportert i kategorien %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:591 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 msgid "Reported in the %s category by %s at %s" msgstr "Rapportert i kategorien %s av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported via %s anonymously at %s" msgstr "Publisert av %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported via %s by %s at %s" msgstr "Rapportert av %s av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:561 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 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:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 msgid "Reported via %s in the %s category by %s at %s" msgstr "Rapportert av %s i kategorien %s av %s %s" @@ -2503,7 +2441,7 @@ msgstr "" msgid "Reporting a problem" msgstr "Legger til eit problem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1274 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" @@ -2546,15 +2484,15 @@ msgstr "Vegoperatør for denne namngjevne vegen (utleia frÃ¥ vegreferansenummer msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Vegoperatør for denne namngjevne vegen (frÃ¥ OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1496 #: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 #: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 @@ -2569,7 +2507,7 @@ msgstr "" msgid "Satellite" msgstr "" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/base/admin/category_edit.html:84 #: templates/web/zurich/admin/body.html:59 #: templates/web/zurich/admin/template_edit.html:29 @@ -2625,7 +2563,7 @@ msgstr "" msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:696 +#: perllib/FixMyStreet/DB/Result/Problem.pm:698 msgid "Sent to %s %s later" msgstr "Sendt til %s %s seinare" @@ -2644,21 +2582,21 @@ msgstr "" #: templates/web/base/report/new/form_user_loggedin.html:23 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22 -#: templates/web/base/report/update/form_name.html:15 +#: templates/web/base/report/update/form_name.html:16 msgid "Show my name publicly" msgstr "Vis namnet mitt offentleg" -#: templates/web/base/around/display_location.html:67 +#: templates/web/base/around/display_location.html:66 msgid "Show old" msgstr "" -#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:57 msgid "Show pins" msgstr "Vis nÃ¥ler" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/general.html:110 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:76 +#: templates/web/base/auth/general.html:86 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2717,9 +2655,8 @@ msgstr "Orsak, vi kunne ikkje finna den staden." #: templates/web/base/auth/general.html:9 #: templates/web/base/report/display.html:21 #: templates/web/base/report/new/fill_in_details_form.html:23 -#, fuzzy msgid "Sorry, we could not log you in. Please fill in the form below." -msgstr "Orsak, vi kunne ikkje tolka den posisjonen. Ver venleg og prøv pÃ¥ nytt." +msgstr "" #: perllib/FixMyStreet/Geocode/Bing.pm:35 #: perllib/FixMyStreet/Geocode/Google.pm:45 @@ -2727,15 +2664,10 @@ msgstr "Orsak, vi kunne ikkje tolka den posisjonen. Ver venleg og prøv pÃ¥ nytt msgid "Sorry, we could not parse that location. Please try again." msgstr "Orsak, vi kunne ikkje tolka den posisjonen. Ver venleg og prøv pÃ¥ nytt." -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:138 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 -#, fuzzy -msgid "Sorry, you can not log in with Facebook. Please try again later." -msgstr "Orsak, vi kunne ikkje tolka den posisjonen. Ver venleg og prøv pÃ¥ nytt." - #: templates/web/base/admin/stats.html:64 msgid "Start Date:" msgstr "" @@ -2744,7 +2676,7 @@ msgstr "" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/report/update/form_update.html:32 +#: templates/web/base/report/update/form_update.html:34 msgid "State" msgstr "Tilstand" @@ -2757,7 +2689,7 @@ msgstr "Tilstand" msgid "State:" msgstr "Tilstand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2797,10 +2729,10 @@ msgid "Subject:" msgstr "Emne:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/base/report/new/form_user_loggedout_by_email.html:39 #: templates/web/base/report/new/form_user_loggedout_password.html:11 -#: templates/web/zurich/report/new/fill_in_details_form.html:96 +#: templates/web/zurich/report/new/fill_in_details_form.html:98 msgid "Submit" msgstr "Send inn" @@ -2828,9 +2760,8 @@ msgstr "Send inn spørjeskjema" msgid "Submitted" msgstr "" -#: templates/web/base/alert/updates.html:17 +#: templates/web/base/alert/updates.html:23 #: templates/web/base/report/display_tools.html:41 -#: templates/web/fixmystreet/alert/updates.html:23 msgid "Subscribe" msgstr "Abonner" @@ -2838,7 +2769,7 @@ msgstr "Abonner" msgid "Subscribe me to an email alert" msgstr "Eg ynskjer Ã¥ abonnera pÃ¥ e-postvarsel" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -2857,7 +2788,7 @@ msgstr "Oppsummering" msgid "Summary reports" msgstr "Oppsummeringsrapportar" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 msgid "Survey" msgstr "" @@ -2917,7 +2848,7 @@ msgstr "" msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "Takk, glad for Ã¥ høyra at problemet er løyst! Vi vil gjerne spørja deg om du har rapportert eit problem til ein administrasjon tidlegare?" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:157 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "Biletet ser ikkje ut til Ã¥ ha vorte lasta opp riktig (%s), prøv pÃ¥ nytt." @@ -2925,7 +2856,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:126 +#: perllib/FixMyStreet/App/Controller/Location.pm:127 msgid "That location does not appear to be in the UK; please try again." msgstr "" @@ -2935,11 +2866,11 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "Det postnummeret vart ikkje gjenkjent, orsak." -#: perllib/FixMyStreet/App/Controller/Admin.pm:724 +#: perllib/FixMyStreet/App/Controller/Admin.pm:722 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:716 +#: perllib/FixMyStreet/App/Controller/Admin.pm:714 msgid "That problem will now be resent." msgstr "Det problemet vil no sendast pÃ¥ nytt." @@ -2951,7 +2882,7 @@ msgstr "" msgid "That report has been removed from FixMyStreet." msgstr "Den rapporten har vorte fjerna frÃ¥ FiksGataMi." -#: templates/web/base/admin/body.html:144 +#: templates/web/base/admin/body.html:142 msgid "" "The <strong>email address</strong> is the destination to which reports about this category will be sent. \n" " Other categories for this body may have the same email address." @@ -3091,9 +3022,9 @@ msgstr "Det oppstod problem med Ã¥ visa «Alle rapportar»-sida. Ver venleg og msgid "There was a problem showing this page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:753 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 -#: templates/web/base/auth/general.html:43 +#: templates/web/base/auth/general.html:53 #: 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 "" @@ -3154,9 +3085,9 @@ msgstr "Denne e-posten er sendt til begge administrasjonane som dekkjer staden f 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:920 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:898 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:935 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:977 #: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "Denne informasjonen er pÃ¥kravd" @@ -3169,11 +3100,11 @@ msgstr "Dette er ein utviklarnettstad. Ting kan knekka nÃ¥r som helst og databas msgid "This is a summary of all reports on this site." msgstr "" -#: templates/web/base/report/update/form_update.html:52 +#: templates/web/base/report/update/form_update.html:54 msgid "This problem has been fixed" msgstr "Dette problemet er løyst" -#: templates/web/base/report/update/form_update.html:46 +#: templates/web/base/report/update/form_update.html:48 msgid "This problem has not been fixed" msgstr "Dette problemet har ikkje vorte løyst" @@ -3210,7 +3141,7 @@ msgstr "Denne nettsida inneheld òg eit bilete av problemet, sendt inn av brukar msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Tidslinje" @@ -3255,8 +3186,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Unable to fix" msgstr "" @@ -3273,7 +3204,7 @@ msgstr "Ikkje stadfesta" msgid "Unknown" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:173 +#: perllib/FixMyStreet/App/Controller/Rss.pm:174 msgid "Unknown alert type" msgstr "Ukjend varsel-type" @@ -3288,7 +3219,7 @@ msgstr "" msgid "Unknown problem ID" msgstr "Ukjend problem-ID" -#: templates/web/base/report/update/form_update.html:25 +#: templates/web/base/report/update/form_update.html:27 msgid "Update" msgstr "" @@ -3340,10 +3271,10 @@ msgstr "Oppdater tilstanden" msgid "Updated" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 -#: perllib/FixMyStreet/App/Controller/Admin.pm:821 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1096 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1144 +#: perllib/FixMyStreet/App/Controller/Admin.pm:809 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3370,7 +3301,7 @@ msgstr "Oppdateringar av {{title}}" msgid "Updates to this problem, %s" msgstr "" -#: templates/web/base/admin/body.html:182 +#: templates/web/base/admin/body.html:180 msgid "Use the <strong>note</strong> to record details that are only displayed in the admin. Notes are not shown publicly, and are not sent to the body." msgstr "" @@ -3379,11 +3310,11 @@ msgstr "" msgid "Used map" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 msgid "User flag removed" msgstr "Brukarflagg fjerna" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1421 msgid "User flagged" msgstr "Brukar flagga" @@ -3391,16 +3322,16 @@ msgstr "Brukar flagga" msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "Brukarar" -#: perllib/FixMyStreet/App/Controller/Admin.pm:382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:412 -#: perllib/FixMyStreet/App/Controller/Admin.pm:429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:380 +#: perllib/FixMyStreet/App/Controller/Admin.pm:410 +#: perllib/FixMyStreet/App/Controller/Admin.pm:427 msgid "Values updated" msgstr "Verdi oppdatert" @@ -3437,16 +3368,15 @@ msgstr "Vi fann meir ein eitt treff for den staden. Vi viser opp til ti treff, s #: templates/web/base/auth/general.html:6 #: templates/web/base/report/display.html:27 #: templates/web/base/report/new/oauth_email_form.html:5 -#, fuzzy msgid "We need your email address, please give it below." -msgstr "(vi viser aldri e-postadressa di eller telefonnummeret ditt)" +msgstr "" #: templates/web/base/report/new/form_user_loggedout_email.html:2 #: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedin.html:30 #: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "" @@ -3455,7 +3385,7 @@ msgstr "" 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." -#: templates/web/base/index-steps.html:31 +#: templates/web/base/index-steps.html:11 msgid "We send it to the council on your behalf" msgstr "Vi sender til administrasjon pÃ¥ dine vegner" @@ -3493,10 +3423,6 @@ msgstr "NÃ¥r sendt" msgid "Whoa there Testino! Three photos are enough." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 -msgid "Whole block of empty flats" -msgstr "Heil blokk med tomme leilegheiter" - #: templates/web/base/tokens/confirm_alert.html:7 msgid "Why stop there? <a href=\"/alert\">Set up more alerts</a> for free." msgstr "" @@ -3516,7 +3442,7 @@ msgstr "NÃ¥r du søkjer etter førespurnader, sÃ¥ er det òg mogleg Ã¥ søkja et msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "" -#: templates/web/base/questionnaire/index.html:96 +#: templates/web/base/questionnaire/index.html:97 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "Kunne du tenkja deg Ã¥ motta ein ny førespurnad om 4 veker, som minner deg om Ã¥ sjekka status?" @@ -3546,8 +3472,8 @@ msgstr "Ã…r" #: templates/web/base/admin/update_edit.html:24 #: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 +#: templates/web/base/questionnaire/index.html:100 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "Ja" @@ -3661,19 +3587,19 @@ msgid "Your Reports" msgstr "Rapportane dine" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/alert/updates.html:19 +#: templates/web/base/alert/updates.html:22 #: templates/web/base/contact/index.html:83 #: templates/web/base/report/display_tools.html:38 #: templates/web/base/report/display_tools.html:40 #: templates/web/base/report/new/form_user_loggedin.html:3 #: templates/web/base/report/new/form_user_loggedout_email.html:1 #: templates/web/base/report/update/form_user_loggedout_email.html:1 -#: templates/web/fixmystreet/alert/updates.html:19 -#: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/zurich/report/new/fill_in_details_form.html:76 +#: templates/web/zurich/report/new/fill_in_details_form.html:78 msgid "Your email" msgstr "" -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/general.html:55 #: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 @@ -3684,17 +3610,17 @@ msgstr "" msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "" -#: templates/web/base/auth/general.html:90 +#: templates/web/base/auth/general.html:100 #: templates/web/base/contact/index.html:76 #: templates/web/base/report/new/form_user_loggedin.html:18 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17 -#: templates/web/base/report/update/form_name.html:11 +#: templates/web/base/report/update/form_name.html:12 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:86 +#: templates/web/zurich/report/new/fill_in_details_form.html:88 msgid "Your name" msgstr "" -#: templates/web/base/auth/general.html:75 +#: templates/web/base/auth/general.html:85 #: 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 @@ -3707,20 +3633,19 @@ msgstr "Passordet ditt har vorte endra" #: templates/web/base/report/new/form_user_loggedin.html:27 #: templates/web/base/report/new/form_user_loggedout_by_email.html:26 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:94 msgid "Your phone number" msgstr "" #: templates/web/base/questionnaire/index.html:14 -#, fuzzy msgid "Your report" -msgstr "Oppdateringane dine" +msgstr "" -#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 +#: templates/web/base/footer.html:29 msgid "Your reports" msgstr "Oppdateringane dine" -#: templates/web/base/my/my.html:41 +#: templates/web/base/my/my.html:39 msgid "Your updates" msgstr "Oppdateringane dine" @@ -3746,7 +3671,7 @@ msgid "didn't use map" msgstr "brukte ikkje kart" #: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/around/postcode_form.html:12 msgid "e.g. ‘%s’ or ‘%s’" msgstr "" @@ -3852,8 +3777,7 @@ msgstr "andre omrÃ¥de:" msgid "reopened" msgstr "opna pÃ¥ nytt" -#: templates/web/base/header.html:33 templates/web/fixmystreet/header.html:64 -#: templates/web/zurich/footer.html:13 +#: templates/web/base/header.html:64 templates/web/zurich/footer.html:13 msgid "sign out" msgstr "" @@ -3931,7 +3855,7 @@ msgid_plural "<big>%s</big> updates on reports" msgstr[0] "<big>%s</big> rapportoppdatering" msgstr[1] "<big>%s</big> rapportoppdateringar" -#: templates/web/emptyhomes/report/new/councils_text_none.html:3 +#: templates/web/base/report/new/councils_text_none.html:3 #, perl-format msgid "We do not yet have details for the council that covers this location." msgid_plural "We do not yet have details for the councils that cover this location." @@ -3973,80 +3897,38 @@ msgid_plural "We do <strong>not</strong> yet have details for the other councils msgstr[0] "Vi har enno <strong>ikkje</strong> detaljane for den andre administrasjonen som dekkjer denne staden." msgstr[1] "Vi har enno <strong>ikkje</strong> detaljane for dei andre administrasjonane som dekkjer denne staden." -#~ msgid "(we never show your email)" -#~ msgstr "(vi viser aldri e-postadressa di)" - -#~ msgid "<strong>No</strong>, let me confirm my report by email:" -#~ msgstr "<strong>Nei</strong>, la meg stadfesta rapporten min med e-post:" - -#~ msgid "<strong>No</strong>, let me confirm my update by email:" -#~ msgstr "<strong>Nei</strong>, la meg stadfesta oppdateringa mi med e-post:" - -#~ msgid "Email me updates" -#~ msgstr "Send meg oppdateringar" - -#~ msgid "Enter a new password:" -#~ msgstr "Skriv inn eit nytt passord:" - -#~ msgid "I'm afraid we couldn't validate that token. If you've copied the URL from an email, please check that you copied it exactly.\n" -#~ msgstr "Eg er redd vi ikkje kunne verifisera den referansen. Viss du kopierte nettadressa frÃ¥ ein e-post, sjekk at du har kopiert ho korrekt.\n" - -#~ msgid "If you use web-based email or have 'junk mail' filters, you may wish to check your bulk/spam mail folders: sometimes, our messages are marked that way." -#~ msgstr "Viss du brukar vevbasert e-post eller har filter for søppel-e-post pÃ¥ e-postkontoen din, kan du i visse tilfelle mÃ¥tta sjÃ¥ etter meldingane vÃ¥re der." - -#~ msgid "Message:" -#~ msgstr "Melding:" - -#~ msgid "More problems nearby" -#~ msgstr "Fleire problem i nærleiken" - -#~ msgid "Nearly Done! Now check your email..." -#~ msgstr "Nesten ferdig! No mÃ¥ du sjekka e-posten din …" - -#~ msgid "Offensive? Unsuitable? Tell us" -#~ msgstr "Støytande? Upassende? Sei frÃ¥" - -#~ msgid "Photo:" -#~ msgstr "Bilete:" - -#~ msgid "Please check your email" -#~ msgstr "Ver venleg og sjekk e-posten du oppgav" - -#~ msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" -#~ msgstr "" -#~ "Merk at oppdateringar ikkje vert sende til administrasjonen. Viss du\n" -#~ "legg igjen namnet ditt sÃ¥ vil det vera offentleg tilgjengeleg.\n" -#~ "Informasjonen din vil berre brukast i samsvar med <a href=\"/faq#privacy\">personvernpolicyen vÃ¥r</a>" +#~ msgid "About us" +#~ msgstr "Om oss" -#~ msgid "This problem has been closed" -#~ msgstr "Dette problemet er lukka" +#~ msgid "Email me new local problems" +#~ msgstr "Send meg e-post om lokale problem" -#~ msgid "This problem is in progress" -#~ msgstr "Dette problemet er under arbeid" +#~ msgid "Empty flat or maisonette" +#~ msgstr "Tom leilegheit" -#~ msgid "This problem is old and of unknown status." -#~ msgstr "Dette problemet er gammalt og med ukjend status." +#~ msgid "Empty house or bungalow" +#~ msgstr "Tomt hus eller bungalow" -#~ msgid "Update:" -#~ msgstr "Oppdatering:" +#~ msgid "Empty office or other commercial" +#~ msgstr "Tomt kontor eller forretningsbygg" -#~ msgid "We have sent you an email containing a link to confirm your account." -#~ msgstr "Vi har sendt deg ein epost som inneheld ei lenkje for Ã¥ stadfesta kontoen din." +#~ msgid "Empty pub or bar" +#~ msgstr "Tom pub eller bar" -#~ msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:" -#~ msgstr "Vi ynskjer Ã¥ fÃ¥ tilbakemelding frÃ¥ deg om kva du meiner om denne tenesta. Berre fyll ut skjemaet, eller send ein e-post <a href='mailto:%s'>%s</a>:" +#~ msgid "Empty public building - school, hospital, etc." +#~ msgstr "Tom offentleg bygning – skule, sjukehus, osb." -#~ msgid "You have already attached a photo to this report, attaching another one will replace it." -#~ msgstr "Du har allereie lagt ved eit bilete til dette problemet. Ã… leggja ved eit anna vil byta ut dette." +#~ msgid "I am afraid you cannot confirm unconfirmed reports." +#~ msgstr "Eg er redd du ikkje kan stadfesta ustadfesta rapportar." -#~ msgid "You have already attached a photo to this update, attaching another one will replace it." -#~ msgstr "Du har allereie lagt ved eit bilete til denne oppdateringa. Ã… leggja ved eit anna vil byta ut dette." +#~ msgid "Problems in this area" +#~ msgstr "Problem i dette omrÃ¥det" -#~ msgid "Your email:" -#~ msgstr "E-posten din" +#~ msgid "Property type:" +#~ msgstr "Type eigenskap:" -#~ msgid "Your name:" -#~ msgstr "Namnet ditt:" +#~ msgid "RSS feed of problems in this %s" +#~ msgstr "RSS-straum for problem i denne %s-en" -#~ msgid "Your email:" -#~ msgstr "E-posten din:" +#~ msgid "Whole block of empty flats" +#~ msgstr "Heil blokk med tomme leilegheiter" diff --git a/locale/pt.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/pt.UTF-8/LC_MESSAGES/FixMyStreet.po index f4bac2de7..690899603 100644 --- a/locale/pt.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/pt.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -4,17 +4,17 @@ # Matthew Somerville <matthew@mysociety.org>, 2011-06-03. # # Translators: +# daey <netrapida@live.com.pt>, 2016 # francisco oliveira martins <francisco.martins@recortes.cv>, 2013 # mySociety <transifex@mysociety.org>, 2013 -# daey <netrapida@live.com.pt>, 2016 # simaor <simaor@hotmail.com>, 2016 msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2016-03-02 13:09+0000\n" -"PO-Revision-Date: 2016-02-15 16:12+0000\n" -"Last-Translator: daey <netrapida@live.com.pt>\n" +"POT-Creation-Date: 2016-05-03 10:41+0100\n" +"PO-Revision-Date: 2016-03-23 12:44+0000\n" +"Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: Portuguese (http://www.transifex.com/mysociety/fixmystreet/language/pt/)\n" "Language: pt\n" "MIME-Version: 1.0\n" @@ -22,7 +22,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/DB/Result/Problem.pm:618 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr "e" @@ -55,9 +55,8 @@ msgid "%s admin:" msgstr "" #: templates/web/base/status/stats.html:26 -#, fuzzy msgid "%s bodies" -msgstr "Corpos" +msgstr "" #: templates/web/base/status/stats.html:24 msgid "%s confirmed alerts, %s unconfirmed" @@ -92,7 +91,7 @@ msgstr "%s atualizações directas" msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "%s questionários enviados - %s respondeu (%s%%)" -#: perllib/FixMyStreet/DB/Result/Problem.pm:683 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "%s ref: %s" msgstr "%s ref: %s" @@ -111,10 +110,6 @@ msgstr "" msgid "%s ward, %s" msgstr "%s ala, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:552 -msgid "%s, reported at %s" -msgstr "%s, reportou em %s" - #: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "%s, %s dentro da ala" @@ -169,7 +164,7 @@ msgstr "(Como ruas e pavimentos esburacados, grafits, arvores caidas, lajes par msgid "(not sent to council)" msgstr "(Não reportar ao conselho)" -#: templates/web/zurich/report/new/fill_in_details_form.html:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "(optional)" msgstr "(opcional)" @@ -181,12 +176,11 @@ msgstr "(público)" msgid "(sent to both)" msgstr "(remeter para ambos)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Escolha uma categoria --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Escolha um tipo de categoria --" @@ -218,26 +212,21 @@ msgstr "<strong> Não </strong> Deixe-me confirmar o meu relatório por e-mail" msgid "<strong>No</strong> Let me confirm my update by email" msgstr "<strong> Não </strong> Deixe-me confirmar a minha atualização por e-mail" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:97 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "<strong> Não </strong>, deixe-me entrar por e-mail" -#: templates/web/base/auth/general.html:70 +#: templates/web/base/auth/general.html:80 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong> Sim </strong> Eu tenho password" -#: templates/web/base/about/about-en-gb.html:1 -#: templates/web/base/about/about-en-gb.html:3 -msgid "About us" -msgstr "Acerca de nós" - #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Action Scheduled" msgstr "Ação Programada" @@ -268,7 +257,7 @@ msgstr "Adicionar nova categoria" msgid "Add user" msgstr "Adicionar user" -#: templates/web/base/my/my.html:56 +#: templates/web/base/my/my.html:54 msgid "Added %s" msgstr "Adicionado %s" @@ -288,7 +277,7 @@ msgstr "Alerta %d criado por %s, tipo %s, os parâmetros %s / %s" msgid "Alert %d disabled (created %s)" msgstr "Alerta %d desativada (criado %s)" -#: templates/web/base/report/update/form_name.html:20 +#: templates/web/base/report/update/form_name.html:21 msgid "Alert me to future updates" msgstr "Avise-me de atualizações futuras" @@ -301,7 +290,7 @@ msgstr "Todos os Relatórios" msgid "All Reports as CSV" msgstr "" -#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 +#: templates/web/base/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:20 @@ -400,7 +389,7 @@ msgstr "Voltar" msgid "Ban email address" msgstr "Ban endereço de e-mail" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1273 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -431,7 +420,7 @@ msgstr "Não pode ver a localizaçao no mapa <em> Salte esta etapa </em>" #: templates/web/base/admin/body.html:68 #: templates/web/base/admin/index.html:54 -#: templates/web/base/report/new/category.html:10 +#: templates/web/base/report/new/category.html:7 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 @@ -446,7 +435,7 @@ msgstr "Categoria" 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/body.html:138 +#: templates/web/base/admin/body.html:137 #: templates/web/base/admin/category_edit.html:23 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/admin/body.html:43 @@ -466,19 +455,19 @@ msgstr "Categoria: %s" msgid "Change password" msgstr "Mudar password" -#: templates/web/base/admin/body.html:160 +#: templates/web/base/admin/body.html:158 msgid "" "Check <strong>confirmed</strong> to indicate that this contact has been confirmed as correct.\n" " If you are not sure of the origin or validity of the contact, leave this unchecked." msgstr "" -#: templates/web/base/admin/body.html:171 +#: templates/web/base/admin/body.html:169 msgid "" "Check <strong>deleted</strong> to remove the category from use. \n" " It will not appear as an available category in the drop-down menu on the report-a-problem page." msgstr "" -#: templates/web/base/admin/body.html:191 +#: templates/web/base/admin/body.html:189 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -489,7 +478,7 @@ msgid "" " at a specific address." msgstr "" -#: templates/web/base/admin/body.html:130 +#: templates/web/base/admin/body.html:129 msgid "" "Choose a <strong>category</strong> 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." @@ -530,8 +519,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:15 #: templates/web/base/admin/report_blocks.html:25 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 @@ -540,7 +529,7 @@ msgstr "" msgid "Closed" msgstr "Fechado" -#: perllib/FixMyStreet/DB/Result/Problem.pm:779 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Closed by council" msgstr "Fechado pelo Conselho" @@ -566,7 +555,7 @@ msgstr "Cobrand data:" msgid "Cobrand:" msgstr "Cobrand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "" @@ -585,9 +574,8 @@ msgstr "Confirmar conta" #: templates/web/base/report/new/form_user_loggedout_password.html:21 #: templates/web/base/report/update/form_user_loggedout_password.html:20 -#, fuzzy msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." -msgstr "Confirme por e-mail abaixo, proporcionando uma nova senha nesse ponto. Quando você confirmar, sua senha será atualizada." +msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:1 #: templates/web/base/tokens/confirm_problem.html:1 @@ -597,7 +585,7 @@ msgstr "Confirme por e-mail abaixo, proporcionando uma nova senha nesse ponto. Q msgid "Confirmation" msgstr "Confirmação" -#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:164 #: templates/web/base/admin/body.html:79 #: templates/web/base/admin/category_edit.html:37 #: templates/web/base/admin/category_edit.html:92 @@ -616,7 +604,7 @@ msgid "Confirmed:" msgstr "Confirmado:" #. ("%s is the site name") -#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 +#: templates/web/base/about/_sidebar.html:6 msgid "Contact %s" msgstr "" @@ -635,8 +623,8 @@ msgstr "Fale com a equipe" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1417 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1445 msgid "Could not find user" msgstr "Não foi possÃvel encontrar usuário" @@ -654,7 +642,7 @@ msgstr "Conselho" msgid "Council contacts for %s" msgstr "Contatos do Conselho para %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:681 +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "Council ref: %s" msgstr "" @@ -673,7 +661,7 @@ msgstr "Conta" msgid "Create a report" msgstr "Criar um report" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "Criar uma categoria" @@ -717,20 +705,20 @@ msgstr "Painel de instrumentos" msgid "Dealt with by subdivision within 5 working days" msgstr "Tratadas pelas subdivisões dentro de 5 dias úteis" -#: perllib/FixMyStreet/App/Controller/Admin.pm:877 +#: perllib/FixMyStreet/App/Controller/Admin.pm:865 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:175 #: templates/web/base/admin/body.html:81 #: templates/web/base/admin/category_edit.html:42 #: templates/web/base/admin/category_edit.html:93 msgid "Deleted" msgstr "Excluidos" -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:47 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -738,7 +726,7 @@ msgid "Description" msgstr "Descripçaoi" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:68 +#: templates/web/zurich/report/new/fill_in_details_form.html:70 msgid "Details" msgstr "DEtalhes" @@ -763,11 +751,11 @@ msgid "Diligency prize league table" msgstr "Diligency prêmio tabela classificativa" #. ("%s is the site name") -#: templates/web/base/auth/general.html:48 -#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/auth/general.html:58 +#: templates/web/base/report/new/form_user_loggedout.html:28 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout.html:17 +#: templates/web/base/report/update/form_user_loggedout.html:27 msgid "Do you have a %s password?" msgstr "" @@ -785,8 +773,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "Duplicate" msgstr "Duplicar" @@ -806,7 +794,7 @@ msgstr "" msgid "Edit" msgstr "Editar" -#: templates/web/base/admin/body.html:220 +#: templates/web/base/admin/body.html:218 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "Editar os detalhes do corpo" @@ -836,7 +824,7 @@ msgstr "Editar" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:39 +#: templates/web/base/auth/general.html:49 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -844,11 +832,11 @@ msgstr "Editar" msgid "Email" msgstr "Email" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 msgid "Email added to abuse list" msgstr "Email adicionado a lista de abusos" -#: templates/web/base/admin/body.html:155 +#: templates/web/base/admin/body.html:153 msgid "Email address:" msgstr "" @@ -860,19 +848,14 @@ msgstr "" msgid "Email alert deleted" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1390 msgid "Email already in abuse list" msgstr "E-mail já está na lista abusos" -#: templates/web/base/around/_updates.html:5 -msgid "Email me new local problems" -msgstr "Enviar novos problemas locais" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 -#: templates/web/base/alert/updates.html:13 #: templates/web/zurich/admin/body.html:47 msgid "Email:" msgstr "Email:" @@ -881,26 +864,6 @@ msgstr "Email:" msgid "Email: %s" msgstr "Email: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 -msgid "Empty flat or maisonette" -msgstr "Apartamento vazio ou duplex" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 -msgid "Empty house or bungalow" -msgstr "Casa vazia ou bungalow" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 -msgid "Empty office or other commercial" -msgstr "Escritório vazio ou outro comercial" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 -msgid "Empty pub or bar" -msgstr "Pub ou bar vazio" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 -msgid "Empty public building - school, hospital, etc." -msgstr "EdifÃcio público vazio - escola, hospital, etc" - #: templates/web/base/admin/body-form.html:162 #: templates/web/base/admin/body-form.html:163 msgid "" @@ -944,18 +907,14 @@ msgstr "Inserir um código postal perto, ou nome da rua, zona ou local" msgid "Enter a nearby street name and area" msgstr "Digite um nome de rua nas proximidades e área" -#: perllib/FixMyStreet/Cobrand/ZeroTB.pm:7 -msgid "Enter a nearby street name and area, postal code or district in Delhi" -msgstr "" - -#: templates/web/base/auth/general.html:99 +#: templates/web/base/auth/general.html:109 #: templates/web/base/report/new/form_user_loggedout_by_email.html:38 #: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Digite uma nova password" -#: templates/web/base/index-steps.html:26 +#: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "Digite os detalhes do problema" @@ -981,7 +940,7 @@ msgstr "Exemplo PostCode %s" msgid "Examples:" msgstr "Exemplos:" -#: templates/web/base/report/new/form_report.html:49 +#: templates/web/base/report/new/form_report.html:51 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "" @@ -1018,19 +977,15 @@ msgstr "Primeiro Nome" msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." msgstr "" -#: templates/web/base/header.html:26 -msgid "FixMyStreet" -msgstr "FixMyStreetMindelo" - #: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:38 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:40 msgid "Fixed" msgstr "Corrigido" @@ -1057,7 +1012,7 @@ msgstr "" msgid "Flag user" msgstr "Bandeira - Usuario" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "Marcado" @@ -1079,8 +1034,7 @@ msgstr "" msgid "Flagged:" msgstr "Marcado:" -#: templates/web/base/reports/_ward-list.html:3 -#: templates/web/fixmystreet/reports/_ward-list.html:4 +#: templates/web/base/reports/_ward-list.html:4 msgid "Follow a ward link to view only reports within that ward." msgstr "Siga um link ala para ver apenas os relatórios dentro do ala." @@ -1111,18 +1065,18 @@ msgstr "Perguntas mais frequentes" msgid "GeoRSS on Google Maps" msgstr "GeoRSS no Google Maps" +#: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:11 -#: templates/web/fixmystreet/around/_updates.html:3 msgid "Get updates" msgstr "Receba as atualizações" -#: templates/web/fixmystreet/reports/_rss.html:3 -#: templates/web/fixmystreet/reports/_rss.html:9 +#: templates/web/base/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:9 msgid "Get updates of %s problems" msgstr "Receba as atualizações de problemas fix de %s" -#: templates/web/fixmystreet/reports/_rss.html:11 -#: templates/web/fixmystreet/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:11 +#: templates/web/base/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "Receba as atualizações de problemas neste %s" @@ -1135,7 +1089,7 @@ msgid "Glad to hear it’s been fixed!" msgstr "" #: templates/web/base/alert/index.html:34 -#: templates/web/base/around/postcode_form.html:16 +#: templates/web/base/around/postcode_form.html:13 #: templates/web/base/reports/_list-filters.html:28 #: templates/web/zurich/admin/stats.html:26 msgid "Go" @@ -1161,7 +1115,7 @@ msgstr "Este problema já foi fixado, relatado?" msgid "Have you ever reported a problem to a council before, or is this your first time?" msgstr "Alguma vez voce ja relatou algum problema ao Conselho, ou é a sua primeira vez?" -#: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:38 +#: templates/web/base/footer.html:38 #: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 @@ -1172,8 +1126,7 @@ msgstr "Ajuda" msgid "Here are the types of local problem alerts for ‘%s’." msgstr "Aqui estão os tipos de alertas de problemas locais para relatar fixed; %s';." -#: templates/web/base/header.html:32 templates/web/fixmystreet/header.html:63 -#: templates/web/zurich/footer.html:12 +#: templates/web/base/header.html:63 templates/web/zurich/footer.html:12 msgid "Hi %s" msgstr "Oi %s" @@ -1189,11 +1142,11 @@ msgstr "Oi %s" msgid "Hidden" msgstr "Esconder" -#: templates/web/base/around/display_location.html:65 +#: templates/web/base/around/display_location.html:64 msgid "Hide old" msgstr "Ocultar" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:59 msgid "Hide pins" msgstr "Ocultar pins" @@ -1213,10 +1166,6 @@ msgstr "Como reportar um problema" msgid "How to send successful reports" msgstr "Como enviar relatorios com sucesso" -#: perllib/FixMyStreet/App/Controller/Admin.pm:752 -msgid "I am afraid you cannot confirm unconfirmed reports." -msgstr "Tenho receio de nao puder confirmar os seus relatorios" - #: templates/web/base/tokens/confirm_problem.html:23 #: templates/web/base/tokens/confirm_problem.html:27 msgid "I just reported a problem on @fixmystreet" @@ -1227,7 +1176,7 @@ msgstr "" msgid "I just updated a problem on @fixmystreet" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88 msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "Receio que não foi possÃvel localizar o seu problema no banco de dados.\n" @@ -1249,7 +1198,7 @@ msgid "" " For basic installations, you don't need to join bodies in this way." msgstr "" -#: templates/web/base/admin/body.html:133 +#: templates/web/base/admin/body.html:132 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." @@ -1273,7 +1222,7 @@ msgid "" "(please note it will not be sent to the council)." msgstr "" -#: templates/web/base/admin/body.html:149 +#: templates/web/base/admin/body.html:147 msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." msgstr "" @@ -1308,10 +1257,10 @@ msgstr "ID ilegal" msgid "Illegal feed selection" msgstr "Seleção de feed ilegal" +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "In Progress" msgstr "Em andamento" @@ -1362,7 +1311,7 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "Agencia_responsavel valor %s inválido" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 msgid "Invalid end date" msgstr "Invalido data final" @@ -1370,16 +1319,16 @@ msgstr "Invalido data final" msgid "Invalid format %s specified." msgstr "Formato inválido%s especificado." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 msgid "Invalid start date" msgstr "Data de inicio invalida" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:5 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Investigating" msgstr "Investigando" @@ -1401,7 +1350,7 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:80 +#: 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 @@ -1439,7 +1388,6 @@ msgstr "Carregando ..." #: 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/fixmystreet/alert/updates.html:1 msgid "Local RSS feeds and email alerts" msgstr "RSS feeds e alertas de e-mail locais" @@ -1448,11 +1396,11 @@ msgstr "RSS feeds e alertas de e-mail locais" msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "RSS feeds e alertas de e-mail locais para '%s'" -#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:35 +#: templates/web/base/footer.html:35 msgid "Local alerts" msgstr "Alertas locais" -#: templates/web/base/index-steps.html:25 +#: templates/web/base/index-steps.html:5 msgid "Locate the problem on a map of the area" msgstr "Localize o problema em um mapa da área ou zona" @@ -1512,14 +1460,14 @@ msgstr "Mês" #: templates/web/base/admin/list_updates.html:7 #: templates/web/base/admin/reports.html:13 #: templates/web/base/admin/users.html:15 -#: templates/web/base/auth/general.html:89 +#: templates/web/base/auth/general.html:99 #: templates/web/base/report/new/form_user_loggedin.html:9 #: templates/web/base/report/new/form_user_loggedout_by_email.html:7 -#: templates/web/base/report/update/form_name.html:4 +#: templates/web/base/report/update/form_name.html:5 #: templates/web/base/reports/index.html:20 #: 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:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "Name" msgstr "Nome" @@ -1543,8 +1491,8 @@ 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:455 -#: perllib/FixMyStreet/Cobrand/Default.pm:495 +#: perllib/FixMyStreet/Cobrand/Default.pm:454 +#: perllib/FixMyStreet/Cobrand/Default.pm:494 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" @@ -1569,7 +1517,7 @@ msgstr "Novos <br>problemas" msgid "New body added" msgstr "Novo corpo adicionado" -#: perllib/FixMyStreet/App/Controller/Admin.pm:387 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 msgid "New category contact added" msgstr "Novo contato de categoria adicionado" @@ -1634,7 +1582,7 @@ msgstr "Proximo" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 -#: templates/web/base/questionnaire/index.html:101 +#: templates/web/base/questionnaire/index.html:102 #: templates/web/base/questionnaire/index.html:53 msgid "No" msgstr "Nao" @@ -1699,8 +1647,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Not Responsible" msgstr "Nao responsavel" @@ -1733,7 +1681,7 @@ msgstr "Nota" 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/base/admin/body.html:186 +#: templates/web/base/admin/body.html:184 #: templates/web/base/admin/category_edit.html:52 #: templates/web/zurich/admin/body.html:53 msgid "Note:" @@ -1747,15 +1695,15 @@ msgstr "Nota: <strong>%s</strong>" msgid "Notes from SDM to DM" msgstr "" -#: templates/web/base/report/new/form_user_loggedout.html:14 #: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/form_user_loggedout.html:24 #: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "Agora, para apresentar o seu relatório ..." #: templates/web/base/report/update-form.html:28 -#: templates/web/base/report/update/form_user_loggedout.html:13 #: templates/web/base/report/update/form_user_loggedout.html:2 +#: templates/web/base/report/update/form_user_loggedout.html:23 msgid "Now to submit your update…" msgstr "Agora, para apresentar a sua atualização ..." @@ -1789,8 +1737,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:23 #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/report/update/form_update.html:36 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1825,13 +1773,13 @@ msgstr "Ou os problemas relatados para:" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "Ou você pode se inscrever em um alerta baseado no que ala, zona ou conselho você está inserido" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1055 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 -#: perllib/FixMyStreet/DB/Result/Problem.pm:558 -#: perllib/FixMyStreet/DB/Result/Problem.pm:568 -#: perllib/FixMyStreet/DB/Result/Problem.pm:578 -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1044 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:659 +#: perllib/FixMyStreet/DB/Result/Problem.pm:562 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 +#: perllib/FixMyStreet/DB/Result/Problem.pm:582 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 #: perllib/FixMyStreet/Script/Reports.pm:175 #: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" @@ -1856,7 +1804,7 @@ msgstr "Parente" msgid "Partial" msgstr "Parcial" -#: templates/web/base/auth/general.html:92 +#: templates/web/base/auth/general.html:102 #: templates/web/base/report/new/form_user_loggedout_by_email.html:31 #: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 @@ -1865,7 +1813,7 @@ msgid "Password (optional)" msgstr "Password (opcional)" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:72 +#: templates/web/base/auth/general.html:82 msgid "Password:" msgstr "Password:" @@ -1873,7 +1821,7 @@ msgstr "Password:" msgid "Permalink" msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:90 msgid "Phone number" msgstr "" @@ -1889,13 +1837,21 @@ msgid "Phone:" msgstr "Telefone:" #: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/questionnaire/index.html:89 +#: templates/web/base/questionnaire/index.html:91 #: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/new/form_report.html:38 +#: templates/web/base/report/new/form_report.html:40 +#: templates/web/base/report/update/form_update.html:20 +#: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:6 #: 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:45 +#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/zurich/report/new/fill_in_details_form.html:63 msgid "Photo" msgstr "Foto" @@ -1919,8 +1875,8 @@ msgstr "Coloque a fix pin no mapa" #: perllib/FixMyStreet/Cobrand/Zurich.pm:955 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:6 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 @@ -1936,16 +1892,16 @@ msgstr "Por favor, seja educado, objectivo, conciso e direto ao ponto." msgid "Please check the passwords and try again" msgstr "Por favor verifique as senhas e tente novamente" -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:33 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:43 #: 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:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:856 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:921 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -1955,7 +1911,7 @@ msgstr "Escolher uma categoria" msgid "Please choose a property type" msgstr "Por favor, escolha um tipo de imóvel" -#: perllib/FixMyStreet/App/Controller/Admin.pm:378 +#: perllib/FixMyStreet/App/Controller/Admin.pm:376 msgid "Please correct the errors below" msgstr "" @@ -1979,11 +1935,10 @@ msgstr "" msgid "Please enter a message" msgstr "Por favor insira uma mensagem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Admin.pm:1079 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 msgid "Please enter a name" -msgstr "Digite seu nome" +msgstr "" #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 @@ -1997,10 +1952,10 @@ msgstr "Por favor insira uma password" msgid "Please enter a subject" msgstr "Por favor insira um assunto" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1075 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1130 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:133 +#: perllib/FixMyStreet/DB/Result/User.pm:143 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2017,9 +1972,9 @@ msgid "Please enter some details" msgstr "Por favor, insira alguns detalhes" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:130 -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:32 +#: perllib/FixMyStreet/DB/Result/User.pm:140 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:42 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2028,7 +1983,7 @@ msgid "Please enter your email" msgstr "Digite seu e-mail" #: templates/web/base/report/new/form_user_loggedout_email.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:80 +#: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "Please enter your email address" msgstr "Por favor, insira o seu endereço de email" @@ -2044,7 +1999,7 @@ msgstr "Por favor, insira o seu nome completo, os conselhos precisam desta infor #: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:126 +#: perllib/FixMyStreet/DB/Result/User.pm:136 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "Digite seu nome" @@ -2071,7 +2026,7 @@ msgstr "Por favor, sinta-se livre para <a href=\\\"%s\\\"> se inscrever de novo msgid "Please fill in details of the problem below." msgstr "Por favor, preencha os detalhes do problema abaixo." -#: templates/web/zurich/report/new/fill_in_details_form.html:72 +#: templates/web/zurich/report/new/fill_in_details_form.html:74 msgid "Please fill in details of the problem." msgstr "Por favor, preencha os detalhes do problema." @@ -2080,7 +2035,7 @@ msgstr "Por favor, preencha os detalhes do problema." msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "Por favor, preencha o formulário abaixo com detalhes do problema e descrever a localização mais precisa possÃvel na caixa de detalhes." -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Por favor, indique se você gostaria de receber um outro questionário" @@ -2089,9 +2044,8 @@ msgid "Please note that updates are not sent to the council." msgstr "Por favor, note que as atualizações não são enviadas para o conselho." #: templates/web/base/report/new/oauth_email_form.html:4 -#, fuzzy msgid "Please note your report has <strong>not yet been sent</strong>." -msgstr "Por favor, note o relatório ainda não foi enviado <strong> </strong>. Escolha uma categoria e acrescentar mais informações abaixo, em seguida, enviar." +msgstr "" #: templates/web/base/report/new/fill_in_details_form.html:20 #: templates/web/zurich/report/new/fill_in_details_form.html:11 @@ -2107,16 +2061,16 @@ msgstr "" msgid "Please note:" msgstr "Favor notar:" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please provide some explanation as to why you're reopening this report" msgstr "Favor fornecer uma explicação de por que você está reabrindo este relatório" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250 msgid "Please provide some text as well as a photo" msgstr "Por favor, forneça algum texto, bem como uma foto" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236 msgid "Please say whether you've ever reported a problem to your council before" msgstr "Por favor, diga se você já relatou um problema para o seu conselho antes" @@ -2132,22 +2086,23 @@ msgstr "Por favor, selecione o feed que deseja" msgid "Please select the type of alert you want" msgstr "Selecione o tipo de alerta que deseja" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232 msgid "Please state whether or not the problem has been fixed" msgstr "Por favor, indique se o problema foi corrigido" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:121 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 #: templates/web/base/js/translation_strings.html:53 -msgid "Please upload a JPEG image only" +#, fuzzy +msgid "Please upload an image only" msgstr "Faça upload somente de uma imagem em JPEG " #: perllib/FixMyStreet/App/Controller/Contact.pm:115 msgid "Please write a message" msgstr "Por favor, escreva uma mensagem" -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Please write your update here" msgstr "Por favor, escreva a sua atualização aqui" @@ -2178,7 +2133,7 @@ msgstr "" msgid "Previous" msgstr "Anterior" -#: templates/web/fixmystreet/footer.html:41 +#: templates/web/base/footer.html:41 msgid "Privacy" msgstr "" @@ -2188,7 +2143,7 @@ msgstr "" msgid "Privacy and cookies" msgstr "" -#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:200 #: templates/web/base/admin/body.html:85 #: templates/web/base/admin/category_edit.html:45 #: templates/web/base/admin/report_edit.html:77 @@ -2217,7 +2172,7 @@ msgstr "Problema %s enviado ao conselho %s" msgid "Problem breakdown by state" msgstr "Colapso problema por estado" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1046 msgid "Problem marked as open." msgstr "Problema marcado como aberto." @@ -2229,10 +2184,6 @@ msgstr "Mudança de estado do problema com base nos resultados da pesquisa" msgid "Problems" msgstr "Problemas" -#: templates/web/base/around/_updates.html:1 -msgid "Problems in this area" -msgstr "Problemas nesta área" - #: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "Problemas nas proximidades" @@ -2250,13 +2201,11 @@ msgid "Problems within %.1fkm of this location" msgstr "Problemas dentro de %.1fkm deste local" #: perllib/FixMyStreet/Cobrand/Default.pm:663 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 #: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "Problemas dentro de %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "Problemas dentro de %s ala" @@ -2275,15 +2224,11 @@ msgstr "Problemas dentro do limite de:" msgid "Property address:" msgstr "Endereço do imóvel:" -#: templates/web/base/report/new/category.html:8 -msgid "Property type:" -msgstr "Tipo de propriedade:" - #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Fornecer uma atualização" -#: templates/web/base/auth/general.html:95 +#: templates/web/base/auth/general.html:105 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 "" @@ -2317,16 +2262,15 @@ msgstr "Questionário %d respondeu para o problema de %d, %s para %s" msgid "Questionnaire %d sent for problem %d" msgstr "Questionário %d enviou para o problema de %d" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 msgid "Questionnaire filled in by problem reporter" msgstr "Questionário preenchido por problema repórter" #: templates/web/base/alert/_list.html:22 +#: templates/web/base/alert/updates.html:9 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display_tools.html:34 -#: templates/web/base/reports/_rss.html:1 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed" msgstr "RSS feed" @@ -2354,18 +2298,12 @@ msgstr "RSS feed de %s, %s problemas pendentes" msgid "RSS feed of nearby problems" msgstr "RSS feed dos problemas próximos" -#: templates/web/base/reports/_rss.html:1 -msgid "RSS feed of problems in this %s" -msgstr "RSS feed dos problemas nesta %s" - #: perllib/FixMyStreet/Cobrand/Default.pm:664 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 #: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "RSS feed dos Problemas Nesta %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 #: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "RSS feed dos problemas dentro de %s ala" @@ -2375,14 +2313,13 @@ msgstr "RSS feed dos problemas dentro de %s ala" msgid "RSS feed of recent local problems" msgstr "RSS feed dos problemas locais recentes" +#: templates/web/base/alert/updates.html:9 #: templates/web/base/report/display_tools.html:34 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed of updates to this problem" msgstr "RSS feed de atualizações para este problema" -#: templates/web/base/alert/updates.html:9 +#: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:36 -#: templates/web/fixmystreet/alert/updates.html:14 msgid "Receive email when updates are left on this problem." msgstr "RSS feed dos problemas locais recentes" @@ -2418,12 +2355,11 @@ msgstr "Remover foto (não pode ser desfeita!)" msgid "Reply to user:" msgstr "" -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/header_logo.html:2 msgid "Report" msgstr "" -#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:26 -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/footer.html:26 templates/web/base/header_logo.html:2 #: templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2433,7 +2369,7 @@ msgstr "Comunicar um problema" msgid "Report abuse" msgstr "Denunciar um abuso" -#: perllib/FixMyStreet/App/Controller/Rss.pm:291 +#: perllib/FixMyStreet/App/Controller/Rss.pm:297 msgid "Report on %s" msgstr "Relatório sobre %s" @@ -2448,7 +2384,7 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "Relatório, vista, ou discutir os problemas locais" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:577 #: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "Relatado anonimamente em %s" @@ -2458,7 +2394,7 @@ msgstr "Relatado anonimamente em %s" msgid "Reported before" msgstr "Relatado antes" -#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 #: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "Relatado por %s em %s" @@ -2472,27 +2408,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "Relatado na categoria %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:569 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 msgid "Reported in the %s category anonymously at %s" msgstr "Relatado na categoria %s anonimamente em %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:591 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 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:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported via %s anonymously at %s" msgstr "Relatado por %s anonimamente em %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported via %s by %s at %s" msgstr "Relatado por %s por%s em %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:561 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 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:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 msgid "Reported via %s in the %s category by %s at %s" msgstr "Relatado por %s na categoria %s por %s em %s" @@ -2513,7 +2449,7 @@ msgstr "" msgid "Reporting a problem" msgstr "Relatando um problema" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1274 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" @@ -2556,15 +2492,15 @@ msgstr "Operador de estrada por esta estrada chamada (derivado do número de ref msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Operador de estrada por esta estrada chamada (a partir de OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1496 #: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "Girar para a esquerda" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 #: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 @@ -2579,7 +2515,7 @@ msgstr "" msgid "Satellite" msgstr "" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/base/admin/category_edit.html:84 #: templates/web/zurich/admin/body.html:59 #: templates/web/zurich/admin/template_edit.html:29 @@ -2635,7 +2571,7 @@ msgstr "" msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:696 +#: perllib/FixMyStreet/DB/Result/Problem.pm:698 msgid "Sent to %s %s later" msgstr "Enviado para %s %s mais tarde" @@ -2654,21 +2590,21 @@ msgstr "Acçao" #: templates/web/base/report/new/form_user_loggedin.html:23 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22 -#: templates/web/base/report/update/form_name.html:15 +#: templates/web/base/report/update/form_name.html:16 msgid "Show my name publicly" msgstr "Mostrar meu nome publicamente" -#: templates/web/base/around/display_location.html:67 +#: templates/web/base/around/display_location.html:66 msgid "Show old" msgstr "Mostrar antigo" -#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:57 msgid "Show pins" msgstr "Mostrar pins" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/general.html:110 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:76 +#: templates/web/base/auth/general.html:86 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2727,9 +2663,8 @@ msgstr "Desculpe, não conseguimos encontrar esse local." #: templates/web/base/auth/general.html:9 #: templates/web/base/report/display.html:21 #: templates/web/base/report/new/fill_in_details_form.html:23 -#, fuzzy msgid "Sorry, we could not log you in. Please fill in the form below." -msgstr "Desculpe, mas não foi possÃvel analisar esse local. Por favor, tente novamente." +msgstr "" #: perllib/FixMyStreet/Geocode/Bing.pm:35 #: perllib/FixMyStreet/Geocode/Google.pm:45 @@ -2737,15 +2672,10 @@ msgstr "Desculpe, mas não foi possÃvel analisar esse local. Por favor, tente n msgid "Sorry, we could not parse that location. Please try again." msgstr "Desculpe, mas não foi possÃvel analisar esse local. Por favor, tente novamente." -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:138 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 -#, fuzzy -msgid "Sorry, you can not log in with Facebook. Please try again later." -msgstr "Houve um problema mostrada nesta página. Por favor, tente novamente mais tarde." - #: templates/web/base/admin/stats.html:64 msgid "Start Date:" msgstr "" @@ -2754,7 +2684,7 @@ msgstr "" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/report/update/form_update.html:32 +#: templates/web/base/report/update/form_update.html:34 msgid "State" msgstr "Estado" @@ -2767,7 +2697,7 @@ msgstr "Estado" msgid "State:" msgstr "Estado" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2807,10 +2737,10 @@ msgid "Subject:" msgstr "Assunto:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/base/report/new/form_user_loggedout_by_email.html:39 #: templates/web/base/report/new/form_user_loggedout_password.html:11 -#: templates/web/zurich/report/new/fill_in_details_form.html:96 +#: templates/web/zurich/report/new/fill_in_details_form.html:98 msgid "Submit" msgstr "Submeter" @@ -2838,9 +2768,8 @@ msgstr "Submeter questionario" msgid "Submitted" msgstr "Submitido" -#: templates/web/base/alert/updates.html:17 +#: templates/web/base/alert/updates.html:23 #: templates/web/base/report/display_tools.html:41 -#: templates/web/fixmystreet/alert/updates.html:23 msgid "Subscribe" msgstr "Subscrever" @@ -2848,7 +2777,7 @@ msgstr "Subscrever" msgid "Subscribe me to an email alert" msgstr "Subcrever um alerta de e-mail" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -2867,7 +2796,7 @@ msgstr "Resumo" msgid "Summary reports" msgstr "Resumo reports" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 msgid "Survey" msgstr "Teste" @@ -2924,7 +2853,7 @@ msgstr "Obrigado por upload de sua foto. Precisamos agora de localizar o seu pro msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "Obrigado, gratos em ouvir que o problema foi corrigido! Podemos apenas perguntar se você já relatou um problema para um conselho antes?" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:157 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "Essa imagem não parece ter sido carregada corretamente (%s), por favor, tente novamente." @@ -2932,7 +2861,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:126 +#: perllib/FixMyStreet/App/Controller/Location.pm:127 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." @@ -2942,11 +2871,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:724 +#: perllib/FixMyStreet/App/Controller/Admin.pm:722 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:716 +#: perllib/FixMyStreet/App/Controller/Admin.pm:714 msgid "That problem will now be resent." msgstr "Esse problema agora será reenviado e reportado ao conselho." @@ -2958,7 +2887,7 @@ msgstr "Esse relatório não pode ser visualizado em %s." msgid "That report has been removed from FixMyStreet." msgstr "Esse relatório foi removido FixMyStreetMIndelo" -#: templates/web/base/admin/body.html:144 +#: templates/web/base/admin/body.html:142 msgid "" "The <strong>email address</strong> is the destination to which reports about this category will be sent. \n" " Other categories for this body may have the same email address." @@ -3098,9 +3027,9 @@ msgstr "Houve um problema ao mostrar a página de todos os relatórios. Por favo 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:764 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:753 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 -#: templates/web/base/auth/general.html:43 +#: templates/web/base/auth/general.html:53 #: 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." @@ -3161,9 +3090,9 @@ msgstr "Este e-mail foi enviado para ambos os conselhos que cobrem o local do pr 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:920 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:898 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:935 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:977 #: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "Esta informação é necessária" @@ -3176,11 +3105,11 @@ msgstr "Este é um site do desenvolvedor, as coisas podem quebrar a qualquer mom msgid "This is a summary of all reports on this site." msgstr "" -#: templates/web/base/report/update/form_update.html:52 +#: templates/web/base/report/update/form_update.html:54 msgid "This problem has been fixed" msgstr "Este problema foi resolvido" -#: templates/web/base/report/update/form_update.html:46 +#: templates/web/base/report/update/form_update.html:48 msgid "This problem has not been fixed" msgstr "Este problema não foi corrigido" @@ -3217,7 +3146,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/App/Controller/Admin.pm:1287 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Timeline" @@ -3262,8 +3191,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Unable to fix" msgstr "Incapaz de ser resolvido" @@ -3280,7 +3209,7 @@ msgstr "Não confirmado" msgid "Unknown" msgstr "Desconhecido" -#: perllib/FixMyStreet/App/Controller/Rss.pm:173 +#: perllib/FixMyStreet/App/Controller/Rss.pm:174 msgid "Unknown alert type" msgstr "Tipo de alerta desconhecido" @@ -3295,7 +3224,7 @@ msgstr "Erro desconhecido" msgid "Unknown problem ID" msgstr "Desconhecido problema com ID" -#: templates/web/base/report/update/form_update.html:25 +#: templates/web/base/report/update/form_update.html:27 msgid "Update" msgstr "Actualizar" @@ -3347,10 +3276,10 @@ msgstr "Atualizar status" msgid "Updated" msgstr "Atualizado" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 -#: perllib/FixMyStreet/App/Controller/Admin.pm:821 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1096 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1144 +#: perllib/FixMyStreet/App/Controller/Admin.pm:809 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3377,7 +3306,7 @@ msgstr "Atualizações sobre {{tÃtulo}}" msgid "Updates to this problem, %s" msgstr "" -#: templates/web/base/admin/body.html:182 +#: templates/web/base/admin/body.html:180 msgid "Use the <strong>note</strong> to record details that are only displayed in the admin. Notes are not shown publicly, and are not sent to the body." msgstr "" @@ -3386,11 +3315,11 @@ msgstr "" msgid "Used map" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 msgid "User flag removed" msgstr "Bandeira usuário removida" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1421 msgid "User flagged" msgstr "Usuário sinalizado" @@ -3398,16 +3327,16 @@ msgstr "Usuário sinalizado" msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "Usuários" -#: perllib/FixMyStreet/App/Controller/Admin.pm:382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:412 -#: perllib/FixMyStreet/App/Controller/Admin.pm:429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:380 +#: perllib/FixMyStreet/App/Controller/Admin.pm:410 +#: perllib/FixMyStreet/App/Controller/Admin.pm:427 msgid "Values updated" msgstr "Valores atualizados" @@ -3444,16 +3373,15 @@ msgstr "Encontramos mais de uma correspondência para essa localização. Mostra #: templates/web/base/auth/general.html:6 #: templates/web/base/report/display.html:27 #: templates/web/base/report/new/oauth_email_form.html:5 -#, fuzzy msgid "We need your email address, please give it below." -msgstr "Nós nunca divulgaremos o seu endereço de e-mail ou número de telefone." +msgstr "" #: templates/web/base/report/new/form_user_loggedout_email.html:2 #: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "Nós nunca divulgaremos o seu e-mail" -#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedin.html:30 #: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "Nós nunca divulgaremos o seu endereço de e-mail ou número de telefone." @@ -3462,7 +3390,7 @@ msgstr "Nós nunca divulgaremos o seu endereço de e-mail ou número de telefone 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." -#: templates/web/base/index-steps.html:31 +#: templates/web/base/index-steps.html:11 msgid "We send it to the council on your behalf" msgstr "Nós enviá-lo para o conselho em seu nome" @@ -3500,10 +3428,6 @@ msgstr "Quando enviar" msgid "Whoa there Testino! Three photos are enough." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 -msgid "Whole block of empty flats" -msgstr "Bloco inteiro de apartamentos vazios" - #: templates/web/base/tokens/confirm_alert.html:7 msgid "Why stop there? <a href=\"/alert\">Set up more alerts</a> for free." msgstr "" @@ -3523,7 +3447,7 @@ msgstr "Com o pedido de pesquisa, também é possÃvel pesquisar agency_responsa msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "" -#: templates/web/base/questionnaire/index.html:96 +#: templates/web/base/questionnaire/index.html:97 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "Gostaria de receber um questionário em 4 semanas, lembrando que você verifique o status?" @@ -3553,8 +3477,8 @@ msgstr "Ano" #: templates/web/base/admin/update_edit.html:24 #: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 +#: templates/web/base/questionnaire/index.html:100 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "Sim" @@ -3668,19 +3592,19 @@ msgid "Your Reports" msgstr "Seus relatorios" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/alert/updates.html:19 +#: templates/web/base/alert/updates.html:22 #: templates/web/base/contact/index.html:83 #: templates/web/base/report/display_tools.html:38 #: templates/web/base/report/display_tools.html:40 #: templates/web/base/report/new/form_user_loggedin.html:3 #: templates/web/base/report/new/form_user_loggedout_email.html:1 #: templates/web/base/report/update/form_user_loggedout_email.html:1 -#: templates/web/fixmystreet/alert/updates.html:19 -#: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/zurich/report/new/fill_in_details_form.html:76 +#: templates/web/zurich/report/new/fill_in_details_form.html:78 msgid "Your email" msgstr "Seu e-mail" -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/general.html:55 #: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 @@ -3691,17 +3615,17 @@ msgstr "O seu endereço de email" msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "Suas informações só serão utilizadas de acordo com nossa <a href=\"/privacy\"> polÃtica de privacidade </a>" -#: templates/web/base/auth/general.html:90 +#: templates/web/base/auth/general.html:100 #: templates/web/base/contact/index.html:76 #: templates/web/base/report/new/form_user_loggedin.html:18 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17 -#: templates/web/base/report/update/form_name.html:11 +#: templates/web/base/report/update/form_name.html:12 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:86 +#: templates/web/zurich/report/new/fill_in_details_form.html:88 msgid "Your name" msgstr "Nome" -#: templates/web/base/auth/general.html:75 +#: templates/web/base/auth/general.html:85 #: 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 @@ -3714,20 +3638,19 @@ msgstr "Sua password foi alterada" #: templates/web/base/report/new/form_user_loggedin.html:27 #: templates/web/base/report/new/form_user_loggedout_by_email.html:26 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:94 msgid "Your phone number" msgstr "Telefone " #: templates/web/base/questionnaire/index.html:14 -#, fuzzy msgid "Your report" -msgstr "Seus relatórios" +msgstr "" -#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 +#: templates/web/base/footer.html:29 msgid "Your reports" msgstr "Seus relatórios" -#: templates/web/base/my/my.html:41 +#: templates/web/base/my/my.html:39 msgid "Your updates" msgstr "Suas atualizações" @@ -3753,7 +3676,7 @@ 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:15 +#: templates/web/base/around/postcode_form.html:12 msgid "e.g. ‘%s’ or ‘%s’" msgstr "por exemplo '%s' ou '%s'" @@ -3859,8 +3782,7 @@ msgstr "outras áreas:" msgid "reopened" msgstr "reaberto" -#: templates/web/base/header.html:33 templates/web/fixmystreet/header.html:64 -#: templates/web/zurich/footer.html:13 +#: templates/web/base/header.html:64 templates/web/zurich/footer.html:13 msgid "sign out" msgstr "sair" @@ -3938,7 +3860,7 @@ msgid_plural "<big>%s</big> updates on reports" msgstr[0] "<big>%s</big> atualização em relatório" msgstr[1] "<big>%s</big> atualização los Relatorios" -#: templates/web/emptyhomes/report/new/councils_text_none.html:3 +#: templates/web/base/report/new/councils_text_none.html:3 #, perl-format msgid "We do not yet have details for the council that covers this location." msgid_plural "We do not yet have details for the councils that cover this location." @@ -3980,89 +3902,44 @@ msgid_plural "We do <strong>not</strong> yet have details for the other councils msgstr[0] "Fazemos <strong> não </strong> ainda tem detalhes para os outros conselhos que cobrem este local." msgstr[1] "Fazemos <strong> não </strong> ainda tem detalhes para os outros conselhos que cobrem este local." -#~ msgid "(we never show your email address or phone number)" -#~ msgstr "(é confidencial seu email e seu numero de telefone)" - -#~ msgid "(we never show your email)" -#~ msgstr "(seu email não será divulgado)" - -#~ msgid "<strong>No</strong>, let me confirm my report by email:" -#~ msgstr "<strong>No</strong>, let me confirm my report by email:" - -#~ msgid "<strong>No</strong>, let me confirm my update by email:" -#~ msgstr "<strong> Não </strong>, deixe-me confirmar a minha atualização por e-mail:" - -#~ msgid "Email me updates" -#~ msgstr "Envie-me atualizações" - -#~ msgid "Enter a new password:" -#~ msgstr "Digite uma nova senha:" - -#~ msgid "I'm afraid we couldn't validate that token. If you've copied the URL from an email, please check that you copied it exactly.\n" -#~ msgstr "Receio que não poderia confirmar se token. Se você copiou o URL de um e-mail, verifique se você copiou exatamente.\n" - -#~ msgid "If you use web-based email or have 'junk mail' filters, you may wish to check your bulk/spam mail folders: sometimes, our messages are marked that way." -#~ msgstr "" -#~ "Se você usar o e-mail baseado na web ou filtros têm\" junk mail \", você pode querer\"\n" -#~ "\"Verifique suas pastas de correio em massa / spam: à s vezes, nossas mensagens são marcadas que\"\n" -#~ "\"Caminho\"" - -#~ msgid "Message:" -#~ msgstr "Menssagem" - -#~ msgid "More problems nearby" -#~ msgstr "Mais problemas próximos" - -#~ msgid "Nearly Done! Now check your email..." -#~ msgstr "Quase pronto! Agora, verifique seu e-mail ..." - -#~ msgid "Offensive? Unsuitable? Tell us" -#~ msgstr "Ofensivo? Inadequado? Informem-nos" - -#~ msgid "Photo:" -#~ msgstr "Foto" - -#~ msgid "Please check your email" -#~ msgstr "Favor verificar seu email" - -#~ msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" -#~ msgstr "Por favor, note que as atualizações Localidade: Não São enviadas par o Conselho. Se Você. deixar Seu Nome Será, Público. SUAS Informations Só Serao utilizadas according to Nossa <a href=\"/faq#privacy\"> Politica de Privacidade </a>" +#~ msgid "%s, reported at %s" +#~ msgstr "%s, reportou em %s" -#~ msgid "This may be because the link is too old or already used, or the address was not copied correctly." -#~ msgstr "Isso pode ser porque o link é velho demais ou já foi utilizado, ou o endereço não foi copiado corretamente." +#~ msgid "About us" +#~ msgstr "Acerca de nós" -#~ msgid "This problem has been closed" -#~ msgstr "Este problema esta solucionado." +#~ msgid "Email me new local problems" +#~ msgstr "Enviar novos problemas locais" -#~ msgid "This problem is in progress" -#~ msgstr "Este problema está em progresso" +#~ msgid "Empty flat or maisonette" +#~ msgstr "Apartamento vazio ou duplex" -#~ msgid "This problem is old and of unknown status." -#~ msgstr "Este problema é antigo e de status desconhecido." +#~ msgid "Empty house or bungalow" +#~ msgstr "Casa vazia ou bungalow" -#~ msgid "Update:" -#~ msgstr "Actualizar:" +#~ msgid "Empty office or other commercial" +#~ msgstr "Escritório vazio ou outro comercial" -#~ msgid "We have not been able to confirm your account - sorry." -#~ msgstr "Nós não temos sido capazes de confirmar a sua conta - desculpe." +#~ msgid "Empty pub or bar" +#~ msgstr "Pub ou bar vazio" -#~ msgid "We have sent you an email containing a link to confirm your account." -#~ msgstr "Nós enviamos um e-mail contendo um link para confirmar sua conta." +#~ msgid "Empty public building - school, hospital, etc." +#~ msgstr "EdifÃcio público vazio - escola, hospital, etc" -#~ msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:" -#~ msgstr "AdorarÃamos ouvir o que você pensa sobre este site. Basta preencher o formulário, ou envie um e-mail para <a href='mailto:%s'>%s</a>:" +#~ msgid "FixMyStreet" +#~ msgstr "FixMyStreetMindelo" -#~ msgid "You have already attached a photo to this report, attaching another one will replace it." -#~ msgstr "Você já anexou uma foto com este relatório, anexando outro irá substituÃ-lo." +#~ msgid "I am afraid you cannot confirm unconfirmed reports." +#~ msgstr "Tenho receio de nao puder confirmar os seus relatorios" -#~ msgid "You have already attached a photo to this update, attaching another one will replace it." -#~ msgstr "Você já anexou uma foto a esta atualização, anexando outra irá substituÃ-la." +#~ msgid "Problems in this area" +#~ msgstr "Problemas nesta área" -#~ msgid "Your email:" -#~ msgstr "Seu e-mail:" +#~ msgid "Property type:" +#~ msgstr "Tipo de propriedade:" -#~ msgid "Your name:" -#~ msgstr "Nome" +#~ msgid "RSS feed of problems in this %s" +#~ msgstr "RSS feed dos problemas nesta %s" -#~ msgid "Your email:" -#~ msgstr "Seu e-mail:" +#~ msgid "Whole block of empty flats" +#~ msgstr "Bloco inteiro de apartamentos vazios" diff --git a/locale/ro_RO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/ro_RO.UTF-8/LC_MESSAGES/FixMyStreet.po index 3af22b4c1..7b6c75452 100644 --- a/locale/ro_RO.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/ro_RO.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2016-03-02 13:09+0000\n" -"PO-Revision-Date: 2015-10-23 16:33+0000\n" +"POT-Creation-Date: 2016-05-03 10:41+0100\n" +"PO-Revision-Date: 2016-03-23 12:43+0000\n" "Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: Romanian (Romania) (http://www.transifex.com/mysociety/fixmystreet/language/ro_RO/)\n" "Language: ro_RO\n" @@ -23,7 +23,7 @@ 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:616 +#: perllib/FixMyStreet/DB/Result/Problem.pm:618 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr "ÅŸi" @@ -92,7 +92,7 @@ msgstr "%s actualizări" msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "%s chestionare trimise – %s completate (%s%%)" -#: perllib/FixMyStreet/DB/Result/Problem.pm:683 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "%s ref: %s" msgstr "%s ref: %s" @@ -111,10 +111,6 @@ msgstr "" msgid "%s ward, %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:552 -msgid "%s, reported at %s" -msgstr "%s, raportat la %s" - #: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "" @@ -169,7 +165,7 @@ msgstr "(cum ar fi graffiti, gunoaie depozitate ilegal, pavaj spart sau iluminat msgid "(not sent to council)" msgstr "(netrimis)" -#: templates/web/zurich/report/new/fill_in_details_form.html:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "(optional)" msgstr "(opÈ›ional)" @@ -181,12 +177,11 @@ msgstr "(public)" msgid "(sent to both)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Alege o categorie --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Alege un tip de proprietate --" @@ -218,26 +213,21 @@ msgstr "" msgid "<strong>No</strong> Let me confirm my update by email" msgstr "" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:97 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "" -#: templates/web/base/auth/general.html:70 +#: templates/web/base/auth/general.html:80 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "" -#: templates/web/base/about/about-en-gb.html:1 -#: templates/web/base/about/about-en-gb.html:3 -msgid "About us" -msgstr "Despre noi" - #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Action Scheduled" msgstr "" @@ -268,7 +258,7 @@ msgstr "Adaugă o categorie nouă" msgid "Add user" msgstr "Adaugă utilizator" -#: templates/web/base/my/my.html:56 +#: templates/web/base/my/my.html:54 msgid "Added %s" msgstr "" @@ -288,7 +278,7 @@ msgstr "" msgid "Alert %d disabled (created %s)" msgstr "" -#: templates/web/base/report/update/form_name.html:20 +#: templates/web/base/report/update/form_name.html:21 msgid "Alert me to future updates" msgstr "" @@ -301,7 +291,7 @@ msgstr "" msgid "All Reports as CSV" msgstr "" -#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 +#: templates/web/base/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:20 @@ -400,7 +390,7 @@ msgstr "" msgid "Ban email address" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1273 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -431,7 +421,7 @@ msgstr "" #: templates/web/base/admin/body.html:68 #: templates/web/base/admin/index.html:54 -#: templates/web/base/report/new/category.html:10 +#: templates/web/base/report/new/category.html:7 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 @@ -446,7 +436,7 @@ msgstr "" msgid "Category fix rate for problems > 4 weeks old" msgstr "" -#: templates/web/base/admin/body.html:138 +#: templates/web/base/admin/body.html:137 #: templates/web/base/admin/category_edit.html:23 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/admin/body.html:43 @@ -466,19 +456,19 @@ msgstr "" msgid "Change password" msgstr "" -#: templates/web/base/admin/body.html:160 +#: templates/web/base/admin/body.html:158 msgid "" "Check <strong>confirmed</strong> to indicate that this contact has been confirmed as correct.\n" " If you are not sure of the origin or validity of the contact, leave this unchecked." msgstr "" -#: templates/web/base/admin/body.html:171 +#: templates/web/base/admin/body.html:169 msgid "" "Check <strong>deleted</strong> to remove the category from use. \n" " It will not appear as an available category in the drop-down menu on the report-a-problem page." msgstr "" -#: templates/web/base/admin/body.html:191 +#: templates/web/base/admin/body.html:189 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -489,7 +479,7 @@ msgid "" " at a specific address." msgstr "" -#: templates/web/base/admin/body.html:130 +#: templates/web/base/admin/body.html:129 msgid "" "Choose a <strong>category</strong> 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." @@ -530,8 +520,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:15 #: templates/web/base/admin/report_blocks.html:25 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 @@ -540,7 +530,7 @@ msgstr "" msgid "Closed" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:779 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Closed by council" msgstr "" @@ -566,7 +556,7 @@ msgstr "" msgid "Cobrand:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "" @@ -596,7 +586,7 @@ msgstr "" msgid "Confirmation" msgstr "" -#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:164 #: templates/web/base/admin/body.html:79 #: templates/web/base/admin/category_edit.html:37 #: templates/web/base/admin/category_edit.html:92 @@ -615,7 +605,7 @@ msgid "Confirmed:" msgstr "" #. ("%s is the site name") -#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 +#: templates/web/base/about/_sidebar.html:6 msgid "Contact %s" msgstr "" @@ -634,8 +624,8 @@ msgstr "" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1417 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1445 msgid "Could not find user" msgstr "" @@ -653,7 +643,7 @@ msgstr "" msgid "Council contacts for %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:681 +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "Council ref: %s" msgstr "" @@ -672,7 +662,7 @@ msgstr "" msgid "Create a report" msgstr "" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "" @@ -716,20 +706,20 @@ msgstr "" msgid "Dealt with by subdivision within 5 working days" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:877 +#: perllib/FixMyStreet/App/Controller/Admin.pm:865 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:175 #: templates/web/base/admin/body.html:81 #: templates/web/base/admin/category_edit.html:42 #: templates/web/base/admin/category_edit.html:93 msgid "Deleted" msgstr "" -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:47 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -737,7 +727,7 @@ msgid "Description" msgstr "" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:68 +#: templates/web/zurich/report/new/fill_in_details_form.html:70 msgid "Details" msgstr "" @@ -762,11 +752,11 @@ msgid "Diligency prize league table" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:48 -#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/auth/general.html:58 +#: templates/web/base/report/new/form_user_loggedout.html:28 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout.html:17 +#: templates/web/base/report/update/form_user_loggedout.html:27 msgid "Do you have a %s password?" msgstr "" @@ -784,8 +774,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "Duplicate" msgstr "" @@ -805,7 +795,7 @@ msgstr "" msgid "Edit" msgstr "" -#: templates/web/base/admin/body.html:220 +#: templates/web/base/admin/body.html:218 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "" @@ -835,7 +825,7 @@ msgstr "" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:39 +#: templates/web/base/auth/general.html:49 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -843,11 +833,11 @@ msgstr "" msgid "Email" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 msgid "Email added to abuse list" msgstr "" -#: templates/web/base/admin/body.html:155 +#: templates/web/base/admin/body.html:153 msgid "Email address:" msgstr "" @@ -859,19 +849,14 @@ msgstr "" msgid "Email alert deleted" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1390 msgid "Email already in abuse list" msgstr "" -#: templates/web/base/around/_updates.html:5 -msgid "Email me new local problems" -msgstr "" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 -#: templates/web/base/alert/updates.html:13 #: templates/web/zurich/admin/body.html:47 msgid "Email:" msgstr "" @@ -880,26 +865,6 @@ msgstr "" msgid "Email: %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 -msgid "Empty flat or maisonette" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 -msgid "Empty house or bungalow" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 -msgid "Empty office or other commercial" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 -msgid "Empty pub or bar" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 -msgid "Empty public building - school, hospital, etc." -msgstr "" - #: templates/web/base/admin/body-form.html:162 #: templates/web/base/admin/body-form.html:163 msgid "" @@ -943,18 +908,14 @@ msgstr "" msgid "Enter a nearby street name and area" msgstr "" -#: perllib/FixMyStreet/Cobrand/ZeroTB.pm:7 -msgid "Enter a nearby street name and area, postal code or district in Delhi" -msgstr "" - -#: templates/web/base/auth/general.html:99 +#: templates/web/base/auth/general.html:109 #: templates/web/base/report/new/form_user_loggedout_by_email.html:38 #: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "" -#: templates/web/base/index-steps.html:26 +#: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "" @@ -980,7 +941,7 @@ msgstr "" msgid "Examples:" msgstr "" -#: templates/web/base/report/new/form_report.html:49 +#: templates/web/base/report/new/form_report.html:51 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "" @@ -1017,19 +978,15 @@ msgstr "" msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." msgstr "" -#: templates/web/base/header.html:26 -msgid "FixMyStreet" -msgstr "" - #: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:38 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:40 msgid "Fixed" msgstr "" @@ -1056,7 +1013,7 @@ msgstr "" msgid "Flag user" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "" @@ -1078,8 +1035,7 @@ msgstr "" msgid "Flagged:" msgstr "" -#: templates/web/base/reports/_ward-list.html:3 -#: templates/web/fixmystreet/reports/_ward-list.html:4 +#: templates/web/base/reports/_ward-list.html:4 msgid "Follow a ward link to view only reports within that ward." msgstr "" @@ -1110,18 +1066,18 @@ msgstr "" msgid "GeoRSS on Google Maps" msgstr "" +#: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:11 -#: templates/web/fixmystreet/around/_updates.html:3 msgid "Get updates" msgstr "" -#: templates/web/fixmystreet/reports/_rss.html:3 -#: templates/web/fixmystreet/reports/_rss.html:9 +#: templates/web/base/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:9 msgid "Get updates of %s problems" msgstr "" -#: templates/web/fixmystreet/reports/_rss.html:11 -#: templates/web/fixmystreet/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:11 +#: templates/web/base/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "" @@ -1134,7 +1090,7 @@ msgid "Glad to hear it’s been fixed!" msgstr "" #: templates/web/base/alert/index.html:34 -#: templates/web/base/around/postcode_form.html:16 +#: templates/web/base/around/postcode_form.html:13 #: templates/web/base/reports/_list-filters.html:28 #: templates/web/zurich/admin/stats.html:26 msgid "Go" @@ -1160,7 +1116,7 @@ msgstr "" msgid "Have you ever reported a problem to a council before, or is this your first time?" msgstr "" -#: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:38 +#: templates/web/base/footer.html:38 #: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 @@ -1171,8 +1127,7 @@ msgstr "" msgid "Here are the types of local problem alerts for ‘%s’." msgstr "" -#: templates/web/base/header.html:32 templates/web/fixmystreet/header.html:63 -#: templates/web/zurich/footer.html:12 +#: templates/web/base/header.html:63 templates/web/zurich/footer.html:12 msgid "Hi %s" msgstr "" @@ -1188,11 +1143,11 @@ msgstr "" msgid "Hidden" msgstr "" -#: templates/web/base/around/display_location.html:65 +#: templates/web/base/around/display_location.html:64 msgid "Hide old" msgstr "" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:59 msgid "Hide pins" msgstr "" @@ -1212,10 +1167,6 @@ msgstr "" msgid "How to send successful reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:752 -msgid "I am afraid you cannot confirm unconfirmed reports." -msgstr "" - #: templates/web/base/tokens/confirm_problem.html:23 #: templates/web/base/tokens/confirm_problem.html:27 msgid "I just reported a problem on @fixmystreet" @@ -1226,7 +1177,7 @@ msgstr "" msgid "I just updated a problem on @fixmystreet" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88 msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "" @@ -1248,7 +1199,7 @@ msgid "" " For basic installations, you don't need to join bodies in this way." msgstr "" -#: templates/web/base/admin/body.html:133 +#: templates/web/base/admin/body.html:132 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." @@ -1269,7 +1220,7 @@ msgid "" "(please note it will not be sent to the council)." msgstr "" -#: templates/web/base/admin/body.html:149 +#: templates/web/base/admin/body.html:147 msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." msgstr "" @@ -1304,10 +1255,10 @@ msgstr "" msgid "Illegal feed selection" msgstr "" +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "In Progress" msgstr "" @@ -1358,7 +1309,7 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 msgid "Invalid end date" msgstr "" @@ -1366,16 +1317,16 @@ msgstr "" msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 msgid "Invalid start date" msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:5 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Investigating" msgstr "" @@ -1397,7 +1348,7 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:80 +#: 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 @@ -1435,7 +1386,6 @@ msgstr "" #: 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/fixmystreet/alert/updates.html:1 msgid "Local RSS feeds and email alerts" msgstr "" @@ -1444,11 +1394,11 @@ msgstr "" msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "" -#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:35 +#: templates/web/base/footer.html:35 msgid "Local alerts" msgstr "" -#: templates/web/base/index-steps.html:25 +#: templates/web/base/index-steps.html:5 msgid "Locate the problem on a map of the area" msgstr "" @@ -1508,14 +1458,14 @@ msgstr "" #: templates/web/base/admin/list_updates.html:7 #: templates/web/base/admin/reports.html:13 #: templates/web/base/admin/users.html:15 -#: templates/web/base/auth/general.html:89 +#: templates/web/base/auth/general.html:99 #: templates/web/base/report/new/form_user_loggedin.html:9 #: templates/web/base/report/new/form_user_loggedout_by_email.html:7 -#: templates/web/base/report/update/form_name.html:4 +#: templates/web/base/report/update/form_name.html:5 #: templates/web/base/reports/index.html:20 #: 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:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "Name" msgstr "" @@ -1539,8 +1489,8 @@ msgstr "" msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:455 -#: perllib/FixMyStreet/Cobrand/Default.pm:495 +#: perllib/FixMyStreet/Cobrand/Default.pm:454 +#: perllib/FixMyStreet/Cobrand/Default.pm:494 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" @@ -1562,7 +1512,7 @@ msgstr "" msgid "New body added" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:387 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 msgid "New category contact added" msgstr "" @@ -1627,7 +1577,7 @@ msgstr "" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 -#: templates/web/base/questionnaire/index.html:101 +#: templates/web/base/questionnaire/index.html:102 #: templates/web/base/questionnaire/index.html:53 msgid "No" msgstr "" @@ -1692,8 +1642,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Not Responsible" msgstr "" @@ -1726,7 +1676,7 @@ 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 "" -#: templates/web/base/admin/body.html:186 +#: templates/web/base/admin/body.html:184 #: templates/web/base/admin/category_edit.html:52 #: templates/web/zurich/admin/body.html:53 msgid "Note:" @@ -1740,15 +1690,15 @@ msgstr "" msgid "Notes from SDM to DM" msgstr "" -#: templates/web/base/report/new/form_user_loggedout.html:14 #: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/form_user_loggedout.html:24 #: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "" #: templates/web/base/report/update-form.html:28 -#: templates/web/base/report/update/form_user_loggedout.html:13 #: templates/web/base/report/update/form_user_loggedout.html:2 +#: templates/web/base/report/update/form_user_loggedout.html:23 msgid "Now to submit your update…" msgstr "" @@ -1782,8 +1732,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:23 #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/report/update/form_update.html:36 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1818,13 +1768,13 @@ msgstr "" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1055 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 -#: perllib/FixMyStreet/DB/Result/Problem.pm:558 -#: perllib/FixMyStreet/DB/Result/Problem.pm:568 -#: perllib/FixMyStreet/DB/Result/Problem.pm:578 -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1044 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:659 +#: perllib/FixMyStreet/DB/Result/Problem.pm:562 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 +#: perllib/FixMyStreet/DB/Result/Problem.pm:582 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 #: perllib/FixMyStreet/Script/Reports.pm:175 #: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" @@ -1849,7 +1799,7 @@ msgstr "" msgid "Partial" msgstr "" -#: templates/web/base/auth/general.html:92 +#: templates/web/base/auth/general.html:102 #: templates/web/base/report/new/form_user_loggedout_by_email.html:31 #: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 @@ -1858,7 +1808,7 @@ msgid "Password (optional)" msgstr "" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:72 +#: templates/web/base/auth/general.html:82 msgid "Password:" msgstr "" @@ -1866,7 +1816,7 @@ msgstr "" msgid "Permalink" msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:90 msgid "Phone number" msgstr "" @@ -1882,13 +1832,21 @@ msgid "Phone:" msgstr "" #: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/questionnaire/index.html:89 +#: templates/web/base/questionnaire/index.html:91 #: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/new/form_report.html:38 +#: templates/web/base/report/new/form_report.html:40 +#: templates/web/base/report/update/form_update.html:20 +#: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:6 #: 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:45 +#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/zurich/report/new/fill_in_details_form.html:63 msgid "Photo" msgstr "" @@ -1912,8 +1870,8 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:955 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:6 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 @@ -1929,16 +1887,16 @@ msgstr "" msgid "Please check the passwords and try again" msgstr "" -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:33 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:43 #: 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:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:856 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:921 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -1948,7 +1906,7 @@ msgstr "" msgid "Please choose a property type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:378 +#: perllib/FixMyStreet/App/Controller/Admin.pm:376 msgid "Please correct the errors below" msgstr "" @@ -1969,8 +1927,8 @@ msgstr "" msgid "Please enter a message" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1079 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 msgid "Please enter a name" msgstr "" @@ -1986,10 +1944,10 @@ msgstr "" msgid "Please enter a subject" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1075 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1130 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:133 +#: perllib/FixMyStreet/DB/Result/User.pm:143 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2006,9 +1964,9 @@ msgid "Please enter some details" msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:130 -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:32 +#: perllib/FixMyStreet/DB/Result/User.pm:140 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:42 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2017,7 +1975,7 @@ msgid "Please enter your email" msgstr "" #: templates/web/base/report/new/form_user_loggedout_email.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:80 +#: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "Please enter your email address" msgstr "" @@ -2033,7 +1991,7 @@ msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:126 +#: perllib/FixMyStreet/DB/Result/User.pm:136 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "" @@ -2060,7 +2018,7 @@ msgstr "" msgid "Please fill in details of the problem below." msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:72 +#: templates/web/zurich/report/new/fill_in_details_form.html:74 msgid "Please fill in details of the problem." msgstr "" @@ -2069,7 +2027,7 @@ msgstr "" msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" @@ -2095,16 +2053,16 @@ msgstr "" msgid "Please note:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please provide some explanation as to why you're reopening this report" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250 msgid "Please provide some text as well as a photo" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236 msgid "Please say whether you've ever reported a problem to your council before" msgstr "" @@ -2120,22 +2078,22 @@ msgstr "" msgid "Please select the type of alert you want" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232 msgid "Please state whether or not the problem has been fixed" msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:121 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 #: templates/web/base/js/translation_strings.html:53 -msgid "Please upload a JPEG image only" +msgid "Please upload an image only" msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 msgid "Please write a message" msgstr "" -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Please write your update here" msgstr "" @@ -2166,7 +2124,7 @@ msgstr "" msgid "Previous" msgstr "" -#: templates/web/fixmystreet/footer.html:41 +#: templates/web/base/footer.html:41 msgid "Privacy" msgstr "" @@ -2176,7 +2134,7 @@ msgstr "" msgid "Privacy and cookies" msgstr "" -#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:200 #: templates/web/base/admin/body.html:85 #: templates/web/base/admin/category_edit.html:45 #: templates/web/base/admin/report_edit.html:77 @@ -2205,7 +2163,7 @@ msgstr "" msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1046 msgid "Problem marked as open." msgstr "" @@ -2217,10 +2175,6 @@ msgstr "" msgid "Problems" msgstr "" -#: templates/web/base/around/_updates.html:1 -msgid "Problems in this area" -msgstr "" - #: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "" @@ -2238,13 +2192,11 @@ msgid "Problems within %.1fkm of this location" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:663 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 #: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "" @@ -2263,15 +2215,11 @@ msgstr "" msgid "Property address:" msgstr "" -#: templates/web/base/report/new/category.html:8 -msgid "Property type:" -msgstr "" - #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "" -#: templates/web/base/auth/general.html:95 +#: templates/web/base/auth/general.html:105 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 "" @@ -2305,16 +2253,15 @@ msgstr "" msgid "Questionnaire %d sent for problem %d" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 msgid "Questionnaire filled in by problem reporter" msgstr "" #: templates/web/base/alert/_list.html:22 +#: templates/web/base/alert/updates.html:9 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display_tools.html:34 -#: templates/web/base/reports/_rss.html:1 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed" msgstr "" @@ -2342,18 +2289,12 @@ msgstr "" msgid "RSS feed of nearby problems" msgstr "" -#: templates/web/base/reports/_rss.html:1 -msgid "RSS feed of problems in this %s" -msgstr "" - #: perllib/FixMyStreet/Cobrand/Default.pm:664 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 #: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 #: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "" @@ -2363,14 +2304,13 @@ msgstr "" msgid "RSS feed of recent local problems" msgstr "" +#: templates/web/base/alert/updates.html:9 #: templates/web/base/report/display_tools.html:34 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed of updates to this problem" msgstr "" -#: templates/web/base/alert/updates.html:9 +#: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:36 -#: templates/web/fixmystreet/alert/updates.html:14 msgid "Receive email when updates are left on this problem." msgstr "" @@ -2406,12 +2346,11 @@ msgstr "" msgid "Reply to user:" msgstr "" -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/header_logo.html:2 msgid "Report" msgstr "" -#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:26 -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/footer.html:26 templates/web/base/header_logo.html:2 #: templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2421,7 +2360,7 @@ msgstr "" msgid "Report abuse" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:291 +#: perllib/FixMyStreet/App/Controller/Rss.pm:297 msgid "Report on %s" msgstr "" @@ -2436,7 +2375,7 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:577 #: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "" @@ -2446,7 +2385,7 @@ msgstr "" msgid "Reported before" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 #: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "" @@ -2460,27 +2399,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:569 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 msgid "Reported in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:591 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 msgid "Reported in the %s category by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported via %s anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported via %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:561 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 msgid "Reported via %s in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 msgid "Reported via %s in the %s category by %s at %s" msgstr "" @@ -2501,7 +2440,7 @@ msgstr "" msgid "Reporting a problem" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1274 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" @@ -2544,15 +2483,15 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1496 #: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 #: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 @@ -2567,7 +2506,7 @@ msgstr "" msgid "Satellite" msgstr "" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/base/admin/category_edit.html:84 #: templates/web/zurich/admin/body.html:59 #: templates/web/zurich/admin/template_edit.html:29 @@ -2623,7 +2562,7 @@ msgstr "" msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:696 +#: perllib/FixMyStreet/DB/Result/Problem.pm:698 msgid "Sent to %s %s later" msgstr "" @@ -2642,21 +2581,21 @@ msgstr "" #: templates/web/base/report/new/form_user_loggedin.html:23 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22 -#: templates/web/base/report/update/form_name.html:15 +#: templates/web/base/report/update/form_name.html:16 msgid "Show my name publicly" msgstr "" -#: templates/web/base/around/display_location.html:67 +#: templates/web/base/around/display_location.html:66 msgid "Show old" msgstr "" -#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:57 msgid "Show pins" msgstr "" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/general.html:110 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:76 +#: templates/web/base/auth/general.html:86 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2724,14 +2663,10 @@ msgstr "" msgid "Sorry, we could not parse that location. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:138 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 -msgid "Sorry, you can not log in with Facebook. Please try again later." -msgstr "" - #: templates/web/base/admin/stats.html:64 msgid "Start Date:" msgstr "" @@ -2740,7 +2675,7 @@ msgstr "" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/report/update/form_update.html:32 +#: templates/web/base/report/update/form_update.html:34 msgid "State" msgstr "" @@ -2753,7 +2688,7 @@ msgstr "" msgid "State:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2793,10 +2728,10 @@ msgid "Subject:" msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/base/report/new/form_user_loggedout_by_email.html:39 #: templates/web/base/report/new/form_user_loggedout_password.html:11 -#: templates/web/zurich/report/new/fill_in_details_form.html:96 +#: templates/web/zurich/report/new/fill_in_details_form.html:98 msgid "Submit" msgstr "" @@ -2824,9 +2759,8 @@ msgstr "" msgid "Submitted" msgstr "" -#: templates/web/base/alert/updates.html:17 +#: templates/web/base/alert/updates.html:23 #: templates/web/base/report/display_tools.html:41 -#: templates/web/fixmystreet/alert/updates.html:23 msgid "Subscribe" msgstr "" @@ -2834,7 +2768,7 @@ msgstr "" msgid "Subscribe me to an email alert" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -2853,7 +2787,7 @@ msgstr "" msgid "Summary reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 msgid "Survey" msgstr "" @@ -2910,7 +2844,7 @@ msgstr "" msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:157 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" @@ -2918,7 +2852,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:126 +#: perllib/FixMyStreet/App/Controller/Location.pm:127 msgid "That location does not appear to be in the UK; please try again." msgstr "" @@ -2928,11 +2862,11 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:724 +#: perllib/FixMyStreet/App/Controller/Admin.pm:722 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:716 +#: perllib/FixMyStreet/App/Controller/Admin.pm:714 msgid "That problem will now be resent." msgstr "" @@ -2944,7 +2878,7 @@ msgstr "" msgid "That report has been removed from FixMyStreet." msgstr "" -#: templates/web/base/admin/body.html:144 +#: templates/web/base/admin/body.html:142 msgid "" "The <strong>email address</strong> is the destination to which reports about this category will be sent. \n" " Other categories for this body may have the same email address." @@ -3084,9 +3018,9 @@ msgstr "" msgid "There was a problem showing this page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:753 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 -#: templates/web/base/auth/general.html:43 +#: templates/web/base/auth/general.html:53 #: 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 "" @@ -3147,9 +3081,9 @@ msgstr "" 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:920 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:898 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:935 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:977 #: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "" @@ -3162,11 +3096,11 @@ msgstr "" msgid "This is a summary of all reports on this site." msgstr "" -#: templates/web/base/report/update/form_update.html:52 +#: templates/web/base/report/update/form_update.html:54 msgid "This problem has been fixed" msgstr "" -#: templates/web/base/report/update/form_update.html:46 +#: templates/web/base/report/update/form_update.html:48 msgid "This problem has not been fixed" msgstr "" @@ -3203,7 +3137,7 @@ msgstr "" msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -3248,8 +3182,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Unable to fix" msgstr "" @@ -3266,7 +3200,7 @@ msgstr "" msgid "Unknown" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:173 +#: perllib/FixMyStreet/App/Controller/Rss.pm:174 msgid "Unknown alert type" msgstr "" @@ -3281,7 +3215,7 @@ msgstr "" msgid "Unknown problem ID" msgstr "" -#: templates/web/base/report/update/form_update.html:25 +#: templates/web/base/report/update/form_update.html:27 msgid "Update" msgstr "" @@ -3333,10 +3267,10 @@ msgstr "" msgid "Updated" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 -#: perllib/FixMyStreet/App/Controller/Admin.pm:821 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1096 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1144 +#: perllib/FixMyStreet/App/Controller/Admin.pm:809 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3363,7 +3297,7 @@ msgstr "" msgid "Updates to this problem, %s" msgstr "" -#: templates/web/base/admin/body.html:182 +#: templates/web/base/admin/body.html:180 msgid "Use the <strong>note</strong> to record details that are only displayed in the admin. Notes are not shown publicly, and are not sent to the body." msgstr "" @@ -3372,11 +3306,11 @@ msgstr "" msgid "Used map" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1421 msgid "User flagged" msgstr "" @@ -3384,16 +3318,16 @@ msgstr "" msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:412 -#: perllib/FixMyStreet/App/Controller/Admin.pm:429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:380 +#: perllib/FixMyStreet/App/Controller/Admin.pm:410 +#: perllib/FixMyStreet/App/Controller/Admin.pm:427 msgid "Values updated" msgstr "" @@ -3430,16 +3364,15 @@ msgstr "" #: templates/web/base/auth/general.html:6 #: templates/web/base/report/display.html:27 #: templates/web/base/report/new/oauth_email_form.html:5 -#, fuzzy msgid "We need your email address, please give it below." -msgstr "(nu afișăm niciodată adresa ta de email sau numărul de telefon)" +msgstr "" #: templates/web/base/report/new/form_user_loggedout_email.html:2 #: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedin.html:30 #: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "" @@ -3448,7 +3381,7 @@ msgstr "" 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 "" -#: templates/web/base/index-steps.html:31 +#: templates/web/base/index-steps.html:11 msgid "We send it to the council on your behalf" msgstr "" @@ -3486,10 +3419,6 @@ msgstr "" msgid "Whoa there Testino! Three photos are enough." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 -msgid "Whole block of empty flats" -msgstr "" - #: templates/web/base/tokens/confirm_alert.html:7 msgid "Why stop there? <a href=\"/alert\">Set up more alerts</a> for free." msgstr "" @@ -3509,7 +3438,7 @@ msgstr "" msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "" -#: templates/web/base/questionnaire/index.html:96 +#: templates/web/base/questionnaire/index.html:97 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "" @@ -3539,8 +3468,8 @@ msgstr "" #: templates/web/base/admin/update_edit.html:24 #: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 +#: templates/web/base/questionnaire/index.html:100 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "" @@ -3654,19 +3583,19 @@ msgid "Your Reports" msgstr "Rapoartele dvs." #: templates/web/base/alert/_list.html:89 +#: templates/web/base/alert/updates.html:19 +#: templates/web/base/alert/updates.html:22 #: templates/web/base/contact/index.html:83 #: templates/web/base/report/display_tools.html:38 #: templates/web/base/report/display_tools.html:40 #: templates/web/base/report/new/form_user_loggedin.html:3 #: templates/web/base/report/new/form_user_loggedout_email.html:1 #: templates/web/base/report/update/form_user_loggedout_email.html:1 -#: templates/web/fixmystreet/alert/updates.html:19 -#: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/zurich/report/new/fill_in_details_form.html:76 +#: templates/web/zurich/report/new/fill_in_details_form.html:78 msgid "Your email" msgstr "" -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/general.html:55 #: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 @@ -3677,17 +3606,17 @@ msgstr "" msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "" -#: templates/web/base/auth/general.html:90 +#: templates/web/base/auth/general.html:100 #: templates/web/base/contact/index.html:76 #: templates/web/base/report/new/form_user_loggedin.html:18 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17 -#: templates/web/base/report/update/form_name.html:11 +#: templates/web/base/report/update/form_name.html:12 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:86 +#: templates/web/zurich/report/new/fill_in_details_form.html:88 msgid "Your name" msgstr "" -#: templates/web/base/auth/general.html:75 +#: templates/web/base/auth/general.html:85 #: 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 @@ -3700,20 +3629,19 @@ msgstr "" #: templates/web/base/report/new/form_user_loggedin.html:27 #: templates/web/base/report/new/form_user_loggedout_by_email.html:26 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:94 msgid "Your phone number" msgstr "" #: templates/web/base/questionnaire/index.html:14 -#, fuzzy msgid "Your report" -msgstr "Rapoartele dvs." +msgstr "" -#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 +#: templates/web/base/footer.html:29 msgid "Your reports" msgstr "" -#: templates/web/base/my/my.html:41 +#: templates/web/base/my/my.html:39 msgid "Your updates" msgstr "" @@ -3739,7 +3667,7 @@ msgid "didn't use map" msgstr "" #: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/around/postcode_form.html:12 msgid "e.g. ‘%s’ or ‘%s’" msgstr "" @@ -3845,8 +3773,7 @@ msgstr "" msgid "reopened" msgstr "" -#: templates/web/base/header.html:33 templates/web/fixmystreet/header.html:64 -#: templates/web/zurich/footer.html:13 +#: templates/web/base/header.html:64 templates/web/zurich/footer.html:13 msgid "sign out" msgstr "" @@ -3929,7 +3856,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: templates/web/emptyhomes/report/new/councils_text_none.html:3 +#: templates/web/base/report/new/councils_text_none.html:3 #, perl-format msgid "We do not yet have details for the council that covers this location." msgid_plural "We do not yet have details for the councils that cover this location." @@ -3977,5 +3904,8 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#~ msgid "(we never show your email)" -#~ msgstr "(nu afișăm niciodată adresa ta de email)" +#~ msgid "%s, reported at %s" +#~ msgstr "%s, raportat la %s" + +#~ msgid "About us" +#~ msgstr "Despre noi" diff --git a/locale/ru.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/ru.UTF-8/LC_MESSAGES/FixMyStreet.po index 9c4844f21..c6c848247 100644 --- a/locale/ru.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/ru.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2016-03-02 13:09+0000\n" -"PO-Revision-Date: 2015-11-25 13:39+0000\n" -"Last-Translator: RU C2 <e2f54y54hgf@outlook.com>\n" +"POT-Creation-Date: 2016-05-03 10:41+0100\n" +"PO-Revision-Date: 2016-03-23 12:44+0000\n" +"Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: Russian (http://www.transifex.com/mysociety/fixmystreet/language/ru/)\n" "Language: ru\n" "MIME-Version: 1.0\n" @@ -21,7 +21,7 @@ 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:616 +#: perllib/FixMyStreet/DB/Result/Problem.pm:618 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr "и" @@ -54,9 +54,8 @@ msgid "%s admin:" msgstr "ÐдминиÑтратор Ñайта %s:" #: templates/web/base/status/stats.html:26 -#, fuzzy msgid "%s bodies" -msgstr "УчреждениÑ" +msgstr "" #: templates/web/base/status/stats.html:24 msgid "%s confirmed alerts, %s unconfirmed" @@ -97,7 +96,7 @@ msgstr "%s обновлений" msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "Отправлено опроÑов: %s – получено ответов: %s (%s%%)" -#: perllib/FixMyStreet/DB/Result/Problem.pm:683 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "%s ref: %s" msgstr "%s ref: %s" @@ -122,10 +121,6 @@ msgstr "" msgid "%s ward, %s" msgstr "%s район, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:552 -msgid "%s, reported at %s" -msgstr "%s, отправлен в %s" - #: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "%s, в пределах района: %s" @@ -180,7 +175,7 @@ msgstr "(например: граффити, муÑор в Ð½ÐµÐ¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð½Ñ msgid "(not sent to council)" msgstr "(не отправлено в органы ÑамоуправлениÑ)" -#: templates/web/zurich/report/new/fill_in_details_form.html:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "(optional)" msgstr "(необÑзательно)" @@ -192,12 +187,11 @@ msgstr "(общедоÑтупно)" msgid "(sent to both)" msgstr "(отправлено в обе инÑтанции)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Выберите категорию --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Выберите тип имущеÑтва --" @@ -232,26 +226,21 @@ msgstr "<strong>Ðет</strong> Я хочу подтвердить Ñвое об msgid "<strong>No</strong> Let me confirm my update by email" msgstr "<strong>Ðет</strong> Я хочу подтвердить обновление Ñлектронным пиÑьмом" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:97 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>Ðет</strong>, Ñ Ñ…Ð¾Ñ‡Ñƒ войти на Ñайт Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ адреÑа Ñл. почты" -#: templates/web/base/auth/general.html:70 +#: templates/web/base/auth/general.html:80 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Да</strong> У Ð¼ÐµÐ½Ñ ÐµÑÑ‚ÑŒ пароль" -#: templates/web/base/about/about-en-gb.html:1 -#: templates/web/base/about/about-en-gb.html:3 -msgid "About us" -msgstr "О наÑ" - #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Action Scheduled" msgstr "ДейÑтвие запланировано" @@ -285,7 +274,7 @@ msgstr "Добавить категорию" msgid "Add user" msgstr "Добавить пользователÑ" -#: templates/web/base/my/my.html:56 +#: templates/web/base/my/my.html:54 msgid "Added %s" msgstr "Добавлено: %s" @@ -305,7 +294,7 @@ msgstr "Создано уведомление «%d» длÑ: %s. Тип: %s, пРmsgid "Alert %d disabled (created %s)" msgstr "Уведомление «%d» отключено (Ñоздано: %s)" -#: templates/web/base/report/update/form_name.html:20 +#: templates/web/base/report/update/form_name.html:21 msgid "Alert me to future updates" msgstr "Оповещать Ð¼ÐµÐ½Ñ Ð¾Ð± обновлениÑÑ… в будущем" @@ -318,7 +307,7 @@ msgstr "Ð’Ñе Отчеты" msgid "All Reports as CSV" msgstr "Ð’Ñе Ð¾Ð±Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ Ð² виде CSV-файлов" -#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 +#: templates/web/base/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:20 @@ -417,7 +406,7 @@ msgstr "Ðазад" msgid "Ban email address" msgstr "Добавить Ð°Ð´Ñ€ÐµÑ Ñл. почты в черный ÑпиÑок" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1273 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -448,7 +437,7 @@ msgstr "Карта не отображаетÑÑ? <em>ПропуÑтите ÑÑ‚Ð #: templates/web/base/admin/body.html:68 #: templates/web/base/admin/index.html:54 -#: templates/web/base/report/new/category.html:10 +#: templates/web/base/report/new/category.html:7 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 @@ -463,7 +452,7 @@ msgstr "КатегориÑ" msgid "Category fix rate for problems > 4 weeks old" msgstr "Процент уÑÑ‚Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð½ÐµÐ¿Ð¾Ð»Ð°Ð´Ð¾Ðº в Ñтой категории, которым больше 4 недель" -#: templates/web/base/admin/body.html:138 +#: templates/web/base/admin/body.html:137 #: templates/web/base/admin/category_edit.html:23 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/admin/body.html:43 @@ -483,7 +472,7 @@ msgstr "КатегориÑ: %s" msgid "Change password" msgstr "Сменить пароль" -#: templates/web/base/admin/body.html:160 +#: templates/web/base/admin/body.html:158 msgid "" "Check <strong>confirmed</strong> to indicate that this contact has been confirmed as correct.\n" " If you are not sure of the origin or validity of the contact, leave this unchecked." @@ -491,7 +480,7 @@ msgstr "" "Чтобы подтвердить доÑтоверноÑÑ‚ÑŒ контактных данных, поÑтавьте галочку в поле <strong>подтверждено</strong>.\n" " ЕÑли у Ð²Ð°Ñ ÐµÑÑ‚ÑŒ ÑÐ¾Ð¼Ð½ÐµÐ½Ð¸Ñ Ð² доÑтоверноÑти Ñведений о контакте, оÑтавьте поле пуÑтым." -#: templates/web/base/admin/body.html:171 +#: templates/web/base/admin/body.html:169 msgid "" "Check <strong>deleted</strong> to remove the category from use. \n" " It will not appear as an available category in the drop-down menu on the report-a-problem page." @@ -499,7 +488,7 @@ msgstr "" "Чтобы удалить Ñту категорию, поÑтавьте галочку в поле<strong>удалено</strong> . \n" " ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ Ð±Ð¾Ð»ÑŒÑˆÐµ не будет отображатьÑÑ ÐºÐ°Ðº доÑÑ‚ÑƒÐ¿Ð½Ð°Ñ Ð² раÑкрывающемÑÑ Ð¼ÐµÐ½ÑŽ на Ñтранице подачи обращений." -#: templates/web/base/admin/body.html:191 +#: templates/web/base/admin/body.html:189 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -517,7 +506,7 @@ msgstr "" " имеют публичной ценноÑти. Ðапример: проÑьба обеÑпечить жителей определенного дома \n" " дополнительным муÑорным баком." -#: templates/web/base/admin/body.html:130 +#: templates/web/base/admin/body.html:129 msgid "" "Choose a <strong>category</strong> 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." @@ -560,8 +549,8 @@ msgstr "Чтобы войти, пройдите по ÑÑылке, указанР#: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:15 #: templates/web/base/admin/report_blocks.html:25 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 @@ -570,7 +559,7 @@ msgstr "Чтобы войти, пройдите по ÑÑылке, указанРmsgid "Closed" msgstr "Закрыто" -#: perllib/FixMyStreet/DB/Result/Problem.pm:779 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Closed by council" msgstr "Закрыто органом ÑамоуправлениÑ" @@ -596,7 +585,7 @@ msgstr "Данные о кобренде:" msgid "Cobrand:" msgstr "Кобренд:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "КонфигурациÑ" @@ -615,9 +604,8 @@ msgstr "Подтвердить аккаунт" #: templates/web/base/report/new/form_user_loggedout_password.html:21 #: templates/web/base/report/update/form_user_loggedout_password.html:20 -#, fuzzy msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." -msgstr "Подтвердите дейÑтвие, Ð²Ð²ÐµÐ´Ñ Ð°Ð´Ñ€ÐµÑ Ñвоей Ñлектронной почты ниже. ЗдеÑÑŒ же вам необходимо будет выбрать новый пароль. Он вÑтупит в Ñилу Ñразу поÑле подтверждениÑ." +msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:1 #: templates/web/base/tokens/confirm_problem.html:1 @@ -627,7 +615,7 @@ msgstr "Подтвердите дейÑтвие, Ð²Ð²ÐµÐ´Ñ Ð°Ð´Ñ€ÐµÑ ÑвоеРmsgid "Confirmation" msgstr "Подтверждение" -#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:164 #: templates/web/base/admin/body.html:79 #: templates/web/base/admin/category_edit.html:37 #: templates/web/base/admin/category_edit.html:92 @@ -646,7 +634,7 @@ msgid "Confirmed:" msgstr "Подтверждено:" #. ("%s is the site name") -#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 +#: templates/web/base/about/_sidebar.html:6 msgid "Contact %s" msgstr "СвÑжитеÑÑŒ Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¾Ð¹ Ñайта %s" @@ -665,8 +653,8 @@ msgstr "СвÑжитеÑÑŒ Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¾Ð¹" msgid "Coordinates:" msgstr "Координаты:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1417 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1445 msgid "Could not find user" msgstr "Ðе удалоÑÑŒ найти пользователÑ" @@ -684,7 +672,7 @@ msgstr "Орган ÑамоуправлениÑ" msgid "Council contacts for %s" msgstr "Контакты органа ÑÐ°Ð¼Ð¾ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð´Ð»Ñ %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:681 +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "Council ref: %s" msgstr "СÑылка на орган ÑамоуправлениÑ: %s" @@ -703,7 +691,7 @@ msgstr "ПодÑчет" msgid "Create a report" msgstr "Создать обращение" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "Создать категорию" @@ -747,20 +735,20 @@ msgstr "Панель управлениÑ" msgid "Dealt with by subdivision within 5 working days" msgstr "Ð’Ð¾Ð¿Ñ€Ð¾Ñ Ñ€ÐµÑˆÐµÐ½ подразделением в течение 5 рабочих дней" -#: perllib/FixMyStreet/App/Controller/Admin.pm:877 +#: perllib/FixMyStreet/App/Controller/Admin.pm:865 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "Удалить шаблон" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:175 #: templates/web/base/admin/body.html:81 #: templates/web/base/admin/category_edit.html:42 #: templates/web/base/admin/category_edit.html:93 msgid "Deleted" msgstr "Удалено" -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:47 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -768,7 +756,7 @@ msgid "Description" msgstr "ОпиÑание" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:68 +#: templates/web/zurich/report/new/fill_in_details_form.html:70 msgid "Details" msgstr "Ð”Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ" @@ -793,11 +781,11 @@ msgid "Diligency prize league table" msgstr "Таблица Ñамых активных пользователей" #. ("%s is the site name") -#: templates/web/base/auth/general.html:48 -#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/auth/general.html:58 +#: templates/web/base/report/new/form_user_loggedout.html:28 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout.html:17 +#: templates/web/base/report/update/form_user_loggedout.html:27 msgid "Do you have a %s password?" msgstr "У Ð²Ð°Ñ ÐµÑÑ‚ÑŒ пароль на Ñайте %s?" @@ -815,8 +803,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "Duplicate" msgstr "Создать копию" @@ -840,7 +828,7 @@ msgstr "" msgid "Edit" msgstr "Редактировать" -#: templates/web/base/admin/body.html:220 +#: templates/web/base/admin/body.html:218 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "Редактировать информацию об учреждении" @@ -870,7 +858,7 @@ msgstr "Редактор" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:39 +#: templates/web/base/auth/general.html:49 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -878,11 +866,11 @@ msgstr "Редактор" msgid "Email" msgstr "ÐÐ´Ñ€ÐµÑ Ñл. почты" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 msgid "Email added to abuse list" msgstr "ÐÐ´Ñ€ÐµÑ Ñл. почты добавлен в черный ÑпиÑок" -#: templates/web/base/admin/body.html:155 +#: templates/web/base/admin/body.html:153 msgid "Email address:" msgstr "ÐÐ´Ñ€ÐµÑ Ñл. почты:" @@ -894,19 +882,14 @@ msgstr "Создано уведомление по Ñл. почте" msgid "Email alert deleted" msgstr "Уведомление по Ñл. почте удалено" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1390 msgid "Email already in abuse list" msgstr "Ðтот Ð°Ð´Ñ€ÐµÑ Ñл. почты уже находитÑÑ Ð² черном ÑпиÑке" -#: templates/web/base/around/_updates.html:5 -msgid "Email me new local problems" -msgstr "ПриÑылайте мне Ñлектронные пиÑьма Ñ Ð¾Ð¿Ð¸Ñанием неполадок поблизоÑти" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 -#: templates/web/base/alert/updates.html:13 #: templates/web/zurich/admin/body.html:47 msgid "Email:" msgstr "ÐÐ´Ñ€ÐµÑ Ñл. почты:" @@ -915,26 +898,6 @@ msgstr "ÐÐ´Ñ€ÐµÑ Ñл. почты:" msgid "Email: %s" msgstr "ÐÐ´Ñ€ÐµÑ Ñл. почты: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 -msgid "Empty flat or maisonette" -msgstr "ПуÑÑ‚Ð°Ñ ÐºÐ²Ð°Ñ€Ñ‚Ð¸Ñ€Ð° или коттедж" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 -msgid "Empty house or bungalow" -msgstr "ПуÑтой дом или бунгало" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 -msgid "Empty office or other commercial" -msgstr "ПуÑтой Ð¾Ñ„Ð¸Ñ Ð¸Ð»Ð¸ коммерчеÑкое помещение" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 -msgid "Empty pub or bar" -msgstr "ПуÑтой паб или бар" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 -msgid "Empty public building - school, hospital, etc." -msgstr "ПуÑтое муниципальное здание: школа, больница и др." - #: templates/web/base/admin/body-form.html:162 #: templates/web/base/admin/body-form.html:163 msgid "" @@ -985,18 +948,14 @@ msgstr "Введите Ð¸Ð½Ð´ÐµÐºÑ Ð±Ð»Ð¸Ð¶Ð°Ð¹ÑˆÐµÐ³Ð¾ Ð¾Ñ‚Ð´ÐµÐ»ÐµÐ½Ð¸Ñ Ñв msgid "Enter a nearby street name and area" msgstr "Введите название ближайшей улицы и регион" -#: perllib/FixMyStreet/Cobrand/ZeroTB.pm:7 -msgid "Enter a nearby street name and area, postal code or district in Delhi" -msgstr "Введите название ближайшей улицы и регион, почтовый Ð¸Ð½Ð´ÐµÐºÑ Ð¸Ð»Ð¸ район в Дели" - -#: templates/web/base/auth/general.html:99 +#: templates/web/base/auth/general.html:109 #: templates/web/base/report/new/form_user_loggedout_by_email.html:38 #: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Введите пароль" -#: templates/web/base/index-steps.html:26 +#: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "Подробно опишите проблему" @@ -1022,7 +981,7 @@ msgstr "Пример почтового индекÑа: %s" msgid "Examples:" msgstr "Примеры:" -#: templates/web/base/report/new/form_report.html:49 +#: templates/web/base/report/new/form_report.html:51 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "Опишите, что пошло не так, где Ñто произошло и как давно..." @@ -1059,19 +1018,15 @@ msgstr "Впервые" msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." msgstr "ИÑправьте Ñто, выбрав <strong>зону покрытиÑ</strong> в форме <em>Редактирование информации об учреждении</em>, раÑположенной ниже." -#: templates/web/base/header.html:26 -msgid "FixMyStreet" -msgstr "FixMyStreet" - #: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:38 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:40 msgid "Fixed" msgstr "ИÑправлено" @@ -1098,7 +1053,7 @@ msgstr "Пометить как удаленное" msgid "Flag user" msgstr "Пометить пользователÑ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "Помечено" @@ -1120,8 +1075,7 @@ msgstr "Ðа помеченные аккаунты пользователей н msgid "Flagged:" msgstr "Помечено:" -#: templates/web/base/reports/_ward-list.html:3 -#: templates/web/fixmystreet/reports/_ward-list.html:4 +#: templates/web/base/reports/_ward-list.html:4 msgid "Follow a ward link to view only reports within that ward." msgstr "Чтобы поÑмотреть только обращениÑ, отноÑÑщиеÑÑ Ðº определенному району, перейдите по ÑÑылке на Ñтот район." @@ -1152,18 +1106,18 @@ msgstr "ЧаÑто задаваемые вопроÑÑ‹" msgid "GeoRSS on Google Maps" msgstr "GeoRSS в Google Картах" +#: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:11 -#: templates/web/fixmystreet/around/_updates.html:3 msgid "Get updates" msgstr "Получать обновлениÑ" -#: templates/web/fixmystreet/reports/_rss.html:3 -#: templates/web/fixmystreet/reports/_rss.html:9 +#: templates/web/base/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:9 msgid "Get updates of %s problems" msgstr "Получать новоÑти о ходе работы над неполадками в: %s" -#: templates/web/fixmystreet/reports/_rss.html:11 -#: templates/web/fixmystreet/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:11 +#: templates/web/base/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "Получать новоÑти о неполадках в:" @@ -1176,7 +1130,7 @@ msgid "Glad to hear it’s been fixed!" msgstr "Здорово, что проблема решена!" #: templates/web/base/alert/index.html:34 -#: templates/web/base/around/postcode_form.html:16 +#: templates/web/base/around/postcode_form.html:13 #: templates/web/base/reports/_list-filters.html:28 #: templates/web/zurich/admin/stats.html:26 msgid "Go" @@ -1202,7 +1156,7 @@ msgstr "Ðта проблема решена?" msgid "Have you ever reported a problem to a council before, or is this your first time?" msgstr "Ð’Ñ‹ впервые отправлÑете обращение в орган ÑамоуправлениÑ?" -#: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:38 +#: templates/web/base/footer.html:38 #: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 @@ -1213,8 +1167,7 @@ msgstr "Помощь" msgid "Here are the types of local problem alerts for ‘%s’." msgstr "ЗдеÑÑŒ предÑтавлены типы уведомлений о неполадках поблизоÑти. Они указаны длÑ: ‘%s’." -#: templates/web/base/header.html:32 templates/web/fixmystreet/header.html:63 -#: templates/web/zurich/footer.html:12 +#: templates/web/base/header.html:63 templates/web/zurich/footer.html:12 msgid "Hi %s" msgstr "Привет, %s!" @@ -1230,11 +1183,11 @@ msgstr "Привет, %s!" msgid "Hidden" msgstr "Скрыто" -#: templates/web/base/around/display_location.html:65 +#: templates/web/base/around/display_location.html:64 msgid "Hide old" msgstr "Скрыть Ñтарые" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:59 msgid "Hide pins" msgstr "Скрыть метки" @@ -1254,10 +1207,6 @@ msgstr "Как Ñообщить о проблеме" msgid "How to send successful reports" msgstr "Как уÑпешно Ñоздавать и отправлÑÑ‚ÑŒ обращениÑ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:752 -msgid "I am afraid you cannot confirm unconfirmed reports." -msgstr "К Ñожалению, вы не можете подтверждать неподтвержденные обращениÑ." - #: templates/web/base/tokens/confirm_problem.html:23 #: templates/web/base/tokens/confirm_problem.html:27 msgid "I just reported a problem on @fixmystreet" @@ -1268,7 +1217,7 @@ msgstr "Я Ñообщаю о проблеме на @fixmystreet" msgid "I just updated a problem on @fixmystreet" msgstr "Я обновлÑÑŽ информацию о проблеме на @fixmystreet" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88 msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "Ðам не удалоÑÑŒ найти ваше обращение в базе данных.\n" @@ -1292,7 +1241,7 @@ msgstr "" "Введите название <strong>ответÑтвенной организации</strong> еÑли Ñто учреждение работает под началом другой организации.\n" " Ð’ Ñлучае Ñ Ð±Ð°Ð·Ð¾Ð²Ñ‹Ð¼Ð¸ уÑтановками вам не нужно объединÑÑ‚ÑŒ учреждениÑ." -#: templates/web/base/admin/body.html:133 +#: templates/web/base/admin/body.html:132 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." @@ -1317,7 +1266,7 @@ msgstr "" "ЕÑли вы хотите внеÑти новую публичную информацию о неполадке,\n" "введите ее здеÑÑŒ (важно: новые данные не будут отправлены в орган ÑамоуправлениÑ)." -#: templates/web/base/admin/body.html:149 +#: templates/web/base/admin/body.html:147 msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." msgstr "ЕÑли вы <strong>не пользуетеÑÑŒ Ñлектронной почтой</strong>, а предпочитаете другой ÑпоÑоб ÑвÑзи, введите ÑервиÑный идентификатор (Open311) или его Ñквивалент." @@ -1360,10 +1309,10 @@ msgstr "Ðеверный идентификатор" msgid "Illegal feed selection" msgstr "Ðеверно выбран фид" +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "In Progress" msgstr "Ð’ процеÑÑе" @@ -1414,7 +1363,7 @@ msgstr "Внутренний реферал" msgid "Invalid agency_responsible value %s" msgstr "Ðеверно задано значение agency_responsible %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 msgid "Invalid end date" msgstr "Ðеверно указана дата окончаниÑ" @@ -1422,16 +1371,16 @@ msgstr "Ðеверно указана дата окончаниÑ" msgid "Invalid format %s specified." msgstr "Ðеверно задан формат: %s." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 msgid "Invalid start date" msgstr "Ðеверно указана дата начала" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:5 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Investigating" msgstr "РаÑÑледование" @@ -1453,7 +1402,7 @@ msgstr "ЮриÑÐ´Ð¸ÐºÑ†Ð¸Ñ Ð½ÐµÐ¸Ð·Ð²ÐµÑтна" msgid "Jurisdiction unknown" msgstr "ЮриÑÐ´Ð¸ÐºÑ†Ð¸Ñ Ð½ÐµÐ¸Ð·Ð²ÐµÑтна" -#: templates/web/base/auth/general.html:80 +#: 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 @@ -1491,7 +1440,6 @@ msgstr "Загрузка..." #: 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/fixmystreet/alert/updates.html:1 msgid "Local RSS feeds and email alerts" msgstr "МеÑтные RSS-фиды и ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð¿Ð¾ Ñл. почте" @@ -1500,11 +1448,11 @@ msgstr "МеÑтные RSS-фиды и ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð¿Ð¾ Ñл. Ð¿Ð¾Ñ‡Ñ msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "МеÑтные RSS-фиды и ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð¿Ð¾ Ñл. почте (‘%s’)" -#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:35 +#: templates/web/base/footer.html:35 msgid "Local alerts" msgstr "МеÑтные уведомлениÑ" -#: templates/web/base/index-steps.html:25 +#: templates/web/base/index-steps.html:5 msgid "Locate the problem on a map of the area" msgstr "Укажите на карте меÑтоположение проблемы" @@ -1564,14 +1512,14 @@ msgstr "МеÑÑц" #: templates/web/base/admin/list_updates.html:7 #: templates/web/base/admin/reports.html:13 #: templates/web/base/admin/users.html:15 -#: templates/web/base/auth/general.html:89 +#: templates/web/base/auth/general.html:99 #: templates/web/base/report/new/form_user_loggedin.html:9 #: templates/web/base/report/new/form_user_loggedout_by_email.html:7 -#: templates/web/base/report/update/form_name.html:4 +#: templates/web/base/report/update/form_name.html:5 #: templates/web/base/reports/index.html:20 #: 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:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "Name" msgstr "ИмÑ" @@ -1595,8 +1543,8 @@ msgstr "Ð‘Ð»Ð¸Ð¶Ð°Ð¹ÑˆÐ°Ñ Ðº метке дорога (генерируетÑÑ msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "Ближайший к метке почтовый Ð¸Ð½Ð´ÐµÐºÑ (генерируетÑÑ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑки): %s (%sm мил.)" -#: perllib/FixMyStreet/Cobrand/Default.pm:455 -#: perllib/FixMyStreet/Cobrand/Default.pm:495 +#: perllib/FixMyStreet/Cobrand/Default.pm:454 +#: perllib/FixMyStreet/Cobrand/Default.pm:494 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "Ð‘Ð»Ð¸Ð¶Ð°Ð¹ÑˆÐ°Ñ Ðº метке дорога (генерируетÑÑ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑки Ñ Ð¸Ñпользованием ÑервиÑа Bing Maps): %s" @@ -1620,7 +1568,7 @@ msgstr "Ðовые <br>неполадки" msgid "New body added" msgstr "Добавлено новое учреждение" -#: perllib/FixMyStreet/App/Controller/Admin.pm:387 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 msgid "New category contact added" msgstr "Добавлен новый контакт в категории" @@ -1685,7 +1633,7 @@ msgstr "Далее" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 -#: templates/web/base/questionnaire/index.html:101 +#: templates/web/base/questionnaire/index.html:102 #: templates/web/base/questionnaire/index.html:53 msgid "No" msgstr "Ðет" @@ -1756,8 +1704,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Not Responsible" msgstr "ОтветÑтвенноÑти не неÑет" @@ -1790,7 +1738,7 @@ 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 "Учтите, что когда ÑиÑтема включает неподтвержденные обращениÑ, региÑтрируетÑÑ Ð´Ð°Ñ‚Ð° ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¾Ð±Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ. Она может отличатьÑÑ Ð¾Ñ‚ даты Ð¿Ð¾Ð´Ñ‚Ð²ÐµÑ€Ð¶Ð´ÐµÐ½Ð¸Ñ Ð¾Ð±Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ, поÑтому Ñти данные могут быть неточными." -#: templates/web/base/admin/body.html:186 +#: templates/web/base/admin/body.html:184 #: templates/web/base/admin/category_edit.html:52 #: templates/web/zurich/admin/body.html:53 msgid "Note:" @@ -1804,15 +1752,15 @@ msgstr "Примечание: <strong>%s</strong>" msgid "Notes from SDM to DM" msgstr "Заметки SDM Ð´Ð»Ñ DM" -#: templates/web/base/report/new/form_user_loggedout.html:14 #: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/form_user_loggedout.html:24 #: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "Теперь обращение можно отправить…" #: templates/web/base/report/update-form.html:28 -#: templates/web/base/report/update/form_user_loggedout.html:13 #: templates/web/base/report/update/form_user_loggedout.html:2 +#: templates/web/base/report/update/form_user_loggedout.html:23 msgid "Now to submit your update…" msgstr "Теперь обновление можно отправить…" @@ -1846,8 +1794,8 @@ msgstr "Краткое резюме" #: templates/web/base/admin/report_blocks.html:23 #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/report/update/form_update.html:36 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1882,13 +1830,13 @@ msgstr "Или данные о неполадках, отправленные Ñ msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "Ð’Ñ‹ также можете подпиÑатьÑÑ Ð½Ð° уведомлениÑ, выбрав Ñвой район или орган ÑамоуправлениÑ:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1055 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 -#: perllib/FixMyStreet/DB/Result/Problem.pm:558 -#: perllib/FixMyStreet/DB/Result/Problem.pm:568 -#: perllib/FixMyStreet/DB/Result/Problem.pm:578 -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1044 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:659 +#: perllib/FixMyStreet/DB/Result/Problem.pm:562 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 +#: perllib/FixMyStreet/DB/Result/Problem.pm:582 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 #: perllib/FixMyStreet/Script/Reports.pm:175 #: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" @@ -1913,7 +1861,7 @@ msgstr "РодительÑкаÑ" msgid "Partial" msgstr "ЧаÑтичнаÑ" -#: templates/web/base/auth/general.html:92 +#: templates/web/base/auth/general.html:102 #: templates/web/base/report/new/form_user_loggedout_by_email.html:31 #: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 @@ -1922,7 +1870,7 @@ msgid "Password (optional)" msgstr "Пароль (необÑзательно)" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:72 +#: templates/web/base/auth/general.html:82 msgid "Password:" msgstr "Пароль:" @@ -1930,7 +1878,7 @@ msgstr "Пароль:" msgid "Permalink" msgstr "ПоÑтоÑÐ½Ð½Ð°Ñ ÑÑылка" -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:90 msgid "Phone number" msgstr "Ðомер телефона" @@ -1946,13 +1894,21 @@ msgid "Phone:" msgstr "Телефон:" #: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/questionnaire/index.html:89 +#: templates/web/base/questionnaire/index.html:91 #: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/new/form_report.html:38 +#: templates/web/base/report/new/form_report.html:40 +#: templates/web/base/report/update/form_update.html:20 +#: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:6 #: 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:45 +#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/zurich/report/new/fill_in_details_form.html:63 msgid "Photo" msgstr "Фото" @@ -1976,8 +1932,8 @@ msgstr "ПоÑтавить метку на карте" #: perllib/FixMyStreet/Cobrand/Zurich.pm:955 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:6 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 @@ -1993,16 +1949,16 @@ msgstr "Будьте вежливы, выражайте Ñвои мыÑли кр msgid "Please check the passwords and try again" msgstr "Проверьте пароли и попробуйте еще раз" -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:33 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:43 #: 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:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:856 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:921 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -2012,7 +1968,7 @@ msgstr "Выберите категорию" msgid "Please choose a property type" msgstr "Выберите тип имущеÑтва" -#: perllib/FixMyStreet/App/Controller/Admin.pm:378 +#: perllib/FixMyStreet/App/Controller/Admin.pm:376 msgid "Please correct the errors below" msgstr "ИÑправьте ошибки ниже" @@ -2036,11 +1992,10 @@ msgstr "Будьте вежливы! Грубые, некорректные об msgid "Please enter a message" msgstr "Введите текÑÑ‚ ÑообщениÑ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Admin.pm:1079 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 msgid "Please enter a name" -msgstr "Введите Ñвое имÑ" +msgstr "" #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 @@ -2054,10 +2009,10 @@ msgstr "Введите пароль" msgid "Please enter a subject" msgstr "Введите тему" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1075 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1130 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:133 +#: perllib/FixMyStreet/DB/Result/User.pm:143 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2074,9 +2029,9 @@ msgid "Please enter some details" msgstr "Введите дополнительную информацию" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:130 -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:32 +#: perllib/FixMyStreet/DB/Result/User.pm:140 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:42 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2085,7 +2040,7 @@ msgid "Please enter your email" msgstr "Введите Ñвой Ñл. адреÑ" #: templates/web/base/report/new/form_user_loggedout_email.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:80 +#: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "Please enter your email address" msgstr "Введите Ð°Ð´Ñ€ÐµÑ Ñвоей Ñл. почты" @@ -2101,7 +2056,7 @@ msgstr "Введите Ñвое полное имÑ. Ðта Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ #: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:126 +#: perllib/FixMyStreet/DB/Result/User.pm:136 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "Введите Ñвое имÑ" @@ -2128,7 +2083,7 @@ msgstr "Ð’Ñ‹ можете еще раз <a href=\"%s\">войти на Ñайт< msgid "Please fill in details of the problem below." msgstr "Подробно раÑÑкажите о неполадке в поле ниже." -#: templates/web/zurich/report/new/fill_in_details_form.html:72 +#: templates/web/zurich/report/new/fill_in_details_form.html:74 msgid "Please fill in details of the problem." msgstr "Подробно опишите проблему." @@ -2137,7 +2092,7 @@ msgstr "Подробно опишите проблему." msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "Заполните форму ниже: раÑÑкажите о неполадке, уточните меÑтоположение. ПоÑтарайтеÑÑŒ предоÑтавить как можно более подробную информацию." -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Укажите, хотите ли вы еще один опроÑник" @@ -2146,9 +2101,8 @@ msgid "Please note that updates are not sent to the council." msgstr "Важно: новые данные не отÑылаютÑÑ Ð² органы ÑамоуправлениÑ." #: templates/web/base/report/new/oauth_email_form.html:4 -#, fuzzy msgid "Please note your report has <strong>not yet been sent</strong>." -msgstr "Внимание! Ваше обращение <strong>не было отправлено</strong>. Чтобы завершить процеÑÑ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸, выберите нужную категорию и добавьте информацию ниже." +msgstr "" #: templates/web/base/report/new/fill_in_details_form.html:20 #: templates/web/zurich/report/new/fill_in_details_form.html:11 @@ -2164,16 +2118,16 @@ msgstr "" msgid "Please note:" msgstr "Внимание:" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please provide some explanation as to why you're reopening this report" msgstr "ПоÑÑните, почему вы решили заново отправить Ñто обращение" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250 msgid "Please provide some text as well as a photo" msgstr "ПредоÑтавьте не только фото, но и пиÑьменный комментарий" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236 msgid "Please say whether you've ever reported a problem to your council before" msgstr "Ð’Ñ‹ впервые отправлÑете обращение в ваш орган ÑамоуправлениÑ?" @@ -2189,22 +2143,23 @@ msgstr "Выберите раÑÑылку" msgid "Please select the type of alert you want" msgstr "Выберите тип уведомлениÑ" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232 msgid "Please state whether or not the problem has been fixed" msgstr "Сообщите о ÑтатуÑе неполадки: проблема была решена?" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:121 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 #: templates/web/base/js/translation_strings.html:53 -msgid "Please upload a JPEG image only" +#, fuzzy +msgid "Please upload an image only" msgstr "Ð’Ñ‹ можете загружать только Ð¸Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ Ð² формате JPEG" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 msgid "Please write a message" msgstr "Ðапишите Ñообщение" -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Please write your update here" msgstr "Введите новые данные здеÑÑŒ" @@ -2235,7 +2190,7 @@ msgstr "Ðа базе платформы <a class=\"platform-logo\" href=\"http: msgid "Previous" msgstr "ПредыдущаÑ" -#: templates/web/fixmystreet/footer.html:41 +#: templates/web/base/footer.html:41 msgid "Privacy" msgstr "КонфиденциальноÑÑ‚ÑŒ" @@ -2245,7 +2200,7 @@ msgstr "КонфиденциальноÑÑ‚ÑŒ" msgid "Privacy and cookies" msgstr "КонфиденциальноÑÑ‚ÑŒ и файлы cookie" -#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:200 #: templates/web/base/admin/body.html:85 #: templates/web/base/admin/category_edit.html:45 #: templates/web/base/admin/report_edit.html:77 @@ -2274,7 +2229,7 @@ msgstr "Проблема (%s) отправлена в орган ÑамоупрРmsgid "Problem breakdown by state" msgstr "Сортировка проблем по ÑтатуÑу" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1046 msgid "Problem marked as open." msgstr "Проблема помечена как открытаÑ." @@ -2286,10 +2241,6 @@ msgstr "Смена ÑтатуÑа проблемы на оÑновании реРmsgid "Problems" msgstr "Проблемы" -#: templates/web/base/around/_updates.html:1 -msgid "Problems in this area" -msgstr "Проблемы в Ñтой меÑтноÑти" - #: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "Проблемы поблизоÑти" @@ -2307,13 +2258,11 @@ msgid "Problems within %.1fkm of this location" msgstr "Проблемы в пределах %.1fkm от Ñтого меÑта" #: perllib/FixMyStreet/Cobrand/Default.pm:663 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 #: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "Проблемы в пределах Ñтого меÑта: %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "Проблемы в пределах Ñтого района: %s" @@ -2332,15 +2281,11 @@ msgstr "Проблемы в пределах Ñтого меÑта:" msgid "Property address:" msgstr "ÐÐ´Ñ€ÐµÑ Ð¸Ð¼ÑƒÑ‰ÐµÑтва:" -#: templates/web/base/report/new/category.html:8 -msgid "Property type:" -msgstr "Тип имущеÑтва:" - #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "ПредоÑтавить новые данные" -#: templates/web/base/auth/general.html:95 +#: templates/web/base/auth/general.html:105 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 "Ð˜Ð¼Ñ Ð¸ пароль необÑзательны. Ðо когда вы предоÑтавите Ñти данные, вы Ñможете быÑтрее Ñообщать о проблемах, вводить новые данные о них и редактировать Ñвои обращениÑ." @@ -2374,16 +2319,15 @@ msgstr "ÐžÐ¿Ñ€Ð¾Ñ (%d) заполнен Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ñ‹ «%d» (%s — msgid "Questionnaire %d sent for problem %d" msgstr "ÐžÐ¿Ñ€Ð¾Ñ (%d) отправлен Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ñ‹ «%d»" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 msgid "Questionnaire filled in by problem reporter" msgstr "ÐžÐ¿Ñ€Ð¾Ñ Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½ автором обращениÑ" #: templates/web/base/alert/_list.html:22 +#: templates/web/base/alert/updates.html:9 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display_tools.html:34 -#: templates/web/base/reports/_rss.html:1 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed" msgstr "RSS-фид" @@ -2411,18 +2355,12 @@ msgstr "%s: RSS-фид, в пределах района: %s" msgid "RSS feed of nearby problems" msgstr "RSS-фид о проблемах поблизоÑти" -#: templates/web/base/reports/_rss.html:1 -msgid "RSS feed of problems in this %s" -msgstr "RSS-фид о проблемах здеÑÑŒ: %s" - #: perllib/FixMyStreet/Cobrand/Default.pm:664 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 #: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "RSS-фид о проблемах в пределах: %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 #: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "RSS-фид о проблемах в пределах района: %s" @@ -2432,14 +2370,13 @@ msgstr "RSS-фид о проблемах в пределах района: %s" msgid "RSS feed of recent local problems" msgstr "RSS-фид о недавних проблемах поблизоÑти" +#: templates/web/base/alert/updates.html:9 #: templates/web/base/report/display_tools.html:34 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed of updates to this problem" msgstr "RSS-фид об обновлениÑÑ… по Ñтой проблеме" -#: templates/web/base/alert/updates.html:9 +#: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:36 -#: templates/web/fixmystreet/alert/updates.html:14 msgid "Receive email when updates are left on this problem." msgstr "Получать Ñл. пиÑьма об обновлениÑÑ… по Ñтой проблеме." @@ -2475,12 +2412,11 @@ msgstr "Удалить фото (дейÑтвие отменить невозмРmsgid "Reply to user:" msgstr "Ответить пользователю:" -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/header_logo.html:2 msgid "Report" msgstr "Сообщить" -#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:26 -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/footer.html:26 templates/web/base/header_logo.html:2 #: templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2490,7 +2426,7 @@ msgstr "Сообщить о проблеме" msgid "Report abuse" msgstr "Сообщить об оÑкорбительном поведении" -#: perllib/FixMyStreet/App/Controller/Rss.pm:291 +#: perllib/FixMyStreet/App/Controller/Rss.pm:297 msgid "Report on %s" msgstr "Сообщить о пользователе: %s" @@ -2505,7 +2441,7 @@ msgstr "Сообщить о Ñвоей проблеме" msgid "Report, view, or discuss local problems" msgstr "ГородÑкие проблемы. Сообщайте, проÑматривайте, обÑуждайте." -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:577 #: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "Сообщено анонимно в: %s" @@ -2515,7 +2451,7 @@ msgstr "Сообщено анонимно в: %s" msgid "Reported before" msgstr "Сообщено ранее" -#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 #: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "Ðвтор обращениÑ: %s, Ð²Ñ€ÐµÐ¼Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸: %s" @@ -2529,27 +2465,27 @@ msgstr "Ðвтор обращениÑ:" msgid "Reported in the %s category" msgstr "Обращение отнеÑено к категории: %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:569 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 msgid "Reported in the %s category anonymously at %s" msgstr "Обращение (категориÑ: %s) отправлено анонимно в: %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:591 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 msgid "Reported in the %s category by %s at %s" msgstr "Обращение (категориÑ: %s), автор: %s, отправлено в: %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported via %s anonymously at %s" msgstr "Ðнонимно отправлено через: %s, Ð²Ñ€ÐµÐ¼Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸: %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported via %s by %s at %s" msgstr "Отправлено через: %s, автор: %s, Ð²Ñ€ÐµÐ¼Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸: %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:561 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 msgid "Reported via %s in the %s category anonymously at %s" msgstr "Ðнонимно отправлено через: %s, категориÑ: %s, Ð²Ñ€ÐµÐ¼Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸: %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 msgid "Reported via %s in the %s category by %s at %s" msgstr "Отправлено через: %s, категориÑ: %s, автор обращениÑ: %s, Ð²Ñ€ÐµÐ¼Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸: %s" @@ -2570,7 +2506,7 @@ msgstr "Обращение отправлено:" msgid "Reporting a problem" msgstr "Сообщение о проблеме" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1274 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" @@ -2613,15 +2549,15 @@ msgstr "Дорога находитÑÑ Ð² ведении: %s" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Дорога находитÑÑ Ð² ведении (Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¸Ð· реÑурÑа OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1496 #: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "Повернуть влево" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 #: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 @@ -2636,7 +2572,7 @@ msgstr "Перед поворотом фото необходимо Ñохран msgid "Satellite" msgstr "Спутник" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/base/admin/category_edit.html:84 #: templates/web/zurich/admin/body.html:59 #: templates/web/zurich/admin/template_edit.html:29 @@ -2692,7 +2628,7 @@ msgstr "Выберите тип уведомлениÑ, а затем либо msgid "Sent report back" msgstr "Обращение возвращено" -#: perllib/FixMyStreet/DB/Result/Problem.pm:696 +#: perllib/FixMyStreet/DB/Result/Problem.pm:698 msgid "Sent to %s %s later" msgstr "Отправлено позже: %s %s" @@ -2711,21 +2647,21 @@ msgstr "ПоделитьÑÑ" #: templates/web/base/report/new/form_user_loggedin.html:23 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22 -#: templates/web/base/report/update/form_name.html:15 +#: templates/web/base/report/update/form_name.html:16 msgid "Show my name publicly" msgstr "Показывать мое Ð¸Ð¼Ñ Ð½Ð° Ñайте" -#: templates/web/base/around/display_location.html:67 +#: templates/web/base/around/display_location.html:66 msgid "Show old" msgstr "Показать давние" -#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:57 msgid "Show pins" msgstr "Показать метки" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/general.html:110 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:76 +#: templates/web/base/auth/general.html:86 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2786,9 +2722,8 @@ msgstr "Ðе удалоÑÑŒ найти Ñто меÑтоположение." #: templates/web/base/auth/general.html:9 #: templates/web/base/report/display.html:21 #: templates/web/base/report/new/fill_in_details_form.html:23 -#, fuzzy msgid "Sorry, we could not log you in. Please fill in the form below." -msgstr "Ðе удалоÑÑŒ проанализировать Ñто меÑтоположение. Повторите попытку." +msgstr "" #: perllib/FixMyStreet/Geocode/Bing.pm:35 #: perllib/FixMyStreet/Geocode/Google.pm:45 @@ -2796,15 +2731,10 @@ msgstr "Ðе удалоÑÑŒ проанализировать Ñто меÑтоп msgid "Sorry, we could not parse that location. Please try again." msgstr "Ðе удалоÑÑŒ проанализировать Ñто меÑтоположение. Повторите попытку." -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:138 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "Ðе удалоÑÑŒ Ñохранить фото. Повторите попытку." -#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 -#, fuzzy -msgid "Sorry, you can not log in with Facebook. Please try again later." -msgstr "При загрузке Ñтраницы произошла ошибка. Повторите попытку позже." - #: templates/web/base/admin/stats.html:64 msgid "Start Date:" msgstr "Дата начала:" @@ -2813,7 +2743,7 @@ msgstr "Дата начала:" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/report/update/form_update.html:32 +#: templates/web/base/report/update/form_update.html:34 msgid "State" msgstr "СтатуÑ" @@ -2826,7 +2756,7 @@ msgstr "СтатуÑ" msgid "State:" msgstr "СтатуÑ:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2866,10 +2796,10 @@ msgid "Subject:" msgstr "Тема:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/base/report/new/form_user_loggedout_by_email.html:39 #: templates/web/base/report/new/form_user_loggedout_password.html:11 -#: templates/web/zurich/report/new/fill_in_details_form.html:96 +#: templates/web/zurich/report/new/fill_in_details_form.html:98 msgid "Submit" msgstr "Отправить" @@ -2897,9 +2827,8 @@ msgstr "Отправить опроÑ" msgid "Submitted" msgstr "Отправлено" -#: templates/web/base/alert/updates.html:17 +#: templates/web/base/alert/updates.html:23 #: templates/web/base/report/display_tools.html:41 -#: templates/web/fixmystreet/alert/updates.html:23 msgid "Subscribe" msgstr "ПодпиÑатьÑÑ" @@ -2907,7 +2836,7 @@ msgstr "ПодпиÑатьÑÑ" msgid "Subscribe me to an email alert" msgstr "ПриÑылать мне ÑƒÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð¿Ð¾ Ñл. почте" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -2926,7 +2855,7 @@ msgstr "Итог" msgid "Summary reports" msgstr "Отчеты об итогах" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 msgid "Survey" msgstr "ОпроÑ" @@ -2983,7 +2912,7 @@ msgstr "СпаÑибо за предоÑтавленное фото. Ð¢ÐµÐ¿ÐµÑ€Ñ msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "Мы рады узнать, что проблема решена! Ðто было ваше первое обращение в орган ÑамоуправлениÑ?" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:157 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "КажетÑÑ, возникли трудноÑти Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¾Ð¹ фото (%s).Повторите попытку." @@ -2991,7 +2920,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:126 +#: perllib/FixMyStreet/App/Controller/Location.pm:127 msgid "That location does not appear to be in the UK; please try again." msgstr "Ðто меÑтоположение находитÑÑ Ð·Ð° пределами Великобритании. Повторите попытку." @@ -3001,11 +2930,11 @@ msgstr "Ðто меÑтоположение находитÑÑ Ð·Ð° предел msgid "That postcode was not recognised, sorry." msgstr "Ðе удалоÑÑŒ раÑпознать индекÑ." -#: perllib/FixMyStreet/App/Controller/Admin.pm:724 +#: perllib/FixMyStreet/App/Controller/Admin.pm:722 msgid "That problem has been marked as sent." msgstr "Проблема помечена как отправленнаÑ." -#: perllib/FixMyStreet/App/Controller/Admin.pm:716 +#: perllib/FixMyStreet/App/Controller/Admin.pm:714 msgid "That problem will now be resent." msgstr "Ð¡ÐµÐ¹Ñ‡Ð°Ñ Ð¼Ñ‹ еще раз отправим Ñто обращение." @@ -3017,7 +2946,7 @@ msgstr "ПроÑмотр Ð¾Ð±Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶ÐµÐ½ на Ñтом Ñ msgid "That report has been removed from FixMyStreet." msgstr "Ðто обращение было удалено Ñ Ñайта FixMyStreet." -#: templates/web/base/admin/body.html:144 +#: templates/web/base/admin/body.html:142 msgid "" "The <strong>email address</strong> is the destination to which reports about this category will be sent. \n" " Other categories for this body may have the same email address." @@ -3169,9 +3098,9 @@ msgstr "При загрузке Ñтраницы «ВÑе обращениÑ» Ð msgid "There was a problem showing this page. Please try again later." msgstr "При загрузке Ñтраницы произошла ошибка. Повторите попытку позже." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:753 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 -#: templates/web/base/auth/general.html:43 +#: templates/web/base/auth/general.html:53 #: 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 "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸Ð»Ð¸ пароль указаны неверно. ЕÑли вы не помните Ñвой пароль или у Ð²Ð°Ñ ÐµÐ³Ð¾ нет, заполните форму «Вход Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ адреÑа Ñл. почты»." @@ -3242,9 +3171,9 @@ msgstr "ПоÑкольку пользователь не обозначил ка 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:920 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:898 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:935 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:977 #: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "Ðта Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ ÑвлÑетÑÑ Ð¾Ð±Ñзательной" @@ -3257,11 +3186,11 @@ msgstr "Ðто Ñайт разработчиков, поÑтому в его Ñ„Ñ msgid "This is a summary of all reports on this site." msgstr "Ðто ÐºÑ€Ð°Ñ‚ÐºÐ°Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¿Ð¾ вÑем обращениÑм на Ñайте." -#: templates/web/base/report/update/form_update.html:52 +#: templates/web/base/report/update/form_update.html:54 msgid "This problem has been fixed" msgstr "Ðта проблема была решена" -#: templates/web/base/report/update/form_update.html:46 +#: templates/web/base/report/update/form_update.html:48 msgid "This problem has not been fixed" msgstr "Ðта проблема не была решена" @@ -3298,7 +3227,7 @@ msgstr "Ðта веб-Ñтраница также Ñодержит фото не msgid "Time spent (in minutes):" msgstr "Времени потрачено (в минутах):" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Временной отрезок" @@ -3343,8 +3272,8 @@ msgstr "Ðапишите нам:" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Unable to fix" msgstr "Ðевозможно уÑтранить" @@ -3361,7 +3290,7 @@ msgstr "Ðе подтверждено" msgid "Unknown" msgstr "Ðеизв." -#: perllib/FixMyStreet/App/Controller/Rss.pm:173 +#: perllib/FixMyStreet/App/Controller/Rss.pm:174 msgid "Unknown alert type" msgstr "ÐеизвеÑтный тип уведомлениÑ" @@ -3376,7 +3305,7 @@ msgstr "ÐеизвеÑÑ‚Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°" msgid "Unknown problem ID" msgstr "ÐеизвеÑтный идентификатор проблемы" -#: templates/web/base/report/update/form_update.html:25 +#: templates/web/base/report/update/form_update.html:27 msgid "Update" msgstr "Обновление" @@ -3428,10 +3357,10 @@ msgstr "Обновление ÑтатуÑов" msgid "Updated" msgstr "Обновлено" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 -#: perllib/FixMyStreet/App/Controller/Admin.pm:821 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1096 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1144 +#: perllib/FixMyStreet/App/Controller/Admin.pm:809 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3458,7 +3387,7 @@ msgstr "Ðовые данные длÑ: {{title}}" msgid "Updates to this problem, %s" msgstr "Ðовые данные Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ñ‹: %s" -#: templates/web/base/admin/body.html:182 +#: templates/web/base/admin/body.html:180 msgid "Use the <strong>note</strong> to record details that are only displayed in the admin. Notes are not shown publicly, and are not sent to the body." msgstr "ИÑпользуйте <strong>заметки</strong>, чтобы предоÑтавить дополнительную информацию Ð´Ð»Ñ Ð°Ð´Ð¼Ð¸Ð½Ð¸Ñтратора. Заметки не видны другим пользователÑм и не отправлÑÑŽÑ‚ÑÑ Ð² органы ÑамоуправлениÑ." @@ -3467,11 +3396,11 @@ msgstr "ИÑпользуйте <strong>заметки</strong>, чтобы прРmsgid "Used map" msgstr "ИÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð½Ð°Ñ ÐºÐ°Ñ€Ñ‚Ð°" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 msgid "User flag removed" msgstr "Пометка удалена" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1421 msgid "User flagged" msgstr "Ðккаунт Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¿Ð¾Ð¼ÐµÑ‡ÐµÐ½" @@ -3479,16 +3408,16 @@ msgstr "Ðккаунт Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¿Ð¾Ð¼ÐµÑ‡ÐµÐ½" msgid "User search finds matches in users' names and email addresses." msgstr "При поиÑке пользователей на Ñайте ÑиÑтема находит ÑоответÑÑ‚Ð²Ð¸Ñ Ð¼ÐµÐ¶Ð´Ñƒ именами пользователей и адреÑами Ñл. почты." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "Пользователи" -#: perllib/FixMyStreet/App/Controller/Admin.pm:382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:412 -#: perllib/FixMyStreet/App/Controller/Admin.pm:429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:380 +#: perllib/FixMyStreet/App/Controller/Admin.pm:410 +#: perllib/FixMyStreet/App/Controller/Admin.pm:427 msgid "Values updated" msgstr "Ð—Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ñ‹" @@ -3525,16 +3454,15 @@ msgstr "Мы нашли более одного ÑоответÑÑ‚Ð²Ð¸Ñ ÑтоР#: templates/web/base/auth/general.html:6 #: templates/web/base/report/display.html:27 #: templates/web/base/report/new/oauth_email_form.html:5 -#, fuzzy msgid "We need your email address, please give it below." -msgstr "Мы никому не будем показывать ваш Ð°Ð´Ñ€ÐµÑ Ñл. почты или номер телефона" +msgstr "" #: templates/web/base/report/new/form_user_loggedout_email.html:2 #: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "Мы никому не будем показывать ваш Ð°Ð´Ñ€ÐµÑ Ñл. почты" -#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedin.html:30 #: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "Мы никому не будем показывать ваш Ð°Ð´Ñ€ÐµÑ Ñл. почты или номер телефона" @@ -3543,7 +3471,7 @@ msgstr "Мы никому не будем показывать ваш Ð°Ð´Ñ€ÐµÑ 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;. Однако в нашей ÑиÑтеме нет ее контактных данных. ЕÑли вам извеÑтен дейÑтвующий Ð°Ð´Ñ€ÐµÑ Ñтой организации, напишите нам об Ñтом." -#: templates/web/base/index-steps.html:31 +#: templates/web/base/index-steps.html:11 msgid "We send it to the council on your behalf" msgstr "Данные будут отправлены в орган ÑÐ°Ð¼Ð¾ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¾Ñ‚ вашего имени" @@ -3581,10 +3509,6 @@ msgstr "Когда были отправлены данные" msgid "Whoa there Testino! Three photos are enough." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 -msgid "Whole block of empty flats" -msgstr "Целый квартал незаÑеленных квартир" - #: templates/web/base/tokens/confirm_alert.html:7 msgid "Why stop there? <a href=\"/alert\">Set up more alerts</a> for free." msgstr "И Ñто еще не вÑÑ‘! <a href=\"/alert\">ПодпишитеÑÑŒ на другие уведомлениÑ</a> беÑплатно." @@ -3604,7 +3528,7 @@ msgstr "С помощью поиÑка по запроÑу можно иÑкат msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "Хотите помочь проекту FixMyStreet? Ðаш код находитÑÑ Ð² открытом доÑтупе и <a href=\"http://fixmystreet.org\">доÑтупен на Ñайте fixmystreet.org</a>." -#: templates/web/base/questionnaire/index.html:96 +#: templates/web/base/questionnaire/index.html:97 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "Хотите получить еще один Ð¾Ð¿Ñ€Ð¾Ñ Ñ‡ÐµÑ€ÐµÐ· 4 недели? Ð’ нем мы напомним вам проверить ÑÑ‚Ð°Ñ‚ÑƒÑ Ð¾Ð±Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ." @@ -3634,8 +3558,8 @@ msgstr "Год" #: templates/web/base/admin/update_edit.html:24 #: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 +#: templates/web/base/questionnaire/index.html:100 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "Да" @@ -3705,9 +3629,8 @@ msgstr "Ð’Ñ‹ уже предоÑтавили фото в Ñтом обращен #: templates/web/base/questionnaire/index.html:83 #: templates/web/base/report/update/form_update.html:14 -#, fuzzy msgid "You have already attached photos to this update. Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)." -msgstr "Ð’Ñ‹ уже предоÑтавили фото в Ñтом обращении. Важно: можно прикрепить не более 3 фото (еÑли выбрать больше изображений, они заменÑÑ‚ прикрепленные ранее)." +msgstr "" #: templates/web/base/auth/sign_out.html:4 #: templates/web/zurich/auth/sign_out.html:3 @@ -3756,19 +3679,19 @@ msgid "Your Reports" msgstr "Ваши обращениÑ" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/alert/updates.html:19 +#: templates/web/base/alert/updates.html:22 #: templates/web/base/contact/index.html:83 #: templates/web/base/report/display_tools.html:38 #: templates/web/base/report/display_tools.html:40 #: templates/web/base/report/new/form_user_loggedin.html:3 #: templates/web/base/report/new/form_user_loggedout_email.html:1 #: templates/web/base/report/update/form_user_loggedout_email.html:1 -#: templates/web/fixmystreet/alert/updates.html:19 -#: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/zurich/report/new/fill_in_details_form.html:76 +#: templates/web/zurich/report/new/fill_in_details_form.html:78 msgid "Your email" msgstr "Ваш Ñл. адреÑ" -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/general.html:55 #: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 @@ -3779,17 +3702,17 @@ msgstr "Ваш Ð°Ð´Ñ€ÐµÑ Ñл. почты" msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "Мы обÑзуемÑÑ Ð¸Ñпользовать предоÑтавленные вами перÑональные данные в ÑоответÑтвии Ñ Ð½Ð°ÑˆÐµÐ¹ <a href=\"/privacy\">политикой конфиденциальноÑти</a>" -#: templates/web/base/auth/general.html:90 +#: templates/web/base/auth/general.html:100 #: templates/web/base/contact/index.html:76 #: templates/web/base/report/new/form_user_loggedin.html:18 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17 -#: templates/web/base/report/update/form_name.html:11 +#: templates/web/base/report/update/form_name.html:12 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:86 +#: templates/web/zurich/report/new/fill_in_details_form.html:88 msgid "Your name" msgstr "Ваше имÑ" -#: templates/web/base/auth/general.html:75 +#: templates/web/base/auth/general.html:85 #: 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 @@ -3802,20 +3725,19 @@ msgstr "Ваш пароль был изменен" #: templates/web/base/report/new/form_user_loggedin.html:27 #: templates/web/base/report/new/form_user_loggedout_by_email.html:26 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:94 msgid "Your phone number" msgstr "Ваш номер телефона" #: templates/web/base/questionnaire/index.html:14 -#, fuzzy msgid "Your report" -msgstr "Ваши обращениÑ" +msgstr "" -#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 +#: templates/web/base/footer.html:29 msgid "Your reports" msgstr "Ваши обращениÑ" -#: templates/web/base/my/my.html:41 +#: templates/web/base/my/my.html:39 msgid "Your updates" msgstr "Ваши обновлениÑ" @@ -3841,7 +3763,7 @@ msgid "didn't use map" msgstr "карта не иÑпользовалаÑÑŒ" #: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/around/postcode_form.html:12 msgid "e.g. ‘%s’ or ‘%s’" msgstr "напр.: ‘%s’ или ‘%s’" @@ -3947,8 +3869,7 @@ msgstr "другие облаÑти" msgid "reopened" msgstr "заново открыто" -#: templates/web/base/header.html:33 templates/web/fixmystreet/header.html:64 -#: templates/web/zurich/footer.html:13 +#: templates/web/base/header.html:64 templates/web/zurich/footer.html:13 msgid "sign out" msgstr "выйти" @@ -4036,7 +3957,7 @@ msgstr[1] "<big>%s</big> Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¾Ð±Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ð¹" msgstr[2] "<big>%s</big> обновлений обращений" msgstr[3] "<big>%s</big> обновлений обращений" -#: templates/web/emptyhomes/report/new/councils_text_none.html:3 +#: templates/web/base/report/new/councils_text_none.html:3 #, perl-format msgid "We do not yet have details for the council that covers this location." msgid_plural "We do not yet have details for the councils that cover this location." @@ -4090,86 +4011,47 @@ msgstr[1] "У Ð½Ð°Ñ Ð¿Ð¾ÐºÐ° <strong>нет</strong> подробной инфРmsgstr[2] "У Ð½Ð°Ñ Ð¿Ð¾ÐºÐ° <strong>нет</strong> подробной информации об органах ÑамоуправлениÑ, в ведении которых находитÑÑ Ñто меÑто." msgstr[3] "У Ð½Ð°Ñ Ð¿Ð¾ÐºÐ° <strong>нет</strong> подробной информации об органах ÑамоуправлениÑ, в ведении которых находитÑÑ Ñто меÑто." -#~ msgid "(we never show your email address or phone number)" -#~ msgstr "(мы не будем отображать ваш Ð°Ð´Ñ€ÐµÑ Ñл. почты или номер телефона)" - -#~ msgid "(we never show your email)" -#~ msgstr "(мы не будем отображать ваш Ð°Ð´Ñ€ÐµÑ Ñл. почты)" - -#~ msgid "<strong>No</strong>, let me confirm my report by email:" -#~ msgstr "<strong>Ðет</strong>, Ñ Ñ…Ð¾Ñ‡Ñƒ подтвердить Ñвое обращение Ñлектронным пиÑьмом:" - -#~ msgid "<strong>No</strong>, let me confirm my update by email:" -#~ msgstr "<strong>Ðет</strong>, Ñ Ñ…Ð¾Ñ‡Ñƒ подтвердить обновление Ñлектронным пиÑьмом:" - -#~ msgid "Email me updates" -#~ msgstr "ПриÑылайте мне Ñлектронные пиÑьма Ñ Ð½Ð¾Ð²Ñ‹Ð¼Ð¸ данными" - -#~ msgid "Enter a new password:" -#~ msgstr "Введите новый пароль:" - -#~ msgid "I'm afraid we couldn't validate that token. If you've copied the URL from an email, please check that you copied it exactly.\n" -#~ msgstr "Ðам не удалоÑÑŒ подтвердить токен. Проверьте, правильно ли вы Ñкопировали Ð°Ð´Ñ€ÐµÑ URL из пиÑьма.\n" - -#~ msgid "If you use web-based email or have 'junk mail' filters, you may wish to check your bulk/spam mail folders: sometimes, our messages are marked that way." -#~ msgstr "ЕÑли вы пользуетеÑÑŒ почтовым веб-ÑервиÑом или уÑтановили Ñпам-фильтры, проверьте папку «Спам»: иногда ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¾Ñ‚ нашей команды автоматичеÑки попадают туда." - -#~ msgid "Message:" -#~ msgstr "Сообщение:" - -#~ msgid "More problems nearby" -#~ msgstr "Больше неполадок поблизоÑти" - -#~ msgid "Nearly Done! Now check your email..." -#~ msgstr "Почти готово! Проверьте почту..." - -#~ msgid "Offensive? Unsuitable? Tell us" -#~ msgstr "ОÑкорбительное поведение? ÐеумеÑтный комментарий? РаÑÑкажите нам об Ñтом." - -#~ msgid "Photo:" -#~ msgstr "Фото:" - -#~ msgid "Please check your email" -#~ msgstr "Проверьте почту" +#~ msgid "%s, reported at %s" +#~ msgstr "%s, отправлен в %s" -#~ msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" -#~ msgstr "Ðовые данные не отÑылаютÑÑ Ð² органы ÑамоуправлениÑ. ЕÑли вы Ñообщите Ñвое имÑ, его будут видеть оÑтальные пользователи. Мы обÑзуемÑÑ Ð¸Ñпользовать предоÑтавленные вами данные в ÑоответÑтвии Ñ Ð½Ð°ÑˆÐµÐ¹ <a href=\"/faq#privacy\">политикой конфиденциальноÑти</a>" +#~ msgid "About us" +#~ msgstr "О наÑ" -#~ msgid "This may be because the link is too old or already used, or the address was not copied correctly." -#~ msgstr "Возможно, ÑÑылка уÑтарела или уже была иÑпользована. Кроме того, Ð°Ð´Ñ€ÐµÑ ÑÑылки мог быть Ñкопирован не полноÑтью." +#~ msgid "Email me new local problems" +#~ msgstr "ПриÑылайте мне Ñлектронные пиÑьма Ñ Ð¾Ð¿Ð¸Ñанием неполадок поблизоÑти" -#~ msgid "This problem has been closed" -#~ msgstr "Ðта проблема была закрыта" +#~ msgid "Empty flat or maisonette" +#~ msgstr "ПуÑÑ‚Ð°Ñ ÐºÐ²Ð°Ñ€Ñ‚Ð¸Ñ€Ð° или коттедж" -#~ msgid "This problem is in progress" -#~ msgstr "Ðта проблема находитÑÑ Ð² Ñтадии разрешениÑ" +#~ msgid "Empty house or bungalow" +#~ msgstr "ПуÑтой дом или бунгало" -#~ msgid "This problem is old and of unknown status." -#~ msgstr "Ðто давнÑÑ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ð° Ñ Ð½ÐµÐ¸Ð·Ð²ÐµÑтным ÑтатуÑом." +#~ msgid "Empty office or other commercial" +#~ msgstr "ПуÑтой Ð¾Ñ„Ð¸Ñ Ð¸Ð»Ð¸ коммерчеÑкое помещение" -#~ msgid "Update:" -#~ msgstr "Обновить:" +#~ msgid "Empty pub or bar" +#~ msgstr "ПуÑтой паб или бар" -#~ msgid "We have not been able to confirm your account - sorry." -#~ msgstr "К Ñожалению, нам не удалоÑÑŒ подтвердить ваш аккаунт." +#~ msgid "Empty public building - school, hospital, etc." +#~ msgstr "ПуÑтое муниципальное здание: школа, больница и др." -#~ msgid "We have sent you an email containing a link to confirm your account." -#~ msgstr "Мы отправили вам пиÑьмо Ñо ÑÑылкой Ð´Ð»Ñ Ð¿Ð¾Ð´Ñ‚Ð²ÐµÑ€Ð¶Ð´ÐµÐ½Ð¸Ñ Ð°ÐºÐºÐ°ÑƒÐ½Ñ‚Ð°." +#~ msgid "Enter a nearby street name and area, postal code or district in Delhi" +#~ msgstr "Введите название ближайшей улицы и регион, почтовый Ð¸Ð½Ð´ÐµÐºÑ Ð¸Ð»Ð¸ район в Дели" -#~ msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:" -#~ msgstr "Мы будем рады узнать ваше мнение о Ñайте. Чтобы отправить обратную ÑвÑзь, заполните форму или пришлите пиÑьмо на адреÑ: <a href='mailto:%s'>%s</a>:" +#~ msgid "FixMyStreet" +#~ msgstr "FixMyStreet" -#~ msgid "You have already attached a photo to this report, attaching another one will replace it." -#~ msgstr "Ð’Ñ‹ уже предоÑтавили фото в Ñтом обращении. ЕÑли выбрать еще одно изображение, оно заменит первое." +#~ msgid "I am afraid you cannot confirm unconfirmed reports." +#~ msgstr "К Ñожалению, вы не можете подтверждать неподтвержденные обращениÑ." -#~ msgid "You have already attached a photo to this update, attaching another one will replace it." -#~ msgstr "Ð’Ñ‹ уже предоÑтавили фото в Ñтом обновлении. ЕÑли выбрать еще одно изображение, оно заменит первое." +#~ msgid "Problems in this area" +#~ msgstr "Проблемы в Ñтой меÑтноÑти" -#~ msgid "Your email:" -#~ msgstr "Ваш Ñл. адреÑ:" +#~ msgid "Property type:" +#~ msgstr "Тип имущеÑтва:" -#~ msgid "Your name:" -#~ msgstr "Ваше имÑ:" +#~ msgid "RSS feed of problems in this %s" +#~ msgstr "RSS-фид о проблемах здеÑÑŒ: %s" -#~ msgid "Your email:" -#~ msgstr "Ваш Ñл. адреÑ:" +#~ msgid "Whole block of empty flats" +#~ msgstr "Целый квартал незаÑеленных квартир" diff --git a/locale/sq.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/sq.UTF-8/LC_MESSAGES/FixMyStreet.po index 12506a05d..2924b6355 100644 --- a/locale/sq.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/sq.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2016-03-02 13:09+0000\n" -"PO-Revision-Date: 2015-10-23 16:38+0000\n" +"POT-Creation-Date: 2016-05-03 10:41+0100\n" +"PO-Revision-Date: 2016-03-23 12:44+0000\n" "Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: Albanian (http://www.transifex.com/mysociety/fixmystreet/language/sq/)\n" "Language: sq\n" @@ -19,7 +19,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/DB/Result/Problem.pm:618 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr "dhe" @@ -88,7 +88,7 @@ msgstr "%s përditësime ne kohë reale" msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "%s pyetesoret jane derguar– %s pergjigjur (%s%%)" -#: perllib/FixMyStreet/DB/Result/Problem.pm:683 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "%s ref: %s" msgstr "%s ref: %s" @@ -107,10 +107,6 @@ msgstr "" msgid "%s ward, %s" msgstr "%s lagje, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:552 -msgid "%s, reported at %s" -msgstr "%s, raportuar në %s" - #: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "%s, brenda lagjes %s" @@ -165,7 +161,7 @@ msgstr "" msgid "(not sent to council)" msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "(optional)" msgstr "(opsionale)" @@ -177,12 +173,11 @@ msgstr "" msgid "(sent to both)" msgstr "(dërguar te të dy)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Zgjedh në kategori --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Zgjedh nje lloj te karakteristikes --" @@ -217,26 +212,21 @@ msgstr "<strong>Jo</strong> Më lejo të konfirmoj raportin tim me email" msgid "<strong>No</strong> Let me confirm my update by email" msgstr "<strong>Jo</strong> Me lejoni te konfirmoj perditesimin me email" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:97 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>Jo</strong> më lejo të kyqem me email" -#: templates/web/base/auth/general.html:70 +#: templates/web/base/auth/general.html:80 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Po</strong> Unë kam një fjalëkalim" -#: templates/web/base/about/about-en-gb.html:1 -#: templates/web/base/about/about-en-gb.html:3 -msgid "About us" -msgstr "Rreth nesh" - #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Action Scheduled" msgstr "Veprim i Planifikuar" @@ -267,7 +257,7 @@ msgstr "Shto një kategori të re" msgid "Add user" msgstr "Shto përdorues" -#: templates/web/base/my/my.html:56 +#: templates/web/base/my/my.html:54 msgid "Added %s" msgstr "Shtoi %s" @@ -287,7 +277,7 @@ msgstr "Paralajmerimi %d u krijua per %s, lloji %s, parametrat %s / %s" msgid "Alert %d disabled (created %s)" msgstr "" -#: templates/web/base/report/update/form_name.html:20 +#: templates/web/base/report/update/form_name.html:21 msgid "Alert me to future updates" msgstr "Me paralajmero per perditesime ne te ardhmen" @@ -300,7 +290,7 @@ msgstr "Te gjitha Raportimet" msgid "All Reports as CSV" msgstr "" -#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 +#: templates/web/base/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:20 @@ -399,7 +389,7 @@ msgstr "Prapa" msgid "Ban email address" msgstr "bllokoemail adresen" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1273 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -430,7 +420,7 @@ msgstr "Nuk mund te shihni harten? <em>Kaloni kete hap</em>" #: templates/web/base/admin/body.html:68 #: templates/web/base/admin/index.html:54 -#: templates/web/base/report/new/category.html:10 +#: templates/web/base/report/new/category.html:7 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 @@ -445,7 +435,7 @@ msgstr "Kategoria" msgid "Category fix rate for problems > 4 weeks old" msgstr "" -#: templates/web/base/admin/body.html:138 +#: templates/web/base/admin/body.html:137 #: templates/web/base/admin/category_edit.html:23 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/admin/body.html:43 @@ -465,19 +455,19 @@ msgstr "Kategoria: %s" msgid "Change password" msgstr "Nderro fjalekalimin" -#: templates/web/base/admin/body.html:160 +#: templates/web/base/admin/body.html:158 msgid "" "Check <strong>confirmed</strong> to indicate that this contact has been confirmed as correct.\n" " If you are not sure of the origin or validity of the contact, leave this unchecked." msgstr "" -#: templates/web/base/admin/body.html:171 +#: templates/web/base/admin/body.html:169 msgid "" "Check <strong>deleted</strong> to remove the category from use. \n" " It will not appear as an available category in the drop-down menu on the report-a-problem page." msgstr "" -#: templates/web/base/admin/body.html:191 +#: templates/web/base/admin/body.html:189 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -488,7 +478,7 @@ msgid "" " at a specific address." msgstr "" -#: templates/web/base/admin/body.html:130 +#: templates/web/base/admin/body.html:129 msgid "" "Choose a <strong>category</strong> 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." @@ -529,8 +519,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:15 #: templates/web/base/admin/report_blocks.html:25 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 @@ -539,7 +529,7 @@ msgstr "" msgid "Closed" msgstr "Mbyllur" -#: perllib/FixMyStreet/DB/Result/Problem.pm:779 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Closed by council" msgstr "" @@ -565,7 +555,7 @@ msgstr "" msgid "Cobrand:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "" @@ -595,7 +585,7 @@ msgstr "" msgid "Confirmation" msgstr "Konfirmimi" -#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:164 #: templates/web/base/admin/body.html:79 #: templates/web/base/admin/category_edit.html:37 #: templates/web/base/admin/category_edit.html:92 @@ -614,7 +604,7 @@ msgid "Confirmed:" msgstr "E konfirmuar:" #. ("%s is the site name") -#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 +#: templates/web/base/about/_sidebar.html:6 msgid "Contact %s" msgstr "" @@ -633,8 +623,8 @@ msgstr "Kontakto ekipin" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1417 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1445 msgid "Could not find user" msgstr "Nuk mund te gjeni perdoruesin" @@ -652,7 +642,7 @@ msgstr "" msgid "Council contacts for %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:681 +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "Council ref: %s" msgstr "" @@ -671,7 +661,7 @@ msgstr "" msgid "Create a report" msgstr "Krijo nje raport" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "Krijo kategorine" @@ -715,20 +705,20 @@ msgstr "" msgid "Dealt with by subdivision within 5 working days" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:877 +#: perllib/FixMyStreet/App/Controller/Admin.pm:865 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:175 #: templates/web/base/admin/body.html:81 #: templates/web/base/admin/category_edit.html:42 #: templates/web/base/admin/category_edit.html:93 msgid "Deleted" msgstr "" -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:47 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -736,7 +726,7 @@ msgid "Description" msgstr "Pershkrim" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:68 +#: templates/web/zurich/report/new/fill_in_details_form.html:70 msgid "Details" msgstr "Detaje" @@ -761,11 +751,11 @@ msgid "Diligency prize league table" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:48 -#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/auth/general.html:58 +#: templates/web/base/report/new/form_user_loggedout.html:28 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout.html:17 +#: templates/web/base/report/update/form_user_loggedout.html:27 msgid "Do you have a %s password?" msgstr "" @@ -783,8 +773,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "Duplicate" msgstr "Dyfisho" @@ -804,7 +794,7 @@ msgstr "" msgid "Edit" msgstr "" -#: templates/web/base/admin/body.html:220 +#: templates/web/base/admin/body.html:218 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "" @@ -834,7 +824,7 @@ msgstr "Editor" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:39 +#: templates/web/base/auth/general.html:49 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -842,11 +832,11 @@ msgstr "Editor" msgid "Email" msgstr "Email" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 msgid "Email added to abuse list" msgstr "Emaili u shtua te lista e abuzimeve" -#: templates/web/base/admin/body.html:155 +#: templates/web/base/admin/body.html:153 msgid "Email address:" msgstr "Email adresa:" @@ -858,19 +848,14 @@ msgstr "" msgid "Email alert deleted" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1390 msgid "Email already in abuse list" msgstr "" -#: templates/web/base/around/_updates.html:5 -msgid "Email me new local problems" -msgstr "Me dergo email per problemet e reja lokale" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 -#: templates/web/base/alert/updates.html:13 #: templates/web/zurich/admin/body.html:47 msgid "Email:" msgstr "Email:" @@ -879,26 +864,6 @@ msgstr "Email:" msgid "Email: %s" msgstr "Email: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 -msgid "Empty flat or maisonette" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 -msgid "Empty house or bungalow" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 -msgid "Empty office or other commercial" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 -msgid "Empty pub or bar" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 -msgid "Empty public building - school, hospital, etc." -msgstr "" - #: templates/web/base/admin/body-form.html:162 #: templates/web/base/admin/body-form.html:163 msgid "" @@ -942,18 +907,14 @@ msgstr "" msgid "Enter a nearby street name and area" msgstr "" -#: perllib/FixMyStreet/Cobrand/ZeroTB.pm:7 -msgid "Enter a nearby street name and area, postal code or district in Delhi" -msgstr "" - -#: templates/web/base/auth/general.html:99 +#: templates/web/base/auth/general.html:109 #: templates/web/base/report/new/form_user_loggedout_by_email.html:38 #: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Shkruaj fjalekalimin" -#: templates/web/base/index-steps.html:26 +#: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "Pershkruaje problemin" @@ -979,7 +940,7 @@ msgstr "Shembull i kodit postar %s" msgid "Examples:" msgstr "Shembuj:" -#: templates/web/base/report/new/form_report.html:49 +#: templates/web/base/report/new/form_report.html:51 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "" @@ -1016,19 +977,15 @@ msgstr "Emri" msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." msgstr "" -#: templates/web/base/header.html:26 -msgid "FixMyStreet" -msgstr "FixMyStreet" - #: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:38 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:40 msgid "Fixed" msgstr "E rregulluar" @@ -1055,7 +1012,7 @@ msgstr "" msgid "Flag user" msgstr "Flamuri i perdoruesit" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "" @@ -1077,8 +1034,7 @@ msgstr "" msgid "Flagged:" msgstr "" -#: templates/web/base/reports/_ward-list.html:3 -#: templates/web/fixmystreet/reports/_ward-list.html:4 +#: templates/web/base/reports/_ward-list.html:4 msgid "Follow a ward link to view only reports within that ward." msgstr "" @@ -1109,18 +1065,18 @@ msgstr "Pyetjet me te shpeshta" msgid "GeoRSS on Google Maps" msgstr "GeoRSS ne Google Maps" +#: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:11 -#: templates/web/fixmystreet/around/_updates.html:3 msgid "Get updates" msgstr "Merr perditesimet" -#: templates/web/fixmystreet/reports/_rss.html:3 -#: templates/web/fixmystreet/reports/_rss.html:9 +#: templates/web/base/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:9 msgid "Get updates of %s problems" msgstr "Merr perditesimet per %s problemet" -#: templates/web/fixmystreet/reports/_rss.html:11 -#: templates/web/fixmystreet/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:11 +#: templates/web/base/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "Merr perditesimet e problemeve ne kete %s" @@ -1133,7 +1089,7 @@ msgid "Glad to hear it’s been fixed!" msgstr "" #: templates/web/base/alert/index.html:34 -#: templates/web/base/around/postcode_form.html:16 +#: templates/web/base/around/postcode_form.html:13 #: templates/web/base/reports/_list-filters.html:28 #: templates/web/zurich/admin/stats.html:26 msgid "Go" @@ -1159,7 +1115,7 @@ msgstr "A ka qene i rregulluar ky problem?" msgid "Have you ever reported a problem to a council before, or is this your first time?" msgstr "" -#: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:38 +#: templates/web/base/footer.html:38 #: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 @@ -1170,8 +1126,7 @@ msgstr "Ndihme" msgid "Here are the types of local problem alerts for ‘%s’." msgstr "Ketu jane llojet e raportimeve te problemeve lokale per ‘%s’." -#: templates/web/base/header.html:32 templates/web/fixmystreet/header.html:63 -#: templates/web/zurich/footer.html:12 +#: templates/web/base/header.html:63 templates/web/zurich/footer.html:12 msgid "Hi %s" msgstr "Pershendetje %s" @@ -1187,11 +1142,11 @@ msgstr "Pershendetje %s" msgid "Hidden" msgstr "E fshehur" -#: templates/web/base/around/display_location.html:65 +#: templates/web/base/around/display_location.html:64 msgid "Hide old" msgstr "Fshih te vjetratt" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:59 msgid "Hide pins" msgstr "Fshih shenjen" @@ -1211,10 +1166,6 @@ msgstr "Si te raportoj nje problem" msgid "How to send successful reports" msgstr "Si te dergoj nje raport ne menyre te sukseshme" -#: perllib/FixMyStreet/App/Controller/Admin.pm:752 -msgid "I am afraid you cannot confirm unconfirmed reports." -msgstr "Une kam frike se ju nuk mund te konfirmoni raportet e pakonfirmuara" - #: templates/web/base/tokens/confirm_problem.html:23 #: templates/web/base/tokens/confirm_problem.html:27 msgid "I just reported a problem on @fixmystreet" @@ -1225,7 +1176,7 @@ msgstr "" msgid "I just updated a problem on @fixmystreet" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88 msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "Une jam i frikesuar se ne nuk mund te lokalizojme problemin tuaj e databaze.\n" @@ -1247,7 +1198,7 @@ msgid "" " For basic installations, you don't need to join bodies in this way." msgstr "" -#: templates/web/base/admin/body.html:133 +#: templates/web/base/admin/body.html:132 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." @@ -1268,7 +1219,7 @@ msgid "" "(please note it will not be sent to the council)." msgstr "" -#: templates/web/base/admin/body.html:149 +#: templates/web/base/admin/body.html:147 msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." msgstr "" @@ -1303,10 +1254,10 @@ msgstr "ID ilegale" msgid "Illegal feed selection" msgstr "zgjedhje e gabuar e feed" +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "In Progress" msgstr "Ne Vazhdim" @@ -1357,7 +1308,7 @@ msgstr "Rekomandim i brendshem" msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 msgid "Invalid end date" msgstr "Data e fundit jovalide" @@ -1365,16 +1316,16 @@ msgstr "Data e fundit jovalide" msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 msgid "Invalid start date" msgstr "Data e fillimit jovalide" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:5 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Investigating" msgstr "Shqyrtuar" @@ -1396,7 +1347,7 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:80 +#: 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 @@ -1434,7 +1385,6 @@ msgstr "Duke ngarkuar..." #: 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/fixmystreet/alert/updates.html:1 msgid "Local RSS feeds and email alerts" msgstr "" @@ -1443,11 +1393,11 @@ msgstr "" msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "" -#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:35 +#: templates/web/base/footer.html:35 msgid "Local alerts" msgstr "" -#: templates/web/base/index-steps.html:25 +#: templates/web/base/index-steps.html:5 msgid "Locate the problem on a map of the area" msgstr "Lokalizo problemin ne harte ne vendin e caktuar" @@ -1507,14 +1457,14 @@ msgstr "Muaji" #: templates/web/base/admin/list_updates.html:7 #: templates/web/base/admin/reports.html:13 #: templates/web/base/admin/users.html:15 -#: templates/web/base/auth/general.html:89 +#: templates/web/base/auth/general.html:99 #: templates/web/base/report/new/form_user_loggedin.html:9 #: templates/web/base/report/new/form_user_loggedout_by_email.html:7 -#: templates/web/base/report/update/form_name.html:4 +#: templates/web/base/report/update/form_name.html:5 #: templates/web/base/reports/index.html:20 #: 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:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "Name" msgstr "Emri" @@ -1538,8 +1488,8 @@ msgstr "" msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:455 -#: perllib/FixMyStreet/Cobrand/Default.pm:495 +#: perllib/FixMyStreet/Cobrand/Default.pm:454 +#: perllib/FixMyStreet/Cobrand/Default.pm:494 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" @@ -1561,7 +1511,7 @@ msgstr "" msgid "New body added" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:387 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 msgid "New category contact added" msgstr "" @@ -1626,7 +1576,7 @@ msgstr "Tjetra" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 -#: templates/web/base/questionnaire/index.html:101 +#: templates/web/base/questionnaire/index.html:102 #: templates/web/base/questionnaire/index.html:53 msgid "No" msgstr "Jo" @@ -1691,8 +1641,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Not Responsible" msgstr "Jo Pergjegjes" @@ -1725,7 +1675,7 @@ msgstr "Shenim" 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/base/admin/body.html:186 +#: templates/web/base/admin/body.html:184 #: templates/web/base/admin/category_edit.html:52 #: templates/web/zurich/admin/body.html:53 msgid "Note:" @@ -1739,15 +1689,15 @@ msgstr "Shenim: <strong>%s</strong>" msgid "Notes from SDM to DM" msgstr "" -#: templates/web/base/report/new/form_user_loggedout.html:14 #: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/form_user_loggedout.html:24 #: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "" #: templates/web/base/report/update-form.html:28 -#: templates/web/base/report/update/form_user_loggedout.html:13 #: templates/web/base/report/update/form_user_loggedout.html:2 +#: templates/web/base/report/update/form_user_loggedout.html:23 msgid "Now to submit your update…" msgstr "Tani ju mund te paraqitni perditesimin…" @@ -1781,8 +1731,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:23 #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/report/update/form_update.html:36 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1817,13 +1767,13 @@ msgstr "Ose raportoni problemet n:" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1055 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 -#: perllib/FixMyStreet/DB/Result/Problem.pm:558 -#: perllib/FixMyStreet/DB/Result/Problem.pm:568 -#: perllib/FixMyStreet/DB/Result/Problem.pm:578 -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1044 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:659 +#: perllib/FixMyStreet/DB/Result/Problem.pm:562 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 +#: perllib/FixMyStreet/DB/Result/Problem.pm:582 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 #: perllib/FixMyStreet/Script/Reports.pm:175 #: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" @@ -1848,7 +1798,7 @@ msgstr "Burim" msgid "Partial" msgstr "I pjesshem" -#: templates/web/base/auth/general.html:92 +#: templates/web/base/auth/general.html:102 #: templates/web/base/report/new/form_user_loggedout_by_email.html:31 #: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 @@ -1857,7 +1807,7 @@ msgid "Password (optional)" msgstr "Fjalekalimi (opsionale)" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:72 +#: templates/web/base/auth/general.html:82 msgid "Password:" msgstr "Fjalekalimi:" @@ -1865,7 +1815,7 @@ msgstr "Fjalekalimi:" msgid "Permalink" msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:90 msgid "Phone number" msgstr "Numri i telefonit" @@ -1881,13 +1831,21 @@ msgid "Phone:" msgstr "Telefoni:" #: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/questionnaire/index.html:89 +#: templates/web/base/questionnaire/index.html:91 #: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/new/form_report.html:38 +#: templates/web/base/report/new/form_report.html:40 +#: templates/web/base/report/update/form_update.html:20 +#: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:6 #: 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:45 +#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/zurich/report/new/fill_in_details_form.html:63 msgid "Photo" msgstr "Fotografia" @@ -1911,8 +1869,8 @@ msgstr "Vendose shenjen ne harte" #: perllib/FixMyStreet/Cobrand/Zurich.pm:955 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:6 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 @@ -1928,16 +1886,16 @@ 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/general.html:27 -#: templates/web/base/auth/general.html:33 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:43 #: 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:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:856 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:921 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -1947,7 +1905,7 @@ msgstr "Ju lutem zgjedhni kategorine" msgid "Please choose a property type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:378 +#: perllib/FixMyStreet/App/Controller/Admin.pm:376 msgid "Please correct the errors below" msgstr "" @@ -1968,11 +1926,10 @@ msgstr "" msgid "Please enter a message" msgstr "Ju lutem shkruaj nje mesazh" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Admin.pm:1079 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 msgid "Please enter a name" -msgstr "Ju lutem shkruani emrin tuaj" +msgstr "" #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 @@ -1986,10 +1943,10 @@ msgstr "Ju lutem shkruaj fjalekalimin" msgid "Please enter a subject" msgstr "Ju lutem shkruaj subjektin" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1075 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1130 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:133 +#: perllib/FixMyStreet/DB/Result/User.pm:143 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2006,9 +1963,9 @@ msgid "Please enter some details" msgstr "Ju lutem shkruaj disa te dhena" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:130 -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:32 +#: perllib/FixMyStreet/DB/Result/User.pm:140 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:42 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2017,7 +1974,7 @@ msgid "Please enter your email" msgstr "Ju lutem shkruani email-in tuaj" #: templates/web/base/report/new/form_user_loggedout_email.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:80 +#: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "Please enter your email address" msgstr "Ju lutem shkruani email adresen tuaj" @@ -2033,7 +1990,7 @@ msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:126 +#: perllib/FixMyStreet/DB/Result/User.pm:136 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "Ju lutem shkruani emrin tuaj" @@ -2060,7 +2017,7 @@ msgstr "Ju lutem ndihuni te lire per tu <a href=\"%s\">kyqur perseri</a>, ose kt msgid "Please fill in details of the problem below." msgstr "Ju lutem pershkruani ne hollesi problemin me poshte." -#: templates/web/zurich/report/new/fill_in_details_form.html:72 +#: templates/web/zurich/report/new/fill_in_details_form.html:74 msgid "Please fill in details of the problem." msgstr "" @@ -2069,7 +2026,7 @@ msgstr "" msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" @@ -2095,16 +2052,16 @@ msgstr "" msgid "Please note:" msgstr "Ju lutem vini re:" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please provide some explanation as to why you're reopening this report" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250 msgid "Please provide some text as well as a photo" msgstr "Ju lutem ofroni nje pershkrim si dhe nje fotografi" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236 msgid "Please say whether you've ever reported a problem to your council before" msgstr "" @@ -2120,22 +2077,23 @@ msgstr "Ju lutem zgjedhni furnizuesin qe deshironi" msgid "Please select the type of alert you want" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232 msgid "Please state whether or not the problem has been fixed" msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:121 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 #: templates/web/base/js/translation_strings.html:53 -msgid "Please upload a JPEG image only" +#, fuzzy +msgid "Please upload an image only" msgstr "Ju lutem ngarkoni vetem fotografi te formatit JPEG" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 msgid "Please write a message" msgstr "Ju lutem shkruani nje mesazh" -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Please write your update here" msgstr "Ju lutem shkruani perditesimin tuaj ketu" @@ -2166,7 +2124,7 @@ msgstr "" msgid "Previous" msgstr "Paraprak" -#: templates/web/fixmystreet/footer.html:41 +#: templates/web/base/footer.html:41 msgid "Privacy" msgstr "" @@ -2176,7 +2134,7 @@ msgstr "" msgid "Privacy and cookies" msgstr "" -#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:200 #: templates/web/base/admin/body.html:85 #: templates/web/base/admin/category_edit.html:45 #: templates/web/base/admin/report_edit.html:77 @@ -2205,7 +2163,7 @@ msgstr "" msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1046 msgid "Problem marked as open." msgstr "Problemi eshte shenuar si i hapur." @@ -2217,10 +2175,6 @@ msgstr "Ndryshim i gjendjes se problemit bazuar ne rezultatet e anketes" msgid "Problems" msgstr "Problemet" -#: templates/web/base/around/_updates.html:1 -msgid "Problems in this area" -msgstr "Problemet ne kete zone" - #: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "Problemet ne afersi" @@ -2238,13 +2192,11 @@ msgid "Problems within %.1fkm of this location" msgstr "Problemet brenda %.1fkm te ketij lokacioni" #: perllib/FixMyStreet/Cobrand/Default.pm:663 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 #: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "Problemet brenda %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "Problemet brenda lagjes %s" @@ -2263,15 +2215,11 @@ msgstr "Problemet brenda kufijve te:" msgid "Property address:" msgstr "Adresa e prones:" -#: templates/web/base/report/new/category.html:8 -msgid "Property type:" -msgstr "Lloji i prones:" - #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Ofro nje perditesim" -#: templates/web/base/auth/general.html:95 +#: templates/web/base/auth/general.html:105 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 "" @@ -2305,16 +2253,15 @@ msgstr "" msgid "Questionnaire %d sent for problem %d" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 msgid "Questionnaire filled in by problem reporter" msgstr "" #: templates/web/base/alert/_list.html:22 +#: templates/web/base/alert/updates.html:9 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display_tools.html:34 -#: templates/web/base/reports/_rss.html:1 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed" msgstr "RSS feed" @@ -2342,18 +2289,12 @@ msgstr "RSS feed i %s, brenda lagjes %s" msgid "RSS feed of nearby problems" msgstr "RSS feed i problemeve ne afersi" -#: templates/web/base/reports/_rss.html:1 -msgid "RSS feed of problems in this %s" -msgstr "RSS feed i problemeve ne kete %s" - #: perllib/FixMyStreet/Cobrand/Default.pm:664 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 #: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "RSS feed i problemeve brenda %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 #: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "RSS feed i problemeve brenda lagjes %s " @@ -2363,14 +2304,13 @@ msgstr "RSS feed i problemeve brenda lagjes %s " msgid "RSS feed of recent local problems" msgstr "RSS feed nga problemet e fundit lokale" +#: templates/web/base/alert/updates.html:9 #: templates/web/base/report/display_tools.html:34 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed of updates to this problem" msgstr "RSS feed per te rejat rreth ketij problemi" -#: templates/web/base/alert/updates.html:9 +#: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:36 -#: templates/web/fixmystreet/alert/updates.html:14 msgid "Receive email when updates are left on this problem." msgstr "Prano email kur ka perditesime te ketij problemi" @@ -2406,12 +2346,11 @@ msgstr "Largo fotografine (nuk mund te kthehet!)" msgid "Reply to user:" msgstr "" -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/header_logo.html:2 msgid "Report" msgstr "" -#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:26 -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/footer.html:26 templates/web/base/header_logo.html:2 #: templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2421,7 +2360,7 @@ msgstr "Raporto nje problem" msgid "Report abuse" msgstr "Raporto abuzimin" -#: perllib/FixMyStreet/App/Controller/Rss.pm:291 +#: perllib/FixMyStreet/App/Controller/Rss.pm:297 msgid "Report on %s" msgstr "Raporto ne %s" @@ -2436,7 +2375,7 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:577 #: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "Raportuar ne menyre anonime te %s" @@ -2446,7 +2385,7 @@ msgstr "Raportuar ne menyre anonime te %s" msgid "Reported before" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 #: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "Raportuar nga %s ne %s" @@ -2460,27 +2399,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "Raportuar ne kategorine %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:569 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 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:591 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 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:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported via %s anonymously at %s" msgstr "Raportuar nepermjet %s ne menyre anonime ne %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported via %s by %s at %s" msgstr "Raportuar nepermjet %s nga %s ne %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:561 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 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:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 msgid "Reported via %s in the %s category by %s at %s" msgstr "Raportuar nepermjet %s ne kategorine %s ne %s" @@ -2501,7 +2440,7 @@ msgstr "" msgid "Reporting a problem" msgstr "Raportimi i nje problemi" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1274 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" @@ -2544,15 +2483,15 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1496 #: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "Rrotullo Majtas" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 #: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 @@ -2567,7 +2506,7 @@ msgstr "" msgid "Satellite" msgstr "" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/base/admin/category_edit.html:84 #: templates/web/zurich/admin/body.html:59 #: templates/web/zurich/admin/template_edit.html:29 @@ -2623,7 +2562,7 @@ msgstr "" msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:696 +#: perllib/FixMyStreet/DB/Result/Problem.pm:698 msgid "Sent to %s %s later" msgstr "" @@ -2642,21 +2581,21 @@ msgstr "Shperndaj" #: templates/web/base/report/new/form_user_loggedin.html:23 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22 -#: templates/web/base/report/update/form_name.html:15 +#: templates/web/base/report/update/form_name.html:16 msgid "Show my name publicly" msgstr "Publiko emrin tim" -#: templates/web/base/around/display_location.html:67 +#: templates/web/base/around/display_location.html:66 msgid "Show old" msgstr "Shfaq te vjetrat" -#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:57 msgid "Show pins" msgstr "Shfaq shenjat" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/general.html:110 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:76 +#: templates/web/base/auth/general.html:86 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2715,9 +2654,8 @@ msgstr "Na vjen keq, ne nuk mund te gjejme kete lokacion." #: templates/web/base/auth/general.html:9 #: templates/web/base/report/display.html:21 #: templates/web/base/report/new/fill_in_details_form.html:23 -#, fuzzy msgid "Sorry, we could not log you in. Please fill in the form below." -msgstr "Na vjen keq, ne nuk mund te kuptojme kete lokacion. Ju lutem provoni perseri." +msgstr "" #: perllib/FixMyStreet/Geocode/Bing.pm:35 #: perllib/FixMyStreet/Geocode/Google.pm:45 @@ -2725,15 +2663,10 @@ msgstr "Na vjen keq, ne nuk mund te kuptojme kete lokacion. Ju lutem provoni per msgid "Sorry, we could not parse that location. Please try again." msgstr "Na vjen keq, ne nuk mund te kuptojme kete lokacion. Ju lutem provoni perseri." -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:138 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 -#, fuzzy -msgid "Sorry, you can not log in with Facebook. Please try again later." -msgstr "Na vjen keq, ne nuk mund te kuptojme kete lokacion. Ju lutem provoni perseri." - #: templates/web/base/admin/stats.html:64 msgid "Start Date:" msgstr "Data e Fillimit:" @@ -2742,7 +2675,7 @@ msgstr "Data e Fillimit:" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/report/update/form_update.html:32 +#: templates/web/base/report/update/form_update.html:34 msgid "State" msgstr "Gjendje" @@ -2755,7 +2688,7 @@ msgstr "Gjendje" msgid "State:" msgstr "Gjendje:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2795,10 +2728,10 @@ msgid "Subject:" msgstr "Tema:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/base/report/new/form_user_loggedout_by_email.html:39 #: templates/web/base/report/new/form_user_loggedout_password.html:11 -#: templates/web/zurich/report/new/fill_in_details_form.html:96 +#: templates/web/zurich/report/new/fill_in_details_form.html:98 msgid "Submit" msgstr "Paraqit" @@ -2826,9 +2759,8 @@ msgstr "Paraqit pyetesorin" msgid "Submitted" msgstr "Paraqitur" -#: templates/web/base/alert/updates.html:17 +#: templates/web/base/alert/updates.html:23 #: templates/web/base/report/display_tools.html:41 -#: templates/web/fixmystreet/alert/updates.html:23 msgid "Subscribe" msgstr "Abonohu" @@ -2836,7 +2768,7 @@ msgstr "Abonohu" msgid "Subscribe me to an email alert" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -2855,7 +2787,7 @@ msgstr "Permbledhje" msgid "Summary reports" msgstr "Raportet përmbledhëse" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 msgid "Survey" msgstr "Studim" @@ -2912,7 +2844,7 @@ msgstr "" msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:157 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" @@ -2920,7 +2852,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:126 +#: perllib/FixMyStreet/App/Controller/Location.pm:127 msgid "That location does not appear to be in the UK; please try again." msgstr "" @@ -2930,11 +2862,11 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:724 +#: perllib/FixMyStreet/App/Controller/Admin.pm:722 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:716 +#: perllib/FixMyStreet/App/Controller/Admin.pm:714 msgid "That problem will now be resent." msgstr "" @@ -2946,7 +2878,7 @@ msgstr "Raporti nuk mund te shihet ne %s." msgid "That report has been removed from FixMyStreet." msgstr "" -#: templates/web/base/admin/body.html:144 +#: templates/web/base/admin/body.html:142 msgid "" "The <strong>email address</strong> is the destination to which reports about this category will be sent. \n" " Other categories for this body may have the same email address." @@ -3086,9 +3018,9 @@ msgstr "" msgid "There was a problem showing this page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:753 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 -#: templates/web/base/auth/general.html:43 +#: templates/web/base/auth/general.html:53 #: 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 "" @@ -3149,9 +3081,9 @@ msgstr "" 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:920 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:898 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:935 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:977 #: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "" @@ -3164,11 +3096,11 @@ msgstr "" msgid "This is a summary of all reports on this site." msgstr "" -#: templates/web/base/report/update/form_update.html:52 +#: templates/web/base/report/update/form_update.html:54 msgid "This problem has been fixed" msgstr "Ky problem ka qene i rregulluar" -#: templates/web/base/report/update/form_update.html:46 +#: templates/web/base/report/update/form_update.html:48 msgid "This problem has not been fixed" msgstr "Ky problem nuk ka qene i rregulluar" @@ -3205,7 +3137,7 @@ msgstr "" msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Kohezgjatja" @@ -3250,8 +3182,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Unable to fix" msgstr "" @@ -3268,7 +3200,7 @@ msgstr "E pakonfirmuar" msgid "Unknown" msgstr "E panjohur" -#: perllib/FixMyStreet/App/Controller/Rss.pm:173 +#: perllib/FixMyStreet/App/Controller/Rss.pm:174 msgid "Unknown alert type" msgstr "" @@ -3283,7 +3215,7 @@ msgstr "Gabim i panjohur" msgid "Unknown problem ID" msgstr "" -#: templates/web/base/report/update/form_update.html:25 +#: templates/web/base/report/update/form_update.html:27 msgid "Update" msgstr "Perditesim" @@ -3335,10 +3267,10 @@ msgstr "" msgid "Updated" msgstr "Perditesuar" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 -#: perllib/FixMyStreet/App/Controller/Admin.pm:821 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1096 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1144 +#: perllib/FixMyStreet/App/Controller/Admin.pm:809 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3365,7 +3297,7 @@ msgstr "Perditesimet ne {{title}}" msgid "Updates to this problem, %s" msgstr "" -#: templates/web/base/admin/body.html:182 +#: templates/web/base/admin/body.html:180 msgid "Use the <strong>note</strong> to record details that are only displayed in the admin. Notes are not shown publicly, and are not sent to the body." msgstr "" @@ -3374,11 +3306,11 @@ msgstr "" msgid "Used map" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1421 msgid "User flagged" msgstr "" @@ -3386,16 +3318,16 @@ msgstr "" msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "Perdoruesit" -#: perllib/FixMyStreet/App/Controller/Admin.pm:382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:412 -#: perllib/FixMyStreet/App/Controller/Admin.pm:429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:380 +#: perllib/FixMyStreet/App/Controller/Admin.pm:410 +#: perllib/FixMyStreet/App/Controller/Admin.pm:427 msgid "Values updated" msgstr "Vlerat e perditesuara" @@ -3432,16 +3364,15 @@ msgstr "" #: templates/web/base/auth/general.html:6 #: templates/web/base/report/display.html:27 #: templates/web/base/report/new/oauth_email_form.html:5 -#, fuzzy msgid "We need your email address, please give it below." -msgstr "Ne asnjëherë nuk do tëshfaqim email adresen ose numrin tuaj të telefonit." +msgstr "" #: templates/web/base/report/new/form_user_loggedout_email.html:2 #: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "ne asnjëherë nuk do të shfaqim email-in tuaj" -#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedin.html:30 #: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "Ne asnjëherë nuk do tëshfaqim email adresen ose numrin tuaj të telefonit." @@ -3450,7 +3381,7 @@ msgstr "Ne asnjëherë nuk do tëshfaqim email adresen ose numrin tuaj të telef 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 "" -#: templates/web/base/index-steps.html:31 +#: templates/web/base/index-steps.html:11 msgid "We send it to the council on your behalf" msgstr "" @@ -3488,10 +3419,6 @@ msgstr "" msgid "Whoa there Testino! Three photos are enough." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 -msgid "Whole block of empty flats" -msgstr "" - #: templates/web/base/tokens/confirm_alert.html:7 msgid "Why stop there? <a href=\"/alert\">Set up more alerts</a> for free." msgstr "" @@ -3511,7 +3438,7 @@ msgstr "" msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "" -#: templates/web/base/questionnaire/index.html:96 +#: templates/web/base/questionnaire/index.html:97 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "" @@ -3541,8 +3468,8 @@ msgstr "Viti" #: templates/web/base/admin/update_edit.html:24 #: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 +#: templates/web/base/questionnaire/index.html:100 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "Po" @@ -3656,19 +3583,19 @@ msgid "Your Reports" msgstr "Raportet tuaja" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/alert/updates.html:19 +#: templates/web/base/alert/updates.html:22 #: templates/web/base/contact/index.html:83 #: templates/web/base/report/display_tools.html:38 #: templates/web/base/report/display_tools.html:40 #: templates/web/base/report/new/form_user_loggedin.html:3 #: templates/web/base/report/new/form_user_loggedout_email.html:1 #: templates/web/base/report/update/form_user_loggedout_email.html:1 -#: templates/web/fixmystreet/alert/updates.html:19 -#: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/zurich/report/new/fill_in_details_form.html:76 +#: templates/web/zurich/report/new/fill_in_details_form.html:78 msgid "Your email" msgstr "Email-i juaj" -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/general.html:55 #: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 @@ -3679,17 +3606,17 @@ msgstr "Email adresa juaj" msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "" -#: templates/web/base/auth/general.html:90 +#: templates/web/base/auth/general.html:100 #: templates/web/base/contact/index.html:76 #: templates/web/base/report/new/form_user_loggedin.html:18 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17 -#: templates/web/base/report/update/form_name.html:11 +#: templates/web/base/report/update/form_name.html:12 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:86 +#: templates/web/zurich/report/new/fill_in_details_form.html:88 msgid "Your name" msgstr "Emri juaj" -#: templates/web/base/auth/general.html:75 +#: templates/web/base/auth/general.html:85 #: 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 @@ -3702,20 +3629,19 @@ msgstr "Fjalekalimi juaj eshte ndryshuar" #: templates/web/base/report/new/form_user_loggedin.html:27 #: templates/web/base/report/new/form_user_loggedout_by_email.html:26 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:94 msgid "Your phone number" msgstr "Numri juaj i telefonit" #: templates/web/base/questionnaire/index.html:14 -#, fuzzy msgid "Your report" -msgstr "Raportet tuaja" +msgstr "" -#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 +#: templates/web/base/footer.html:29 msgid "Your reports" msgstr "Raportet tuaja" -#: templates/web/base/my/my.html:41 +#: templates/web/base/my/my.html:39 msgid "Your updates" msgstr "Perditesimet tuaja" @@ -3741,7 +3667,7 @@ msgid "didn't use map" msgstr "nuk e perdorni harten" #: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/around/postcode_form.html:12 msgid "e.g. ‘%s’ or ‘%s’" msgstr "p.sh. ‘%s’ ose ‘%s’" @@ -3847,8 +3773,7 @@ msgstr "zona tjera:" msgid "reopened" msgstr "rihapur" -#: templates/web/base/header.html:33 templates/web/fixmystreet/header.html:64 -#: templates/web/zurich/footer.html:13 +#: templates/web/base/header.html:64 templates/web/zurich/footer.html:13 msgid "sign out" msgstr "shkyqur" @@ -3926,7 +3851,7 @@ msgid_plural "<big>%s</big> updates on reports" msgstr[0] "<big>%s</big> perditesim ne raporte" msgstr[1] "<big>%s</big> perditesime ne raporte" -#: templates/web/emptyhomes/report/new/councils_text_none.html:3 +#: templates/web/base/report/new/councils_text_none.html:3 #, perl-format msgid "We do not yet have details for the council that covers this location." msgid_plural "We do not yet have details for the councils that cover this location." @@ -3968,53 +3893,26 @@ msgid_plural "We do <strong>not</strong> yet have details for the other councils msgstr[0] "" msgstr[1] "" -#~ msgid "(we never show your email address or phone number)" -#~ msgstr "(ne asnjëherë nuk do tëshfaqim email adresen ose numrin tuaj të telefonit)" - -#~ msgid "(we never show your email)" -#~ msgstr "(ne asnjëherë nuk do të shfaqim email-in tuaj)" - -#~ msgid "<strong>No</strong>, let me confirm my report by email:" -#~ msgstr "<strong>Jo</strong>, me lejoni te konfirmoj raportin tim me email:" - -#~ msgid "<strong>No</strong>, let me confirm my update by email:" -#~ msgstr "<strong>Jo</strong>, me lejo te konfirmoj perditesimin tim me email:" - -#~ msgid "Enter a new password:" -#~ msgstr "Shkruaj fjalekalimin e ri:" - -#~ msgid "Message:" -#~ msgstr "Mesazh:" - -#~ msgid "More problems nearby" -#~ msgstr "Me shume probleme ketu afer" - -#~ msgid "Photo:" -#~ msgstr "Fotografia:" - -#~ msgid "Please check your email" -#~ msgstr "Ju lutem kontrolloni email-in tuaj" - -#~ msgid "This problem has been closed" -#~ msgstr "Ky problem ka qene i mbyllur" +#~ msgid "%s, reported at %s" +#~ msgstr "%s, raportuar në %s" -#~ msgid "This problem is in progress" -#~ msgstr "Ky problem eshte ne progres" +#~ msgid "About us" +#~ msgstr "Rreth nesh" -#~ msgid "This problem is old and of unknown status." -#~ msgstr "Ky problem eshte i vjeter dhe me status te panjohur." +#~ msgid "Email me new local problems" +#~ msgstr "Me dergo email per problemet e reja lokale" -#~ msgid "Update:" -#~ msgstr "Perditesim:" +#~ msgid "FixMyStreet" +#~ msgstr "FixMyStreet" -#~ msgid "We have not been able to confirm your account - sorry." -#~ msgstr "Ne nuk jemi ne gjendje te konfirmojme llogarine tuaj - na vjen keq." +#~ msgid "I am afraid you cannot confirm unconfirmed reports." +#~ msgstr "Une kam frike se ju nuk mund te konfirmoni raportet e pakonfirmuara" -#~ msgid "Your email:" -#~ msgstr "Email-i juaj:" +#~ msgid "Problems in this area" +#~ msgstr "Problemet ne kete zone" -#~ msgid "Your name:" -#~ msgstr "Emri juaj:" +#~ msgid "Property type:" +#~ msgstr "Lloji i prones:" -#~ msgid "Your email:" -#~ msgstr "Email-i juaj;" +#~ msgid "RSS feed of problems in this %s" +#~ msgstr "RSS feed i problemeve ne kete %s" diff --git a/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po index 5a1fdf08d..b68ef7cdf 100644 --- a/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2016-03-02 13:09+0000\n" -"PO-Revision-Date: 2016-01-31 19:36+0000\n" +"POT-Creation-Date: 2016-05-03 10:41+0100\n" +"PO-Revision-Date: 2016-04-29 13:21+0000\n" "Last-Translator: Jon Kristensen <info@jonkri.com>\n" "Language-Team: Swedish (Sweden) (http://www.transifex.com/mysociety/fixmystreet/language/sv_SE/)\n" "Language: sv_SE\n" @@ -21,7 +21,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/DB/Result/Problem.pm:618 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr "eller" @@ -54,9 +54,8 @@ msgid "%s admin:" msgstr "%s administratör:" #: templates/web/base/status/stats.html:26 -#, fuzzy msgid "%s bodies" -msgstr "Förvaltningar" +msgstr "%s förvaltningar" #: templates/web/base/status/stats.html:24 msgid "%s confirmed alerts, %s unconfirmed" @@ -91,7 +90,7 @@ msgstr "%s uppdateringar" msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "%s frÃ¥geformulär skickade – %s besvarade (%s%%)" -#: perllib/FixMyStreet/DB/Result/Problem.pm:683 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "%s ref: %s" msgstr "%s ref: %s" @@ -110,10 +109,6 @@ msgstr "%s skickar olika kategorier av rapporter till olika enheter inom en komm msgid "%s ward, %s" msgstr "Administrativa omrÃ¥det %s, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:552 -msgid "%s, reported at %s" -msgstr "%s, rapporterad %s" - #: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "%s inom det administrativa omrÃ¥det %s" @@ -168,7 +163,7 @@ msgstr "(ex.v. graffiti, skräp, trasiga gatustenar eller belysning)" msgid "(not sent to council)" msgstr "(ej skickat till kommunen)" -#: templates/web/zurich/report/new/fill_in_details_form.html:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "(optional)" msgstr "(valfritt)" @@ -180,12 +175,11 @@ msgstr "(offentlig)" msgid "(sent to both)" msgstr "(skickat till bÃ¥da)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Välj en katagori --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Välj en fastighetstyp --" @@ -220,26 +214,21 @@ msgstr "<strong>Nej</strong> LÃ¥t mig bekräfta min rapport via epost" msgid "<strong>No</strong> Let me confirm my update by email" msgstr "<strong>Nej</strong> LÃ¥t mig bekräfta uppdateringen via epost" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:97 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>Nej</strong> LÃ¥t mig logga in med min epostadress" -#: templates/web/base/auth/general.html:70 +#: templates/web/base/auth/general.html:80 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Ja</strong>, jag har ett lösenord" -#: templates/web/base/about/about-en-gb.html:1 -#: templates/web/base/about/about-en-gb.html:3 -msgid "About us" -msgstr "Om oss" - #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Action Scheduled" msgstr "Ã…tgärd är schemalagd" @@ -270,7 +259,7 @@ msgstr "Ny kategori" msgid "Add user" msgstr "Lägg till användare" -#: templates/web/base/my/my.html:56 +#: templates/web/base/my/my.html:54 msgid "Added %s" msgstr "Lades till %s" @@ -290,7 +279,7 @@ msgstr "Bevakning %d skapad för %s av typen %s med parametrarna %s/%s" msgid "Alert %d disabled (created %s)" msgstr "Bevakning %d avaktiverad (skapad %s)" -#: templates/web/base/report/update/form_name.html:20 +#: templates/web/base/report/update/form_name.html:21 msgid "Alert me to future updates" msgstr "Varsko mig om framtida uppdateringar" @@ -303,7 +292,7 @@ msgstr "Alla rapporter" msgid "All Reports as CSV" msgstr "Alla rapporter som CSV" -#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 +#: templates/web/base/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:20 @@ -347,7 +336,7 @@ msgstr "Är du en utvecklare?" #: templates/web/base/js/translation_strings.html:52 msgid "Are you sure you want to cancel this upload?" -msgstr "" +msgstr "Är du säker pÃ¥ att du vill avbryta den här uppladdningen?" #: templates/web/base/admin/body-form.html:69 #: templates/web/base/admin/body.html:16 @@ -402,7 +391,7 @@ msgstr "Tillbaka" msgid "Ban email address" msgstr "Förbjud epostadress" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1273 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -433,7 +422,7 @@ msgstr "Kan du inte se kartan? <em>Hoppa över det här steget</em>" #: templates/web/base/admin/body.html:68 #: templates/web/base/admin/index.html:54 -#: templates/web/base/report/new/category.html:10 +#: templates/web/base/report/new/category.html:7 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 @@ -448,7 +437,7 @@ msgstr "Kategori" msgid "Category fix rate for problems > 4 weeks old" msgstr "Kategorins lösningsnivÃ¥ för problem över 4 veckor gamla" -#: templates/web/base/admin/body.html:138 +#: templates/web/base/admin/body.html:137 #: templates/web/base/admin/category_edit.html:23 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/admin/body.html:43 @@ -468,7 +457,7 @@ msgstr "Kategori: %s" msgid "Change password" msgstr "Ändra lösenord" -#: templates/web/base/admin/body.html:160 +#: templates/web/base/admin/body.html:158 msgid "" "Check <strong>confirmed</strong> to indicate that this contact has been confirmed as correct.\n" " If you are not sure of the origin or validity of the contact, leave this unchecked." @@ -476,13 +465,13 @@ msgstr "" "Markera <strong>bekräftad</strong> för att visa att denna kontakt har verifierats.\n" "Om du inte är säker pÃ¥ ursprung eller giltighet för denna kontakt, lämna detta omarkerat." -#: templates/web/base/admin/body.html:171 +#: templates/web/base/admin/body.html:169 msgid "" "Check <strong>deleted</strong> to remove the category from use. \n" " It will not appear as an available category in the drop-down menu on the report-a-problem page." msgstr "Markera <strong>raderad</strong> för att ta bort denna kategori frÃ¥n att användas. Den kommer inte dyka upp som en valbar kategori i rullgardinslistan pÃ¥ sidan där användare rapporterar ett problem." -#: templates/web/base/admin/body.html:191 +#: templates/web/base/admin/body.html:189 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -493,7 +482,7 @@ msgid "" " at a specific address." msgstr "Kryssa i <strong>privat</strong> om rapporter i den här kategorin <strong>aldrig skall visas pÃ¥ sajten</strong>.<br>Kategorier är vanligtvis inte privata.<br>Detta är lämpligt för rapporter som du vill tillÃ¥ta att användare rapporterar till förvaltningen, men där det inte finns nÃ¥got allmänt intresse av att visa rapporten. Det kan exempelvis vara en kategori som används för att sätta ut en extra papperskorg pÃ¥ en specifik adress." -#: templates/web/base/admin/body.html:130 +#: templates/web/base/admin/body.html:129 msgid "" "Choose a <strong>category</strong> 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." @@ -534,8 +523,8 @@ msgstr "Klicka pÃ¥ länken i vÃ¥rt bekräftelsemail för att logga in." #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:15 #: templates/web/base/admin/report_blocks.html:25 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 @@ -544,7 +533,7 @@ msgstr "Klicka pÃ¥ länken i vÃ¥rt bekräftelsemail för att logga in." msgid "Closed" msgstr "Stängd" -#: perllib/FixMyStreet/DB/Result/Problem.pm:779 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Closed by council" msgstr "Stängd av kommunen" @@ -570,7 +559,7 @@ msgstr "Cobrand data:" msgid "Cobrand:" msgstr "Cobrand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Konfiguration" @@ -589,7 +578,6 @@ msgstr "Bekräfta konto" #: templates/web/base/report/new/form_user_loggedout_password.html:21 #: templates/web/base/report/update/form_user_loggedout_password.html:20 -#, fuzzy msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." msgstr "Bekräfta via epost nedan genom att ange ett nytt lösenord. När du bekräftar kommer ditt lösenord att uppdateras." @@ -601,7 +589,7 @@ msgstr "Bekräfta via epost nedan genom att ange ett nytt lösenord. När du bek msgid "Confirmation" msgstr "Bekräftelse" -#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:164 #: templates/web/base/admin/body.html:79 #: templates/web/base/admin/category_edit.html:37 #: templates/web/base/admin/category_edit.html:92 @@ -620,7 +608,7 @@ msgid "Confirmed:" msgstr "Bekräftat:" #. ("%s is the site name") -#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 +#: templates/web/base/about/_sidebar.html:6 msgid "Contact %s" msgstr "Kontakta %s" @@ -639,8 +627,8 @@ msgstr "Kontakta teamet" msgid "Coordinates:" msgstr "Koordinater:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1417 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1445 msgid "Could not find user" msgstr "Kan inte hitta användaren" @@ -658,7 +646,7 @@ msgstr "Kommun" msgid "Council contacts for %s" msgstr "Kommunkontakter för %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:681 +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "Council ref: %s" msgstr "kommunens referens: %s" @@ -677,7 +665,7 @@ msgstr "Antal" msgid "Create a report" msgstr "Skapa en rapport" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "Skapa en kategori" @@ -721,20 +709,20 @@ msgstr "Skrivbord" msgid "Dealt with by subdivision within 5 working days" msgstr "Hanterat av underavdelning inom 5 arbetsdagar" -#: perllib/FixMyStreet/App/Controller/Admin.pm:877 +#: perllib/FixMyStreet/App/Controller/Admin.pm:865 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "Ta bort mall" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:175 #: templates/web/base/admin/body.html:81 #: templates/web/base/admin/category_edit.html:42 #: templates/web/base/admin/category_edit.html:93 msgid "Deleted" msgstr "Borttagen" -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:47 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -742,7 +730,7 @@ msgid "Description" msgstr "Beskrivning" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:68 +#: templates/web/zurich/report/new/fill_in_details_form.html:70 msgid "Details" msgstr "Detaljer" @@ -767,11 +755,11 @@ msgid "Diligency prize league table" msgstr "Flitighetstopplistan" #. ("%s is the site name") -#: templates/web/base/auth/general.html:48 -#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/auth/general.html:58 +#: templates/web/base/report/new/form_user_loggedout.html:28 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout.html:17 +#: templates/web/base/report/update/form_user_loggedout.html:27 msgid "Do you have a %s password?" msgstr "Har du ett lösenord för %s?" @@ -785,12 +773,12 @@ msgstr "Gillar du inte formulär?" #: templates/web/base/js/translation_strings.html:51 msgid "Drag and drop photos here or <u>click to upload</u>" -msgstr "" +msgstr "Släpp foton här eller <u>klicka för att ladda upp</u>" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "Duplicate" msgstr "Finns redan" @@ -810,7 +798,7 @@ msgstr "Varje förvaltningskontakt har en kategori, och denna visas för allmän msgid "Edit" msgstr "Ändra" -#: templates/web/base/admin/body.html:220 +#: templates/web/base/admin/body.html:218 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "Ändra förvaltningsdetaljer" @@ -840,7 +828,7 @@ msgstr "Redaktör" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:39 +#: templates/web/base/auth/general.html:49 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -848,11 +836,11 @@ msgstr "Redaktör" msgid "Email" msgstr "Epost" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 msgid "Email added to abuse list" msgstr "Epostadressen tillagd till missbrukslistan" -#: templates/web/base/admin/body.html:155 +#: templates/web/base/admin/body.html:153 msgid "Email address:" msgstr "E-postadress:" @@ -864,19 +852,14 @@ msgstr "E-postnotifikation skapad" msgid "Email alert deleted" msgstr "E-postnotifikation borttagen" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1390 msgid "Email already in abuse list" msgstr "Epostadressen finns redan i missbrukslistan" -#: templates/web/base/around/_updates.html:5 -msgid "Email me new local problems" -msgstr "Eposta mig nya problem lokalt" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 -#: templates/web/base/alert/updates.html:13 #: templates/web/zurich/admin/body.html:47 msgid "Email:" msgstr "Epost:" @@ -885,26 +868,6 @@ msgstr "Epost:" msgid "Email: %s" msgstr "E-post: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 -msgid "Empty flat or maisonette" -msgstr "Tom lägenhet" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 -msgid "Empty house or bungalow" -msgstr "Tomt hus" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 -msgid "Empty office or other commercial" -msgstr "Tomt kontor eller annan kommersiell lokal" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 -msgid "Empty pub or bar" -msgstr "Tom pub eller bar" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 -msgid "Empty public building - school, hospital, etc." -msgstr "Tom publik byggnad - skola, sjukhus, etc." - #: templates/web/base/admin/body-form.html:162 #: templates/web/base/admin/body-form.html:163 msgid "" @@ -951,18 +914,14 @@ msgstr "Ange ett postnummer eller gatunamn och ort" msgid "Enter a nearby street name and area" msgstr "Ange ett närligande gatunamn och ort" -#: perllib/FixMyStreet/Cobrand/ZeroTB.pm:7 -msgid "Enter a nearby street name and area, postal code or district in Delhi" -msgstr "Ange ett närligande gatunamn och ort, postnummer och distrikt i Delhi" - -#: templates/web/base/auth/general.html:99 +#: templates/web/base/auth/general.html:109 #: templates/web/base/report/new/form_user_loggedout_by_email.html:38 #: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Ange ett lösenord" -#: templates/web/base/index-steps.html:26 +#: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "Skriv in information om problemet" @@ -988,7 +947,7 @@ msgstr "Exempelpostnummer %s" msgid "Examples:" msgstr "Exempel:" -#: templates/web/base/report/new/form_report.html:49 +#: templates/web/base/report/new/form_report.html:51 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "Beskriv vad problemet är, exakt var det är, och hur länge det har varit där..." @@ -1025,19 +984,15 @@ msgstr "Första gÃ¥ngen" msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." msgstr "Lös detta genom att välja ett <strong>lämpligt omrÃ¥de</strong> i <em>Ändra förvaltningsdetaljer</em> i formuläret nedan." -#: templates/web/base/header.html:26 -msgid "FixMyStreet" -msgstr "FixaMinGata" - #: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:38 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:40 msgid "Fixed" msgstr "Löst" @@ -1064,7 +1019,7 @@ msgstr "Flagga som borttagen" msgid "Flag user" msgstr "Flagga användare" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "Flaggat" @@ -1086,8 +1041,7 @@ msgstr "Flaggade användare är inte begränsade pÃ¥ nÃ¥got sätt. Detta är bar msgid "Flagged:" msgstr "Flaggat:" -#: templates/web/base/reports/_ward-list.html:3 -#: templates/web/fixmystreet/reports/_ward-list.html:4 +#: templates/web/base/reports/_ward-list.html:4 msgid "Follow a ward link to view only reports within that ward." msgstr "Följ en länk till ett omrÃ¥de för att se rapporter endast inom det omrÃ¥det." @@ -1118,18 +1072,18 @@ msgstr "Vanliga frÃ¥gor" msgid "GeoRSS on Google Maps" msgstr "GeoRSS pÃ¥ Google Maps" +#: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:11 -#: templates/web/fixmystreet/around/_updates.html:3 msgid "Get updates" msgstr "FÃ¥ uppdateringar" -#: templates/web/fixmystreet/reports/_rss.html:3 -#: templates/web/fixmystreet/reports/_rss.html:9 +#: templates/web/base/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:9 msgid "Get updates of %s problems" msgstr "FÃ¥ uppdateringar av %s problem" -#: templates/web/fixmystreet/reports/_rss.html:11 -#: templates/web/fixmystreet/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:11 +#: templates/web/base/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "FÃ¥ uppdateringar om problem i denna %s" @@ -1142,7 +1096,7 @@ msgid "Glad to hear it’s been fixed!" msgstr "Vi är glada att höra att det har blivit löst!" #: templates/web/base/alert/index.html:34 -#: templates/web/base/around/postcode_form.html:16 +#: templates/web/base/around/postcode_form.html:13 #: templates/web/base/reports/_list-filters.html:28 #: templates/web/zurich/admin/stats.html:26 msgid "Go" @@ -1168,7 +1122,7 @@ msgstr "Har det här problemet blivit löst?" msgid "Have you ever reported a problem to a council before, or is this your first time?" msgstr "Har du nÃ¥gonsin rapporterat ett problem till en kommun tidigare eller är det här första gÃ¥ngen?" -#: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:38 +#: templates/web/base/footer.html:38 #: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 @@ -1179,8 +1133,7 @@ msgstr "Hjälp" 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’" -#: templates/web/base/header.html:32 templates/web/fixmystreet/header.html:63 -#: templates/web/zurich/footer.html:12 +#: templates/web/base/header.html:63 templates/web/zurich/footer.html:12 msgid "Hi %s" msgstr "Hej %s" @@ -1196,11 +1149,11 @@ msgstr "Hej %s" msgid "Hidden" msgstr "Gömd" -#: templates/web/base/around/display_location.html:65 +#: templates/web/base/around/display_location.html:64 msgid "Hide old" msgstr "Göm äldre" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:59 msgid "Hide pins" msgstr "Göm pinnar" @@ -1220,10 +1173,6 @@ msgstr "Hur man rapporterar ett problem" msgid "How to send successful reports" msgstr "Hur bra rapporter skickas" -#: perllib/FixMyStreet/App/Controller/Admin.pm:752 -msgid "I am afraid you cannot confirm unconfirmed reports." -msgstr "Tyvärr kan du inte bekräfta obekräftade rapporter" - #: templates/web/base/tokens/confirm_problem.html:23 #: templates/web/base/tokens/confirm_problem.html:27 msgid "I just reported a problem on @fixmystreet" @@ -1234,7 +1183,7 @@ msgstr "Jag rapporterade precis ett problem pÃ¥ @fixamingata" msgid "I just updated a problem on @fixmystreet" msgstr "Jag uppdaterade precis ett problem pÃ¥ @fixamingata" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88 msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "Tyvärr kunde vi inte hitta ditt problem i databasen.\n" @@ -1256,7 +1205,7 @@ msgid "" " For basic installations, you don't need to join bodies in this way." msgstr "Identifiera en <strong>förälder</strong> om den här förvaltningen är en del av en annan förvaltning. Den här typen av kopplingar behövs inte göras i enklare installationer." -#: templates/web/base/admin/body.html:133 +#: templates/web/base/admin/body.html:132 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." @@ -1277,7 +1226,7 @@ msgid "" "(please note it will not be sent to the council)." msgstr "Om du vill lämna ytterligare information om problemet, ange det här. Till exempel, hur upplevde du kommunikationen med kommunen? Om du skickar en rapport här kommer den att visas offentligt pÃ¥ FixaMinGata." -#: templates/web/base/admin/body.html:149 +#: templates/web/base/admin/body.html:147 msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." msgstr "Om du använder <strong>en utskicksmetod som inte är e-post</strong>, ange ditt service-ID (Open311) eller liknande här." @@ -1312,10 +1261,10 @@ msgstr "Ogiltigt ID" msgid "Illegal feed selection" msgstr "Ogiltigt RSS-flöde" +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "In Progress" msgstr "PÃ¥gÃ¥ende" @@ -1366,7 +1315,7 @@ msgstr "Interna refereringar" msgid "Invalid agency_responsible value %s" msgstr "Inkorrekt värde för agency_responsible, \"%s\"" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 msgid "Invalid end date" msgstr "Inkorrekt slutdatum" @@ -1374,16 +1323,16 @@ msgstr "Inkorrekt slutdatum" msgid "Invalid format %s specified." msgstr "Inkorrekt format %s angivet." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 msgid "Invalid start date" msgstr "Inkorrekt startdatum" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:5 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Investigating" msgstr "Utredes" @@ -1405,7 +1354,7 @@ msgstr "Jurisdiktion Okänd" msgid "Jurisdiction unknown" msgstr "Jurisdiktion okänd" -#: templates/web/base/auth/general.html:80 +#: 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 @@ -1443,7 +1392,6 @@ msgstr "Laddar..." #: 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/fixmystreet/alert/updates.html:1 msgid "Local RSS feeds and email alerts" msgstr "Lokala RSS-flöden och epostbevakningar" @@ -1452,11 +1400,11 @@ msgstr "Lokala RSS-flöden och epostbevakningar" msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "Lokala RSS-flöden och epostbevakningar för '%s'" -#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:35 +#: templates/web/base/footer.html:35 msgid "Local alerts" msgstr "Lokala rapporter" -#: templates/web/base/index-steps.html:25 +#: templates/web/base/index-steps.html:5 msgid "Locate the problem on a map of the area" msgstr "Lokalisera problemet pÃ¥ en karta över omrÃ¥det" @@ -1516,14 +1464,14 @@ msgstr "MÃ¥nad" #: templates/web/base/admin/list_updates.html:7 #: templates/web/base/admin/reports.html:13 #: templates/web/base/admin/users.html:15 -#: templates/web/base/auth/general.html:89 +#: templates/web/base/auth/general.html:99 #: templates/web/base/report/new/form_user_loggedin.html:9 #: templates/web/base/report/new/form_user_loggedout_by_email.html:7 -#: templates/web/base/report/update/form_name.html:4 +#: templates/web/base/report/update/form_name.html:5 #: templates/web/base/reports/index.html:20 #: 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:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "Name" msgstr "Namn" @@ -1547,8 +1495,8 @@ 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:455 -#: perllib/FixMyStreet/Cobrand/Default.pm:495 +#: perllib/FixMyStreet/Cobrand/Default.pm:454 +#: perllib/FixMyStreet/Cobrand/Default.pm:494 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" @@ -1572,7 +1520,7 @@ msgstr "Nya <br>problem" msgid "New body added" msgstr "Ny förvaltning tillagd" -#: perllib/FixMyStreet/App/Controller/Admin.pm:387 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 msgid "New category contact added" msgstr "Nya kategorikontakter tillagda" @@ -1637,7 +1585,7 @@ msgstr "Nästa" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 -#: templates/web/base/questionnaire/index.html:101 +#: templates/web/base/questionnaire/index.html:102 #: templates/web/base/questionnaire/index.html:53 msgid "No" msgstr "Nej" @@ -1702,8 +1650,8 @@ msgstr "Normala (publika) användare skall inte associeras med nÃ¥gon <strong>fà #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Not Responsible" msgstr "Ej ansvarig" @@ -1736,7 +1684,7 @@ msgstr "Observera" 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/base/admin/body.html:186 +#: templates/web/base/admin/body.html:184 #: templates/web/base/admin/category_edit.html:52 #: templates/web/zurich/admin/body.html:53 msgid "Note:" @@ -1750,15 +1698,15 @@ msgstr "Observera: <strong>%s</strong>" msgid "Notes from SDM to DM" msgstr "Anteckningar frÃ¥n SDM till DM" -#: templates/web/base/report/new/form_user_loggedout.html:14 #: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/form_user_loggedout.html:24 #: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "För att skicka din rapport…" #: templates/web/base/report/update-form.html:28 -#: templates/web/base/report/update/form_user_loggedout.html:13 #: templates/web/base/report/update/form_user_loggedout.html:2 +#: templates/web/base/report/update/form_user_loggedout.html:23 msgid "Now to submit your update…" msgstr "För att skicka din uppdatering…" @@ -1792,8 +1740,8 @@ msgstr "Kort sammanfattning" #: templates/web/base/admin/report_blocks.html:23 #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/report/update/form_update.html:36 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1828,13 +1776,13 @@ msgstr "Eller problem rapporterade til:" 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:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1055 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 -#: perllib/FixMyStreet/DB/Result/Problem.pm:558 -#: perllib/FixMyStreet/DB/Result/Problem.pm:568 -#: perllib/FixMyStreet/DB/Result/Problem.pm:578 -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1044 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:659 +#: perllib/FixMyStreet/DB/Result/Problem.pm:562 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 +#: perllib/FixMyStreet/DB/Result/Problem.pm:582 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 #: perllib/FixMyStreet/Script/Reports.pm:175 #: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" @@ -1859,7 +1807,7 @@ msgstr "Förälder" msgid "Partial" msgstr "Partiell" -#: templates/web/base/auth/general.html:92 +#: templates/web/base/auth/general.html:102 #: templates/web/base/report/new/form_user_loggedout_by_email.html:31 #: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 @@ -1868,7 +1816,7 @@ msgid "Password (optional)" msgstr "Lösenord (valfritt)" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:72 +#: templates/web/base/auth/general.html:82 msgid "Password:" msgstr "Lösenord:" @@ -1876,7 +1824,7 @@ msgstr "Lösenord:" msgid "Permalink" msgstr "Permanent länk" -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:90 msgid "Phone number" msgstr "Telefonnummer" @@ -1892,13 +1840,21 @@ msgid "Phone:" msgstr "Telefonnummer:" #: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/questionnaire/index.html:89 +#: templates/web/base/questionnaire/index.html:91 #: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/new/form_report.html:38 +#: templates/web/base/report/new/form_report.html:40 +#: templates/web/base/report/update/form_update.html:20 +#: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:6 #: 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:45 +#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/zurich/report/new/fill_in_details_form.html:63 msgid "Photo" msgstr "Foto" @@ -1922,8 +1878,8 @@ msgstr "Placera nÃ¥len pÃ¥ kartan" #: perllib/FixMyStreet/Cobrand/Zurich.pm:955 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:6 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 @@ -1939,16 +1895,16 @@ 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/general.html:27 -#: templates/web/base/auth/general.html:33 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:43 #: 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:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:856 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:921 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -1958,7 +1914,7 @@ msgstr "Välj en kategori" msgid "Please choose a property type" msgstr "Välj en fastighetstyp" -#: perllib/FixMyStreet/App/Controller/Admin.pm:378 +#: perllib/FixMyStreet/App/Controller/Admin.pm:376 msgid "Please correct the errors below" msgstr "Vänligen korrigera felen nedan" @@ -1979,11 +1935,10 @@ msgstr "Var snäll och missbruka inte tjänsten, det förstör för alla." msgid "Please enter a message" msgstr "Skriv in ett meddelande" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Admin.pm:1079 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 msgid "Please enter a name" -msgstr "Skriv in ditt namn och efternamn" +msgstr "Skriv in ett namn" #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 @@ -1997,10 +1952,10 @@ msgstr "Skriv in ett lösenord" msgid "Please enter a subject" msgstr "Skriv in ett ärende" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1075 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1130 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:133 +#: perllib/FixMyStreet/DB/Result/User.pm:143 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2017,9 +1972,9 @@ msgid "Please enter some details" msgstr "Skriv nÃ¥gra detaljer" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:130 -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:32 +#: perllib/FixMyStreet/DB/Result/User.pm:140 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:42 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2028,7 +1983,7 @@ msgid "Please enter your email" msgstr "Skriv in din epostadress" #: templates/web/base/report/new/form_user_loggedout_email.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:80 +#: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "Please enter your email address" msgstr "Skriv in din epostadress" @@ -2044,7 +1999,7 @@ msgstr "Skriv in ditt namn och efternamn om kommunen behöver den informationen. #: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:126 +#: perllib/FixMyStreet/DB/Result/User.pm:136 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "Skriv in ditt namn och efternamn" @@ -2071,7 +2026,7 @@ msgstr "Välkommen att <a href=\"&s\">logga in igen</a>, eller gÃ¥ tillbaka till msgid "Please fill in details of the problem below." msgstr "Fyll i information om problemet nedan." -#: templates/web/zurich/report/new/fill_in_details_form.html:72 +#: templates/web/zurich/report/new/fill_in_details_form.html:74 msgid "Please fill in details of the problem." msgstr "Fyll i information om problemet nedan." @@ -2080,7 +2035,7 @@ msgstr "Fyll i information om problemet nedan." msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "Fyll i information om problemet nedan och beskriv den exakta platsen för problemet sÃ¥ noga du kan." -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Ange ifall du vill ta emot ett annat frÃ¥geformulär" @@ -2089,9 +2044,8 @@ msgid "Please note that updates are not sent to the council." msgstr "Observera att uppdateringar inte skickas till kommunen." #: templates/web/base/report/new/oauth_email_form.html:4 -#, fuzzy msgid "Please note your report has <strong>not yet been sent</strong>." -msgstr "Observera att din rapport <strong>inte har skickats än</strong>. Välj en kategori och ytterligare information nedan. Tryck sedan pÃ¥ skicka." +msgstr "Observera att din rapport <strong>inte har skickats än</strong>." #: templates/web/base/report/new/fill_in_details_form.html:20 #: templates/web/zurich/report/new/fill_in_details_form.html:11 @@ -2100,23 +2054,23 @@ msgstr "Observera att din rapport <strong>inte har skickats än</strong>. Välj #: templates/web/base/report/display.html:26 msgid "Please note your update has <strong>not yet been posted</strong>." -msgstr "" +msgstr "Observera att din uppdatering <strong>inte har publicerats än</strong>." #: templates/web/base/report/new/notes.html:1 #: templates/web/zurich/report/new/notes.html:1 msgid "Please note:" msgstr "Observera:" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please provide some explanation as to why you're reopening this report" msgstr "Skriv en förklaring till varför du öppna de här rapporten igen" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250 msgid "Please provide some text as well as a photo" msgstr "Skriv lite förklarande text tillsammans med ett foto" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236 msgid "Please say whether you've ever reported a problem to your council before" msgstr "Ange om du har anmält ett problem till kommunen tidigare eller ej" @@ -2132,22 +2086,23 @@ msgstr "Välj det RSS-flöde du vill ha" msgid "Please select the type of alert you want" msgstr "Välj den kategori av rapporter du vill ha" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232 msgid "Please state whether or not the problem has been fixed" msgstr "Ange om problemet har lösts eller ej" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:121 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 #: templates/web/base/js/translation_strings.html:53 -msgid "Please upload a JPEG image only" +#, fuzzy +msgid "Please upload an image only" msgstr "Ladda upp en JPEG-bild" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 msgid "Please write a message" msgstr "Skriv ett meddelande" -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Please write your update here" msgstr "Skriv din uppdatering här" @@ -2178,7 +2133,7 @@ msgstr "Byggd pÃ¥ <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">Fi msgid "Previous" msgstr "FöregÃ¥ende" -#: templates/web/fixmystreet/footer.html:41 +#: templates/web/base/footer.html:41 msgid "Privacy" msgstr "Personlig integritet" @@ -2188,7 +2143,7 @@ msgstr "Personlig integritet" msgid "Privacy and cookies" msgstr "Integritetsskydd och kakor" -#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:200 #: templates/web/base/admin/body.html:85 #: templates/web/base/admin/category_edit.html:45 #: templates/web/base/admin/report_edit.html:77 @@ -2217,7 +2172,7 @@ msgstr "Rapport %s skickad till %s" msgid "Problem breakdown by state" msgstr "Rapporter per status" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1046 msgid "Problem marked as open." msgstr "Problemet markerat som öppet." @@ -2229,10 +2184,6 @@ msgstr "Problemets status ändrats baserat pÃ¥ utredningsresultat" msgid "Problems" msgstr "Problem" -#: templates/web/base/around/_updates.html:1 -msgid "Problems in this area" -msgstr "Problem i detta omrÃ¥de" - #: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "Närliggande problem" @@ -2250,13 +2201,11 @@ msgid "Problems within %.1fkm of this location" msgstr "Problem inom %.1f km frÃ¥n denna position" #: perllib/FixMyStreet/Cobrand/Default.pm:663 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 #: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "Problem inom %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "Problem inom omrÃ¥det %s" @@ -2275,15 +2224,11 @@ msgstr "Problem inom gränsen för:" msgid "Property address:" msgstr "Fastighetsadress:" -#: templates/web/base/report/new/category.html:8 -msgid "Property type:" -msgstr "Fastighetstyp:" - #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Ge en uppdatering" -#: templates/web/base/auth/general.html:95 +#: templates/web/base/auth/general.html:105 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." @@ -2317,16 +2262,15 @@ msgstr "FrÃ¥geformulär %d svarat för problem %d, %s till %s" msgid "Questionnaire %d sent for problem %d" msgstr "FrÃ¥geformulär %d skickat för problem %d" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 msgid "Questionnaire filled in by problem reporter" msgstr "FrÃ¥geformulär ifyllt av rapportören" #: templates/web/base/alert/_list.html:22 +#: templates/web/base/alert/updates.html:9 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display_tools.html:34 -#: templates/web/base/reports/_rss.html:1 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed" msgstr "RSS-flöde" @@ -2354,18 +2298,12 @@ 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" -#: templates/web/base/reports/_rss.html:1 -msgid "RSS feed of problems in this %s" -msgstr "RSS-flöde för problem i denna %s" - #: perllib/FixMyStreet/Cobrand/Default.pm:664 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 #: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "RSS-flöde för problem inom %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 #: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "RSS-flöde för problem inom omrÃ¥de %s" @@ -2375,14 +2313,13 @@ msgstr "RSS-flöde för problem inom omrÃ¥de %s" msgid "RSS feed of recent local problems" msgstr "RSS-flöde för senaste lokala problemen" +#: templates/web/base/alert/updates.html:9 #: templates/web/base/report/display_tools.html:34 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed of updates to this problem" msgstr "RSS-flöde för uppdateringar till denna rapport" -#: templates/web/base/alert/updates.html:9 +#: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:36 -#: templates/web/fixmystreet/alert/updates.html:14 msgid "Receive email when updates are left on this problem." msgstr "ErhÃ¥ll epost när uppdateringar ges till denna rapport" @@ -2418,12 +2355,11 @@ msgstr "Ta bort foto (kan inte Ã¥ngras!)" msgid "Reply to user:" msgstr "Besvara användare:" -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/header_logo.html:2 msgid "Report" msgstr "Rapportera" -#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:26 -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/footer.html:26 templates/web/base/header_logo.html:2 #: templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2433,7 +2369,7 @@ msgstr "Rapportera ett problem" msgid "Report abuse" msgstr "Rapportera missbruk" -#: perllib/FixMyStreet/App/Controller/Rss.pm:291 +#: perllib/FixMyStreet/App/Controller/Rss.pm:297 msgid "Report on %s" msgstr "Rappoort pÃ¥ %s" @@ -2448,7 +2384,7 @@ msgstr "Rapportera ditt problem" msgid "Report, view, or discuss local problems" msgstr "Rapportera, visa, eller diskutera lokala problem" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:577 #: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "Rapporterat anonymt %s" @@ -2458,7 +2394,7 @@ msgstr "Rapporterat anonymt %s" msgid "Reported before" msgstr "Rapporterat tidigare" -#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 #: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "Rapporterat av %s den %s" @@ -2472,27 +2408,27 @@ msgstr "Rapporterad av:" msgid "Reported in the %s category" msgstr "Rapporterat i kategori %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:569 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 msgid "Reported in the %s category anonymously at %s" msgstr "Anonym rapport i kategori %s, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:591 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 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:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported via %s anonymously at %s" msgstr "Rapporterat av %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported via %s by %s at %s" msgstr "Rapporterat av %s av %s den %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:561 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 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:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 msgid "Reported via %s in the %s category by %s at %s" msgstr "Rapporterat av %s i kategorin %s av %s den %s" @@ -2513,7 +2449,7 @@ msgstr "Rapporterad:" msgid "Reporting a problem" msgstr "Rapportera ett problem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1274 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" @@ -2556,15 +2492,15 @@ msgstr "Vägoperatör för den här namngivna vägen (hämtat frÃ¥n vägens numm msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Vägoperatör för den här namngivna vägen (frÃ¥n OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1496 #: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "Rotera Ã¥t vänster" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 #: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 @@ -2579,7 +2515,7 @@ msgstr "Rotation av detta foto kommer att radera osparade rapportändringar." msgid "Satellite" msgstr "Satellit" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/base/admin/category_edit.html:84 #: templates/web/zurich/admin/body.html:59 #: templates/web/zurich/admin/template_edit.html:29 @@ -2635,7 +2571,7 @@ msgstr "Välj vilken kategori av rapporter du vill fÃ¥ och klicka knappen för e msgid "Sent report back" msgstr "Skicka tillbaka rapport" -#: perllib/FixMyStreet/DB/Result/Problem.pm:696 +#: perllib/FixMyStreet/DB/Result/Problem.pm:698 msgid "Sent to %s %s later" msgstr "Skickades till %s, %s senare" @@ -2654,21 +2590,21 @@ msgstr "Dela" #: templates/web/base/report/new/form_user_loggedin.html:23 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22 -#: templates/web/base/report/update/form_name.html:15 +#: templates/web/base/report/update/form_name.html:16 msgid "Show my name publicly" msgstr "Visa mitt namn publikt" -#: templates/web/base/around/display_location.html:67 +#: templates/web/base/around/display_location.html:66 msgid "Show old" msgstr "Visa äldre" -#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:57 msgid "Show pins" msgstr "Visa pinnar" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/general.html:110 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:76 +#: templates/web/base/auth/general.html:86 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2729,9 +2665,8 @@ msgstr "Tyvärr kan vi inte hitta den adressen." #: templates/web/base/auth/general.html:9 #: templates/web/base/report/display.html:21 #: templates/web/base/report/new/fill_in_details_form.html:23 -#, fuzzy msgid "Sorry, we could not log you in. Please fill in the form below." -msgstr "Tyvärr kan vi inte förstÃ¥ den adressen. Försök gärna igen." +msgstr "Inloggningen misslyckades. Fyll i formuläret nedan." #: perllib/FixMyStreet/Geocode/Bing.pm:35 #: perllib/FixMyStreet/Geocode/Google.pm:45 @@ -2739,15 +2674,10 @@ msgstr "Tyvärr kan vi inte förstÃ¥ den adressen. Försök gärna igen." msgid "Sorry, we could not parse that location. Please try again." msgstr "Tyvärr kan vi inte förstÃ¥ den adressen. Försök gärna igen." -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:138 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "Tyvärr kan vi inte spara bilden eller bilderna. Försök gärna igen." -#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 -#, fuzzy -msgid "Sorry, you can not log in with Facebook. Please try again later." -msgstr "Det uppstod ett problem med att visa denna sida. Försök gärna igen senare." - #: templates/web/base/admin/stats.html:64 msgid "Start Date:" msgstr "Startdatum:" @@ -2756,7 +2686,7 @@ msgstr "Startdatum:" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/report/update/form_update.html:32 +#: templates/web/base/report/update/form_update.html:34 msgid "State" msgstr "Status" @@ -2769,7 +2699,7 @@ msgstr "Status" msgid "State:" msgstr "Status:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2809,10 +2739,10 @@ msgid "Subject:" msgstr "Ärende:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/base/report/new/form_user_loggedout_by_email.html:39 #: templates/web/base/report/new/form_user_loggedout_password.html:11 -#: templates/web/zurich/report/new/fill_in_details_form.html:96 +#: templates/web/zurich/report/new/fill_in_details_form.html:98 msgid "Submit" msgstr "Skicka" @@ -2840,9 +2770,8 @@ msgstr "Skicka frÃ¥geformulär" msgid "Submitted" msgstr "Skickad" -#: templates/web/base/alert/updates.html:17 +#: templates/web/base/alert/updates.html:23 #: templates/web/base/report/display_tools.html:41 -#: templates/web/fixmystreet/alert/updates.html:23 msgid "Subscribe" msgstr "Prenumerera" @@ -2850,7 +2779,7 @@ msgstr "Prenumerera" msgid "Subscribe me to an email alert" msgstr "Prenumerera med epost" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -2869,7 +2798,7 @@ msgstr "Sammanfattning" msgid "Summary reports" msgstr "Sammanställningsrapporter" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 msgid "Survey" msgstr "Enkät" @@ -2926,7 +2855,7 @@ msgstr "Tack för att du bifogade ett foto. Vi mÃ¥ste nu lokalisera ditt problem msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "Tack, vi är glada över att det har blivit Ã¥tgärdat. Har du rapporterat ett problem till en kommun tidigare?" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:157 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "Bilden verkar inte ha laddats upp korrekt (%s), var vänlig försök igen." @@ -2934,7 +2863,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:126 +#: perllib/FixMyStreet/App/Controller/Location.pm:127 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." @@ -2944,11 +2873,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:724 +#: perllib/FixMyStreet/App/Controller/Admin.pm:722 msgid "That problem has been marked as sent." msgstr "Problemet har markerats som skickat." -#: perllib/FixMyStreet/App/Controller/Admin.pm:716 +#: perllib/FixMyStreet/App/Controller/Admin.pm:714 msgid "That problem will now be resent." msgstr "Rapportern kommer nu att skickas om." @@ -2960,7 +2889,7 @@ msgstr "Rapporten kan inte visas pÃ¥ %s." msgid "That report has been removed from FixMyStreet." msgstr "Rapporten har tagits bort frÃ¥n FixaMinGata." -#: templates/web/base/admin/body.html:144 +#: templates/web/base/admin/body.html:142 msgid "" "The <strong>email address</strong> is the destination to which reports about this category will be sent. \n" " Other categories for this body may have the same email address." @@ -3100,9 +3029,9 @@ msgstr "Det uppstod ett problem med att visa sidan med alla rapporter. Försök 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:764 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:753 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 -#: templates/web/base/auth/general.html:43 +#: templates/web/base/auth/general.html:53 #: 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’." @@ -3163,9 +3092,9 @@ msgstr "Det här brevet har skickats till flera adresser eftersom rapportören i 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:920 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:898 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:935 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:977 #: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "Den här informationen krävs" @@ -3178,11 +3107,11 @@ msgstr "Det här är en utvecklingsplats: olika saker kan komma att gÃ¥ sönder msgid "This is a summary of all reports on this site." msgstr "Det här är en sammanställning av alla rapporter." -#: templates/web/base/report/update/form_update.html:52 +#: templates/web/base/report/update/form_update.html:54 msgid "This problem has been fixed" msgstr "Det här problemet har lösts" -#: templates/web/base/report/update/form_update.html:46 +#: templates/web/base/report/update/form_update.html:48 msgid "This problem has not been fixed" msgstr "Det här problemet har inte lösts" @@ -3219,7 +3148,7 @@ msgstr "Den här sidan innehÃ¥ller ocksÃ¥ ett foto av problemet" msgid "Time spent (in minutes):" msgstr "Nedlagd tid (i minuter):" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Tidslinje" @@ -3264,8 +3193,8 @@ msgstr "Prova att skicka ett e-brev till oss direkt:" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Unable to fix" msgstr "Kunde inte Ã¥tgärda" @@ -3282,7 +3211,7 @@ msgstr "Obekräftat" msgid "Unknown" msgstr "Okänt" -#: perllib/FixMyStreet/App/Controller/Rss.pm:173 +#: perllib/FixMyStreet/App/Controller/Rss.pm:174 msgid "Unknown alert type" msgstr "Okänd feltyp" @@ -3297,7 +3226,7 @@ msgstr "Okänt fel" msgid "Unknown problem ID" msgstr "Okänt problemnummer" -#: templates/web/base/report/update/form_update.html:25 +#: templates/web/base/report/update/form_update.html:27 msgid "Update" msgstr "Uppdatering" @@ -3349,10 +3278,10 @@ msgstr "Uppdaterad status" msgid "Updated" msgstr "Uppdaterad" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 -#: perllib/FixMyStreet/App/Controller/Admin.pm:821 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1096 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1144 +#: perllib/FixMyStreet/App/Controller/Admin.pm:809 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3379,7 +3308,7 @@ msgstr "Uppdateringar för {{title}}" msgid "Updates to this problem, %s" msgstr "Uppdateringar för det här problemet, %s" -#: templates/web/base/admin/body.html:182 +#: templates/web/base/admin/body.html:180 msgid "Use the <strong>note</strong> to record details that are only displayed in the admin. Notes are not shown publicly, and are not sent to the body." msgstr "Använd <strong>anteckningen</strong> för att dokumentera information som bara visas för administratörer. Anteckningar visas inte offentligt och skickas inte till förvaltningen." @@ -3388,11 +3317,11 @@ msgstr "Använd <strong>anteckningen</strong> för att dokumentera information s msgid "Used map" msgstr "Använde kartan" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 msgid "User flag removed" msgstr "Användarflaggan borttagen" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1421 msgid "User flagged" msgstr "Användaren flaggad" @@ -3400,16 +3329,16 @@ msgstr "Användaren flaggad" 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/App/Controller/Admin.pm:1289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "Användare" -#: perllib/FixMyStreet/App/Controller/Admin.pm:382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:412 -#: perllib/FixMyStreet/App/Controller/Admin.pm:429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:380 +#: perllib/FixMyStreet/App/Controller/Admin.pm:410 +#: perllib/FixMyStreet/App/Controller/Admin.pm:427 msgid "Values updated" msgstr "Värden uppdaterade" @@ -3446,16 +3375,15 @@ msgstr "Vi hittade fler än en träff. Vi visar upp till tio träffar nedan. Om #: templates/web/base/auth/general.html:6 #: templates/web/base/report/display.html:27 #: templates/web/base/report/new/oauth_email_form.html:5 -#, fuzzy msgid "We need your email address, please give it below." -msgstr "Vi visar aldrig din epostadress eller telefonnummer publikt." +msgstr "Skriv in din e-postadress nedan." #: templates/web/base/report/new/form_user_loggedout_email.html:2 #: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "Vi visar aldrig din epostadress publikt" -#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedin.html:30 #: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "Vi visar aldrig din epostadress eller telefonnummer publikt." @@ -3464,7 +3392,7 @@ msgstr "Vi visar aldrig din epostadress eller telefonnummer publikt." 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." -#: templates/web/base/index-steps.html:31 +#: templates/web/base/index-steps.html:11 msgid "We send it to the council on your behalf" msgstr "Vi skickar rapportern till berörd kommun" @@ -3500,11 +3428,7 @@ msgstr "Vid avsändning" #: templates/web/base/js/translation_strings.html:50 msgid "Whoa there Testino! Three photos are enough." -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 -msgid "Whole block of empty flats" -msgstr "Hela block med tomma lägenheter" +msgstr "Du kan som mest ladda upp tre foton." #: templates/web/base/tokens/confirm_alert.html:7 msgid "Why stop there? <a href=\"/alert\">Set up more alerts</a> for free." @@ -3525,7 +3449,7 @@ msgstr "Vid sökningar är det ocksÃ¥ möjligt att söka efter agency_responsibl msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "Vill du bidra till FixaMinGata? VÃ¥r kod är öppen programvara och <a href=\"http://fixmystreet.org\">tillgänglig pÃ¥ fixmystreet.org</a>." -#: templates/web/base/questionnaire/index.html:96 +#: templates/web/base/questionnaire/index.html:97 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "Vill du bli pÃ¥mind om att kolla statusen med ett annat frÃ¥geformulär om fyra veckor?" @@ -3555,8 +3479,8 @@ msgstr "Ã…r" #: templates/web/base/admin/update_edit.html:24 #: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 +#: templates/web/base/questionnaire/index.html:100 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "Ja" @@ -3623,9 +3547,8 @@ msgstr "Du har redan bifogat bilder till den här rapporten. Notera att du kan b #: templates/web/base/questionnaire/index.html:83 #: templates/web/base/report/update/form_update.html:14 -#, fuzzy msgid "You have already attached photos to this update. Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)." -msgstr "Du har redan bifogat bilder till den här rapporten. Notera att du kan bifoga som mest tre bilder (om du försöker ladda upp fler tas de tidigaste bort)." +msgstr "Du har redan bifogat foton till din uppdatering. Notera att du kan bifoga som mest tre bilder (om du försöker ladda upp fler tas de tidigaste bort)." #: templates/web/base/auth/sign_out.html:4 #: templates/web/zurich/auth/sign_out.html:3 @@ -3671,19 +3594,19 @@ msgid "Your Reports" msgstr "Dina rapporter" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/alert/updates.html:19 +#: templates/web/base/alert/updates.html:22 #: templates/web/base/contact/index.html:83 #: templates/web/base/report/display_tools.html:38 #: templates/web/base/report/display_tools.html:40 #: templates/web/base/report/new/form_user_loggedin.html:3 #: templates/web/base/report/new/form_user_loggedout_email.html:1 #: templates/web/base/report/update/form_user_loggedout_email.html:1 -#: templates/web/fixmystreet/alert/updates.html:19 -#: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/zurich/report/new/fill_in_details_form.html:76 +#: templates/web/zurich/report/new/fill_in_details_form.html:78 msgid "Your email" msgstr "Din epostadress" -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/general.html:55 #: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 @@ -3694,17 +3617,17 @@ msgstr "Din epostadress" msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "Din information kommer endast att användas i enlighet med vÃ¥r <a href=\"/privacy\">sekretesspolicy</a>" -#: templates/web/base/auth/general.html:90 +#: templates/web/base/auth/general.html:100 #: templates/web/base/contact/index.html:76 #: templates/web/base/report/new/form_user_loggedin.html:18 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17 -#: templates/web/base/report/update/form_name.html:11 +#: templates/web/base/report/update/form_name.html:12 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:86 +#: templates/web/zurich/report/new/fill_in_details_form.html:88 msgid "Your name" msgstr "Ditt namn och efternamn" -#: templates/web/base/auth/general.html:75 +#: templates/web/base/auth/general.html:85 #: 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 @@ -3717,20 +3640,19 @@ msgstr "Ditt lösenord har ändrats" #: templates/web/base/report/new/form_user_loggedin.html:27 #: templates/web/base/report/new/form_user_loggedout_by_email.html:26 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:94 msgid "Your phone number" msgstr "Ditt telefonnummer" #: templates/web/base/questionnaire/index.html:14 -#, fuzzy msgid "Your report" -msgstr "Dina rapporter" +msgstr "Din rapport" -#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 +#: templates/web/base/footer.html:29 msgid "Your reports" msgstr "Dina rapporter" -#: templates/web/base/my/my.html:41 +#: templates/web/base/my/my.html:39 msgid "Your updates" msgstr "Dina uppdateringar" @@ -3756,7 +3678,7 @@ msgid "didn't use map" msgstr "använde inte kartan" #: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/around/postcode_form.html:12 msgid "e.g. ‘%s’ or ‘%s’" msgstr "ex.v. '%s' eller '%s'" @@ -3862,8 +3784,7 @@ msgstr "andra omrÃ¥den:" msgid "reopened" msgstr "öppnat pÃ¥ nytt" -#: templates/web/base/header.html:33 templates/web/fixmystreet/header.html:64 -#: templates/web/zurich/footer.html:13 +#: templates/web/base/header.html:64 templates/web/zurich/footer.html:13 msgid "sign out" msgstr "logga ut" @@ -3941,7 +3862,7 @@ msgid_plural "<big>%s</big> updates on reports" msgstr[0] "<big>%s</big> uppdatering av rapporter" msgstr[1] "<big>%s</big> uppdateringar av rapporter" -#: templates/web/emptyhomes/report/new/councils_text_none.html:3 +#: templates/web/base/report/new/councils_text_none.html:3 #, perl-format msgid "We do not yet have details for the council that covers this location." msgid_plural "We do not yet have details for the councils that cover this location." @@ -3983,86 +3904,50 @@ msgid_plural "We do <strong>not</strong> yet have details for the other councils msgstr[0] "Vi har ännu <strong>ingen</strong> information om kommunen pÃ¥ den platsen" msgstr[1] "Kommunen pÃ¥ platsen har valt att inte ta emot rapporter frÃ¥n FixaMinGata." -#~ msgid "(we never show your email address or phone number)" -#~ msgstr "(vi visar aldrig din epostadress eller telefonnummer)" - -#~ msgid "(we never show your email)" -#~ msgstr "(vi visar aldrig din epostadress)" - -#~ msgid "<strong>No</strong>, let me confirm my report by email:" -#~ msgstr "<strong>Nej<strong>, lÃ¥t mig bekräfta min rapport via epost:" - -#~ msgid "<strong>No</strong>, let me confirm my update by email:" -#~ msgstr "<strong>Nej</strong>, lÃ¥t mig bekräfta min uppdatering via epost:" - -#~ msgid "Email me updates" -#~ msgstr "Eposta mig uppdateringar" - -#~ msgid "Enter a new password:" -#~ msgstr "Ange ett nytt lösenord:" - -#~ msgid "I'm afraid we couldn't validate that token. If you've copied the URL from an email, please check that you copied it exactly.\n" -#~ msgstr "Tyvärr kan vi inte hitta den rapporten. Om du kopierade en länk frÃ¥n ett epost bör du verifiera att du kopierade länken exakt.\n" - -#~ msgid "If you use web-based email or have 'junk mail' filters, you may wish to check your bulk/spam mail folders: sometimes, our messages are marked that way." -#~ msgstr "Om du använder webbmail och har spamfilter bör du kolla din spamfolder eftersom vÃ¥ra brev ibland markeras som skräp." - -#~ msgid "Message:" -#~ msgstr "Meddelande:" - -#~ msgid "More problems nearby" -#~ msgstr "Fler närliggande problem" - -#~ msgid "Nearly Done! Now check your email..." -#~ msgstr "Nästan klar! Kolla nu din epost." - -#~ msgid "Offensive? Unsuitable? Tell us" -#~ msgstr "Kränkande eller olämpligt? Kontakta oss" - -#~ msgid "Photo:" -#~ msgstr "Foto:" +#~ msgid "%s, reported at %s" +#~ msgstr "%s, rapporterad %s" -#~ msgid "Please check your email" -#~ msgstr "Vänligen kontrollera din epost" +#~ msgid "About us" +#~ msgstr "Om oss" -#~ msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" -#~ msgstr "Observera att uppdateringar inte skickas till kommunen. Om du lämnar ditt namn kommer det att visas publikt. Din information används endast i enlighet med vÃ¥r <a href=\"/faq#privacy\">sekretesspolicy</a>" +#~ msgid "Email me new local problems" +#~ msgstr "Eposta mig nya problem lokalt" -#~ msgid "This may be because the link is too old or already used, or the address was not copied correctly." -#~ msgstr "Detta kan bero pÃ¥ att länken är för gammal, att den redan har använts, eller att adressen inte kopierades korrekt." +#~ msgid "Empty flat or maisonette" +#~ msgstr "Tom lägenhet" -#~ msgid "This problem has been closed" -#~ msgstr "Den här rapporten har stängts" +#~ msgid "Empty house or bungalow" +#~ msgstr "Tomt hus" -#~ msgid "This problem is in progress" -#~ msgstr "Arbete pÃ¥gÃ¥r med att lösa problemet" +#~ msgid "Empty office or other commercial" +#~ msgstr "Tomt kontor eller annan kommersiell lokal" -#~ msgid "This problem is old and of unknown status." -#~ msgstr "Problemet är gammalt och har okänt status" +#~ msgid "Empty pub or bar" +#~ msgstr "Tom pub eller bar" -#~ msgid "Update:" -#~ msgstr "Uppdatering:" +#~ msgid "Empty public building - school, hospital, etc." +#~ msgstr "Tom publik byggnad - skola, sjukhus, etc." -#~ msgid "We have not been able to confirm your account - sorry." -#~ msgstr "Vi beklagar att vi inte har kunnat bekräfta ditt konto." +#~ msgid "Enter a nearby street name and area, postal code or district in Delhi" +#~ msgstr "Ange ett närligande gatunamn och ort, postnummer och distrikt i Delhi" -#~ msgid "We have sent you an email containing a link to confirm your account." -#~ msgstr "Vi har skickat dig epost med en länk för att bekräfta ditt konto." +#~ msgid "FixMyStreet" +#~ msgstr "FixaMinGata" -#~ msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:" -#~ msgstr "Vi vill gärna höra vad du tycker om FixaMinGata. Fyll i formuläret nedan och skicka in, eller skicka epost till <a href='mailto:%s'>%s</a>:" +#~ msgid "I am afraid you cannot confirm unconfirmed reports." +#~ msgstr "Tyvärr kan du inte bekräfta obekräftade rapporter" -#~ msgid "You have already attached a photo to this report, attaching another one will replace it." -#~ msgstr "Du har redan bifogat ett foto till rapporten. Om du bifogar ett nytt foto kommer det att ersätta det tidigare." +#~ msgid "Problems in this area" +#~ msgstr "Problem i detta omrÃ¥de" -#~ msgid "You have already attached a photo to this update, attaching another one will replace it." -#~ msgstr "Du har redan bifogat ett foto till uppdateringen. Om du bifogar ett nytt foto kommer det att ersätta det tidigare." +#~ msgid "Property type:" +#~ msgstr "Fastighetstyp:" -#~ msgid "Your email:" -#~ msgstr "Din epostadress:" +#~ msgid "RSS feed of problems in this %s" +#~ msgstr "RSS-flöde för problem i denna %s" -#~ msgid "Your name:" -#~ msgstr "Ditt namn:" +#~ msgid "Sorry, you can not log in with Facebook. Please try again later." +#~ msgstr "Du kunde inte logga in med Facebook. Försök gärna igen." -#~ msgid "Your email:" -#~ msgstr "Din epostadress:" +#~ msgid "Whole block of empty flats" +#~ msgstr "Hela block med tomma lägenheter" diff --git a/locale/tr_TR.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/tr_TR.UTF-8/LC_MESSAGES/FixMyStreet.po index cf0dfd1da..dab9a154e 100644 --- a/locale/tr_TR.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/tr_TR.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -6,14 +6,13 @@ # Translators: # Eda Karaman <edakaraman_92@hotmail.de>, 2015 # Muradiye <Muradiye.ates@gmail.com>, 2015 -# Seyithan Ates <seyithan.ahmet@gmail.com>, 2015-2016 msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2016-03-02 13:09+0000\n" -"PO-Revision-Date: 2016-03-08 10:24+0000\n" -"Last-Translator: Seyithan Ates <seyithan.ahmet@gmail.com>\n" +"POT-Creation-Date: 2016-05-03 10:41+0100\n" +"PO-Revision-Date: 2016-03-23 12:44+0000\n" +"Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: Turkish (Turkey) (http://www.transifex.com/mysociety/fixmystreet/language/tr_TR/)\n" "Language: tr_TR\n" "MIME-Version: 1.0\n" @@ -21,7 +20,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/DB/Result/Problem.pm:618 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr "ve" @@ -54,9 +53,8 @@ msgid "%s admin:" msgstr "%s Yönetici:" #: templates/web/base/status/stats.html:26 -#, fuzzy msgid "%s bodies" -msgstr "Bölümler" +msgstr "" #: templates/web/base/status/stats.html:24 msgid "%s confirmed alerts, %s unconfirmed" @@ -91,7 +89,7 @@ msgstr "%s güncellemeler" msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "%s bildirim – %s cevaplandı (%s%%)" -#: perllib/FixMyStreet/DB/Result/Problem.pm:683 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "%s ref: %s" msgstr "%s ref: %s" @@ -110,10 +108,6 @@ msgstr "" msgid "%s ward, %s" msgstr "%s bölüm, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:552 -msgid "%s, reported at %s" -msgstr "%s, rapor edilmiÅŸ %s" - #: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "%s, içinde %s bölüm" @@ -168,7 +162,7 @@ msgstr "(duvar yazısı (grafiti), moloz atma, kırık kaldırım döşeme, ya d msgid "(not sent to council)" msgstr "(kurula gönderilmemiÅŸ)" -#: templates/web/zurich/report/new/fill_in_details_form.html:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "(optional)" msgstr "(isteÄŸe baÄŸlı)" @@ -180,12 +174,11 @@ msgstr "(kamu)" msgid "(sent to both)" msgstr "(her ikisine de gönderildi)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Kategori seçiniz--" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Bir özellik seçiniz --" @@ -220,26 +213,21 @@ msgstr "<strong>Hayır</strong> E mail yoluyla raporumu onaylamama izin ver" msgid "<strong>No</strong> Let me confirm my update by email" msgstr "<strong>Hayır</strong> Güncellemelerimi e-posta yoluyla onaylamama izin ver" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:97 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>Hayır</strong> e-posta yoluyla giriÅŸ yapmama izin ver" -#: templates/web/base/auth/general.html:70 +#: templates/web/base/auth/general.html:80 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Evet</strong> ÅŸifrem var" -#: templates/web/base/about/about-en-gb.html:1 -#: templates/web/base/about/about-en-gb.html:3 -msgid "About us" -msgstr "Hakkımızda" - #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Action Scheduled" msgstr "Planlı Eylem" @@ -274,7 +262,7 @@ msgstr "Yeni kategori ekle" msgid "Add user" msgstr "Kullanıcı ekle" -#: templates/web/base/my/my.html:56 +#: templates/web/base/my/my.html:54 msgid "Added %s" msgstr "EklenmiÅŸ %s" @@ -294,7 +282,7 @@ msgstr "Uyarı %d için oluÅŸturulmuÅŸ %s, tür %s, deÄŸiÅŸkenler %s / %s" msgid "Alert %d disabled (created %s)" msgstr "Uyarı %d engellendi (oluÅŸturuldu %s)" -#: templates/web/base/report/update/form_name.html:20 +#: templates/web/base/report/update/form_name.html:21 msgid "Alert me to future updates" msgstr "Güncellemeleri bildir" @@ -307,7 +295,7 @@ msgstr "Tüm Bildirimler" msgid "All Reports as CSV" msgstr "Tüm raporlar CSV olarak" -#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 +#: templates/web/base/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:20 @@ -406,7 +394,7 @@ msgstr "Geri" msgid "Ban email address" msgstr "Email adresini engelle" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1273 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -437,7 +425,7 @@ msgstr "Haritayı göremiyor musunuz? <em>Bu adımı atlayın</em>" #: templates/web/base/admin/body.html:68 #: templates/web/base/admin/index.html:54 -#: templates/web/base/report/new/category.html:10 +#: templates/web/base/report/new/category.html:7 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 @@ -452,7 +440,7 @@ msgstr "Kategori" 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/body.html:138 +#: templates/web/base/admin/body.html:137 #: templates/web/base/admin/category_edit.html:23 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/admin/body.html:43 @@ -472,7 +460,7 @@ msgstr "Kategori: %s" msgid "Change password" msgstr "Åžifreyi deÄŸiÅŸtir" -#: templates/web/base/admin/body.html:160 +#: templates/web/base/admin/body.html:158 msgid "" "Check <strong>confirmed</strong> to indicate that this contact has been confirmed as correct.\n" " If you are not sure of the origin or validity of the contact, leave this unchecked." @@ -480,7 +468,7 @@ msgstr "" "Bu kiÅŸinin doÄŸru olarak teyit edildiÄŸini belirtmek için<strong>doÄŸrulandı</strong> kontrol edin.\n" "EÄŸer kiÅŸinin kaynağından veya doÄŸruluÄŸundan emin deÄŸilseniz, onu kontrol edilmemiÅŸ olarak bırakın." -#: templates/web/base/admin/body.html:171 +#: templates/web/base/admin/body.html:169 msgid "" "Check <strong>deleted</strong> to remove the category from use. \n" " It will not appear as an available category in the drop-down menu on the report-a-problem page." @@ -488,7 +476,7 @@ msgstr "" " Kullanım kategorisinden kaldırmak için <strong>silindi</strong> kontrol edin.\n" "Problem bildirim sayfasındaki açılır menüden mevcut bir kategori olarak görünmez. " -#: templates/web/base/admin/body.html:191 +#: templates/web/base/admin/body.html:189 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -505,7 +493,7 @@ msgstr "" "Bu kullanıcının ilgili birime bildirimde bulunmasına izin vermek istediÄŸiniz konular için uygundur, gizli olanlar hariç. Ä°ngiltere'de, ekstra çöp kutusu talebi gibi hizmetlerde bunu daha önce kullanmıştık\n" "belirli bir adres için." -#: templates/web/base/admin/body.html:130 +#: templates/web/base/admin/body.html:129 msgid "" "Choose a <strong>category</strong> 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." @@ -548,8 +536,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:15 #: templates/web/base/admin/report_blocks.html:25 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 @@ -558,7 +546,7 @@ msgstr "" msgid "Closed" msgstr "Kapalı" -#: perllib/FixMyStreet/DB/Result/Problem.pm:779 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Closed by council" msgstr "Kurul tarafından kapatıldı" @@ -584,7 +572,7 @@ msgstr "Cobrand data:" msgid "Cobrand:" msgstr "Cobrand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Yapılandırma" @@ -603,9 +591,8 @@ msgstr "Hesabı onayla" #: templates/web/base/report/new/form_user_loggedout_password.html:21 #: templates/web/base/report/update/form_user_loggedout_password.html:20 -#, fuzzy msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." -msgstr "Bu noktada yeni bir ÅŸifre saÄŸlayarak, aÅŸağıdaki e-posta ile onaylayın. Onayladıktan sonra ÅŸifreniz güncellenecektir." +msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:1 #: templates/web/base/tokens/confirm_problem.html:1 @@ -615,7 +602,7 @@ msgstr "Bu noktada yeni bir ÅŸifre saÄŸlayarak, aÅŸağıdaki e-posta ile onaylay msgid "Confirmation" msgstr "Onay" -#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:164 #: templates/web/base/admin/body.html:79 #: templates/web/base/admin/category_edit.html:37 #: templates/web/base/admin/category_edit.html:92 @@ -634,7 +621,7 @@ msgid "Confirmed:" msgstr "Onaylanmış:" #. ("%s is the site name") -#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 +#: templates/web/base/about/_sidebar.html:6 msgid "Contact %s" msgstr "" @@ -653,8 +640,8 @@ msgstr "Grupla baÄŸlantı kur" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1417 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1445 msgid "Could not find user" msgstr "Kullanıcı bulunamadı" @@ -672,7 +659,7 @@ msgstr "Kurul" msgid "Council contacts for %s" msgstr "Kurula ulaÅŸmak için %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:681 +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "Council ref: %s" msgstr "Kurul ref: %s" @@ -691,7 +678,7 @@ msgstr "Sayma" msgid "Create a report" msgstr "Bildiri oluÅŸtur" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "Kategori oluÅŸtur" @@ -735,20 +722,20 @@ msgstr "Kontrol Paneli " msgid "Dealt with by subdivision within 5 working days" msgstr "Alt komisyon tarafından 5 iÅŸ günü içinde üstesinden gelinilecek" -#: perllib/FixMyStreet/App/Controller/Admin.pm:877 +#: perllib/FixMyStreet/App/Controller/Admin.pm:865 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:175 #: templates/web/base/admin/body.html:81 #: templates/web/base/admin/category_edit.html:42 #: templates/web/base/admin/category_edit.html:93 msgid "Deleted" msgstr "Silindi" -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:47 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -756,7 +743,7 @@ msgid "Description" msgstr "Tanım" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:68 +#: templates/web/zurich/report/new/fill_in_details_form.html:70 msgid "Details" msgstr "Detaylar" @@ -781,11 +768,11 @@ msgid "Diligency prize league table" msgstr "Özenle hazırlanmış iÅŸbirliÄŸi tablosu" #. ("%s is the site name") -#: templates/web/base/auth/general.html:48 -#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/auth/general.html:58 +#: templates/web/base/report/new/form_user_loggedout.html:28 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout.html:17 +#: templates/web/base/report/update/form_user_loggedout.html:27 msgid "Do you have a %s password?" msgstr "" @@ -803,8 +790,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "Duplicate" msgstr "ÇoÄŸaltmak" @@ -824,7 +811,7 @@ msgstr "" msgid "Edit" msgstr "Ekle" -#: templates/web/base/admin/body.html:220 +#: templates/web/base/admin/body.html:218 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "Bölümün detaylarını düzenle" @@ -854,7 +841,7 @@ msgstr "Editör" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:39 +#: templates/web/base/auth/general.html:49 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -862,11 +849,11 @@ msgstr "Editör" msgid "Email" msgstr "E-posta" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 msgid "Email added to abuse list" msgstr "E-posta kara listeye eklendi" -#: templates/web/base/admin/body.html:155 +#: templates/web/base/admin/body.html:153 msgid "Email address:" msgstr "E-posta adresi:" @@ -878,19 +865,14 @@ msgstr "E-posta uyarısı oluÅŸturuldu" msgid "Email alert deleted" msgstr "E-posta uyarısı silindi" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1390 msgid "Email already in abuse list" msgstr "E-posta kara listede" -#: templates/web/base/around/_updates.html:5 -msgid "Email me new local problems" -msgstr "Yeni yerel problemleri e posta olarak gönder" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 -#: templates/web/base/alert/updates.html:13 #: templates/web/zurich/admin/body.html:47 msgid "Email:" msgstr "E-posta:" @@ -899,26 +881,6 @@ msgstr "E-posta:" msgid "Email: %s" msgstr "E-posta: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 -msgid "Empty flat or maisonette" -msgstr "BoÅŸ daire veye müstakil ev" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 -msgid "Empty house or bungalow" -msgstr "BoÅŸ ev veya bungalov" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 -msgid "Empty office or other commercial" -msgstr "BoÅŸ büro veya diÄŸer ticari yerler" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 -msgid "Empty pub or bar" -msgstr "BoÅŸ pub veya bar" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 -msgid "Empty public building - school, hospital, etc." -msgstr "BoÅŸ kamu binası- okul, hastane, vb." - #: templates/web/base/admin/body-form.html:162 #: templates/web/base/admin/body-form.html:163 msgid "" @@ -966,18 +928,14 @@ msgstr "Yakınlardaki bir posta kodu, cadde veya bölge ismi giriniz" msgid "Enter a nearby street name and area" msgstr "Yakınlardaki bir cadde ve bölge ismi giriniz" -#: perllib/FixMyStreet/Cobrand/ZeroTB.pm:7 -msgid "Enter a nearby street name and area, postal code or district in Delhi" -msgstr "Yakın çevrede bulunan cadde ismi, bölge ismi, posta kodu veya Delhi de bulunan semti girin" - -#: templates/web/base/auth/general.html:99 +#: templates/web/base/auth/general.html:109 #: templates/web/base/report/new/form_user_loggedout_by_email.html:38 #: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Åžifre gir" -#: templates/web/base/index-steps.html:26 +#: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "Problem hakkında detaylı bilgi giriniz" @@ -1003,7 +961,7 @@ msgstr "Örnek postakodu " msgid "Examples:" msgstr "Örnekler:" -#: templates/web/base/report/new/form_report.html:49 +#: templates/web/base/report/new/form_report.html:51 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "Sorunun ne olduÄŸunu, nerede ve nezamandan beri orada olduÄŸunu açıklayın..." @@ -1040,19 +998,15 @@ msgstr "Ä°lk kez" msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." msgstr "" -#: templates/web/base/header.html:26 -msgid "FixMyStreet" -msgstr "FixMyStreet" - #: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:38 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:40 msgid "Fixed" msgstr "Sorun çözüldü" @@ -1079,7 +1033,7 @@ msgstr "Silindi olarak seçildi" msgid "Flag user" msgstr "Kullanıcıyı seç" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "Seçildi" @@ -1101,8 +1055,7 @@ msgstr "Seçilen kullanıcılar hiç bir ÅŸekilde kısıtlanmamıştır. Bu sade msgid "Flagged:" msgstr "Seçilenler:" -#: templates/web/base/reports/_ward-list.html:3 -#: templates/web/fixmystreet/reports/_ward-list.html:4 +#: templates/web/base/reports/_ward-list.html:4 msgid "Follow a ward link to view only reports within that ward." msgstr "Sadece o bölge içinde yer alan raporları görüntülemek için bölge linkini takip ediniz." @@ -1133,18 +1086,18 @@ msgstr "Sıkça Sorulan Sorular" msgid "GeoRSS on Google Maps" msgstr " Google Haritadaki GeoRSS " +#: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:11 -#: templates/web/fixmystreet/around/_updates.html:3 msgid "Get updates" msgstr "Güncellemeleri yap" -#: templates/web/fixmystreet/reports/_rss.html:3 -#: templates/web/fixmystreet/reports/_rss.html:9 +#: templates/web/base/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:9 msgid "Get updates of %s problems" msgstr "%s Problemlerin güncellemelerini yap" -#: templates/web/fixmystreet/reports/_rss.html:11 -#: templates/web/fixmystreet/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:11 +#: templates/web/base/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr " Bu %s'te problemlerin güncellemelerini yap" @@ -1157,7 +1110,7 @@ msgid "Glad to hear it’s been fixed!" msgstr "Problemin çözüldüğünü duymak güzel" #: templates/web/base/alert/index.html:34 -#: templates/web/base/around/postcode_form.html:16 +#: templates/web/base/around/postcode_form.html:13 #: templates/web/base/reports/_list-filters.html:28 #: templates/web/zurich/admin/stats.html:26 msgid "Go" @@ -1183,7 +1136,7 @@ msgstr "Bu sorun giderildi mi? " msgid "Have you ever reported a problem to a council before, or is this your first time?" msgstr "Daha önce bir problemi bir kurula bildirdiniz mi, yoksa bu ilk defa mı?" -#: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:38 +#: templates/web/base/footer.html:38 #: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 @@ -1194,8 +1147,7 @@ msgstr "Yardım" msgid "Here are the types of local problem alerts for ‘%s’." msgstr "‘%s’ için yerel sorun uyarı çeÅŸitleri buradadır." -#: templates/web/base/header.html:32 templates/web/fixmystreet/header.html:63 -#: templates/web/zurich/footer.html:12 +#: templates/web/base/header.html:63 templates/web/zurich/footer.html:12 msgid "Hi %s" msgstr "Merhaba %s" @@ -1211,11 +1163,11 @@ msgstr "Merhaba %s" msgid "Hidden" msgstr "Gizli" -#: templates/web/base/around/display_location.html:65 +#: templates/web/base/around/display_location.html:64 msgid "Hide old" msgstr "Eskileri gizle" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:59 msgid "Hide pins" msgstr "Ä°ÄŸneler gizle" @@ -1235,10 +1187,6 @@ msgstr "Bir problem nasıl bildirilir" msgid "How to send successful reports" msgstr "BaÅŸarılı bildirim nasıl gönderilir" -#: perllib/FixMyStreet/App/Controller/Admin.pm:752 -msgid "I am afraid you cannot confirm unconfirmed reports." -msgstr "Maalesef onaylanmamış bildirimleri onaylayamıyorsunuz." - #: templates/web/base/tokens/confirm_problem.html:23 #: templates/web/base/tokens/confirm_problem.html:27 msgid "I just reported a problem on @fixmystreet" @@ -1249,7 +1197,7 @@ msgstr "@fixmystreet'e bir problemi henüz bildirdim." msgid "I just updated a problem on @fixmystreet" msgstr "@fixmystreet'teki problemi yeni güncelledim" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88 msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "Maalesef veri tabanında sorunun yerini bulamadık.\n" @@ -1271,7 +1219,7 @@ msgid "" " For basic installations, you don't need to join bodies in this way." msgstr "" -#: templates/web/base/admin/body.html:133 +#: templates/web/base/admin/body.html:132 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." @@ -1292,7 +1240,7 @@ msgid "" "(please note it will not be sent to the council)." msgstr "" -#: templates/web/base/admin/body.html:149 +#: templates/web/base/admin/body.html:147 msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." msgstr "" @@ -1327,10 +1275,10 @@ msgstr "Kanunsuz kimlik " msgid "Illegal feed selection" msgstr "Yasadışı bildirim seçimi" +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "In Progress" msgstr "Devam Etmekte" @@ -1381,7 +1329,7 @@ msgstr "İç yönlendirme" msgid "Invalid agency_responsible value %s" msgstr "Geçersiz ajans_sorumlu deÄŸer %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 msgid "Invalid end date" msgstr "Geçersiz bitiÅŸ tarihi" @@ -1389,16 +1337,16 @@ msgstr "Geçersiz bitiÅŸ tarihi" msgid "Invalid format %s specified." msgstr "Geçersiz format %s belirlenmiÅŸ." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 msgid "Invalid start date" msgstr "Geçersiz baÅŸlangıç tarihi" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:5 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Investigating" msgstr "Ä°ncelenmekte" @@ -1420,7 +1368,7 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:80 +#: 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 @@ -1458,7 +1406,6 @@ msgstr "Yükleniyor..." #: 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/fixmystreet/alert/updates.html:1 msgid "Local RSS feeds and email alerts" msgstr "Yerel RSS bildirimi ve e-posta uyarısı" @@ -1467,11 +1414,11 @@ msgstr "Yerel RSS bildirimi ve e-posta uyarısı" msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "Yerel RSS bildirimi ve‘%s’ için e-posta uyarısı" -#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:35 +#: templates/web/base/footer.html:35 msgid "Local alerts" msgstr "Yerel uyarılar" -#: templates/web/base/index-steps.html:25 +#: templates/web/base/index-steps.html:5 msgid "Locate the problem on a map of the area" msgstr "Problemin bulunduÄŸu alandaki haritayı bul ve iÅŸaretle" @@ -1531,14 +1478,14 @@ msgstr "Ay" #: templates/web/base/admin/list_updates.html:7 #: templates/web/base/admin/reports.html:13 #: templates/web/base/admin/users.html:15 -#: templates/web/base/auth/general.html:89 +#: templates/web/base/auth/general.html:99 #: templates/web/base/report/new/form_user_loggedin.html:9 #: templates/web/base/report/new/form_user_loggedout_by_email.html:7 -#: templates/web/base/report/update/form_name.html:4 +#: templates/web/base/report/update/form_name.html:5 #: templates/web/base/reports/index.html:20 #: 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:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "Name" msgstr "Ä°sim" @@ -1562,8 +1509,8 @@ msgstr "" msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:455 -#: perllib/FixMyStreet/Cobrand/Default.pm:495 +#: perllib/FixMyStreet/Cobrand/Default.pm:454 +#: perllib/FixMyStreet/Cobrand/Default.pm:494 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" @@ -1585,7 +1532,7 @@ msgstr "Yeni <br>sorunlar" msgid "New body added" msgstr "Yeni bölüm eklendi" -#: perllib/FixMyStreet/App/Controller/Admin.pm:387 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 msgid "New category contact added" msgstr "Yeni kategori bilgisi eklendi" @@ -1650,7 +1597,7 @@ msgstr "Sonraki" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 -#: templates/web/base/questionnaire/index.html:101 +#: templates/web/base/questionnaire/index.html:102 #: templates/web/base/questionnaire/index.html:53 msgid "No" msgstr "Hayır" @@ -1715,8 +1662,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Not Responsible" msgstr "Sorumlu deÄŸildir" @@ -1749,7 +1696,7 @@ msgstr "Not" 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/base/admin/body.html:186 +#: templates/web/base/admin/body.html:184 #: templates/web/base/admin/category_edit.html:52 #: templates/web/zurich/admin/body.html:53 msgid "Note:" @@ -1763,15 +1710,15 @@ msgstr "Not:<strong>%s</strong>" msgid "Notes from SDM to DM" msgstr "" -#: templates/web/base/report/new/form_user_loggedout.html:14 #: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/form_user_loggedout.html:24 #: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "Åžimdi bildirimini&hellip kaydet;" #: templates/web/base/report/update-form.html:28 -#: templates/web/base/report/update/form_user_loggedout.html:13 #: templates/web/base/report/update/form_user_loggedout.html:2 +#: templates/web/base/report/update/form_user_loggedout.html:23 msgid "Now to submit your update…" msgstr "" @@ -1805,8 +1752,8 @@ msgstr "Tek-satırlık özet" #: templates/web/base/admin/report_blocks.html:23 #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/report/update/form_update.html:36 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1841,13 +1788,13 @@ msgstr "Veya 'e bildirilen sorunlar:" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1055 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 -#: perllib/FixMyStreet/DB/Result/Problem.pm:558 -#: perllib/FixMyStreet/DB/Result/Problem.pm:568 -#: perllib/FixMyStreet/DB/Result/Problem.pm:578 -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1044 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:659 +#: perllib/FixMyStreet/DB/Result/Problem.pm:562 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 +#: perllib/FixMyStreet/DB/Result/Problem.pm:582 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 #: perllib/FixMyStreet/Script/Reports.pm:175 #: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" @@ -1872,7 +1819,7 @@ msgstr "Ebeveyn" msgid "Partial" msgstr "Kısmi" -#: templates/web/base/auth/general.html:92 +#: templates/web/base/auth/general.html:102 #: templates/web/base/report/new/form_user_loggedout_by_email.html:31 #: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 @@ -1881,7 +1828,7 @@ msgid "Password (optional)" msgstr "Åžifre (isteÄŸe baÄŸlı)" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:72 +#: templates/web/base/auth/general.html:82 msgid "Password:" msgstr "Åžifre:" @@ -1889,7 +1836,7 @@ msgstr "Åžifre:" msgid "Permalink" msgstr "Permalink" -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:90 msgid "Phone number" msgstr "Telefon numarası" @@ -1905,13 +1852,21 @@ msgid "Phone:" msgstr "Telefon:" #: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/questionnaire/index.html:89 +#: templates/web/base/questionnaire/index.html:91 #: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/new/form_report.html:38 +#: templates/web/base/report/new/form_report.html:40 +#: templates/web/base/report/update/form_update.html:20 +#: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:6 #: 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:45 +#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/zurich/report/new/fill_in_details_form.html:63 msgid "Photo" msgstr "FotoÄŸraf" @@ -1935,8 +1890,8 @@ msgstr "Harita üzerine iÅŸaretleyin" #: perllib/FixMyStreet/Cobrand/Zurich.pm:955 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:6 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 @@ -1952,16 +1907,16 @@ 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/general.html:27 -#: templates/web/base/auth/general.html:33 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:43 #: 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:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:856 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:921 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -1971,7 +1926,7 @@ msgstr "Kategori seçiniz" msgid "Please choose a property type" msgstr "Bir özellik seçin" -#: perllib/FixMyStreet/App/Controller/Admin.pm:378 +#: perllib/FixMyStreet/App/Controller/Admin.pm:376 msgid "Please correct the errors below" msgstr "Lütfen aÅŸağıdaki hataları düzeltiniz" @@ -1992,11 +1947,10 @@ msgstr "" msgid "Please enter a message" msgstr "Mesaj giriniz" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Admin.pm:1079 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 msgid "Please enter a name" -msgstr "Lütfen isminizi giriniz" +msgstr "" #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 @@ -2010,10 +1964,10 @@ msgstr "Åžifre giriniz" msgid "Please enter a subject" msgstr "Konu giriniz" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1075 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1130 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:133 +#: perllib/FixMyStreet/DB/Result/User.pm:143 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2030,9 +1984,9 @@ msgid "Please enter some details" msgstr "Lütfen bir kaç ayrıntı giriniz" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:130 -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:32 +#: perllib/FixMyStreet/DB/Result/User.pm:140 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:42 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2041,7 +1995,7 @@ msgid "Please enter your email" msgstr "E-posta giriniz" #: templates/web/base/report/new/form_user_loggedout_email.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:80 +#: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "Please enter your email address" msgstr "Lütfen mail adresinizi giriniz" @@ -2057,7 +2011,7 @@ msgstr "Lütfen adınızı ve soyadınızı giriniz, kurullar için gereklidir â #: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:126 +#: perllib/FixMyStreet/DB/Result/User.pm:136 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "Lütfen isminizi giriniz" @@ -2084,7 +2038,7 @@ msgstr "Lütfen rahat bir ÅŸekilde <a href=\"%s\"> tekrar giriÅŸ yapın</a>, vey msgid "Please fill in details of the problem below." msgstr "Lütfen aÅŸağıdaki probleme ait ayrıntıları giriniz." -#: templates/web/zurich/report/new/fill_in_details_form.html:72 +#: templates/web/zurich/report/new/fill_in_details_form.html:74 msgid "Please fill in details of the problem." msgstr "Lütfen probleme ait ayrıntıları giriniz." @@ -2093,7 +2047,7 @@ msgstr "Lütfen probleme ait ayrıntıları giriniz." msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "Lütfen aÅŸağıda verilen formu problemin detayları ile ilgili doldurunuz ve konumu detay kutucuÄŸu içerisine mümkün oldukça yakın bir ÅŸekilde tarif ediniz." -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "BaÅŸka bir anket doldurmak istediÄŸinizi belirtiniz." @@ -2102,9 +2056,8 @@ msgid "Please note that updates are not sent to the council." msgstr "Güncellemeler kurula gönderilmemiÅŸtir." #: templates/web/base/report/new/oauth_email_form.html:4 -#, fuzzy msgid "Please note your report has <strong>not yet been sent</strong>." -msgstr "Bildiriminiz henüz <strong>gönderilmemiÅŸtir. Bir kategori seçiniz ve ayrıntılı bilgi ekleyiniz, sonra kaydediniz." +msgstr "" #: templates/web/base/report/new/fill_in_details_form.html:20 #: templates/web/zurich/report/new/fill_in_details_form.html:11 @@ -2120,16 +2073,16 @@ msgstr "" msgid "Please note:" msgstr "Lütfen dikkat:" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please provide some explanation as to why you're reopening this report" msgstr "Bu bildirimi neden paylaÅŸatığınza dair lütfen bir kaç açıklama yapın" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250 msgid "Please provide some text as well as a photo" msgstr "Hem metin hem de fotoÄŸraf ekleyiniz" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236 msgid "Please say whether you've ever reported a problem to your council before" msgstr "Bir kurula daha önce sorun bildirip bildirmediÄŸinizi belirtin" @@ -2145,22 +2098,23 @@ msgstr "Bilgilendirme seçiniz" msgid "Please select the type of alert you want" msgstr "Ä°stediÄŸiniz bir bildiri ÅŸekli secin" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232 msgid "Please state whether or not the problem has been fixed" msgstr "Problemin giderilmiÅŸ veya giderilmemiÅŸ olması durumunu bildiriniz lütfen" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:121 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 #: templates/web/base/js/translation_strings.html:53 -msgid "Please upload a JPEG image only" +#, fuzzy +msgid "Please upload an image only" msgstr "Sadece JPEG formatı yükleyin" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 msgid "Please write a message" msgstr "Mesaj gönderin" -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Please write your update here" msgstr "Güncellemeleri buraya yazınız" @@ -2191,7 +2145,7 @@ msgstr "" msgid "Previous" msgstr "Önceki" -#: templates/web/fixmystreet/footer.html:41 +#: templates/web/base/footer.html:41 msgid "Privacy" msgstr "Gizlilik" @@ -2201,7 +2155,7 @@ msgstr "Gizlilik" msgid "Privacy and cookies" msgstr "" -#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:200 #: templates/web/base/admin/body.html:85 #: templates/web/base/admin/category_edit.html:45 #: templates/web/base/admin/report_edit.html:77 @@ -2230,7 +2184,7 @@ msgstr "Problem %s kurula gönderildi %s" msgid "Problem breakdown by state" msgstr "Sorun devlet tarafından meydana gelmiÅŸtir" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1046 msgid "Problem marked as open." msgstr "Problem çözülmemiÅŸ olarak iÅŸaretlenmiÅŸtir." @@ -2242,10 +2196,6 @@ msgstr "AraÅŸtırma sonucu göz önünde bulundurularak problemin durumundaki de msgid "Problems" msgstr "Sorunlar" -#: templates/web/base/around/_updates.html:1 -msgid "Problems in this area" -msgstr "Bu bölgedeki problemler" - #: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "Çevredeki problemler" @@ -2263,13 +2213,11 @@ msgid "Problems within %.1fkm of this location" msgstr "Konumun %.1fkm içerisinde yer alan sorunlar" #: perllib/FixMyStreet/Cobrand/Default.pm:663 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 #: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "%s deki problemler" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "%s semtindeki sorunlar" @@ -2288,15 +2236,11 @@ msgstr "Ä°lgilenilen kısım içinde yer alan sorunlar:" msgid "Property address:" msgstr "Emlak adresi:" -#: templates/web/base/report/new/category.html:8 -msgid "Property type:" -msgstr "Emlak türü:" - #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Güncellemeye izin ver" -#: templates/web/base/auth/general.html:95 +#: templates/web/base/auth/general.html:105 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." @@ -2330,16 +2274,15 @@ msgstr "%s den %s 'e cevaplanan %d sorunun %d anketi" msgid "Questionnaire %d sent for problem %d" msgstr "%d sorunu için gönderilen %d anket" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 msgid "Questionnaire filled in by problem reporter" msgstr "Anket sorun bildirici tarafından dolduruldu" #: templates/web/base/alert/_list.html:22 +#: templates/web/base/alert/updates.html:9 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display_tools.html:34 -#: templates/web/base/reports/_rss.html:1 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed" msgstr "RSS besleme" @@ -2367,18 +2310,12 @@ msgstr "%s içinde %s gözetimiyle RSS besleme" msgid "RSS feed of nearby problems" msgstr "Civardaki problemlerle alakalı RSS besleme" -#: templates/web/base/reports/_rss.html:1 -msgid "RSS feed of problems in this %s" -msgstr "%s ile ilgili problemeleri RSS besleme" - #: perllib/FixMyStreet/Cobrand/Default.pm:664 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 #: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "%s içerisindeki problemlerle alakalı RSS besleme" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 #: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "%s bölgesi içerisindeki problemlerle alakalı RSS besleme" @@ -2388,14 +2325,13 @@ msgstr "%s bölgesi içerisindeki problemlerle alakalı RSS besleme" msgid "RSS feed of recent local problems" msgstr "Son günlerdeki yerel problemlerle alakalı RSS besleme" +#: templates/web/base/alert/updates.html:9 #: templates/web/base/report/display_tools.html:34 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed of updates to this problem" msgstr "Bu problemin güncellemelerini RSS olarak besle" -#: templates/web/base/alert/updates.html:9 +#: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:36 -#: templates/web/fixmystreet/alert/updates.html:14 msgid "Receive email when updates are left on this problem." msgstr "Bu sorunda herhangi bir güncelleme olduÄŸunda e-posta ile bildir." @@ -2431,12 +2367,11 @@ msgstr "FotoÄŸrafı kaldır (mümkün olmayabilir)" msgid "Reply to user:" msgstr "" -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/header_logo.html:2 msgid "Report" msgstr "Bildirim" -#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:26 -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/footer.html:26 templates/web/base/header_logo.html:2 #: templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2446,7 +2381,7 @@ msgstr "Bir problem bildir" msgid "Report abuse" msgstr "Kötüye kullanım bildir" -#: perllib/FixMyStreet/App/Controller/Rss.pm:291 +#: perllib/FixMyStreet/App/Controller/Rss.pm:297 msgid "Report on %s" msgstr "%s 'e bildir" @@ -2461,7 +2396,7 @@ msgstr "Probleminizi bildirin" msgid "Report, view, or discuss local problems" msgstr "Yerel problemleri bildir, göster ve tartış" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:577 #: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "%s 'e ananim olarak bildirilmiÅŸ" @@ -2471,7 +2406,7 @@ msgstr "%s 'e ananim olarak bildirilmiÅŸ" msgid "Reported before" msgstr "Önceden bildirilmiÅŸ" -#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 #: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "%s tarafından %s de bildirilmiÅŸtir" @@ -2485,27 +2420,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "%s kategorisine bildirilmiÅŸtir" -#: perllib/FixMyStreet/DB/Result/Problem.pm:569 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 msgid "Reported in the %s category anonymously at %s" msgstr "%s kategorisine anonim olarak %s de bildirilmiÅŸtir" -#: perllib/FixMyStreet/DB/Result/Problem.pm:591 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 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:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported via %s anonymously at %s" msgstr "%s aracılığıyla anonim olarak %s de bildirilmiÅŸtir" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported via %s by %s at %s" msgstr "%s yoluyla %s tarafından %s da bildirilmiÅŸtir" -#: perllib/FixMyStreet/DB/Result/Problem.pm:561 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 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:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 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" @@ -2526,7 +2461,7 @@ msgstr "" msgid "Reporting a problem" msgstr "Bir problemin bildirilmesi" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1274 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" @@ -2569,15 +2504,15 @@ msgstr "Bu isimli yol için yol operatörü (yol referans numarası ve türünde msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Bu isimli yol için yol operatörü (OpenStreetMap'ten): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1496 #: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "Sola YerleÅŸtir" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 #: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 @@ -2592,7 +2527,7 @@ msgstr "" msgid "Satellite" msgstr "Uydu" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/base/admin/category_edit.html:84 #: templates/web/zurich/admin/body.html:59 #: templates/web/zurich/admin/template_edit.html:29 @@ -2648,7 +2583,7 @@ msgstr "" msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:696 +#: perllib/FixMyStreet/DB/Result/Problem.pm:698 msgid "Sent to %s %s later" msgstr "%s %s sonra gönder" @@ -2667,21 +2602,21 @@ msgstr "PaylaÅŸ" #: templates/web/base/report/new/form_user_loggedin.html:23 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22 -#: templates/web/base/report/update/form_name.html:15 +#: templates/web/base/report/update/form_name.html:16 msgid "Show my name publicly" msgstr "Ä°smimi açıkça göster " -#: templates/web/base/around/display_location.html:67 +#: templates/web/base/around/display_location.html:66 msgid "Show old" msgstr "Eskileri göster" -#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:57 msgid "Show pins" msgstr "Ä°ÅŸaretlemeleri göster" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/general.html:110 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:76 +#: templates/web/base/auth/general.html:86 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2740,9 +2675,8 @@ msgstr "Ãœzgünüz, konum bulunamadı." #: templates/web/base/auth/general.html:9 #: templates/web/base/report/display.html:21 #: templates/web/base/report/new/fill_in_details_form.html:23 -#, fuzzy msgid "Sorry, we could not log you in. Please fill in the form below." -msgstr "Ãœzgünüz, konum ayrıştırılamadı. Daha sonra tekrar deneyin." +msgstr "" #: perllib/FixMyStreet/Geocode/Bing.pm:35 #: perllib/FixMyStreet/Geocode/Google.pm:45 @@ -2750,15 +2684,10 @@ msgstr "Ãœzgünüz, konum ayrıştırılamadı. Daha sonra tekrar deneyin." msgid "Sorry, we could not parse that location. Please try again." msgstr "Ãœzgünüz, konum ayrıştırılamadı. Daha sonra tekrar deneyin." -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:138 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 -#, fuzzy -msgid "Sorry, you can not log in with Facebook. Please try again later." -msgstr "Bu sayfa görüntülenirken bir sorun oluÅŸtu. Lütfen daha sonra tekrar deneyin." - #: templates/web/base/admin/stats.html:64 msgid "Start Date:" msgstr "BaÅŸlangıç Tarihi:" @@ -2767,7 +2696,7 @@ msgstr "BaÅŸlangıç Tarihi:" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/report/update/form_update.html:32 +#: templates/web/base/report/update/form_update.html:34 msgid "State" msgstr "Devlet" @@ -2780,7 +2709,7 @@ msgstr "Devlet" msgid "State:" msgstr "Devlet:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2820,10 +2749,10 @@ msgid "Subject:" msgstr "Konu:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/base/report/new/form_user_loggedout_by_email.html:39 #: templates/web/base/report/new/form_user_loggedout_password.html:11 -#: templates/web/zurich/report/new/fill_in_details_form.html:96 +#: templates/web/zurich/report/new/fill_in_details_form.html:98 msgid "Submit" msgstr "Kaydet" @@ -2851,9 +2780,8 @@ msgstr "Anketi kaydet" msgid "Submitted" msgstr "Kaydedildi" -#: templates/web/base/alert/updates.html:17 +#: templates/web/base/alert/updates.html:23 #: templates/web/base/report/display_tools.html:41 -#: templates/web/fixmystreet/alert/updates.html:23 msgid "Subscribe" msgstr "Kaydet" @@ -2861,7 +2789,7 @@ msgstr "Kaydet" msgid "Subscribe me to an email alert" msgstr "E-posta uyarısını benim için onayla" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -2880,7 +2808,7 @@ msgstr "Özet" msgid "Summary reports" msgstr "Özet bildirimler" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 msgid "Survey" msgstr "Anket" @@ -2937,7 +2865,7 @@ msgstr "Resim yüklediÄŸiniz için teÅŸekkür ederiz. Şİmsi sorunu konumlandı msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "TeÅŸekkürler, sorunun hallolduÄŸuna sevindim. Bu sorunu daha önce herhangi bir birime bildirmiÅŸ miydiniz?" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:157 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "Bu ÅŸekilde resim doÄŸru yüklemiÅŸ gibi görünmüyor (%s), lütfen tekrar deneyin." @@ -2945,7 +2873,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:126 +#: perllib/FixMyStreet/App/Controller/Location.pm:127 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." @@ -2955,11 +2883,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:724 +#: perllib/FixMyStreet/App/Controller/Admin.pm:722 msgid "That problem has been marked as sent." msgstr "Problem gönderildi olarak iÅŸaretlenmiÅŸtir." -#: perllib/FixMyStreet/App/Controller/Admin.pm:716 +#: perllib/FixMyStreet/App/Controller/Admin.pm:714 msgid "That problem will now be resent." msgstr "Bu problem yeniden gönderilecektir." @@ -2971,7 +2899,7 @@ msgstr "Bu bildirim %s 'te görüntülenemiyor" msgid "That report has been removed from FixMyStreet." msgstr "Bu bildirim FixMyStreet'ten kaldırılmışır." -#: templates/web/base/admin/body.html:144 +#: templates/web/base/admin/body.html:142 msgid "" "The <strong>email address</strong> is the destination to which reports about this category will be sent. \n" " Other categories for this body may have the same email address." @@ -3111,9 +3039,9 @@ msgstr "Tüm Bildirimlerin görüntülendiÄŸi sayfada bir sorun var. Lütfen dah 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:764 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:753 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 -#: templates/web/base/auth/general.html:43 +#: templates/web/base/auth/general.html:53 #: 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. " @@ -3174,9 +3102,9 @@ msgstr "Kullanıcının problemi sınıflandırmama durumunda, bu e-posta proble 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:920 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:898 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:935 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:977 #: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "Bu bilgi gereklidir" @@ -3189,11 +3117,11 @@ msgstr "Burası geliÅŸen bir sitedir, her an çökebilir ve veritabanı belli ar msgid "This is a summary of all reports on this site." msgstr "Bu, bu sitedeki bütün raporların özetidir." -#: templates/web/base/report/update/form_update.html:52 +#: templates/web/base/report/update/form_update.html:54 msgid "This problem has been fixed" msgstr "Bu problem çözüldü" -#: templates/web/base/report/update/form_update.html:46 +#: templates/web/base/report/update/form_update.html:48 msgid "This problem has not been fixed" msgstr "Bu problem giderilemedi" @@ -3230,7 +3158,7 @@ msgstr "Bu internet sitesine problemin fotoÄŸrafı da kullanıcı tarafından ek msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Zaman çizelgesi" @@ -3275,8 +3203,8 @@ msgstr "Direkt olarak e-posta gönderin:" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Unable to fix" msgstr "Onarımı mümkün deÄŸil" @@ -3293,7 +3221,7 @@ msgstr "Onaylanmamış" msgid "Unknown" msgstr "Bilinmeyen" -#: perllib/FixMyStreet/App/Controller/Rss.pm:173 +#: perllib/FixMyStreet/App/Controller/Rss.pm:174 msgid "Unknown alert type" msgstr "Bilinmeyen uyarı tipi" @@ -3308,7 +3236,7 @@ msgstr "Bilinmeyen hata" msgid "Unknown problem ID" msgstr "Bilinmeyen ID problemi" -#: templates/web/base/report/update/form_update.html:25 +#: templates/web/base/report/update/form_update.html:27 msgid "Update" msgstr "Güncelleme" @@ -3360,10 +3288,10 @@ msgstr "Güncelleme durumu" msgid "Updated" msgstr "Güncellendi" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 -#: perllib/FixMyStreet/App/Controller/Admin.pm:821 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1096 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1144 +#: perllib/FixMyStreet/App/Controller/Admin.pm:809 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3390,7 +3318,7 @@ msgstr "{{title}} daki güncellemeler" msgid "Updates to this problem, %s" msgstr "" -#: templates/web/base/admin/body.html:182 +#: templates/web/base/admin/body.html:180 msgid "Use the <strong>note</strong> to record details that are only displayed in the admin. Notes are not shown publicly, and are not sent to the body." msgstr "Detayları kaydetmek için sadece adminin ekranında görünen <strong>notu</strong> kullanın. Bilgiler kuruma gönderilmeyecek ve kimse tarafından görünmeyecektir." @@ -3399,11 +3327,11 @@ msgstr "Detayları kaydetmek için sadece adminin ekranında görünen <strong>n msgid "Used map" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 msgid "User flag removed" msgstr "Kullanıcı etiketi kaldırıldı" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1421 msgid "User flagged" msgstr "Kullanıcı etiketlendi" @@ -3411,16 +3339,16 @@ msgstr "Kullanıcı etiketlendi" 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/App/Controller/Admin.pm:1289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "Kullanıcılar" -#: perllib/FixMyStreet/App/Controller/Admin.pm:382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:412 -#: perllib/FixMyStreet/App/Controller/Admin.pm:429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:380 +#: perllib/FixMyStreet/App/Controller/Admin.pm:410 +#: perllib/FixMyStreet/App/Controller/Admin.pm:427 msgid "Values updated" msgstr "DeÄŸerler güncellendi" @@ -3457,16 +3385,15 @@ msgstr "O bölgede birden fazla iÅŸaretlenmiÅŸ yer mevcut. On tane iÅŸaretlenmiÅ #: templates/web/base/auth/general.html:6 #: templates/web/base/report/display.html:27 #: templates/web/base/report/new/oauth_email_form.html:5 -#, fuzzy msgid "We need your email address, please give it below." -msgstr "Telefon numaranızı ve e-posta adresinizi gizli tutulacaktır" +msgstr "" #: templates/web/base/report/new/form_user_loggedout_email.html:2 #: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "E-posta adresiniz gizli tutulacaktır" -#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedin.html:30 #: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "Telefon numaranızı ve e-posta adresinizi gizli tutulacaktır" @@ -3475,7 +3402,7 @@ msgstr "Telefon numaranızı ve e-posta adresinizi gizli tutulacaktır" 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." -#: templates/web/base/index-steps.html:31 +#: templates/web/base/index-steps.html:11 msgid "We send it to the council on your behalf" msgstr "Sizin adınıza kurula gönderiyoruz" @@ -3513,10 +3440,6 @@ msgstr "GönderildiÄŸinde" msgid "Whoa there Testino! Three photos are enough." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 -msgid "Whole block of empty flats" -msgstr "Bütün boÅŸ daireler" - #: templates/web/base/tokens/confirm_alert.html:7 msgid "Why stop there? <a href=\"/alert\">Set up more alerts</a> for free." msgstr "Neden devam etmiyorsun? <a href=\"/alert\">Ãœcretsiz olarak</a> daha fazla uyarı ekle." @@ -3536,7 +3459,7 @@ msgstr "kurum_sorumluluÄŸunun birime gelen talepleri sınırlandırması mümkü msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "FixMyStreet'e katkıda bulunmak ister misin? Åžifremiz herkese açıktır ve <a href=\"http://fixmystreet.org\"> burdan ulaşılabilir fixmystreet.org</a>." -#: templates/web/base/questionnaire/index.html:96 +#: templates/web/base/questionnaire/index.html:97 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "Durumunu kontrol etmek için 4 hafta sonra bir anket yolu ile hatırlatma ister misiniz?" @@ -3566,8 +3489,8 @@ msgstr "Yıl" #: templates/web/base/admin/update_edit.html:24 #: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 +#: templates/web/base/questionnaire/index.html:100 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "Evet" @@ -3683,19 +3606,19 @@ msgid "Your Reports" msgstr "Bildirimlerin" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/alert/updates.html:19 +#: templates/web/base/alert/updates.html:22 #: templates/web/base/contact/index.html:83 #: templates/web/base/report/display_tools.html:38 #: templates/web/base/report/display_tools.html:40 #: templates/web/base/report/new/form_user_loggedin.html:3 #: templates/web/base/report/new/form_user_loggedout_email.html:1 #: templates/web/base/report/update/form_user_loggedout_email.html:1 -#: templates/web/fixmystreet/alert/updates.html:19 -#: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/zurich/report/new/fill_in_details_form.html:76 +#: templates/web/zurich/report/new/fill_in_details_form.html:78 msgid "Your email" msgstr "E-posta adresiniz" -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/general.html:55 #: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 @@ -3706,17 +3629,17 @@ msgstr "E-posta adresin" msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "Bilgileriniz sadece bizim <a href=\"/privacy\">gizlilik politikası</a> uyumluluÄŸu çerçevesinde kullanılacaktır" -#: templates/web/base/auth/general.html:90 +#: templates/web/base/auth/general.html:100 #: templates/web/base/contact/index.html:76 #: templates/web/base/report/new/form_user_loggedin.html:18 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17 -#: templates/web/base/report/update/form_name.html:11 +#: templates/web/base/report/update/form_name.html:12 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:86 +#: templates/web/zurich/report/new/fill_in_details_form.html:88 msgid "Your name" msgstr "Adınız" -#: templates/web/base/auth/general.html:75 +#: templates/web/base/auth/general.html:85 #: 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 @@ -3729,20 +3652,19 @@ msgstr "Åžifren deÄŸiÅŸtirildi" #: templates/web/base/report/new/form_user_loggedin.html:27 #: templates/web/base/report/new/form_user_loggedout_by_email.html:26 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:94 msgid "Your phone number" msgstr "Telefon numaran" #: templates/web/base/questionnaire/index.html:14 -#, fuzzy msgid "Your report" -msgstr "Bildirimlerin" +msgstr "" -#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 +#: templates/web/base/footer.html:29 msgid "Your reports" msgstr "Bildirimlerin" -#: templates/web/base/my/my.html:41 +#: templates/web/base/my/my.html:39 msgid "Your updates" msgstr "Güncellemelerin" @@ -3768,7 +3690,7 @@ msgid "didn't use map" msgstr "harita kullanılmamış" #: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/around/postcode_form.html:12 msgid "e.g. ‘%s’ or ‘%s’" msgstr "ör. ‘%s’ veya ‘%s’" @@ -3874,8 +3796,7 @@ msgstr "diÄŸer bölgeler:" msgid "reopened" msgstr "yeniden açıldı" -#: templates/web/base/header.html:33 templates/web/fixmystreet/header.html:64 -#: templates/web/zurich/footer.html:13 +#: templates/web/base/header.html:64 templates/web/zurich/footer.html:13 msgid "sign out" msgstr "çıkış yap" @@ -3948,7 +3869,7 @@ msgid "<big>%s</big> update on reports" msgid_plural "<big>%s</big> updates on reports" msgstr[0] "<big>%s</big> bildirimlerin güncellemeleri" -#: templates/web/emptyhomes/report/new/councils_text_none.html:3 +#: templates/web/base/report/new/councils_text_none.html:3 #, perl-format msgid "We do not yet have details for the council that covers this location." msgid_plural "We do not yet have details for the councils that cover this location." @@ -3984,80 +3905,47 @@ msgid "We do <strong>not</strong> yet have details for the other council that co msgid_plural "We do <strong>not</strong> yet have details for the other councils that cover this location." msgstr[0] "BahsettiÄŸiniz alanı kapsayan ilgili diÄŸer kurullar hakkında henüz detaylı bilgimiz <strong>yok</strong>" -#~ msgid "(we never show your email address or phone number)" -#~ msgstr "(e-posta adresiniz veya telefon numaranız gizli tutulacaktır)" - -#~ msgid "(we never show your email)" -#~ msgstr "(e-posta adresiniz gizli tutulacaktır)" - -#~ msgid "<strong>No</strong>, let me confirm my report by email:" -#~ msgstr "<strong>Hayır</strong>, bildirimleri e-posta yoluyla onaylamaya izin ver" - -#~ msgid "<strong>No</strong>, let me confirm my update by email:" -#~ msgstr "<strong>Hayır</strong>, güncellemelerimi e-posta yoluyla onaylamama izin ver" - -#~ msgid "Email me updates" -#~ msgstr "Güncellemeleri bana e-posta yolu ile bildir" - -#~ msgid "Enter a new password:" -#~ msgstr "Yeni bir ÅŸifre gir:" - -#~ msgid "Message:" -#~ msgstr "Ä°leti:" - -#~ msgid "More problems nearby" -#~ msgstr "Yakındaki diÄŸer problemler" - -#~ msgid "Nearly Done! Now check your email..." -#~ msgstr "Yeni halledildi! Åžimdi e-postanızı kontrol edin..." - -#~ msgid "Offensive? Unsuitable? Tell us" -#~ msgstr "Saldırgan? Uygunsuz? Lütfen bilirin" - -#~ msgid "Photo:" -#~ msgstr "FotoÄŸraf:" - -#~ msgid "Please check your email" -#~ msgstr "E-posta adresinizi kontrol ediniz" +#~ msgid "%s, reported at %s" +#~ msgstr "%s, rapor edilmiÅŸ %s" -#~ msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" -#~ msgstr "Güncellemeler kurula gönderilmemiÅŸtir. Ä°sminizi belirttiÄŸiniz takdirde halka açık olacaktır. Bilgileriniz sadece bizim <a href=\"/faq#privacy\">gizlilik politikalarımıza uygun olarak kullanılacaktır</a>" +#~ msgid "About us" +#~ msgstr "Hakkımızda" -#~ msgid "This may be because the link is too old or already used, or the address was not copied correctly." -#~ msgstr "Muhtemelen linkin çok eski veya adresin doÄŸru kopyalanmamış olmasından kaynaklıdır." +#~ msgid "Email me new local problems" +#~ msgstr "Yeni yerel problemleri e posta olarak gönder" -#~ msgid "This problem has been closed" -#~ msgstr "Bu problem kapatıldı." +#~ msgid "Empty flat or maisonette" +#~ msgstr "BoÅŸ daire veye müstakil ev" -#~ msgid "This problem is in progress" -#~ msgstr "Bu problemin çözümüne iliÅŸkin süreç devam ediyor" +#~ msgid "Empty house or bungalow" +#~ msgstr "BoÅŸ ev veya bungalov" -#~ msgid "This problem is old and of unknown status." -#~ msgstr "Bu problem eski ve durumu bilinmemektedir." +#~ msgid "Empty office or other commercial" +#~ msgstr "BoÅŸ büro veya diÄŸer ticari yerler" -#~ msgid "Update:" -#~ msgstr "Güncelleme:" +#~ msgid "Empty pub or bar" +#~ msgstr "BoÅŸ pub veya bar" -#~ msgid "We have not been able to confirm your account - sorry." -#~ msgstr "Ãœzgünüz, hesabınızın onayı henüz mümkün olmadı ." +#~ msgid "Empty public building - school, hospital, etc." +#~ msgstr "BoÅŸ kamu binası- okul, hastane, vb." -#~ msgid "We have sent you an email containing a link to confirm your account." -#~ msgstr "Hesabınızı onaylamak için size ilgili linkin olduÄŸu bir e-posta gönderdik." +#~ msgid "Enter a nearby street name and area, postal code or district in Delhi" +#~ msgstr "Yakın çevrede bulunan cadde ismi, bölge ismi, posta kodu veya Delhi de bulunan semti girin" -#~ msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:" -#~ msgstr "Bu site hakkında neler düşündüğünü merak ediyoruz. Formu doldur, veya buraya e-posta gönder <a href='mailto:%s'>%s</a>:" +#~ msgid "FixMyStreet" +#~ msgstr "FixMyStreet" -#~ msgid "You have already attached a photo to this report, attaching another one will replace it." -#~ msgstr "Bu rapor için daha önce bir fotoÄŸraf eklediniz, eklediÄŸiniz diÄŸer fotoÄŸraf onun yerine geçecektir." +#~ msgid "I am afraid you cannot confirm unconfirmed reports." +#~ msgstr "Maalesef onaylanmamış bildirimleri onaylayamıyorsunuz." -#~ msgid "You have already attached a photo to this update, attaching another one will replace it." -#~ msgstr "Bu güncelleme için daha önce bir fotoÄŸraf eklediniz, eklediÄŸiniz diÄŸer fotoÄŸraf onun yerine geçecektir." +#~ msgid "Problems in this area" +#~ msgstr "Bu bölgedeki problemler" -#~ msgid "Your email:" -#~ msgstr "E-posta adresiniz:" +#~ msgid "Property type:" +#~ msgstr "Emlak türü:" -#~ msgid "Your name:" -#~ msgstr "Adınız:" +#~ msgid "RSS feed of problems in this %s" +#~ msgstr "%s ile ilgili problemeleri RSS besleme" -#~ msgid "Your email:" -#~ msgstr "Sizin e-posta:" +#~ msgid "Whole block of empty flats" +#~ msgstr "Bütün boÅŸ daireler" diff --git a/locale/uk_UA.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/uk_UA.UTF-8/LC_MESSAGES/FixMyStreet.po index a7e2d97c2..8699a75b8 100644 --- a/locale/uk_UA.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/uk_UA.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2016-03-02 13:09+0000\n" -"PO-Revision-Date: 2015-10-23 16:37+0000\n" +"POT-Creation-Date: 2016-05-03 10:41+0100\n" +"PO-Revision-Date: 2016-03-23 12:43+0000\n" "Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: Ukrainian (Ukraine) (http://www.transifex.com/mysociety/fixmystreet/language/uk_UA/)\n" "Language: uk_UA\n" @@ -20,7 +20,7 @@ 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:616 +#: perllib/FixMyStreet/DB/Result/Problem.pm:618 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr "Ñ–" @@ -53,9 +53,8 @@ msgid "%s admin:" msgstr "" #: templates/web/base/status/stats.html:26 -#, fuzzy msgid "%s bodies" -msgstr "Органи" +msgstr "" #: templates/web/base/status/stats.html:24 msgid "%s confirmed alerts, %s unconfirmed" @@ -90,7 +89,7 @@ msgstr "%s оперативних Ñповіщень" msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "%s опитувань надіÑлано – на %s відповіли (%s%%)" -#: perllib/FixMyStreet/DB/Result/Problem.pm:683 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "%s ref: %s" msgstr "%s поÑиланнÑ: %s" @@ -109,10 +108,6 @@ msgstr "" msgid "%s ward, %s" msgstr "%s район, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:552 -msgid "%s, reported at %s" -msgstr "%s, Ñповіщено о %s" - #: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "%s, в межах %s району" @@ -167,7 +162,7 @@ msgstr "(графіті, ÑміттÑ, крива бруківка, пробле msgid "(not sent to council)" msgstr "(не відправлено муніципалітету)" -#: templates/web/zurich/report/new/fill_in_details_form.html:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "(optional)" msgstr "(вибірково)" @@ -179,12 +174,11 @@ msgstr "" msgid "(sent to both)" msgstr "(відправлено обидвом)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Оберіть категорію --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Оберіть тип майна --" @@ -219,26 +213,21 @@ msgstr "<strong>ÐÑ–</strong> Я підтверджу ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ðµ-п msgid "<strong>No</strong> Let me confirm my update by email" msgstr "<strong>ÐÑ–</strong> Я підтверджу Ð¿Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ðµ-поштою" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:97 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>ÐÑ–</strong> Ñ Ð·Ð°Ð»Ð¾Ð³Ñ–Ð½ÑŽÑÑŒ через е-пошту" -#: templates/web/base/auth/general.html:70 +#: templates/web/base/auth/general.html:80 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Так</strong> Ð’ мене Ñ” пароль" -#: templates/web/base/about/about-en-gb.html:1 -#: templates/web/base/about/about-en-gb.html:3 -msgid "About us" -msgstr "Про наÑ" - #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Action Scheduled" msgstr "Запланована діÑ" @@ -269,7 +258,7 @@ msgstr "Додати нову категорію" msgid "Add user" msgstr "Додати кориÑтувача" -#: templates/web/base/my/my.html:56 +#: templates/web/base/my/my.html:54 msgid "Added %s" msgstr "Додано %s" @@ -289,7 +278,7 @@ msgstr "Ð¡Ð¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ %d Ñтворено Ð´Ð»Ñ %s, type %s, парамРmsgid "Alert %d disabled (created %s)" msgstr "Ð¡Ð¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ %d відключено (Ñтворено %s)" -#: templates/web/base/report/update/form_name.html:20 +#: templates/web/base/report/update/form_name.html:21 msgid "Alert me to future updates" msgstr "ПовідомлÑти мене про оновленнÑ" @@ -302,7 +291,7 @@ msgstr "Ð’ÑÑ– звіти" msgid "All Reports as CSV" msgstr "" -#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 +#: templates/web/base/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:20 @@ -401,7 +390,7 @@ msgstr "Ðазад" msgid "Ban email address" msgstr "Забанити адреÑу" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1273 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -432,7 +421,7 @@ msgstr "Ðе бачите мапу? <em>ПропуÑÑ‚Ñ–Ñ‚ÑŒ цей крок</em #: templates/web/base/admin/body.html:68 #: templates/web/base/admin/index.html:54 -#: templates/web/base/report/new/category.html:10 +#: templates/web/base/report/new/category.html:7 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 @@ -447,7 +436,7 @@ msgstr "КатегоріÑ" msgid "Category fix rate for problems > 4 weeks old" msgstr "Ð’ цій категорії проблеми не вирішуютьÑÑ > 4 тижнів" -#: templates/web/base/admin/body.html:138 +#: templates/web/base/admin/body.html:137 #: templates/web/base/admin/category_edit.html:23 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/admin/body.html:43 @@ -467,7 +456,7 @@ msgstr "КатегоріÑ: %s" msgid "Change password" msgstr "Змінити пароль" -#: templates/web/base/admin/body.html:160 +#: templates/web/base/admin/body.html:158 msgid "" "Check <strong>confirmed</strong> to indicate that this contact has been confirmed as correct.\n" " If you are not sure of the origin or validity of the contact, leave this unchecked." @@ -475,13 +464,13 @@ msgstr "" "Позначте <strong>підтверджений</strong>, щоб вказати, що цей контакт був підтверджений Ñк вірний.\n" "Якщо ви не впевнені у походженні та доÑтовірніÑÑ‚ÑŒ контакта, залиште не позначеним." -#: templates/web/base/admin/body.html:171 +#: templates/web/base/admin/body.html:169 msgid "" "Check <strong>deleted</strong> to remove the category from use. \n" " It will not appear as an available category in the drop-down menu on the report-a-problem page." msgstr "" -#: templates/web/base/admin/body.html:191 +#: templates/web/base/admin/body.html:189 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -492,7 +481,7 @@ msgid "" " at a specific address." msgstr "" -#: templates/web/base/admin/body.html:130 +#: templates/web/base/admin/body.html:129 msgid "" "Choose a <strong>category</strong> 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." @@ -533,8 +522,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:15 #: templates/web/base/admin/report_blocks.html:25 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 @@ -543,7 +532,7 @@ msgstr "" msgid "Closed" msgstr "Закрито" -#: perllib/FixMyStreet/DB/Result/Problem.pm:779 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Closed by council" msgstr "Закрито муніципалітетом" @@ -569,7 +558,7 @@ msgstr "Cobrand data:" msgid "Cobrand:" msgstr "Cobrand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "КонфігураціÑ" @@ -588,9 +577,8 @@ msgstr "Підтвердити запиÑ" #: templates/web/base/report/new/form_user_loggedout_password.html:21 #: templates/web/base/report/update/form_user_loggedout_password.html:20 -#, fuzzy msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." -msgstr "Підтвердіть е-адреÑу, ввівши новий пароль на цей раз. ПіÑÐ»Ñ Ð¿Ñ–Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¶ÐµÐ½Ð½Ñ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ буде змінено." +msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:1 #: templates/web/base/tokens/confirm_problem.html:1 @@ -600,7 +588,7 @@ msgstr "Підтвердіть е-адреÑу, ввівши новий паро msgid "Confirmation" msgstr "ПідтвердженнÑ" -#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:164 #: templates/web/base/admin/body.html:79 #: templates/web/base/admin/category_edit.html:37 #: templates/web/base/admin/category_edit.html:92 @@ -619,7 +607,7 @@ msgid "Confirmed:" msgstr "Підтверджені:" #. ("%s is the site name") -#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 +#: templates/web/base/about/_sidebar.html:6 msgid "Contact %s" msgstr "" @@ -638,8 +626,8 @@ msgstr "ЗвернутиÑÑŒ до команди" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1417 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1445 msgid "Could not find user" msgstr "Ðе вдалоÑÑŒ знайти кориÑтувача" @@ -657,7 +645,7 @@ msgstr "Рада" msgid "Council contacts for %s" msgstr "Контакти ради Ð´Ð»Ñ %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:681 +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "Council ref: %s" msgstr "рада ref: %s" @@ -676,7 +664,7 @@ msgstr "ЧиÑло" msgid "Create a report" msgstr "Створити ÑповіщеннÑ" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "Створити категорію" @@ -720,20 +708,20 @@ msgstr "Дашборд" msgid "Dealt with by subdivision within 5 working days" msgstr "Dealt with by subdivision within 5 working days" -#: perllib/FixMyStreet/App/Controller/Admin.pm:877 +#: perllib/FixMyStreet/App/Controller/Admin.pm:865 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:175 #: templates/web/base/admin/body.html:81 #: templates/web/base/admin/category_edit.html:42 #: templates/web/base/admin/category_edit.html:93 msgid "Deleted" msgstr "Видалено" -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:47 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -741,7 +729,7 @@ msgid "Description" msgstr "ОпиÑ" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:68 +#: templates/web/zurich/report/new/fill_in_details_form.html:70 msgid "Details" msgstr "Подробиці" @@ -766,11 +754,11 @@ msgid "Diligency prize league table" msgstr "Ð¢Ð°Ð±Ð»Ð¸Ñ†Ñ Ð½Ð°Ð¹Ñтаранніших призерів" #. ("%s is the site name") -#: templates/web/base/auth/general.html:48 -#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/auth/general.html:58 +#: templates/web/base/report/new/form_user_loggedout.html:28 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout.html:17 +#: templates/web/base/report/update/form_user_loggedout.html:27 msgid "Do you have a %s password?" msgstr "" @@ -788,8 +776,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "Duplicate" msgstr "Дубль" @@ -809,7 +797,7 @@ msgstr "" msgid "Edit" msgstr "Редагувати" -#: templates/web/base/admin/body.html:220 +#: templates/web/base/admin/body.html:218 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "Редагувати дані про орган" @@ -839,7 +827,7 @@ msgstr "Редактор" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:39 +#: templates/web/base/auth/general.html:49 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -847,11 +835,11 @@ msgstr "Редактор" msgid "Email" msgstr "Е-пошта" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 msgid "Email added to abuse list" msgstr "Пошта занеÑена в чорний ÑпиÑок" -#: templates/web/base/admin/body.html:155 +#: templates/web/base/admin/body.html:153 msgid "Email address:" msgstr "ÐдреÑа е-пошти:" @@ -863,19 +851,14 @@ msgstr "" msgid "Email alert deleted" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1390 msgid "Email already in abuse list" msgstr "ÐдреÑа вже в чорному ÑпиÑку" -#: templates/web/base/around/_updates.html:5 -msgid "Email me new local problems" -msgstr "ПовідомлÑйте мене про локальні проблеми лиÑтом" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 -#: templates/web/base/alert/updates.html:13 #: templates/web/zurich/admin/body.html:47 msgid "Email:" msgstr "Е-пошта:" @@ -884,26 +867,6 @@ msgstr "Е-пошта:" msgid "Email: %s" msgstr "Е-пошта: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 -msgid "Empty flat or maisonette" -msgstr "ÐŸÐ¾Ñ€Ð¾Ð¶Ð½Ñ ÐºÐ²Ð°Ñ€Ñ‚Ð¸Ñ€Ð° або дворівнева" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 -msgid "Empty house or bungalow" -msgstr "Порожній будинок або бунгало" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 -msgid "Empty office or other commercial" -msgstr "Порожній Ð¾Ñ„Ñ–Ñ Ð°Ð±Ð¾ інше комерційне приміщеннÑ" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 -msgid "Empty pub or bar" -msgstr "Порожній паб або бар" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 -msgid "Empty public building - school, hospital, etc." -msgstr "ÐŸÐ¾Ñ€Ð¾Ð¶Ð½Ñ Ð³Ñ€Ð¾Ð¼Ð°Ð´Ñька Ð±ÑƒÐ´Ñ–Ð²Ð»Ñ - школа, Ð»Ñ–ÐºÐ°Ñ€Ð½Ñ Ñ‚Ð° ін." - #: templates/web/base/admin/body-form.html:162 #: templates/web/base/admin/body-form.html:163 msgid "" @@ -947,18 +910,14 @@ msgstr "Введіть найближчу поштову адреÑу, або н msgid "Enter a nearby street name and area" msgstr "Введіть назву вулиці чи району поблизу" -#: perllib/FixMyStreet/Cobrand/ZeroTB.pm:7 -msgid "Enter a nearby street name and area, postal code or district in Delhi" -msgstr "" - -#: templates/web/base/auth/general.html:99 +#: templates/web/base/auth/general.html:109 #: templates/web/base/report/new/form_user_loggedout_by_email.html:38 #: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Введіть пароль" -#: templates/web/base/index-steps.html:26 +#: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "Введіть подробиці проблеми" @@ -984,7 +943,7 @@ msgstr "Зразок поштового коду %s" msgid "Examples:" msgstr "Приклади:" -#: templates/web/base/report/new/form_report.html:49 +#: templates/web/base/report/new/form_report.html:51 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "" @@ -1021,19 +980,15 @@ msgstr "Ім’Ñ" msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." msgstr "Полагодіть це вибравши <strong>зону покриттÑ</strong> в <em>формі Ñ€ÐµÐ´Ð°Ð³ÑƒÐ²Ð°Ð½Ð½Ñ Ð¾Ñ€Ð³Ð°Ð½Ñƒ </em> нижче." -#: templates/web/base/header.html:26 -msgid "FixMyStreet" -msgstr "FixMyStreet" - #: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:38 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:40 msgid "Fixed" msgstr "Вирішено" @@ -1060,7 +1015,7 @@ msgstr "Відмітьте Ñк видалене" msgid "Flag user" msgstr "Відмітьте кориÑтувача" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "Відмічено" @@ -1082,8 +1037,7 @@ msgstr "Відмічені кориÑтувачі не заборонені. ЦРmsgid "Flagged:" msgstr "Відмічено:" -#: templates/web/base/reports/_ward-list.html:3 -#: templates/web/fixmystreet/reports/_ward-list.html:4 +#: templates/web/base/reports/_ward-list.html:4 msgid "Follow a ward link to view only reports within that ward." msgstr "ПроÑлійте за поÑиланнÑм на район щоб бачити звіти лише по цьому району" @@ -1114,18 +1068,18 @@ msgstr "ЧаÑто задавані питаннÑ" msgid "GeoRSS on Google Maps" msgstr "" +#: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:11 -#: templates/web/fixmystreet/around/_updates.html:3 msgid "Get updates" msgstr "Отримувати оновленнÑ" -#: templates/web/fixmystreet/reports/_rss.html:3 -#: templates/web/fixmystreet/reports/_rss.html:9 +#: templates/web/base/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:9 msgid "Get updates of %s problems" msgstr "Отримувати Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð¿Ð¾ %s проблем" -#: templates/web/fixmystreet/reports/_rss.html:11 -#: templates/web/fixmystreet/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:11 +#: templates/web/base/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "Отримувати Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ проблеми в %s" @@ -1138,7 +1092,7 @@ msgid "Glad to hear it’s been fixed!" msgstr "" #: templates/web/base/alert/index.html:34 -#: templates/web/base/around/postcode_form.html:16 +#: templates/web/base/around/postcode_form.html:13 #: templates/web/base/reports/_list-filters.html:28 #: templates/web/zurich/admin/stats.html:26 msgid "Go" @@ -1164,7 +1118,7 @@ msgstr "Проблему було вирішено?" msgid "Have you ever reported a problem to a council before, or is this your first time?" msgstr "Ви вже Ñповіщали про проблеми раніше, чи це вперше?" -#: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:38 +#: templates/web/base/footer.html:38 #: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 @@ -1175,8 +1129,7 @@ msgstr "Допомога" msgid "Here are the types of local problem alerts for ‘%s’." msgstr "От типи локальних Ñповіщень про проблеми Ð´Ð»Ñ ‘%s’." -#: templates/web/base/header.html:32 templates/web/fixmystreet/header.html:63 -#: templates/web/zurich/footer.html:12 +#: templates/web/base/header.html:63 templates/web/zurich/footer.html:12 msgid "Hi %s" msgstr "Вітаємо, %s" @@ -1192,11 +1145,11 @@ msgstr "Вітаємо, %s" msgid "Hidden" msgstr "Прихований" -#: templates/web/base/around/display_location.html:65 +#: templates/web/base/around/display_location.html:64 msgid "Hide old" msgstr "Приховати заÑтарілі" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:59 msgid "Hide pins" msgstr "Приховати привÑзки" @@ -1216,10 +1169,6 @@ msgstr "Як ÑповіÑтити про проблему" msgid "How to send successful reports" msgstr "Як надіÑлати ÑкіÑне ÑповіщеннÑ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:752 -msgid "I am afraid you cannot confirm unconfirmed reports." -msgstr "Ðажаль ви не можете підтвердити непідтверджені ÑповіщеннÑ" - #: templates/web/base/tokens/confirm_problem.html:23 #: templates/web/base/tokens/confirm_problem.html:27 msgid "I just reported a problem on @fixmystreet" @@ -1230,7 +1179,7 @@ msgstr "" msgid "I just updated a problem on @fixmystreet" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88 msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "Ðажаль ми не можем знайти вашу проблему в базі даних.\n" @@ -1254,7 +1203,7 @@ msgstr "" "Визначіть <strong>предка</strong> Ñкщо цей орган Ñ” чаÑтиною іншого органу.\n" " Ð”Ð»Ñ Ð±Ð°Ð·Ð¾Ð²Ð¸Ñ… налаштувань вам не потрібно поєднувати органи таким чином." -#: templates/web/base/admin/body.html:133 +#: templates/web/base/admin/body.html:132 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." @@ -1277,7 +1226,7 @@ msgid "" "(please note it will not be sent to the council)." msgstr "" -#: templates/web/base/admin/body.html:149 +#: templates/web/base/admin/body.html:147 msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." msgstr "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." @@ -1312,10 +1261,10 @@ msgstr "Ðевірний ідентифікатор" msgid "Illegal feed selection" msgstr "Ðевірний вибір завантаженнÑ" +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "In Progress" msgstr "Ð’ процеÑÑ–" @@ -1366,7 +1315,7 @@ msgstr "Внутрішнє поÑиланнÑ" msgid "Invalid agency_responsible value %s" msgstr "Ðевірне Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ agency_responsible %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 msgid "Invalid end date" msgstr "Ðевірна кінцева дата" @@ -1374,16 +1323,16 @@ msgstr "Ðевірна кінцева дата" msgid "Invalid format %s specified." msgstr "Ðевірний формат %s ." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 msgid "Invalid start date" msgstr "Ðевірна початкова дата" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:5 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Investigating" msgstr "ДоÑлідженнÑ" @@ -1405,7 +1354,7 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:80 +#: 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 @@ -1443,7 +1392,6 @@ msgstr "ЗавантаженнÑ..." #: 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/fixmystreet/alert/updates.html:1 msgid "Local RSS feeds and email alerts" msgstr "Локальний RSS потік та поштові ÑповіщеннÑ" @@ -1452,11 +1400,11 @@ msgstr "Локальний RSS потік та поштові Ñповіщенн msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "Локальний RSS потік та поштові ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð´Ð»Ñ â€˜%s’" -#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:35 +#: templates/web/base/footer.html:35 msgid "Local alerts" msgstr "Локальні ÑповіщеннÑ" -#: templates/web/base/index-steps.html:25 +#: templates/web/base/index-steps.html:5 msgid "Locate the problem on a map of the area" msgstr "Позначте проблему на карті району" @@ -1516,14 +1464,14 @@ msgstr "МіÑÑць" #: templates/web/base/admin/list_updates.html:7 #: templates/web/base/admin/reports.html:13 #: templates/web/base/admin/users.html:15 -#: templates/web/base/auth/general.html:89 +#: templates/web/base/auth/general.html:99 #: templates/web/base/report/new/form_user_loggedin.html:9 #: templates/web/base/report/new/form_user_loggedout_by_email.html:7 -#: templates/web/base/report/update/form_name.html:4 +#: templates/web/base/report/update/form_name.html:5 #: templates/web/base/reports/index.html:20 #: 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:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "Name" msgstr "Ім'Ñ" @@ -1547,8 +1495,8 @@ msgstr "Ðайближча дорога до шпильки на карті (аРmsgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "Ðайближчий поштовий Ñ–Ð½Ð´ÐµÐºÑ Ð´Ð¾ шпильки на карті (автоматично згенеровано): %s (відÑтань: %sм)" -#: perllib/FixMyStreet/Cobrand/Default.pm:455 -#: perllib/FixMyStreet/Cobrand/Default.pm:495 +#: perllib/FixMyStreet/Cobrand/Default.pm:454 +#: perllib/FixMyStreet/Cobrand/Default.pm:494 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "Ðайближча дорога до шпильки на карті (автоматично згенеровано через Bing карти): %s%s" @@ -1572,7 +1520,7 @@ msgstr "Ðові <br>проблеми" msgid "New body added" msgstr "Ðовий орган додано" -#: perllib/FixMyStreet/App/Controller/Admin.pm:387 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 msgid "New category contact added" msgstr "Ðовий контакт категорії додано" @@ -1637,7 +1585,7 @@ msgstr "Далі" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 -#: templates/web/base/questionnaire/index.html:101 +#: templates/web/base/questionnaire/index.html:102 #: templates/web/base/questionnaire/index.html:53 msgid "No" msgstr "ÐÑ–" @@ -1702,8 +1650,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Not Responsible" msgstr "Ðе відповідальний" @@ -1736,7 +1684,7 @@ 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 "Зауважте, коли включаєм непідтвердженне ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð¼Ð¸ викориÑтовуєм дату ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ ÑповіщеннÑ. Вона може відрізнÑтиÑÑŒ від дати Ð¿Ñ–Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¶ÐµÐ½Ð½Ñ ÑповіщеннÑ, тому цифри в датах можуть трошки Ñтрибати." -#: templates/web/base/admin/body.html:186 +#: templates/web/base/admin/body.html:184 #: templates/web/base/admin/category_edit.html:52 #: templates/web/zurich/admin/body.html:53 msgid "Note:" @@ -1750,15 +1698,15 @@ msgstr "Ðотатка: <strong>%s</strong>" msgid "Notes from SDM to DM" msgstr "" -#: templates/web/base/report/new/form_user_loggedout.html:14 #: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/form_user_loggedout.html:24 #: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "Тепер відправити ваше ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ …" #: templates/web/base/report/update-form.html:28 -#: templates/web/base/report/update/form_user_loggedout.html:13 #: templates/web/base/report/update/form_user_loggedout.html:2 +#: templates/web/base/report/update/form_user_loggedout.html:23 msgid "Now to submit your update…" msgstr "Тепер щоб відправити ваше поновленнх" @@ -1792,8 +1740,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:23 #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/report/update/form_update.html:36 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1828,13 +1776,13 @@ msgstr "Ðбо проблеми прозвітовані до:" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "Ðбо ви можете підпиÑатиÑÑŒ на алÑрми відноÑно вашого району чи департаменту:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1055 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 -#: perllib/FixMyStreet/DB/Result/Problem.pm:558 -#: perllib/FixMyStreet/DB/Result/Problem.pm:568 -#: perllib/FixMyStreet/DB/Result/Problem.pm:578 -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1044 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:659 +#: perllib/FixMyStreet/DB/Result/Problem.pm:562 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 +#: perllib/FixMyStreet/DB/Result/Problem.pm:582 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 #: perllib/FixMyStreet/Script/Reports.pm:175 #: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" @@ -1859,7 +1807,7 @@ msgstr "Предок" msgid "Partial" msgstr "ЧаÑтково" -#: templates/web/base/auth/general.html:92 +#: templates/web/base/auth/general.html:102 #: templates/web/base/report/new/form_user_loggedout_by_email.html:31 #: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 @@ -1868,7 +1816,7 @@ msgid "Password (optional)" msgstr "Пароль (опціонально)" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:72 +#: templates/web/base/auth/general.html:82 msgid "Password:" msgstr "Пароль:" @@ -1876,7 +1824,7 @@ msgstr "Пароль:" msgid "Permalink" msgstr "ПоÑтійне поÑиланнÑ" -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:90 msgid "Phone number" msgstr "Ðомер телефону" @@ -1892,13 +1840,21 @@ msgid "Phone:" msgstr "Телефон:" #: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/questionnaire/index.html:89 +#: templates/web/base/questionnaire/index.html:91 #: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/new/form_report.html:38 +#: templates/web/base/report/new/form_report.html:40 +#: templates/web/base/report/update/form_update.html:20 +#: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:6 #: 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:45 +#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/zurich/report/new/fill_in_details_form.html:63 msgid "Photo" msgstr "Фото" @@ -1922,8 +1878,8 @@ msgstr "РозміÑÑ‚Ñ–Ñ‚ÑŒ шпильку на карті" #: perllib/FixMyStreet/Cobrand/Zurich.pm:955 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:6 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 @@ -1939,16 +1895,16 @@ msgstr "Будь лаÑка будьте ввічливим, виразним Ñ– msgid "Please check the passwords and try again" msgstr "Будь лаÑка перевірте пароль Ñ– Ñпробуйте ще раз" -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:33 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:43 #: 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:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:856 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:921 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -1958,7 +1914,7 @@ msgstr "Будь лаÑка оберіть категорію" msgid "Please choose a property type" msgstr "Будь лаÑка оберіть тип майна" -#: perllib/FixMyStreet/App/Controller/Admin.pm:378 +#: perllib/FixMyStreet/App/Controller/Admin.pm:376 msgid "Please correct the errors below" msgstr "" @@ -1979,11 +1935,10 @@ msgstr "Будь лаÑка не викориÑтовуйте образи msgid "Please enter a message" msgstr "Будь лаÑка введіть повідомленнÑ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Admin.pm:1079 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 msgid "Please enter a name" -msgstr "Будь лаÑка введіть ім'Ñ" +msgstr "" #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 @@ -1997,10 +1952,10 @@ msgstr "Будь лаÑка введіть пароль" msgid "Please enter a subject" msgstr "Будь лаÑка вкажіть тему" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1075 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1130 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:133 +#: perllib/FixMyStreet/DB/Result/User.pm:143 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2017,9 +1972,9 @@ msgid "Please enter some details" msgstr "Будь лаÑка додайте трохи подробиць" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:130 -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:32 +#: perllib/FixMyStreet/DB/Result/User.pm:140 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:42 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2028,7 +1983,7 @@ msgid "Please enter your email" msgstr "Будь лаÑка вкажіть е-пошту" #: templates/web/base/report/new/form_user_loggedout_email.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:80 +#: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "Please enter your email address" msgstr "Будь лаÑка вкажіть адреÑу е-пошти" @@ -2044,7 +1999,7 @@ msgstr "Будь лаÑка введіть ім'Ñ Ñ‚Ð° прізвище - деР#: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:126 +#: perllib/FixMyStreet/DB/Result/User.pm:136 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "Будь лаÑка введіть ім'Ñ" @@ -2071,7 +2026,7 @@ msgstr "Ви можете <a href=\"%s\">увійти знов</a>, або поРmsgid "Please fill in details of the problem below." msgstr "Будь лаÑка додайте подробиці про проблему нижче." -#: templates/web/zurich/report/new/fill_in_details_form.html:72 +#: templates/web/zurich/report/new/fill_in_details_form.html:74 msgid "Please fill in details of the problem." msgstr "Будь лаÑка опишіть проблему детально" @@ -2080,7 +2035,7 @@ msgstr "Будь лаÑка опишіть проблему детально" msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "Будь лаÑка заповніть форму нижче подробицÑми проблеми, Ñ– опишіть міÑÑ†ÐµÐ·Ð½Ð°Ñ…Ð¾Ð´Ð¶ÐµÐ½Ð½Ñ Ñкомога точніше в полі подробиць." -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Будь лаÑка вкажіть чи ви хочете отримати інші опитуваннÑ." @@ -2089,9 +2044,8 @@ msgid "Please note that updates are not sent to the council." msgstr "Будь лаÑка зауважте що Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð½Ðµ надÑилаютьÑÑ Ð´ÐµÐ¿Ð°Ñ€Ñ‚Ð°Ð¼ÐµÐ½Ñ‚Ñƒ." #: templates/web/base/report/new/oauth_email_form.html:4 -#, fuzzy msgid "Please note your report has <strong>not yet been sent</strong>." -msgstr "Будь лаÑка заауважте, що ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ <strong>ще не було надіÑлано</strong>. Оберіть категорію та іншу інформацію нижче, Ñ– надішліть." +msgstr "" #: templates/web/base/report/new/fill_in_details_form.html:20 #: templates/web/zurich/report/new/fill_in_details_form.html:11 @@ -2107,16 +2061,16 @@ msgstr "" msgid "Please note:" msgstr "Будь лаÑка зауважте:" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please provide some explanation as to why you're reopening this report" msgstr "Будь лаÑка додайте трохи поÑÑнень ÑтоÑовно Ð¿ÐµÑ€ÐµÐ²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ñ‚Ñ ÑповіщеннÑ" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250 msgid "Please provide some text as well as a photo" msgstr "Будь лаÑка додайте текÑÑ‚ Ñ– фото" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236 msgid "Please say whether you've ever reported a problem to your council before" msgstr "Будь лаÑка розкажіть чи ви відправлÑли ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð´ÐµÐ¿Ð°Ñ€Ñ‚Ð°Ð¼ÐµÐ½Ñ‚Ñƒ раніше" @@ -2132,22 +2086,23 @@ msgstr "Оберіть бажаний потік інформації" msgid "Please select the type of alert you want" msgstr "Будь лаÑка оберіть тип бажаних алÑрмів" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232 msgid "Please state whether or not the problem has been fixed" msgstr "Будь лаÑка вкажіть чи була вирішена проблема" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:121 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 #: templates/web/base/js/translation_strings.html:53 -msgid "Please upload a JPEG image only" +#, fuzzy +msgid "Please upload an image only" msgstr "Будь лаÑка завантажуйте тільки JPEG зображеннÑ" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 msgid "Please write a message" msgstr "Будь лаÑка напишіть повідомленнÑ" -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Please write your update here" msgstr "Будь лаÑка напишіть поновленнÑ" @@ -2178,7 +2133,7 @@ msgstr "" msgid "Previous" msgstr "Попередній" -#: templates/web/fixmystreet/footer.html:41 +#: templates/web/base/footer.html:41 msgid "Privacy" msgstr "" @@ -2188,7 +2143,7 @@ msgstr "" msgid "Privacy and cookies" msgstr "" -#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:200 #: templates/web/base/admin/body.html:85 #: templates/web/base/admin/category_edit.html:45 #: templates/web/base/admin/report_edit.html:77 @@ -2217,7 +2172,7 @@ msgstr "Проблему %s надіÑлано департаменту %s" msgid "Problem breakdown by state" msgstr "Розбивка проблем по Ñтану" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1046 msgid "Problem marked as open." msgstr "Проблема маркована відкритою." @@ -2229,10 +2184,6 @@ msgstr "Стан проблеми змінено базуючиÑÑŒ на Ñ€ÐµÐ·Ñ msgid "Problems" msgstr "Проблеми" -#: templates/web/base/around/_updates.html:1 -msgid "Problems in this area" -msgstr "Проблеми в цьому районі" - #: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "Проблеми поблизу" @@ -2250,13 +2201,11 @@ msgid "Problems within %.1fkm of this location" msgstr "Проблеми в радіуÑÑ– %.1fkm від цієї точки" #: perllib/FixMyStreet/Cobrand/Default.pm:663 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 #: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "Проблеми в межах %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "Проблеми в межах %s району" @@ -2275,15 +2224,11 @@ msgstr "Проблеми в межах:" msgid "Property address:" msgstr "ÐдреÑа майна:" -#: templates/web/base/report/new/category.html:8 -msgid "Property type:" -msgstr "Тип майна:" - #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Ðадішліть оновленнÑ" -#: templates/web/base/auth/general.html:95 +#: templates/web/base/auth/general.html:105 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 "Ð’ÐºÐ°Ð·Ð°Ð½Ð½Ñ Ñ–Ð¼ÐµÐ½Ñ– Ñ– паролю не обов'Ñзкове, проте це дозволить вам більш легко Ñповіщати про проблеми, залишати Ð¿Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ñ‚Ð° керувати вашими ÑповіщеннÑми" @@ -2317,16 +2262,15 @@ msgstr "ÐžÐ¿Ð¸Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ %d проведено ÑтоÑовно пробле msgid "Questionnaire %d sent for problem %d" msgstr "Ðнкета %d відправлена по проблемі %d" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 msgid "Questionnaire filled in by problem reporter" msgstr "Ðнкета заповнена автором ÑповіщеннÑ" #: templates/web/base/alert/_list.html:22 +#: templates/web/base/alert/updates.html:9 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display_tools.html:34 -#: templates/web/base/reports/_rss.html:1 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed" msgstr "RSS потік" @@ -2354,18 +2298,12 @@ msgstr "" msgid "RSS feed of nearby problems" msgstr "" -#: templates/web/base/reports/_rss.html:1 -msgid "RSS feed of problems in this %s" -msgstr "" - #: perllib/FixMyStreet/Cobrand/Default.pm:664 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 #: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 #: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "" @@ -2375,14 +2313,13 @@ msgstr "" msgid "RSS feed of recent local problems" msgstr "RSS Ñтрічка недавніх локальних проблем" +#: templates/web/base/alert/updates.html:9 #: templates/web/base/report/display_tools.html:34 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed of updates to this problem" msgstr "RSS Ñтрічка з оновленнÑми по цій проблемі" -#: templates/web/base/alert/updates.html:9 +#: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:36 -#: templates/web/fixmystreet/alert/updates.html:14 msgid "Receive email when updates are left on this problem." msgstr "Отримувати лиÑта коли Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ Ð¿Ð¾ проблемі буде оновлена" @@ -2418,12 +2355,11 @@ msgstr "Видалити фото (це Ð½ÐµÐ·Ð²Ð¾Ñ€Ð¾Ñ‚Ð½Ñ Ð¾Ð¿ÐµÑ€Ð°Ñ†Ñ–Ñ!)" msgid "Reply to user:" msgstr "" -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/header_logo.html:2 msgid "Report" msgstr "" -#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:26 -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/footer.html:26 templates/web/base/header_logo.html:2 #: templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2433,7 +2369,7 @@ msgstr "СповіÑтити про проблему" msgid "Report abuse" msgstr "ПоÑкаржитиÑÑŒ" -#: perllib/FixMyStreet/App/Controller/Rss.pm:291 +#: perllib/FixMyStreet/App/Controller/Rss.pm:297 msgid "Report on %s" msgstr "Звіт по %s" @@ -2448,7 +2384,7 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "Сповіщайте, переглÑдайте, або обговорюйте міÑцеві проблеми" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:577 #: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "Сповіщено анонімно по %s" @@ -2458,7 +2394,7 @@ msgstr "Сповіщено анонімно по %s" msgid "Reported before" msgstr "Сповіщено раніше" -#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 #: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "Перевідкрито %s о %s" @@ -2472,27 +2408,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "Сповіщено в категорії %s " -#: perllib/FixMyStreet/DB/Result/Problem.pm:569 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 msgid "Reported in the %s category anonymously at %s" msgstr "Сповіщено в категорії %s анонімно о %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:591 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 msgid "Reported in the %s category by %s at %s" msgstr "Сповіщено в категорію %s %s о %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported via %s anonymously at %s" msgstr "Сповіщено %s анонімно о %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported via %s by %s at %s" msgstr "Сповіщено через %s %s о %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:561 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 msgid "Reported via %s in the %s category anonymously at %s" msgstr "Сповіщено через %s в категорію %s анонімно о %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 msgid "Reported via %s in the %s category by %s at %s" msgstr "Сповіщено через %s в категорію %s %s о %s" @@ -2513,7 +2449,7 @@ msgstr "" msgid "Reporting a problem" msgstr "СповіÑтити про проблему" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1274 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" @@ -2556,15 +2492,15 @@ msgstr "ОбÑлуговувач цієї дороги (отримано з до msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "ОбÑлуговувач цієї дороги (з OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1496 #: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "Повернули вліво" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 #: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 @@ -2579,7 +2515,7 @@ msgstr "" msgid "Satellite" msgstr "" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/base/admin/category_edit.html:84 #: templates/web/zurich/admin/body.html:59 #: templates/web/zurich/admin/template_edit.html:29 @@ -2635,7 +2571,7 @@ msgstr "" msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:696 +#: perllib/FixMyStreet/DB/Result/Problem.pm:698 msgid "Sent to %s %s later" msgstr "Відправити %s %s пізніше" @@ -2654,21 +2590,21 @@ msgstr "Поширити" #: templates/web/base/report/new/form_user_loggedin.html:23 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22 -#: templates/web/base/report/update/form_name.html:15 +#: templates/web/base/report/update/form_name.html:16 msgid "Show my name publicly" msgstr "Показувати моє ім'Ñ Ð¿ÑƒÐ±Ð»Ñ–Ñ‡Ð½Ð¾" -#: templates/web/base/around/display_location.html:67 +#: templates/web/base/around/display_location.html:66 msgid "Show old" msgstr "Показувати Ñтарі" -#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:57 msgid "Show pins" msgstr "Показувати шпильки" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/general.html:110 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:76 +#: templates/web/base/auth/general.html:86 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2727,9 +2663,8 @@ msgstr "Вибачте, ми не знайшли це міÑце" #: templates/web/base/auth/general.html:9 #: templates/web/base/report/display.html:21 #: templates/web/base/report/new/fill_in_details_form.html:23 -#, fuzzy msgid "Sorry, we could not log you in. Please fill in the form below." -msgstr "Вибачте, ми не можем розпізнати це міÑце. Спробуйте пізніше." +msgstr "" #: perllib/FixMyStreet/Geocode/Bing.pm:35 #: perllib/FixMyStreet/Geocode/Google.pm:45 @@ -2737,15 +2672,10 @@ msgstr "Вибачте, ми не можем розпізнати це міÑцРmsgid "Sorry, we could not parse that location. Please try again." msgstr "Вибачте, ми не можем розпізнати це міÑце. Спробуйте пізніше." -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:138 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 -#, fuzzy -msgid "Sorry, you can not log in with Facebook. Please try again later." -msgstr "СталаÑÑŒ помилка при Ñпробі показати Ñторінку. Будь лаÑка Ñпробуйте пізніше." - #: templates/web/base/admin/stats.html:64 msgid "Start Date:" msgstr "Початкова дата:" @@ -2754,7 +2684,7 @@ msgstr "Початкова дата:" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/report/update/form_update.html:32 +#: templates/web/base/report/update/form_update.html:34 msgid "State" msgstr "Стан" @@ -2767,7 +2697,7 @@ msgstr "Стан" msgid "State:" msgstr "Стан:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2807,10 +2737,10 @@ msgid "Subject:" msgstr "Тема:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/base/report/new/form_user_loggedout_by_email.html:39 #: templates/web/base/report/new/form_user_loggedout_password.html:11 -#: templates/web/zurich/report/new/fill_in_details_form.html:96 +#: templates/web/zurich/report/new/fill_in_details_form.html:98 msgid "Submit" msgstr "Підтвердити" @@ -2838,9 +2768,8 @@ msgstr "Підтвердити анкету" msgid "Submitted" msgstr "Підтверджено" -#: templates/web/base/alert/updates.html:17 +#: templates/web/base/alert/updates.html:23 #: templates/web/base/report/display_tools.html:41 -#: templates/web/fixmystreet/alert/updates.html:23 msgid "Subscribe" msgstr "ПідпиÑатиÑÑŒ" @@ -2848,7 +2777,7 @@ msgstr "ПідпиÑатиÑÑŒ" msgid "Subscribe me to an email alert" msgstr "Підпишіть мене на поштові алÑрми" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -2867,7 +2796,7 @@ msgstr "Резюме" msgid "Summary reports" msgstr "Сумарні ÑповіщеннÑ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 msgid "Survey" msgstr "ОпитуваннÑ" @@ -2924,7 +2853,7 @@ msgstr "ДÑкуємо за надіÑлане фото. Тепер нам Ð¿Ð¾Ñ msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "ДÑкуєм, раді чути, що проблему вирішено! Можемо ми поцікавитиÑÑŒ чи Ñповіщали ви органи про будь-Ñку проблему раніше?" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:157 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "Під Ñ‡Ð°Ñ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ñ„Ð¾Ñ‚Ð¾ трапилаÑÑŒ помилка(%s), будь лаÑка повторіть" @@ -2932,7 +2861,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:126 +#: perllib/FixMyStreet/App/Controller/Location.pm:127 msgid "That location does not appear to be in the UK; please try again." msgstr "" @@ -2942,11 +2871,11 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "Поштовий код не розпізнано, вибачте." -#: perllib/FixMyStreet/App/Controller/Admin.pm:724 +#: perllib/FixMyStreet/App/Controller/Admin.pm:722 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:716 +#: perllib/FixMyStreet/App/Controller/Admin.pm:714 msgid "That problem will now be resent." msgstr "Цю проблему зараз перезвітують." @@ -2958,7 +2887,7 @@ msgstr "Цей ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð½ÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ показати на %s. msgid "That report has been removed from FixMyStreet." msgstr "Це ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð±ÑƒÐ»Ð¾ видалено." -#: templates/web/base/admin/body.html:144 +#: templates/web/base/admin/body.html:142 msgid "" "The <strong>email address</strong> is the destination to which reports about this category will be sent. \n" " Other categories for this body may have the same email address." @@ -3104,9 +3033,9 @@ msgstr "СталаÑÑŒ проблема з відображеннÑм Ñторі msgid "There was a problem showing this page. Please try again later." msgstr "СталаÑÑŒ помилка при Ñпробі показати Ñторінку. Будь лаÑка Ñпробуйте пізніше." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:753 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 -#: templates/web/base/auth/general.html:43 +#: templates/web/base/auth/general.html:53 #: 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 "З комбінацією поштової адреÑи Ñ– паролю щоÑÑŒ не так. Якщо ви не в змозі пригадати пароль або у Ð²Ð°Ñ Ð¹Ð¾Ð³Ð¾ немає, заповніть Ñекцію ‘увійти поштою’" @@ -3167,9 +3096,9 @@ msgstr "" 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:920 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:898 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:935 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:977 #: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "Ð¦Ñ Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ Ð¾Ð±Ð¾Ð²'Ñзкова" @@ -3182,11 +3111,11 @@ msgstr "" msgid "This is a summary of all reports on this site." msgstr "" -#: templates/web/base/report/update/form_update.html:52 +#: templates/web/base/report/update/form_update.html:54 msgid "This problem has been fixed" msgstr "Цю проблему вирішено" -#: templates/web/base/report/update/form_update.html:46 +#: templates/web/base/report/update/form_update.html:48 msgid "This problem has not been fixed" msgstr "Цю проблему не вирішено" @@ -3223,7 +3152,7 @@ msgstr "Ð¦Ñ Ð²ÐµÐ±-Ñторінка також міÑтить фото проб msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "ХронологіÑ" @@ -3268,8 +3197,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Unable to fix" msgstr "Ðеможливо виправити" @@ -3286,7 +3215,7 @@ msgstr "Ðе підтверджено" msgid "Unknown" msgstr "Ðевідомо" -#: perllib/FixMyStreet/App/Controller/Rss.pm:173 +#: perllib/FixMyStreet/App/Controller/Rss.pm:174 msgid "Unknown alert type" msgstr "Ðевідомий тип алÑрму" @@ -3301,7 +3230,7 @@ msgstr "Ðевідома помилка" msgid "Unknown problem ID" msgstr "Ðевідомий ідентифікатор проблеми" -#: templates/web/base/report/update/form_update.html:25 +#: templates/web/base/report/update/form_update.html:27 msgid "Update" msgstr "ПоновленнÑ" @@ -3353,10 +3282,10 @@ msgstr "Поновити ÑтатуÑи" msgid "Updated" msgstr "Поновлено" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 -#: perllib/FixMyStreet/App/Controller/Admin.pm:821 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1096 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1144 +#: perllib/FixMyStreet/App/Controller/Admin.pm:809 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3383,7 +3312,7 @@ msgstr "ÐŸÐ¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ ÑтоÑовно {{title}}" msgid "Updates to this problem, %s" msgstr "" -#: templates/web/base/admin/body.html:182 +#: templates/web/base/admin/body.html:180 msgid "Use the <strong>note</strong> to record details that are only displayed in the admin. Notes are not shown publicly, and are not sent to the body." msgstr "" @@ -3392,11 +3321,11 @@ msgstr "" msgid "Used map" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 msgid "User flag removed" msgstr "КориÑтувацький прапорець видалено" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1421 msgid "User flagged" msgstr "КориÑтувач відмічений" @@ -3404,16 +3333,16 @@ msgstr "КориÑтувач відмічений" msgid "User search finds matches in users' names and email addresses." msgstr "Пошук кориÑтувачів знайшов ÑÐ¿Ñ–Ð²Ð¿Ð°Ð´Ñ–Ð½Ð½Ñ Ð² іменах та поштових адреÑах" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "КориÑтувачі" -#: perllib/FixMyStreet/App/Controller/Admin.pm:382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:412 -#: perllib/FixMyStreet/App/Controller/Admin.pm:429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:380 +#: perllib/FixMyStreet/App/Controller/Admin.pm:410 +#: perllib/FixMyStreet/App/Controller/Admin.pm:427 msgid "Values updated" msgstr "Ð—Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð¾" @@ -3450,16 +3379,15 @@ msgstr "Ми знайшли більше одного ÑÐ¿Ñ–Ð²Ð¿Ð°Ð´Ñ–Ð½Ð½Ñ Ð´Ð #: templates/web/base/auth/general.html:6 #: templates/web/base/report/display.html:27 #: templates/web/base/report/new/oauth_email_form.html:5 -#, fuzzy msgid "We need your email address, please give it below." -msgstr "Ми ніколи не публікуємо вашу поштову адреÑу чи номер телефону." +msgstr "" #: templates/web/base/report/new/form_user_loggedout_email.html:2 #: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "Ми ніколи не публікуєм вашу поштову адреÑу" -#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedin.html:30 #: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "Ми ніколи не публікуємо вашу поштову адреÑу чи номер телефону." @@ -3468,7 +3396,7 @@ msgstr "Ми ніколи не публікуємо вашу поштову ад 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; нажаль, наразі у Ð½Ð°Ñ Ð½ÐµÐ¼Ð°Ñ” Ñ—Ñ… контактних даних. Якщо ви знаєте точну адреÑу, будь лаÑка залишайтеÑÑŒ на зв'Ñзку." -#: templates/web/base/index-steps.html:31 +#: templates/web/base/index-steps.html:11 msgid "We send it to the council on your behalf" msgstr "Ми надіÑлали це відповідному департаменту від вашого імені" @@ -3506,10 +3434,6 @@ msgstr "Коли відправлено" msgid "Whoa there Testino! Three photos are enough." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 -msgid "Whole block of empty flats" -msgstr "Whole block of empty flats" - #: templates/web/base/tokens/confirm_alert.html:7 msgid "Why stop there? <a href=\"/alert\">Set up more alerts</a> for free." msgstr "" @@ -3529,7 +3453,7 @@ msgstr "" msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "" -#: templates/web/base/questionnaire/index.html:96 +#: templates/web/base/questionnaire/index.html:97 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "Хочете отримати ще іншу анкету за 4 тижні, нагадуючу вам про перевірку ÑтатуÑу?" @@ -3559,8 +3483,8 @@ msgstr "Рік" #: templates/web/base/admin/update_edit.html:24 #: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 +#: templates/web/base/questionnaire/index.html:100 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "Так" @@ -3677,19 +3601,19 @@ msgid "Your Reports" msgstr "Ваші ÑповіщеннÑ" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/alert/updates.html:19 +#: templates/web/base/alert/updates.html:22 #: templates/web/base/contact/index.html:83 #: templates/web/base/report/display_tools.html:38 #: templates/web/base/report/display_tools.html:40 #: templates/web/base/report/new/form_user_loggedin.html:3 #: templates/web/base/report/new/form_user_loggedout_email.html:1 #: templates/web/base/report/update/form_user_loggedout_email.html:1 -#: templates/web/fixmystreet/alert/updates.html:19 -#: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/zurich/report/new/fill_in_details_form.html:76 +#: templates/web/zurich/report/new/fill_in_details_form.html:78 msgid "Your email" msgstr "Ваша пошта" -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/general.html:55 #: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 @@ -3700,17 +3624,17 @@ msgstr "Ваша адреÑа е-пошти" msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "Ваша Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ Ð±ÑƒÐ´Ðµ викориÑтана згідно <a href=\"/privacy\">політики конфіденційноÑÑ‚Ñ–</a>" -#: templates/web/base/auth/general.html:90 +#: templates/web/base/auth/general.html:100 #: templates/web/base/contact/index.html:76 #: templates/web/base/report/new/form_user_loggedin.html:18 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17 -#: templates/web/base/report/update/form_name.html:11 +#: templates/web/base/report/update/form_name.html:12 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:86 +#: templates/web/zurich/report/new/fill_in_details_form.html:88 msgid "Your name" msgstr "Ваше ім'Ñ" -#: templates/web/base/auth/general.html:75 +#: templates/web/base/auth/general.html:85 #: 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 @@ -3723,20 +3647,19 @@ msgstr "Ваш пароль було змінено" #: templates/web/base/report/new/form_user_loggedin.html:27 #: templates/web/base/report/new/form_user_loggedout_by_email.html:26 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:94 msgid "Your phone number" msgstr "Ваш телефон" #: templates/web/base/questionnaire/index.html:14 -#, fuzzy msgid "Your report" -msgstr "Ваші ÑповіщеннÑ" +msgstr "" -#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 +#: templates/web/base/footer.html:29 msgid "Your reports" msgstr "Ваші ÑповіщеннÑ" -#: templates/web/base/my/my.html:41 +#: templates/web/base/my/my.html:39 msgid "Your updates" msgstr "Ваші поновленнÑ" @@ -3762,7 +3685,7 @@ msgid "didn't use map" msgstr "не викориÑтовував карту" #: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/around/postcode_form.html:12 msgid "e.g. ‘%s’ or ‘%s’" msgstr "наприклад ‘%s’ чи ‘%s’" @@ -3868,8 +3791,7 @@ msgstr "інші зони:" msgid "reopened" msgstr "перевідкрито" -#: templates/web/base/header.html:33 templates/web/fixmystreet/header.html:64 -#: templates/web/zurich/footer.html:13 +#: templates/web/base/header.html:64 templates/web/zurich/footer.html:13 msgid "sign out" msgstr "вийти" @@ -3952,7 +3874,7 @@ msgstr[0] "<big>%s</big> Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð½Ð° звіті" msgstr[1] "<big>%s</big> оновлень на звіті" msgstr[2] "<big>%s</big> оновлень на звіті" -#: templates/web/emptyhomes/report/new/councils_text_none.html:3 +#: templates/web/base/report/new/councils_text_none.html:3 #, perl-format msgid "We do not yet have details for the council that covers this location." msgid_plural "We do not yet have details for the councils that cover this location." @@ -4000,80 +3922,41 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#~ msgid "(we never show your email address or phone number)" -#~ msgstr "(ми не публікуєм вашу електронну адреÑу Ñ– номер телефону)" - -#~ msgid "(we never show your email)" -#~ msgstr "(ми не публікуєм вашу поштову адреÑу)" - -#~ msgid "<strong>No</strong>, let me confirm my report by email:" -#~ msgstr "<strong>ÐÑ–</strong>, Ñ Ð¿Ñ–Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¶Ñƒ ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ðµ-поштою" - -#~ msgid "<strong>No</strong>, let me confirm my update by email:" -#~ msgstr "<strong>ÐÑ–</strong>, Я підтверджу Ð¿Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ðµ-поштою:" - -#~ msgid "Email me updates" -#~ msgstr "ÐадÑилайте мені новини" - -#~ msgid "Enter a new password:" -#~ msgstr "Введіть новий пароль:" - -#~ msgid "I'm afraid we couldn't validate that token. If you've copied the URL from an email, please check that you copied it exactly.\n" -#~ msgstr "Ðажаль ми не можем валідувати цей токен. Якщо ви зкопіювали поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð· е-пошти, перевірте чи воно Ñкопійовано вірно.\n" - -#~ msgid "If you use web-based email or have 'junk mail' filters, you may wish to check your bulk/spam mail folders: sometimes, our messages are marked that way." -#~ msgstr "Якщо ви кориÑтуєтеÑÑŒ онлайн-поштовиком або маєте Ñпам-фільтр, перевірте папку Ñпам: інколи наші Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿Ð¾Ñ‚Ñ€Ð°Ð¿Ð»ÑÑŽÑ‚ÑŒ в цю категорію." - -#~ msgid "Message:" -#~ msgstr "ПовідомленнÑ:" - -#~ msgid "More problems nearby" -#~ msgstr "Ще проблеми поблизу" - -#~ msgid "Nearly Done! Now check your email..." -#~ msgstr "Майже закінчили! Тепер перевірте вашу е-пошту..." - -#~ msgid "Offensive? Unsuitable? Tell us" -#~ msgstr "Образливо? ÐедопуÑтимо? Розкажіть нам" - -#~ msgid "Photo:" -#~ msgstr "Фото:" - -#~ msgid "Please check your email" -#~ msgstr "Будь лаÑка перевірте вашу пошту" +#~ msgid "%s, reported at %s" +#~ msgstr "%s, Ñповіщено о %s" -#~ msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" -#~ msgstr "Будь лаÑка зауважте що Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð½Ðµ надÑилаютьÑÑ Ð´ÐµÐ¿Ð°Ñ€Ñ‚Ð°Ð¼ÐµÐ½Ñ‚Ñƒ. Якщо залишите ім'Ñ Ð²Ð¾Ð½Ð¸ Ñтануть публічними. Ваша Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ñ†Ñ–Ñ Ð±ÑƒÐ´Ðµ викориÑтана згідно з нашою <a href=\"/faq#privacy\">політикою конфіденційноÑÑ‚Ñ–</a>" +#~ msgid "About us" +#~ msgstr "Про наÑ" -#~ msgid "This problem has been closed" -#~ msgstr "Цю проблему закрито" +#~ msgid "Email me new local problems" +#~ msgstr "ПовідомлÑйте мене про локальні проблеми лиÑтом" -#~ msgid "This problem is in progress" -#~ msgstr "Ð¦Ñ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ð° в процеÑÑ–" +#~ msgid "Empty flat or maisonette" +#~ msgstr "ÐŸÐ¾Ñ€Ð¾Ð¶Ð½Ñ ÐºÐ²Ð°Ñ€Ñ‚Ð¸Ñ€Ð° або дворівнева" -#~ msgid "This problem is old and of unknown status." -#~ msgstr "Ð¦Ñ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ð° заÑтаріла Ñ– Ñ—Ñ— ÑÑ‚Ð°Ñ‚ÑƒÑ Ð½ÐµÐ²Ñ–Ð´Ð¾Ð¼Ð¸Ð¹." +#~ msgid "Empty house or bungalow" +#~ msgstr "Порожній будинок або бунгало" -#~ msgid "Update:" -#~ msgstr "ПоновленнÑ:" +#~ msgid "Empty office or other commercial" +#~ msgstr "Порожній Ð¾Ñ„Ñ–Ñ Ð°Ð±Ð¾ інше комерційне приміщеннÑ" -#~ msgid "We have not been able to confirm your account - sorry." -#~ msgstr "Ðам не вдалоÑÑŒ підтвердити ваш обліковий запиÑ. Вибачте." +#~ msgid "Empty pub or bar" +#~ msgstr "Порожній паб або бар" -#~ msgid "We have sent you an email containing a link to confirm your account." -#~ msgstr "Ми відправили вам лиÑта з поÑиланнÑм на Ð¿Ñ–Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¶ÐµÐ½Ð½Ñ Ð¾Ð±Ð»Ñ–ÐºÐ¾Ð²Ð¾Ð³Ð¾ запиÑу." +#~ msgid "Empty public building - school, hospital, etc." +#~ msgstr "ÐŸÐ¾Ñ€Ð¾Ð¶Ð½Ñ Ð³Ñ€Ð¾Ð¼Ð°Ð´Ñька Ð±ÑƒÐ´Ñ–Ð²Ð»Ñ - школа, Ð»Ñ–ÐºÐ°Ñ€Ð½Ñ Ñ‚Ð° ін." -#~ msgid "You have already attached a photo to this report, attaching another one will replace it." -#~ msgstr "Ви вже додали фото до цього ÑповіщеннÑ, Ð´Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ Ð½Ð¾Ð²Ð¾Ð³Ð¾ фото видалить попереднє." +#~ msgid "FixMyStreet" +#~ msgstr "FixMyStreet" -#~ msgid "You have already attached a photo to this update, attaching another one will replace it." -#~ msgstr "Ви вже додали фото до цього поновленнÑ, Ð´Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ Ð½Ð¾Ð²Ð¾Ð³Ð¾ фото видалить попереднє." +#~ msgid "I am afraid you cannot confirm unconfirmed reports." +#~ msgstr "Ðажаль ви не можете підтвердити непідтверджені ÑповіщеннÑ" -#~ msgid "Your email:" -#~ msgstr "Ваша е-пошта:" +#~ msgid "Problems in this area" +#~ msgstr "Проблеми в цьому районі" -#~ msgid "Your name:" -#~ msgstr "Ваше ім'Ñ:" +#~ msgid "Property type:" +#~ msgstr "Тип майна:" -#~ msgid "Your email:" -#~ msgstr "Ваша е-пошта:" +#~ msgid "Whole block of empty flats" +#~ msgstr "Whole block of empty flats" diff --git a/locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po index 7e07ae9ec..05fdc9c6f 100644 --- a/locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -4,14 +4,13 @@ # Matthew Somerville <matthew@mysociety.org>, 2011-06-03. # # Translators: -# Chi-Hsun Tsai <chihsun.tsai@gmail.com>, 2015-2016 msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2016-03-02 13:09+0000\n" -"PO-Revision-Date: 2016-01-29 02:52+0000\n" -"Last-Translator: Chi-Hsun Tsai <chihsun.tsai@gmail.com>\n" +"POT-Creation-Date: 2016-05-03 10:41+0100\n" +"PO-Revision-Date: 2016-03-23 12:43+0000\n" +"Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: Chinese (http://www.transifex.com/mysociety/fixmystreet/language/zh/)\n" "Language: zh\n" "MIME-Version: 1.0\n" @@ -19,7 +18,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/DB/Result/Problem.pm:618 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr "與" @@ -52,9 +51,8 @@ msgid "%s admin:" msgstr "%s 管ç†:" #: templates/web/base/status/stats.html:26 -#, fuzzy msgid "%s bodies" -msgstr "有關單ä½" +msgstr "" #: templates/web/base/status/stats.html:24 msgid "%s confirmed alerts, %s unconfirmed" @@ -95,7 +93,7 @@ msgstr "%s ç¾å ´æ›´æ–°" msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "%s å•å·é€å‡º – % 回覆(%s%%)" -#: perllib/FixMyStreet/DB/Result/Problem.pm:683 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "%s ref: %s" msgstr "%s æµæ°´è™Ÿ: %s " @@ -119,10 +117,6 @@ msgstr "" msgid "%s ward, %s" msgstr "%s 里/å€, %s " -#: perllib/FixMyStreet/DB/Result/Problem.pm:552 -msgid "%s, reported at %s" -msgstr "%s 在 %s è™•ä¹‹ç”³å ± " - #: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "%s, 在%s 里/å€" @@ -177,7 +171,7 @@ msgstr "(例如塗鴉, 文宣張貼, 人行é“鋪æ¿æˆ–街燈æ壤, )" msgid "(not sent to council)" msgstr "ä¸è¦å‘地方政府é€å‡º" -#: templates/web/zurich/report/new/fill_in_details_form.html:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "(optional)" msgstr "(ä»»é¸)" @@ -189,12 +183,11 @@ msgstr "(公開)" msgid "(sent to both)" msgstr "兩個都é€å‡º" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "é¸æ“‡åˆ†é¡ž" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "é¸æ“‡å…¬ç‰©ç¨®é¡ž" @@ -231,26 +224,21 @@ msgstr "<strong>ä¸</strong> 我è¦åˆ©ç”¨é›»å郵件確èªæˆ‘çš„ç”³å ± " msgid "<strong>No</strong> Let me confirm my update by email" msgstr "<strong>ä¸</strong> 我è¦ç”¨é›»å郵件收到更新通知" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:97 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>ä¸</strong> 我è¦ç”¨é›»å郵件登入" -#: templates/web/base/auth/general.html:70 +#: templates/web/base/auth/general.html:80 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>是</strong> 我有密碼" -#: templates/web/base/about/about-en-gb.html:1 -#: templates/web/base/about/about-en-gb.html:3 -msgid "About us" -msgstr "關於我們" - #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Action Scheduled" msgstr "行動排程 " @@ -285,7 +273,7 @@ msgstr "新增種類" msgid "Add user" msgstr "新增使用者" -#: templates/web/base/my/my.html:56 +#: templates/web/base/my/my.html:54 msgid "Added %s" msgstr "新增 %s" @@ -305,7 +293,7 @@ msgstr "%s創建之 %d通知,　種類 %s, åƒæ•¸ %s / %s" msgid "Alert %d disabled (created %s)" msgstr "%d 關閉通知 " -#: templates/web/base/report/update/form_name.html:20 +#: templates/web/base/report/update/form_name.html:21 msgid "Alert me to future updates" msgstr "通知我æ¤äº‹å¾ŒçºŒ" @@ -318,7 +306,7 @@ msgstr "æ‰€æœ‰äº‹ä»¶ç”³å ±" msgid "All Reports as CSV" msgstr "æ‰€æœ‰äº‹ä»¶ç”³å ±å˜æˆCSVæ ¼å¼" -#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 +#: templates/web/base/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:20 @@ -417,7 +405,7 @@ msgstr "回上層" msgid "Ban email address" msgstr "ç¦æ¢ä¹‹é›»å郵件" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1273 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -448,7 +436,7 @@ msgstr "無法顯示地圖？ <em>ç•¥éŽæœ¬æ¥é©Ÿ</em>" #: templates/web/base/admin/body.html:68 #: templates/web/base/admin/index.html:54 -#: templates/web/base/report/new/category.html:10 +#: templates/web/base/report/new/category.html:7 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 @@ -463,7 +451,7 @@ msgstr "類別" msgid "Category fix rate for problems > 4 weeks old" msgstr "4週å‰å·±ä¿®å¾©å•é¡Œä¹‹é¡žåˆ¥" -#: templates/web/base/admin/body.html:138 +#: templates/web/base/admin/body.html:137 #: templates/web/base/admin/category_edit.html:23 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/admin/body.html:43 @@ -483,7 +471,7 @@ msgstr "類別: %s" msgid "Change password" msgstr "æ›´æ›å¯†ç¢¼" -#: templates/web/base/admin/body.html:160 +#: templates/web/base/admin/body.html:158 msgid "" "Check <strong>confirmed</strong> to indicate that this contact has been confirmed as correct.\n" " If you are not sure of the origin or validity of the contact, leave this unchecked." @@ -491,7 +479,7 @@ msgstr "" "看看<strong>已確èªç”³å ±</strong> æ¤é¡¯ç¤ºæ‰¿è¾¦äººå“¡å·²ç¢ºèªç”³è¨´ç„¡èª¤ã€‚\n" "å¦‚æžœä½ ç„¡æ³•ç¢ºå®šæ‰¿è¾¯äººå“¡ä¾†æºèˆ‡æœ‰æ•ˆèˆ‡å¦, è«‹ä¿ç•™ç©ºç™½ã€‚" -#: templates/web/base/admin/body.html:171 +#: templates/web/base/admin/body.html:169 msgid "" "Check <strong>deleted</strong> to remove the category from use. \n" " It will not appear as an available category in the drop-down menu on the report-a-problem page." @@ -499,7 +487,7 @@ msgstr "" "看看<strong>已刪除</strong> 以移除該類別。\n" "æ¤é刪除類別將ä¸æœƒé¡¯ç¤ºåœ¨ç”³å ±å•é¡Œé 的下拉å¼é¸é …上。" -#: templates/web/base/admin/body.html:191 +#: templates/web/base/admin/body.html:189 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -516,7 +504,7 @@ msgstr "" "這類å•é¡Œé©åˆæ–¼ç”¨æˆ¶ç”³å ±çµ¦æœ‰é—œæ©Ÿé—œï¼Œä½†å…¬é–‹ç”³å ±è³‡æ–™ä¸¦ç„¡å…¬ç›Šæ€§\n" "例如在英國想在æŸç‰¹å®šåœ°é»žè¦æ±‚多安置垃圾ç’" -#: templates/web/base/admin/body.html:130 +#: templates/web/base/admin/body.html:129 msgid "" "Choose a <strong>category</strong> 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." @@ -557,8 +545,8 @@ msgstr "é¸æ“‡ç¢ºèªé›»å郵件上的連çµä»¥ä½œç™»å…¥" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:15 #: templates/web/base/admin/report_blocks.html:25 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 @@ -567,7 +555,7 @@ msgstr "é¸æ“‡ç¢ºèªé›»å郵件上的連çµä»¥ä½œç™»å…¥" msgid "Closed" msgstr "關閉" -#: perllib/FixMyStreet/DB/Result/Problem.pm:779 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Closed by council" msgstr "由地方政府關閉" @@ -593,7 +581,7 @@ msgstr "è¯åˆå“牌資料:" msgid "Cobrand:" msgstr "è¯åˆå“牌:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "è¨å®š" @@ -612,9 +600,8 @@ msgstr "確èªå¸³æˆ¶" #: templates/web/base/report/new/form_user_loggedout_password.html:21 #: templates/web/base/report/update/form_user_loggedout_password.html:20 -#, fuzzy msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." -msgstr "確èªä¸‹æ–¹é›»å郵件，輸入新密碼，按確èªéµå¾Œï¼Œæ‚¨çš„密碼å³åˆ»æ›´æ–°ã€‚" +msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:1 #: templates/web/base/tokens/confirm_problem.html:1 @@ -624,7 +611,7 @@ msgstr "確èªä¸‹æ–¹é›»å郵件，輸入新密碼，按確èªéµå¾Œï¼Œæ‚¨çš„密 msgid "Confirmation" msgstr "確èª" -#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:164 #: templates/web/base/admin/body.html:79 #: templates/web/base/admin/category_edit.html:37 #: templates/web/base/admin/category_edit.html:92 @@ -643,7 +630,7 @@ msgid "Confirmed:" msgstr "已確èªï¼š" #. ("%s is the site name") -#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 +#: templates/web/base/about/_sidebar.html:6 msgid "Contact %s" msgstr "è¯çµ¡ %s" @@ -662,8 +649,8 @@ msgstr "連çµæœ¬åœ˜éšŠ" msgid "Coordinates:" msgstr "å”åŒå–®ä½:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1417 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1445 msgid "Could not find user" msgstr "找ä¸åˆ°è©²æˆ¶ç”¨" @@ -681,7 +668,7 @@ msgstr "地方政府" msgid "Council contacts for %s" msgstr "è¯ç¹‹åœ°æ–¹æ”¿åºœ %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:681 +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "Council ref: %s" msgstr "地方政府æµæ°´è™Ÿã€€ref: %s" @@ -700,7 +687,7 @@ msgstr "數é‡" msgid "Create a report" msgstr "å‰µå»ºç”³å ±" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "創建類別" @@ -744,20 +731,20 @@ msgstr "控制å°" msgid "Dealt with by subdivision within 5 working days" msgstr "下屬單ä½5個工作天內處ç†ã€‚" -#: perllib/FixMyStreet/App/Controller/Admin.pm:877 +#: perllib/FixMyStreet/App/Controller/Admin.pm:865 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "刪除模版" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:175 #: templates/web/base/admin/body.html:81 #: templates/web/base/admin/category_edit.html:42 #: templates/web/base/admin/category_edit.html:93 msgid "Deleted" msgstr "刪除" -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:47 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -765,7 +752,7 @@ msgid "Description" msgstr "æè¿°" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:68 +#: templates/web/zurich/report/new/fill_in_details_form.html:70 msgid "Details" msgstr "細節" @@ -790,11 +777,11 @@ msgid "Diligency prize league table" msgstr "勤奮表ç¾åå–®" #. ("%s is the site name") -#: templates/web/base/auth/general.html:48 -#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/auth/general.html:58 +#: templates/web/base/report/new/form_user_loggedout.html:28 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout.html:17 +#: templates/web/base/report/update/form_user_loggedout.html:27 msgid "Do you have a %s password?" msgstr "您是å¦æœ‰ %s密碼？ " @@ -812,8 +799,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "Duplicate" msgstr "複製 " @@ -836,7 +823,7 @@ msgstr "" msgid "Edit" msgstr "編輯" -#: templates/web/base/admin/body.html:220 +#: templates/web/base/admin/body.html:218 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "編輯有關單ä½ç´°ç¯€" @@ -866,7 +853,7 @@ msgstr "編輯器" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:39 +#: templates/web/base/auth/general.html:49 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -874,11 +861,11 @@ msgstr "編輯器" msgid "Email" msgstr "é›»å郵件" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 msgid "Email added to abuse list" msgstr "é›»å郵件列入濫發åå–®" -#: templates/web/base/admin/body.html:155 +#: templates/web/base/admin/body.html:153 msgid "Email address:" msgstr "é›»å郵件:" @@ -890,19 +877,14 @@ msgstr "建立電郵通知" msgid "Email alert deleted" msgstr "å–消電郵通知" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1390 msgid "Email already in abuse list" msgstr "é›»å郵件己在濫發åå–®" -#: templates/web/base/around/_updates.html:5 -msgid "Email me new local problems" -msgstr "以電郵通知其它å•é¡Œ" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 -#: templates/web/base/alert/updates.html:13 #: templates/web/zurich/admin/body.html:47 msgid "Email:" msgstr "é›»å郵件:" @@ -911,26 +893,6 @@ msgstr "é›»å郵件:" msgid "Email: %s" msgstr "é›»å郵件: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 -msgid "Empty flat or maisonette" -msgstr "閒置的公寓或大樓" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 -msgid "Empty house or bungalow" -msgstr "閒置的房èˆ" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 -msgid "Empty office or other commercial" -msgstr "閒置的辦公室或其它商æ¥ç©ºé–“" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 -msgid "Empty pub or bar" -msgstr "閒置的酒館或咖啡廳" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 -msgid "Empty public building - school, hospital, etc." -msgstr "閒置的公共建築物，如å¸æ ¡,醫院ç‰" - #: templates/web/base/admin/body-form.html:162 #: templates/web/base/admin/body-form.html:163 msgid "" @@ -979,18 +941,14 @@ msgstr "輸入本å€çš„郵編，街å或å€åŸŸã€‚" msgid "Enter a nearby street name and area" msgstr "輸入最近的街å或地å€" -#: perllib/FixMyStreet/Cobrand/ZeroTB.pm:7 -msgid "Enter a nearby street name and area, postal code or district in Delhi" -msgstr "輸入最近的街å，地å€æˆ–郵編號碼" - -#: templates/web/base/auth/general.html:99 +#: templates/web/base/auth/general.html:109 #: templates/web/base/report/new/form_user_loggedout_by_email.html:38 #: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "請輸入密碼" -#: templates/web/base/index-steps.html:26 +#: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "請在æ¤å¡«å¯«å•é¡Œçš„細節" @@ -1016,7 +974,7 @@ msgstr "郵éžå€è™Ÿç¯„例 %s" msgid "Examples:" msgstr "範例：" -#: templates/web/base/report/new/form_report.html:49 +#: templates/web/base/report/new/form_report.html:51 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "說明什麼壞掉故障了，確切的地點以åŠå®ƒç½®æ–¼æ¤è™•æœ‰å¤šä¹…了" @@ -1053,19 +1011,15 @@ msgstr "首次" msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." msgstr "é¸æ“‡<strong>涵蓋的å€åŸŸ</strong> <em>編輯有關單ä½</em> 表單。" -#: templates/web/base/header.html:26 -msgid "FixMyStreet" -msgstr "FixMyStreet" - #: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:38 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:40 msgid "Fixed" msgstr "已處ç†" @@ -1092,7 +1046,7 @@ msgstr "標記è¦å‘Šç‚ºåˆªé™¤ã€€" msgid "Flag user" msgstr "標記è¦å‘Šç”¨æˆ¶" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "標記è¦å‘Š" @@ -1114,8 +1068,7 @@ msgstr "被標記è¦å‘Šçš„用戶其權é™ä¸å—影響，åªæ˜¯åˆ—入特別關注 msgid "Flagged:" msgstr "è¦å‘Š:" -#: templates/web/base/reports/_ward-list.html:3 -#: templates/web/fixmystreet/reports/_ward-list.html:4 +#: templates/web/base/reports/_ward-list.html:4 msgid "Follow a ward link to view only reports within that ward." msgstr "追踪里/å€é€£çµï¼Œä»¥æª¢è¦–該å€å…§ä¹‹ç”³å ±" @@ -1146,18 +1099,18 @@ msgstr "常見å•é¡Œå›žè¦†ã€€" msgid "GeoRSS on Google Maps" msgstr "google 地圖上的地ç†RSS" +#: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:11 -#: templates/web/fixmystreet/around/_updates.html:3 msgid "Get updates" msgstr "å–å¾—æ›´æ–°" -#: templates/web/fixmystreet/reports/_rss.html:3 -#: templates/web/fixmystreet/reports/_rss.html:9 +#: templates/web/base/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:9 msgid "Get updates of %s problems" msgstr "å–å¾— %så•é¡Œä¹‹æ›´æ–°" -#: templates/web/fixmystreet/reports/_rss.html:11 -#: templates/web/fixmystreet/reports/_rss.html:3 +#: templates/web/base/reports/_rss.html:11 +#: templates/web/base/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "å–å¾— %så€åŸŸå…§çš„å•é¡Œæ›´æ–°" @@ -1170,7 +1123,7 @@ msgid "Glad to hear it’s been fixed!" msgstr "很高興è½åˆ°å•é¡Œå·²è™•ç†äº†ã€‚" #: templates/web/base/alert/index.html:34 -#: templates/web/base/around/postcode_form.html:16 +#: templates/web/base/around/postcode_form.html:13 #: templates/web/base/reports/_list-filters.html:28 #: templates/web/zurich/admin/stats.html:26 msgid "Go" @@ -1196,7 +1149,7 @@ msgstr "å•é¡Œå·²è™•ç†äº†å—Ž?" msgid "Have you ever reported a problem to a council before, or is this your first time?" msgstr "您之å‰æ˜¯å¦æ›¾å‘åœ°æ–¹æ”¿åºœç”³å ±éŽå•é¡Œï¼Ÿæˆ–者æ¤ç‚ºæ‚¨çš„é¦–æ¬¡ç”³å ±ï¼Ÿã€€" -#: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:38 +#: templates/web/base/footer.html:38 #: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 @@ -1207,8 +1160,7 @@ msgstr "å”助" msgid "Here are the types of local problem alerts for ‘%s’." msgstr "æ¤ç‚ºåœ¨åœ°å•é¡Œçš„種類　‘%s’." -#: templates/web/base/header.html:32 templates/web/fixmystreet/header.html:63 -#: templates/web/zurich/footer.html:12 +#: templates/web/base/header.html:63 templates/web/zurich/footer.html:12 msgid "Hi %s" msgstr "您好 %s" @@ -1224,11 +1176,11 @@ msgstr "您好 %s" msgid "Hidden" msgstr "éš±è—" -#: templates/web/base/around/display_location.html:65 +#: templates/web/base/around/display_location.html:64 msgid "Hide old" msgstr "éš±è—舊文" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:59 msgid "Hide pins" msgstr "éš±è—地圖標示" @@ -1248,10 +1200,6 @@ msgstr "å¦‚ä½•ç”³å ±å•é¡Œ " msgid "How to send successful reports" msgstr "如何æˆåŠŸåœ°é€å‡ºç”³å ±" -#: perllib/FixMyStreet/App/Controller/Admin.pm:752 -msgid "I am afraid you cannot confirm unconfirmed reports." -msgstr "您ä¸èƒ½ç¢ºèªæ¤å°šæœªç¢ºèªä¹‹ç”³å ±ã€€" - #: templates/web/base/tokens/confirm_problem.html:23 #: templates/web/base/tokens/confirm_problem.html:27 msgid "I just reported a problem on @fixmystreet" @@ -1262,7 +1210,7 @@ msgstr "我剛æ‰ç”³å ±äº†ä¸€å€‹å•é¡Œ " msgid "I just updated a problem on @fixmystreet" msgstr "我利用@fixmystreet ç”³å ±äº†ä¸€å€‹å•é¡Œ " -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88 msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr " 我們無法在資料庫ä¸æ‰¾åˆ°æ‚¨çš„å•é¡Œã€‚\n" @@ -1286,7 +1234,7 @@ msgstr "" "辨別<strong>上級主責</strong> 如果該有關單ä½ç‚ºå…¶å®ƒå–®ä½çš„下屬\n" "基本安è£ä¸ï¼Œæ‚¨ä¸å¿…åŠ å…¥æœ‰é—œå–®ä½" -#: templates/web/base/admin/body.html:133 +#: templates/web/base/admin/body.html:132 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." @@ -1312,7 +1260,7 @@ msgstr "" "如果您希望公開留言該å•é¡Œä¹‹æ›´æ–°ï¼Œè«‹åœ¨æ¤è¼¸å…¥\n" "(請注æ„它ä¸æœƒè‡ªå‹•é€åˆ°åœ°æ–¹æ”¿åºœ)" -#: templates/web/base/admin/body.html:149 +#: templates/web/base/admin/body.html:147 msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." msgstr "如果您使用 <strong>éžé›»å郵件é€å‡ºç”³è¨´æ–¹å¼</strong>, 請在æ¤è¼¸å…¥æ¤æœå‹™ä»£è™Ÿ (Open311) 或åŒç‰çš„代號。" @@ -1358,10 +1306,10 @@ msgstr "無效帳戶" msgid "Illegal feed selection" msgstr "無效的訂閱é¸é …" +#: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update/form_update.html:34 #: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:38 msgid "In Progress" msgstr "處ç†ä¸" @@ -1412,7 +1360,7 @@ msgstr "內部推薦" msgid "Invalid agency_responsible value %s" msgstr "無效的權責單ä½æ•¸å€¼ %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 msgid "Invalid end date" msgstr "無效的çµæŸæ—¥æœŸ" @@ -1420,16 +1368,16 @@ msgstr "無效的çµæŸæ—¥æœŸ" msgid "Invalid format %s specified." msgstr "無效的%s ç‰¹å®šæ ¼å¼" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 msgid "Invalid start date" msgstr "無效的開始日期" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:5 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:35 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:37 msgid "Investigating" msgstr "調查ä¸" @@ -1451,7 +1399,7 @@ msgstr "未知的管轄機關" msgid "Jurisdiction unknown" msgstr "未知的管轄機關" -#: templates/web/base/auth/general.html:80 +#: 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 @@ -1489,7 +1437,6 @@ msgstr "載入ä¸...." #: 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/fixmystreet/alert/updates.html:1 msgid "Local RSS feeds and email alerts" msgstr "當地å•é¡Œè¨‚閱與電郵通知" @@ -1498,11 +1445,11 @@ msgstr "當地å•é¡Œè¨‚閱與電郵通知" msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "當地å•é¡Œè¨‚閱與電郵通知 %s　" -#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:35 +#: templates/web/base/footer.html:35 msgid "Local alerts" msgstr "當地å•é¡Œã€€" -#: templates/web/base/index-steps.html:25 +#: templates/web/base/index-steps.html:5 msgid "Locate the problem on a map of the area" msgstr "在地圖上標記å•é¡Œä¹‹å€åŸŸ" @@ -1562,14 +1509,14 @@ msgstr "月份" #: templates/web/base/admin/list_updates.html:7 #: templates/web/base/admin/reports.html:13 #: templates/web/base/admin/users.html:15 -#: templates/web/base/auth/general.html:89 +#: templates/web/base/auth/general.html:99 #: templates/web/base/report/new/form_user_loggedin.html:9 #: templates/web/base/report/new/form_user_loggedout_by_email.html:7 -#: templates/web/base/report/update/form_name.html:4 +#: templates/web/base/report/update/form_name.html:5 #: templates/web/base/reports/index.html:20 #: 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:82 +#: templates/web/zurich/report/new/fill_in_details_form.html:84 msgid "Name" msgstr "åå—" @@ -1593,8 +1540,8 @@ 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:455 -#: perllib/FixMyStreet/Cobrand/Default.pm:495 +#: perllib/FixMyStreet/Cobrand/Default.pm:454 +#: perllib/FixMyStreet/Cobrand/Default.pm:494 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "找出地圖標記上最近的街é“(利用 Bing Maps自動産生): %s" @@ -1618,7 +1565,7 @@ msgstr "æ–° <br>å•é¡Œã€€" msgid "New body added" msgstr "新增內文" -#: perllib/FixMyStreet/App/Controller/Admin.pm:387 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 msgid "New category contact added" msgstr "新增類別承辦 人" @@ -1683,7 +1630,7 @@ msgstr "下一æ¥" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 -#: templates/web/base/questionnaire/index.html:101 +#: templates/web/base/questionnaire/index.html:102 #: templates/web/base/questionnaire/index.html:53 msgid "No" msgstr "ç„¡" @@ -1754,8 +1701,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Not Responsible" msgstr "無責任æ¸å±¬" @@ -1788,7 +1735,7 @@ 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 "請注æ„這è£åŒ…括了本月份總çµæ’°å¯«å‰ï¼Œå°šæœªç¢ºèªçš„ç”³å ±ï¼Œæ‰€ä»¥æ•¸ç›®å¯èƒ½ç¨æœ‰é™ä½Žã€‚" -#: templates/web/base/admin/body.html:186 +#: templates/web/base/admin/body.html:184 #: templates/web/base/admin/category_edit.html:52 #: templates/web/zurich/admin/body.html:53 msgid "Note:" @@ -1802,15 +1749,15 @@ msgstr "ç†è¨˜: <strong>%s</strong>" msgid "Notes from SDM to DM" msgstr "" -#: templates/web/base/report/new/form_user_loggedout.html:14 #: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/form_user_loggedout.html:24 #: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "ç¾åœ¨é€å‡ºæ‚¨çš„ç”³å ± …" #: templates/web/base/report/update-form.html:28 -#: templates/web/base/report/update/form_user_loggedout.html:13 #: templates/web/base/report/update/form_user_loggedout.html:2 +#: templates/web/base/report/update/form_user_loggedout.html:23 msgid "Now to submit your update…" msgstr "ç¾åœ¨é€å‡ºæ‚¨æ›´æ–°çš„ç”³å ± … 您是å¦æœ‰æœ¬ç«™å¸³å¯†ï¼Ÿ" @@ -1844,8 +1791,8 @@ msgstr "一å¥ç¸½çµ" #: templates/web/base/admin/report_blocks.html:23 #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/report/update/form_update.html:36 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1880,13 +1827,13 @@ msgstr "或將æ¤å•é¡Œ ç”³å ±çµ¦:" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "您å¯ä»¥è¨‚閱　里/å€å…§çš„更新通知" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1055 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 -#: perllib/FixMyStreet/DB/Result/Problem.pm:558 -#: perllib/FixMyStreet/DB/Result/Problem.pm:568 -#: perllib/FixMyStreet/DB/Result/Problem.pm:578 -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1044 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:659 +#: perllib/FixMyStreet/DB/Result/Problem.pm:562 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 +#: perllib/FixMyStreet/DB/Result/Problem.pm:582 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 #: perllib/FixMyStreet/Script/Reports.pm:175 #: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" @@ -1911,7 +1858,7 @@ msgstr "上級 " msgid "Partial" msgstr "部份" -#: templates/web/base/auth/general.html:92 +#: templates/web/base/auth/general.html:102 #: templates/web/base/report/new/form_user_loggedout_by_email.html:31 #: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 @@ -1920,7 +1867,7 @@ msgid "Password (optional)" msgstr "密碼(ä»»é¸):" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:72 +#: templates/web/base/auth/general.html:82 msgid "Password:" msgstr "密碼:" @@ -1928,7 +1875,7 @@ msgstr "密碼:" msgid "Permalink" msgstr "永久連çµ" -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:90 msgid "Phone number" msgstr "電話號碼" @@ -1944,13 +1891,21 @@ msgid "Phone:" msgstr "電話" #: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/questionnaire/index.html:89 +#: templates/web/base/questionnaire/index.html:91 #: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/new/form_report.html:38 +#: templates/web/base/report/new/form_report.html:40 +#: templates/web/base/report/update/form_update.html:20 +#: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:6 #: 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:45 +#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/zurich/report/new/fill_in_details_form.html:63 msgid "Photo" msgstr "照片" @@ -1974,8 +1929,8 @@ msgstr "在地圖上作標記" #: perllib/FixMyStreet/Cobrand/Zurich.pm:955 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:6 -#: templates/web/base/dashboard/index.html:142 -#: templates/web/base/dashboard/index.html:143 +#: templates/web/base/dashboard/index.html:140 +#: templates/web/base/dashboard/index.html:141 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 @@ -1991,16 +1946,16 @@ msgstr "用語請éµå®ˆç¦®ç¯€ï¼Œæ˜Žç¢ºè§£é‡‹å•é¡Œ " msgid "Please check the passwords and try again" msgstr "è«‹å†æ¬¡ç¢ºèªæ‚¨çš„密碼" -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:33 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:43 #: 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:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:856 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:921 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -2010,7 +1965,7 @@ msgstr "è«‹é¸æ“‡é¡žåˆ¥" msgid "Please choose a property type" msgstr "é¸æ“‡å…¬ç‰©ç¨®é¡ž" -#: perllib/FixMyStreet/App/Controller/Admin.pm:378 +#: perllib/FixMyStreet/App/Controller/Admin.pm:376 msgid "Please correct the errors below" msgstr "è«‹æ›´æ£ä¸‹æ–¹ä¹‹éŒ¯èª¤" @@ -2034,11 +1989,10 @@ msgstr "請勿濫用本æœå‹™ï¼Œæ¿«ç”¨å°‡é€ æˆæ‚¨çš„政府輕視其它使用者 msgid "Please enter a message" msgstr "請寫下您的留言" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Admin.pm:1079 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1134 msgid "Please enter a name" -msgstr "請輸入您的姓æ°" +msgstr "" #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 @@ -2052,10 +2006,10 @@ msgstr "請輸入密碼" msgid "Please enter a subject" msgstr "請填下主旨" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1075 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1130 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:133 +#: perllib/FixMyStreet/DB/Result/User.pm:143 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2072,9 +2026,9 @@ msgid "Please enter some details" msgstr "請填寫進一æ¥ç´°ç¯€" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:130 -#: templates/web/base/auth/general.html:27 -#: templates/web/base/auth/general.html:32 +#: perllib/FixMyStreet/DB/Result/User.pm:140 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/auth/general.html:42 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2083,7 +2037,7 @@ msgid "Please enter your email" msgstr "請輸入您的電å郵件" #: templates/web/base/report/new/form_user_loggedout_email.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:80 +#: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "Please enter your email address" msgstr "請輸入您的電å郵件" @@ -2099,7 +2053,7 @@ msgstr "請輸入您的全å，地方政府需è¦æ¤è³‡æ–™ – 如果您ä¸å¸Œæ #: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:126 +#: perllib/FixMyStreet/DB/Result/User.pm:136 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "請輸入您的姓æ°" @@ -2126,7 +2080,7 @@ msgstr "æ¡è¿Ž<a href=\"%s\">å†æ¬¡ç™»å…¥</a>, 或是å†æ¬¡å…‰è‡¨ <a href=\"/\"> msgid "Please fill in details of the problem below." msgstr "請在下方輸入å•é¡Œçš„細節" -#: templates/web/zurich/report/new/fill_in_details_form.html:72 +#: templates/web/zurich/report/new/fill_in_details_form.html:74 msgid "Please fill in details of the problem." msgstr "請在æ¤å¡«å¯«å•é¡Œçš„細節" @@ -2135,7 +2089,7 @@ msgstr "請在æ¤å¡«å¯«å•é¡Œçš„細節" msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "請利用下方表單填寫å•é¡Œç´°ç¯€ï¼Œåœ¨ç´°ç¯€é …請儘é‡è¿°æ˜Žæº–確的ä½ç½®ã€‚　" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "è«‹é¸æ“‡æ‚¨æ˜¯å¦é¡˜æ„收到其它å•å·" @@ -2144,9 +2098,8 @@ msgid "Please note that updates are not sent to the council." msgstr "請注æ„這個更新ä¸æœƒé€åˆ°åœ°æ–¹æ”¿åºœ" #: templates/web/base/report/new/oauth_email_form.html:4 -#, fuzzy msgid "Please note your report has <strong>not yet been sent</strong>." -msgstr "請注æ„æ‚¨çš„ç”³å ±é‚„<strong>未é€å‡º</strong>. é¸æ“‡åˆé©é¡žåˆ¥åŠé€²ä¸€æ¥è³‡è¨Šï¼Œå†äºˆé€å‡ºã€‚" +msgstr "" #: templates/web/base/report/new/fill_in_details_form.html:20 #: templates/web/zurich/report/new/fill_in_details_form.html:11 @@ -2162,16 +2115,16 @@ msgstr "" msgid "Please note:" msgstr "è«‹åŠ è¨»è¨˜" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please provide some explanation as to why you're reopening this report" msgstr "如果您是å†æ¬¡ç”³å ±ï¼Œè«‹èªªæ˜ŽåŽŸå› " -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250 msgid "Please provide some text as well as a photo" msgstr "è«‹æ供一些文å—æ•è¿°èˆ‡ç…§ç‰‡" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236 msgid "Please say whether you've ever reported a problem to your council before" msgstr "è«‹æ•æ˜Žæ‚¨æ˜¯å¦æ›¾å‘åœ°æ–¹æ”¿åºœç”³å ±éŽå•é¡Œï¼Ÿã€€" @@ -2187,22 +2140,23 @@ msgstr "è«‹é¸æ“‡è¨‚閱方å¼" msgid "Please select the type of alert you want" msgstr "è«‹é¸æ“‡æ›´æ–°é€šçŸ¥æ–¹å¼" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232 msgid "Please state whether or not the problem has been fixed" msgstr "è«‹æ•æ˜Žè©²å•é¡Œæ˜¯å¦å·²è§£æ±º" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:121 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 #: templates/web/base/js/translation_strings.html:53 -msgid "Please upload a JPEG image only" +#, fuzzy +msgid "Please upload an image only" msgstr "請上傳JPEGæ ¼å¼ç…§ç‰‡" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 msgid "Please write a message" msgstr "諘寫下您的留言" -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Please write your update here" msgstr "請寫下您的更新" @@ -2233,7 +2187,7 @@ msgstr "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">F msgid "Previous" msgstr "之å‰" -#: templates/web/fixmystreet/footer.html:41 +#: templates/web/base/footer.html:41 msgid "Privacy" msgstr "éš±ç§" @@ -2243,7 +2197,7 @@ msgstr "éš±ç§" msgid "Privacy and cookies" msgstr "éš±ç§èˆ‡cookies" -#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:200 #: templates/web/base/admin/body.html:85 #: templates/web/base/admin/category_edit.html:45 #: templates/web/base/admin/report_edit.html:77 @@ -2272,7 +2226,7 @@ msgstr "%s　å•é¡Œå·²é€é”到地方政府　%s　" msgid "Problem breakdown by state" msgstr "本站出ç¾æ•…éšœå•é¡Œã€€" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1046 msgid "Problem marked as open." msgstr "å•é¡Œæ¨™è¨»ç‚ºé–‹æ”¾" @@ -2284,10 +2238,6 @@ msgstr "ä¾èª¿æŸ¥çµæžœå‘ˆç¾çš„å•é¡Œæ”¹å–„" msgid "Problems" msgstr "å•é¡Œ" -#: templates/web/base/around/_updates.html:1 -msgid "Problems in this area" -msgstr "本å€åŸŸå…§çš„å•é¡Œ" - #: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "é„°è¿‘çš„å•é¡Œ" @@ -2305,13 +2255,11 @@ msgid "Problems within %.1fkm of this location" msgstr "該地點　%.1f公里內的å•é¡Œã€€" #: perllib/FixMyStreet/Cobrand/Default.pm:663 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 #: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "在 %s 內的å•é¡Œ" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "在 %s 里/å€çš„å•é¡Œ" @@ -2330,15 +2278,11 @@ msgstr "在 範åœå…§çš„å•é¡Œ" msgid "Property address:" msgstr "公物地å€ï¼š" -#: templates/web/base/report/new/category.html:8 -msgid "Property type:" -msgstr "公物種類" - #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "æ供更新資訊" -#: templates/web/base/auth/general.html:95 +#: templates/web/base/auth/general.html:105 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 "æä¾›å稱與密碼éžç‚ºå¿…è¦ï¼Œä½†å…¶å¯ä»¥è®“æ‚¨æ›´ä¾¿æ–¼ç”³å ±å•é¡Œï¼Œæ供更新與管ç†æ‚¨çš„ç”³å ±ã€‚ã€€ã€€" @@ -2372,16 +2316,15 @@ msgstr " %d回覆之å•é¡Œ%d, %s 到 %s å•å· " msgid "Questionnaire %d sent for problem %d" msgstr "關於 %då•é¡Œæ‰€é€å‡ºä¹‹ %då•å· " -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 msgid "Questionnaire filled in by problem reporter" msgstr "ç”±å•é¡Œç”³å ±è€…所填之å•å·" #: templates/web/base/alert/_list.html:22 +#: templates/web/base/alert/updates.html:9 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display_tools.html:34 -#: templates/web/base/reports/_rss.html:1 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed" msgstr "RSS訂閱" @@ -2409,18 +2352,12 @@ msgstr "%s, 在%s 里/å€" msgid "RSS feed of nearby problems" msgstr " RSS訂閱 %så€åŸŸå•é¡Œ" -#: templates/web/base/reports/_rss.html:1 -msgid "RSS feed of problems in this %s" -msgstr "æ¤ %s å•é¡Œä¹‹RSS 訂閱" - #: perllib/FixMyStreet/Cobrand/Default.pm:664 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 #: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "在 %s 內之å•é¡ŒRSS 訂閱" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 #: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "在 %s 里/å€å•é¡Œçš„RSS 訂閱" @@ -2430,14 +2367,13 @@ msgstr "在 %s 里/å€å•é¡Œçš„RSS 訂閱" msgid "RSS feed of recent local problems" msgstr "最近當地å•é¡Œçš„RSS訂閱" +#: templates/web/base/alert/updates.html:9 #: templates/web/base/report/display_tools.html:34 -#: templates/web/fixmystreet/alert/updates.html:9 msgid "RSS feed of updates to this problem" msgstr "最近當地å•é¡Œæ›´æ–°çš„RSS訂閱" -#: templates/web/base/alert/updates.html:9 +#: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:36 -#: templates/web/fixmystreet/alert/updates.html:14 msgid "Receive email when updates are left on this problem." msgstr "é€éŽé›»å郵件收å–該å•é¡Œä¹‹æ›´æ–°æ¶ˆæ¯" @@ -2473,12 +2409,11 @@ msgstr "移陯照片(無法回復)" msgid "Reply to user:" msgstr "給用戶的回應" -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/header_logo.html:2 msgid "Report" msgstr "æå ±ã€€" -#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:26 -#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/base/footer.html:26 templates/web/base/header_logo.html:2 #: templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2488,7 +2423,7 @@ msgstr "ç”³å ±å•é¡Œ" msgid "Report abuse" msgstr "ç”³å ±æ¿«ç”¨" -#: perllib/FixMyStreet/App/Controller/Rss.pm:291 +#: perllib/FixMyStreet/App/Controller/Rss.pm:297 msgid "Report on %s" msgstr "在%sã€€ç”³å ±ã€€" @@ -2503,7 +2438,7 @@ msgstr "ç”³å ±ä½ çš„å•é¡Œ" msgid "Report, view, or discuss local problems" msgstr "ç”³å ±ï¼Œæª¢è¦–ï¼Œæˆ–è¨Žè«–åœ¨åœ°å•é¡Œ" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:577 #: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "在%s 匿åç”³å ± " @@ -2513,7 +2448,7 @@ msgstr "在%s 匿åç”³å ± " msgid "Reported before" msgstr "之å‰çš„ç”³å ±" -#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 #: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "ç”±%s çš„ %s ç”³å ±" @@ -2527,27 +2462,27 @@ msgstr "ç”±ã€€ã€€ç”³å ±" msgid "Reported in the %s category" msgstr "%s ç¨®é¡žä¹‹ç”³å ±" -#: perllib/FixMyStreet/DB/Result/Problem.pm:569 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 msgid "Reported in the %s category anonymously at %s" msgstr "%s 種類下的匿åç”³å ±" -#: perllib/FixMyStreet/DB/Result/Problem.pm:591 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 msgid "Reported in the %s category by %s at %s" msgstr "%s 在 %s　%sé¡žåˆ¥çš„ç”³å ±ã€€" -#: perllib/FixMyStreet/DB/Result/Problem.pm:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported via %s anonymously at %s" msgstr "在%s 匿åç”³å ± " -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported via %s by %s at %s" msgstr "%s　é€éŽ %s　在　%sé¡žåˆ¥çš„ç”³å ±" -#: perllib/FixMyStreet/DB/Result/Problem.pm:561 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 msgid "Reported via %s in the %s category anonymously at %s" msgstr "é€éŽ %s　在　%s類別的匿åç”³å ±" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 msgid "Reported via %s in the %s category by %s at %s" msgstr "%s 在 %s　%sé¡žåˆ¥çš„ç”³å ±ã€€" @@ -2568,7 +2503,7 @@ msgstr "å·²ç”³å ± %s" msgid "Reporting a problem" msgstr "ç”³å ±å•é¡Œ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1274 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" @@ -2611,15 +2546,15 @@ msgstr "æ¤æŒ‡å®šè¡—é“之é“路營é‹è€…(å–自é“è·¯åƒç…§ç¢¼èˆ‡ç¨®é¡ž): %s" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "æ¤æŒ‡å®šè¡—é“之é“路營é‹è€…(來自OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1496 #: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "左轉　" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1492 #: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 @@ -2634,7 +2569,7 @@ msgstr "æ—‹è½‰é€™å¼µç…§ç‰‡å°‡æœƒå°Žè‡´ç”³å ±ä¸æœªå˜æª”的照片更動消失" msgid "Satellite" msgstr "衛星" -#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/body.html:206 #: templates/web/base/admin/category_edit.html:84 #: templates/web/zurich/admin/body.html:59 #: templates/web/zurich/admin/template_edit.html:29 @@ -2690,7 +2625,7 @@ msgstr "é¸æ“‡æ‚¨è¦æƒ³çš„通知方å¼æˆ–點é¸RSS訂閱按鈕，或者輸入您 msgid "Sent report back" msgstr "é€å›žç”³å ±" -#: perllib/FixMyStreet/DB/Result/Problem.pm:696 +#: perllib/FixMyStreet/DB/Result/Problem.pm:698 msgid "Sent to %s %s later" msgstr "%s ç¨å¾Œé€çµ¦%s" @@ -2709,21 +2644,21 @@ msgstr "分享" #: templates/web/base/report/new/form_user_loggedin.html:23 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22 -#: templates/web/base/report/update/form_name.html:15 +#: templates/web/base/report/update/form_name.html:16 msgid "Show my name publicly" msgstr "公開我的姓å" -#: templates/web/base/around/display_location.html:67 +#: templates/web/base/around/display_location.html:66 msgid "Show old" msgstr "顯示舊文" -#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:57 msgid "Show pins" msgstr "顯示地圖標示" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/general.html:110 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:76 +#: templates/web/base/auth/general.html:86 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2785,9 +2720,8 @@ msgstr "抱æ‰ï¼Œæˆ‘們無法找到æ¤ä½ç½®" #: templates/web/base/auth/general.html:9 #: templates/web/base/report/display.html:21 #: templates/web/base/report/new/fill_in_details_form.html:23 -#, fuzzy msgid "Sorry, we could not log you in. Please fill in the form below." -msgstr "抱æ‰ï¼Œæˆ‘們無法解æžæ¤åœ°é»žï¼Œè«‹é‡è©¦ä¸€æ¬¡" +msgstr "" #: perllib/FixMyStreet/Geocode/Bing.pm:35 #: perllib/FixMyStreet/Geocode/Google.pm:45 @@ -2795,15 +2729,10 @@ msgstr "抱æ‰ï¼Œæˆ‘們無法解æžæ¤åœ°é»žï¼Œè«‹é‡è©¦ä¸€æ¬¡" msgid "Sorry, we could not parse that location. Please try again." msgstr "抱æ‰ï¼Œæˆ‘們無法解æžæ¤åœ°é»žï¼Œè«‹é‡è©¦ä¸€æ¬¡" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:138 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "抱æ‰ï¼Œæˆ‘們無法儲å˜ä½ 的照片，請é‡è©¦ä¸€æ¬¡" -#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 -#, fuzzy -msgid "Sorry, you can not log in with Facebook. Please try again later." -msgstr "本é 出ç¾éŒ¯èª¤ï¼Œè«‹å†è©¦ä¸€æ¬¡" - #: templates/web/base/admin/stats.html:64 msgid "Start Date:" msgstr "å•å§‹æ—¥ï¼š" @@ -2812,7 +2741,7 @@ msgstr "å•å§‹æ—¥ï¼š" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/report/update/form_update.html:32 +#: templates/web/base/report/update/form_update.html:34 msgid "State" msgstr "陳述" @@ -2825,7 +2754,7 @@ msgstr "陳述" msgid "State:" msgstr "陳述:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2865,10 +2794,10 @@ msgid "Subject:" msgstr "主旨:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/base/report/new/form_user_loggedout_by_email.html:39 #: templates/web/base/report/new/form_user_loggedout_password.html:11 -#: templates/web/zurich/report/new/fill_in_details_form.html:96 +#: templates/web/zurich/report/new/fill_in_details_form.html:98 msgid "Submit" msgstr "é€å‡º" @@ -2896,9 +2825,8 @@ msgstr "é€å‡ºå•å·" msgid "Submitted" msgstr "å·²é€å‡º" -#: templates/web/base/alert/updates.html:17 +#: templates/web/base/alert/updates.html:23 #: templates/web/base/report/display_tools.html:41 -#: templates/web/fixmystreet/alert/updates.html:23 msgid "Subscribe" msgstr "訂閱" @@ -2906,7 +2834,7 @@ msgstr "訂閱" msgid "Subscribe me to an email alert" msgstr "åŠ å…¥é€šçŸ¥ä¿¡ä»¶" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -2925,7 +2853,7 @@ msgstr "摘è¦" msgid "Summary reports" msgstr "ç”³å ±æ‘˜è¦" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 msgid "Survey" msgstr "調查" @@ -2982,7 +2910,7 @@ msgstr "æ„Ÿè¬ä¸Šå‚³ç…§ç‰‡ï¼Œç¾åœ¨éœ€è¦çŸ¥é“å•é¡Œçš„地點ä½ç½®ï¼Œè«‹åœ¨ä¸Š msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "è¬è¬ï¼Œå¾ˆé«˜èˆˆçŸ¥é“æ¤å•é¡Œå·±ä¿®å¾©äº†ã€‚è«‹å•æ‚¨éŽåŽ»æ˜¯å¦æ›¾ç”³å ±éŽå•é¡Œï¼Ÿ " -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:152 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:157 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "照片上傳似乎無法æ£å¸¸ (%s), è«‹å†è©¦ä¸€æ¬¡ã€‚ " @@ -2990,7 +2918,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:126 +#: perllib/FixMyStreet/App/Controller/Location.pm:127 msgid "That location does not appear to be in the UK; please try again." msgstr "這地點似乎ä¸åœ¨å°ç£; è«‹å†è©¦ 一次。" @@ -3000,11 +2928,11 @@ msgstr "這地點似乎ä¸åœ¨å°ç£; è«‹å†è©¦ 一次。" msgid "That postcode was not recognised, sorry." msgstr "抱æ‰æ¤éƒµéžå€è™Ÿç„¡æ³•è¾¨è˜" -#: perllib/FixMyStreet/App/Controller/Admin.pm:724 +#: perllib/FixMyStreet/App/Controller/Admin.pm:722 msgid "That problem has been marked as sent." msgstr "å•é¡Œè¢«æ¨™è¨»ç‚ºé€å‡º" -#: perllib/FixMyStreet/App/Controller/Admin.pm:716 +#: perllib/FixMyStreet/App/Controller/Admin.pm:714 msgid "That problem will now be resent." msgstr "æ¤å•é¡Œå°‡é‡æ–°é€å‡º" @@ -3016,7 +2944,7 @@ msgstr "æ¤ç”³å ±ç„¡æ³•åœ¨ %s上檢視　" msgid "That report has been removed from FixMyStreet." msgstr "è©²ç”³å ±å·²éFixMyStreet 移除　" -#: templates/web/base/admin/body.html:144 +#: templates/web/base/admin/body.html:142 msgid "" "The <strong>email address</strong> is the destination to which reports about this category will be sent. \n" " Other categories for this body may have the same email address." @@ -3168,9 +3096,9 @@ msgstr "本é ç¾åœ¨ç„¡æ³•é¡˜ç¾æ‰€è¦æ±‚çš„ç”³å ±è³‡æ–™ï¼Œè«‹ç¨å€™å†è©¦ã€‚" msgid "There was a problem showing this page. Please try again later." msgstr "本é 出ç¾éŒ¯èª¤ï¼Œè«‹å†è©¦ä¸€æ¬¡" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:753 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 -#: templates/web/base/auth/general.html:43 +#: templates/web/base/auth/general.html:53 #: 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 "您的電å郵件與密碼ä¸ç›¸ç¬¦ï¼Œå¦‚果您éºå¿˜å¯†ç¢¼æˆ–尚未註冊，請在申請表單上填入電å郵件" @@ -3241,9 +3169,9 @@ msgstr "當用戶沒有é¸æ“‡é¡žåˆ¥æ™‚，電å郵件將é€åˆ°è² 責該å€åŸŸçš„ 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:920 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:898 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:935 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:977 #: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "æœ¬é …è³‡è¨Šå¿…å¡«" @@ -3256,11 +3184,11 @@ msgstr "本站為開發試用，å¯èƒ½éš¨æ™‚故障，資料庫也會定期刪除 msgid "This is a summary of all reports on this site." msgstr "æœ¬ç«™æ‰€æœ‰ç”³å ±ç¸½çµ" -#: templates/web/base/report/update/form_update.html:52 +#: templates/web/base/report/update/form_update.html:54 msgid "This problem has been fixed" msgstr "å•é¡Œå·±è™•ç†å®Œç•¢" -#: templates/web/base/report/update/form_update.html:46 +#: templates/web/base/report/update/form_update.html:48 msgid "This problem has not been fixed" msgstr "å•é¡Œå°šæœªè§£æ±º" @@ -3297,7 +3225,7 @@ msgstr "本é 包括由用戶æä¾›å應å•é¡Œçš„照片　" msgid "Time spent (in minutes):" msgstr "花費時間(以分é˜è¨ˆ):" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "時間軸" @@ -3342,8 +3270,8 @@ msgstr "何ä¸ç›´æŽ¥ç™¼ä¿¡çµ¦æˆ‘們:" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update/form_update.html:34 -#: templates/web/base/report/update/form_update.html:37 +#: templates/web/base/report/update/form_update.html:36 +#: templates/web/base/report/update/form_update.html:39 msgid "Unable to fix" msgstr "無法修復" @@ -3360,7 +3288,7 @@ msgstr "未確èªçš„" msgid "Unknown" msgstr "未知的" -#: perllib/FixMyStreet/App/Controller/Rss.pm:173 +#: perllib/FixMyStreet/App/Controller/Rss.pm:174 msgid "Unknown alert type" msgstr "未知的通知類別" @@ -3375,7 +3303,7 @@ msgstr "未知的錯誤" msgid "Unknown problem ID" msgstr "未知的å•é¡Œç·¨è™Ÿã€€ã€€" -#: templates/web/base/report/update/form_update.html:25 +#: templates/web/base/report/update/form_update.html:27 msgid "Update" msgstr "æ›´æ–°" @@ -3427,10 +3355,10 @@ msgstr "更新之狀態" msgid "Updated" msgstr "已更新" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 -#: perllib/FixMyStreet/App/Controller/Admin.pm:821 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1096 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1144 +#: perllib/FixMyStreet/App/Controller/Admin.pm:809 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3457,7 +3385,7 @@ msgstr "ç”±{{title}}æ›´æ–°" msgid "Updates to this problem, %s" msgstr "æ›´æ–°å•é¡Œ, %s" -#: templates/web/base/admin/body.html:182 +#: templates/web/base/admin/body.html:180 msgid "Use the <strong>note</strong> to record details that are only displayed in the admin. Notes are not shown publicly, and are not sent to the body." msgstr "使用<strong>記事本</strong> 來記錄給管ç†å“¡å¯çœ‹åˆ°çš„ç´°ç¯€å ±å‘Šã€‚é€™éƒ¨ä»½ä¸æœƒå…¬é–‹ï¼Œä¹Ÿä¸æœƒé€çµ¦ç›¸é—œå–®ä½ã€‚" @@ -3466,11 +3394,11 @@ msgstr "使用<strong>記事本</strong> 來記錄給管ç†å“¡å¯çœ‹åˆ°çš„細節 msgid "Used map" msgstr "已用éŽä¹‹åœ°åœ–" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 msgid "User flag removed" msgstr "移除用戶的標記è¦å‘Š" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1421 msgid "User flagged" msgstr "給用戶標記è¦å‘Š" @@ -3478,16 +3406,16 @@ msgstr "給用戶標記è¦å‘Š" msgid "User search finds matches in users' names and email addresses." msgstr "用戶找到相符的å稱與電å郵件" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "使用者" -#: perllib/FixMyStreet/App/Controller/Admin.pm:382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:412 -#: perllib/FixMyStreet/App/Controller/Admin.pm:429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:380 +#: perllib/FixMyStreet/App/Controller/Admin.pm:410 +#: perllib/FixMyStreet/App/Controller/Admin.pm:427 msgid "Values updated" msgstr "數值更新" @@ -3524,16 +3452,15 @@ msgstr "本å€åŸŸæˆ‘們找到更多符åˆçš„資料，我們最多顯示åç†è³‡ #: templates/web/base/auth/general.html:6 #: templates/web/base/report/display.html:27 #: templates/web/base/report/new/oauth_email_form.html:5 -#, fuzzy msgid "We need your email address, please give it below." -msgstr "我們ä¸æœƒå…¬é–‹æ‚¨çš„é›»å郵件或是電話號碼" +msgstr "" #: templates/web/base/report/new/form_user_loggedout_email.html:2 #: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "我們ä¸æœƒå…¬é–‹æ‚¨çš„é›»å郵件" -#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedin.html:30 #: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "我們ä¸æœƒå…¬é–‹æ‚¨çš„é›»å郵件或是電話號碼" @@ -3542,7 +3469,7 @@ msgstr "我們ä¸æœƒå…¬é–‹æ‚¨çš„é›»å郵件或是電話號碼" 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之責任，然而目å‰æˆ‘們並無他們的è¯çµ¡è³‡è¨Šã€‚如果您知é“é©ç•¶çš„è¯çµ¡äººè³‡è¨Šï¼Œè«‹å‘Šè¨´æˆ‘們。" -#: templates/web/base/index-steps.html:31 +#: templates/web/base/index-steps.html:11 msgid "We send it to the council on your behalf" msgstr "我們將代表您將æ¤å‘ˆå ±çµ¦åœ°æ–¹æ”¿åºœ" @@ -3580,10 +3507,6 @@ msgstr "何時é€å‡º" msgid "Whoa there Testino! Three photos are enough." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 -msgid "Whole block of empty flats" -msgstr "æ•´å€ç‚ºé–’置廢棄空間" - #: templates/web/base/tokens/confirm_alert.html:7 msgid "Why stop there? <a href=\"/alert\">Set up more alerts</a> for free." msgstr "為何在æ¤å¡ä½ï¼Ÿå…è²»<a href=\"/alert\">è¨å®šæ›´å¤šè¨Šæ¯é€šçŸ¥</a> " @@ -3603,7 +3526,7 @@ msgstr "æœå°‹è¦æ±‚，也å¯èƒ½é™åˆ¶å–®ä¸€æ©Ÿæ§‹ä¸æœå°‹ç›¸é—œæ¬Šè²¬å–®ä½ã€‚ msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "您願為FixMyStreetè²¢ç»å—Ž?這個一個開放原始碼，å¯å¾ž <a href=\"http://fixmystreet.org\">fixmystreet.org</a>官網進一æ¥äº†è§£ã€€" -#: templates/web/base/questionnaire/index.html:96 +#: templates/web/base/questionnaire/index.html:97 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "您是å¦é¡˜æ„4週後å†æ”¶åˆ°å¦ä¸€ä»½å•å·ï¼Ÿä»¥æ醒您確èªæœ€æ–°çš„ç‹€æ³" @@ -3633,8 +3556,8 @@ msgstr "年份" #: templates/web/base/admin/update_edit.html:24 #: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 +#: templates/web/base/questionnaire/index.html:100 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "是" @@ -3704,9 +3627,8 @@ msgstr "在æ¤ç”³å ±ä¸ä½ å·²ç¶“é™„åŠ äº†ç…§ç‰‡(注æ„ä½ æœ€å¤šå¯é™„3張照片, #: templates/web/base/questionnaire/index.html:83 #: templates/web/base/report/update/form_update.html:14 -#, fuzzy msgid "You have already attached photos to this update. Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)." -msgstr "在æ¤ç”³å ±ä¸ä½ å·²ç¶“é™„åŠ äº†ç…§ç‰‡(注æ„ä½ æœ€å¤šå¯é™„3張照片,å¦‚æžœä½ é‚„æƒ³ä¸Šå‚³æ›´å¤šå¼µ,原先的照片會被移除)" +msgstr "" #: templates/web/base/auth/sign_out.html:4 #: templates/web/zurich/auth/sign_out.html:3 @@ -3755,19 +3677,19 @@ msgid "Your Reports" msgstr "æ‚¨çš„ç”³å ±ã€€" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/alert/updates.html:19 +#: templates/web/base/alert/updates.html:22 #: templates/web/base/contact/index.html:83 #: templates/web/base/report/display_tools.html:38 #: templates/web/base/report/display_tools.html:40 #: templates/web/base/report/new/form_user_loggedin.html:3 #: templates/web/base/report/new/form_user_loggedout_email.html:1 #: templates/web/base/report/update/form_user_loggedout_email.html:1 -#: templates/web/fixmystreet/alert/updates.html:19 -#: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/zurich/report/new/fill_in_details_form.html:76 +#: templates/web/zurich/report/new/fill_in_details_form.html:78 msgid "Your email" msgstr "您的電å郵件" -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/general.html:55 #: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 @@ -3778,17 +3700,17 @@ msgstr "您的電å郵件" msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "您的個人資料，將會ä¾ç…§<a href=\"/privacy\">本站隱ç§æ¬Šæ”¿ç–</a>作處ç†ä½¿ç”¨" -#: templates/web/base/auth/general.html:90 +#: templates/web/base/auth/general.html:100 #: templates/web/base/contact/index.html:76 #: templates/web/base/report/new/form_user_loggedin.html:18 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17 -#: templates/web/base/report/update/form_name.html:11 +#: templates/web/base/report/update/form_name.html:12 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:86 +#: templates/web/zurich/report/new/fill_in_details_form.html:88 msgid "Your name" msgstr "姓å" -#: templates/web/base/auth/general.html:75 +#: templates/web/base/auth/general.html:85 #: 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 @@ -3801,20 +3723,19 @@ msgstr "密碼已更新" #: templates/web/base/report/new/form_user_loggedin.html:27 #: templates/web/base/report/new/form_user_loggedout_by_email.html:26 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:94 msgid "Your phone number" msgstr "電話號碼" #: templates/web/base/questionnaire/index.html:14 -#, fuzzy msgid "Your report" -msgstr "ä½ ä½œçš„ç”³å ±" +msgstr "" -#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 +#: templates/web/base/footer.html:29 msgid "Your reports" msgstr "ä½ ä½œçš„ç”³å ±" -#: templates/web/base/my/my.html:41 +#: templates/web/base/my/my.html:39 msgid "Your updates" msgstr "æ›´æ–°" @@ -3840,7 +3761,7 @@ msgid "didn't use map" msgstr "ä¸ä½¿ç”¨åœ°åœ–" #: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/around/postcode_form.html:12 msgid "e.g. ‘%s’ or ‘%s’" msgstr "例如 ‘%s’ 或 ‘%s’" @@ -3946,8 +3867,7 @@ msgstr "其它地å€:" msgid "reopened" msgstr "é‡å•Ÿç”³å ±" -#: templates/web/base/header.html:33 templates/web/fixmystreet/header.html:64 -#: templates/web/zurich/footer.html:13 +#: templates/web/base/header.html:64 templates/web/zurich/footer.html:13 msgid "sign out" msgstr "登出" @@ -4020,7 +3940,7 @@ msgid "<big>%s</big> update on reports" msgid_plural "<big>%s</big> updates on reports" msgstr[0] "<big>%s</big> æ›´æ–°ç”³å ±" -#: templates/web/emptyhomes/report/new/councils_text_none.html:3 +#: templates/web/base/report/new/councils_text_none.html:3 #, perl-format msgid "We do not yet have details for the council that covers this location." msgid_plural "We do not yet have details for the councils that cover this location." @@ -4056,86 +3976,47 @@ msgid "We do <strong>not</strong> yet have details for the other council that co msgid_plural "We do <strong>not</strong> yet have details for the other councils that cover this location." msgstr[0] "我們<strong>尚未<strong>有該å€åŸŸå…¶å®ƒå–®ä½ä¹‹ç´°ç¯€ã€€" -#~ msgid "(we never show your email address or phone number)" -#~ msgstr "(我們ä¸æœƒé€éœ²æ‚¨çš„電話或電郵)" - -#~ msgid "(we never show your email)" -#~ msgstr "(我們ä¸æœƒå…¬é–‹æ‚¨çš„é›»å郵件)" - -#~ msgid "<strong>No</strong>, let me confirm my report by email:" -#~ msgstr "<strong>ä¸</strong>, 我想用電å郵件確èªæˆ‘çš„ç”³å ±l:" - -#~ msgid "<strong>No</strong>, let me confirm my update by email:" -#~ msgstr "<strong>ä¸</strong>, 我è¦åˆ©ç”¨é›»å郵件收å–更新通知:" - -#~ msgid "Email me updates" -#~ msgstr "以電郵通知更新" - -#~ msgid "Enter a new password:" -#~ msgstr "請輸入新密碼" - -#~ msgid "I'm afraid we couldn't validate that token. If you've copied the URL from an email, please check that you copied it exactly.\n" -#~ msgstr "們無法驗è‰æ¤ä»£è™Ÿï¼Œå¦‚果您從電å郵件ä¸è¤‡è£½äº†è¶…連çµç¶²å€ï¼Œè«‹æª¢æŸ¥æ‚¨è¤‡è£½æ˜¯å¦æ£ç¢ºã€‚\n" - -#~ msgid "If you use web-based email or have 'junk mail' filters, you may wish to check your bulk/spam mail folders: sometimes, our messages are marked that way." -#~ msgstr "如果您使用網é é›»å郵件或開啟垃圾信件éŽæ¿¾ï¼Œæ‚¨æœ€å¥½æª¢æŸ¥ä¸€ä¸‹æ‚¨çš„垃圾信匧，本站郵件å¯èƒ½è¢«æ¸åˆ°è©²åˆ†é¡žä¸‹ã€‚" - -#~ msgid "Message:" -#~ msgstr "留言" - -#~ msgid "More problems nearby" -#~ msgstr "更多鄰近的å•é¡Œã€€" - -#~ msgid "Nearly Done! Now check your email..." -#~ msgstr "å·®ä¸å¤šå¿«å®Œæˆäº†ï¼Œç¾åœ¨æª¢æŸ¥æ‚¨çš„é›»åä¿¡ç®±" - -#~ msgid "Offensive? Unsuitable? Tell us" -#~ msgstr "å—到羞辱？ä¸é©ç•¶ï¼Ÿè«‹ 告訴我們" - -#~ msgid "Photo:" -#~ msgstr "照片:" - -#~ msgid "Please check your email" -#~ msgstr "請檢查您的電å郵件" +#~ msgid "%s, reported at %s" +#~ msgstr "%s 在 %s è™•ä¹‹ç”³å ± " -#~ msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" -#~ msgstr "è«‹ç•™æ„這個å•é¡Œçš„æ›´æ–°ä¸æœƒé€é”給地方政府，如果您留下姓å，它將會ä¾ç…§æœ¬ç¶²ç«™çš„éš±ç§æ¬Šæ”¿ç–作處ç†ä½¿ç”¨" +#~ msgid "About us" +#~ msgstr "關於我們" -#~ msgid "This may be because the link is too old or already used, or the address was not copied correctly." -#~ msgstr "å¯èƒ½ç‚ºé€£çµå¤±æ•ˆæˆ–已被使用éŽï¼Œæˆ–是連çµç¶²å€æœªæ£ç¢ºè¤‡è£½ã€‚" +#~ msgid "Email me new local problems" +#~ msgstr "以電郵通知其它å•é¡Œ" -#~ msgid "This problem has been closed" -#~ msgstr "æ¤å•é¡Œå·±çµæ¡ˆ" +#~ msgid "Empty flat or maisonette" +#~ msgstr "閒置的公寓或大樓" -#~ msgid "This problem is in progress" -#~ msgstr "å•é¡Œæ£åœ¨è™•ç†ä¸" +#~ msgid "Empty house or bungalow" +#~ msgstr "閒置的房èˆ" -#~ msgid "This problem is old and of unknown status." -#~ msgstr "æ¤å•é¡Œå·²å¤±æ™‚效，目å‰ç‹€æ³ä¸æ˜Ž" +#~ msgid "Empty office or other commercial" +#~ msgstr "閒置的辦公室或其它商æ¥ç©ºé–“" -#~ msgid "Update:" -#~ msgstr "æ›´æ–°:" +#~ msgid "Empty pub or bar" +#~ msgstr "閒置的酒館或咖啡廳" -#~ msgid "We have not been able to confirm your account - sorry." -#~ msgstr "抱æ‰ï¼Œæˆ‘們無法確èªæ‚¨çš„帳戶。" +#~ msgid "Empty public building - school, hospital, etc." +#~ msgstr "閒置的公共建築物，如å¸æ ¡,醫院ç‰" -#~ msgid "We have sent you an email containing a link to confirm your account." -#~ msgstr "我們剛寄給您一å°å…§æœ‰é€£çµç¢ºèªçš„é›»å郵件。" +#~ msgid "Enter a nearby street name and area, postal code or district in Delhi" +#~ msgstr "輸入最近的街å，地å€æˆ–郵編號碼" -#~ msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:" -#~ msgstr "我們想知é“您å°æœ¬ç«™çš„建è°ã€‚è«‹å¡«æ¤è¡¨å–®ï¼Œæˆ–發é€é›»å郵件到<a href='mailto:%s'>%s</a>:" +#~ msgid "FixMyStreet" +#~ msgstr "FixMyStreet" -#~ msgid "You have already attached a photo to this report, attaching another one will replace it." -#~ msgstr "æ‚¨å·²åœ¨æœ¬ç”³å ±ä¸é™„åŠ ä¸€å¼µç…§ç‰‡ï¼Œç”¨å¦ä¸€å¼µç…§ç‰‡å°‡å–代原照片。" +#~ msgid "I am afraid you cannot confirm unconfirmed reports." +#~ msgstr "您ä¸èƒ½ç¢ºèªæ¤å°šæœªç¢ºèªä¹‹ç”³å ±ã€€" -#~ msgid "You have already attached a photo to this update, attaching another one will replace it." -#~ msgstr "æ‚¨å·²åœ¨æœ¬ç”³å ±æ›´æ–°ä¸é™„åŠ ä¸€å¼µç…§ç‰‡ï¼Œç”¨å¦ä¸€å¼µç…§ç‰‡å°‡å–代原照片。" +#~ msgid "Problems in this area" +#~ msgstr "本å€åŸŸå…§çš„å•é¡Œ" -#~ msgid "Your email:" -#~ msgstr "ä½ çš„é›»å郵件:" +#~ msgid "Property type:" +#~ msgstr "公物種類" -#~ msgid "Your name:" -#~ msgstr "姓å:" +#~ msgid "RSS feed of problems in this %s" +#~ msgstr "æ¤ %s å•é¡Œä¹‹RSS 訂閱" -#~ msgid "Your email:" -#~ msgstr "您的電å郵件:" +#~ msgid "Whole block of empty flats" +#~ msgstr "æ•´å€ç‚ºé–’置廢棄空間" diff --git a/perllib/FixMyStreet/App/Model/PhotoSet.pm b/perllib/FixMyStreet/App/Model/PhotoSet.pm index 243675f2c..b44bf4b38 100644 --- a/perllib/FixMyStreet/App/Model/PhotoSet.pm +++ b/perllib/FixMyStreet/App/Model/PhotoSet.pm @@ -8,6 +8,8 @@ use if !$ENV{TRAVIS}, 'Image::Magick'; use Scalar::Util 'openhandle', 'blessed'; use Digest::SHA qw(sha1_hex); use Image::Size; +use IPC::Cmd qw(can_run); +use IPC::Open3; use MIME::Base64; has c => ( @@ -144,7 +146,12 @@ has ids => ( # Arrayref of $fileid tuples (always, so post upload/raw data proc my $photo_blob = eval { my $filename = $upload->tempname; my $out; - $out = `jhead -se -autorot $filename 2>&1` if $type eq 'jpeg'; + if ($type eq 'jpeg' && can_run('jhead')) { + my $pid = open3(undef, my $stdout, undef, 'jhead', '-se', '-autorot', $filename); + $out = join('', <$stdout>); + waitpid($pid, 0); + close $stdout; + } unless (defined $out) { my ($w, $h, $err) = Image::Size::imgsize($filename); die _("Please upload an image only") . "\n" if !defined $w || $err !~ /JPG|GIF|PNG|TIF/; diff --git a/perllib/FixMyStreet/SendReport/Angus.pm b/perllib/FixMyStreet/SendReport/Angus.pm index 15441cc1f..cab5de173 100644 --- a/perllib/FixMyStreet/SendReport/Angus.pm +++ b/perllib/FixMyStreet/SendReport/Angus.pm @@ -160,7 +160,6 @@ sub send { } } catch { my $e = $_; - print "Caught an error: $e\n"; $self->error( "Error sending to Angus: $e" ); }; $self->success( !$return ); diff --git a/perllib/FixMyStreet/SendReport/EastHants.pm b/perllib/FixMyStreet/SendReport/EastHants.pm index cc302b8b3..55ec79613 100644 --- a/perllib/FixMyStreet/SendReport/EastHants.pm +++ b/perllib/FixMyStreet/SendReport/EastHants.pm @@ -52,7 +52,6 @@ sub send { $return = 0 if $result eq 'Report received'; } catch { my $e = $_; - print "Caught an error: $e\n"; $self->error( "Error sending to East Hants: $e" ); }; $self->success( !$return ); diff --git a/perllib/FixMyStreet/SendReport/Open311.pm b/perllib/FixMyStreet/SendReport/Open311.pm index 5c7fa30f3..bf5ed3e30 100644 --- a/perllib/FixMyStreet/SendReport/Open311.pm +++ b/perllib/FixMyStreet/SendReport/Open311.pm @@ -144,14 +144,11 @@ sub send { $self->success( 1 ); } else { $result *= 1; - # temporary fix to resolve some issues with west berks - if ( $row->bodies_str =~ /2619/ ) { - $result *= 0; - } + $self->error( "Failed to send over Open311\n" ) unless $self->error; + $self->error( $self->error . "\n" . $open311->error ); } } - $self->error( 'Failed to send over Open311' ) unless $self->success; return $result; } diff --git a/perllib/Open311/GetServiceRequestUpdates.pm b/perllib/Open311/GetServiceRequestUpdates.pm index 11bc1e64f..daa5fb64d 100644 --- a/perllib/Open311/GetServiceRequestUpdates.pm +++ b/perllib/Open311/GetServiceRequestUpdates.pm @@ -89,6 +89,13 @@ sub update_comments { # what problem it belongs to so just skip next unless $request_id; + my $comment_time = eval { + DateTime::Format::W3CDTF->parse_datetime( $request->{updated_datetime} || "" ); + }; + next if $@; + my $updated = DateTime::Format::W3CDTF->format_datetime($comment_time->clone->set_time_zone('UTC')); + next if @args && ($updated lt $args[0] || $updated gt $args[1]); + my $problem; my $criteria = { external_id => $request_id, @@ -99,8 +106,6 @@ sub update_comments { my $c = $p->comments->search( { external_id => $request->{update_id} } ); if ( !$c->first ) { - my $comment_time = DateTime::Format::W3CDTF->parse_datetime( $request->{updated_datetime} ); - my $comment = $self->schema->resultset('Comment')->new( { problem => $p, diff --git a/t/open311/getservicerequestupdates.t b/t/open311/getservicerequestupdates.t index a57d2d0e6..134d5422e 100644 --- a/t/open311/getservicerequestupdates.t +++ b/t/open311/getservicerequestupdates.t @@ -38,7 +38,7 @@ UPDATED_DATETIME }; -my $dt = DateTime->now; +my $dt = DateTime->now(formatter => DateTime::Format::W3CDTF->new); # basic xml -> perl object tests for my $test ( @@ -571,7 +571,8 @@ subtest 'check that existing comments are not duplicated' => sub { is $problem->comments->count, 1, 'one comment before fetching updates'; $requests_xml =~ s/UPDATED_DATETIME2/$dt/; - $requests_xml =~ s/UPDATED_DATETIME/@{[ $comment->confirmed ]}/; + my $confirmed = DateTime::Format::W3CDTF->format_datetime($comment->confirmed); + $requests_xml =~ s/UPDATED_DATETIME/$confirmed/; my $o = Open311->new( jurisdiction => 'mysociety', endpoint => 'http://example.com', test_mode => 1, test_get_returns => { 'servicerequestupdates.xml' => $requests_xml } ); @@ -596,12 +597,12 @@ subtest 'check that existing comments are not duplicated' => sub { foreach my $test ( { desc => 'check that closed and then open comment results in correct state', - dt1 => $dt->subtract( hours => 1 ), + dt1 => $dt->clone->subtract( hours => 1 ), dt2 => $dt, }, { desc => 'check that old comments do not change problem status', - dt1 => $dt->subtract( hours => 2 ), + dt1 => $dt->clone->subtract( minutes => 90 ), dt2 => $dt, } ) { @@ -627,7 +628,7 @@ foreach my $test ( { $problem->comments->delete; $problem->state( 'confirmed' ); - $problem->lastupdate( $dt->subtract( hours => 3 ) ); + $problem->lastupdate( $dt->clone->subtract( hours => 3 ) ); $problem->update; $requests_xml =~ s/UPDATED_DATETIME/$test->{dt1}/; @@ -683,7 +684,7 @@ foreach my $test ( { $problem->comments->delete; $problem->state( 'confirmed' ); - $problem->lastupdate( $dt->subtract( hours => 3 ) ); + $problem->lastupdate( $dt->clone->subtract( hours => 3 ) ); $problem->update; my @alerts = map { diff --git a/templates/web/base/js/translation_strings.html b/templates/web/base/js/translation_strings.html index b97104f92..2171566ba 100644 --- a/templates/web/base/js/translation_strings.html +++ b/templates/web/base/js/translation_strings.html @@ -50,7 +50,7 @@ upload_max_files_exceeded: '[% loc ('Whoa there Testino! Three photos are enough.') | replace("'", "\\'") %]', upload_default_message: '[% loc ('Drag and drop photos here or <u>click to upload</u>') | replace("'", "\\'") %]', upload_cancel_confirmation: '[% loc ('Are you sure you want to cancel this upload?') | replace("'", "\\'") %]', - upload_invalid_file_type: '[% loc ('Please upload a JPEG image only') | replace("'", "\\'") %]', + upload_invalid_file_type: '[% loc ('Please upload an image only') | replace("'", "\\'") %]', report_problem_heading: '[% loc('Click map to report a problem') | replace("'", "\\'") %]' }; diff --git a/templates/web/base/report/new/category.html b/templates/web/base/report/new/category.html index a89a4d5e9..8cfbecdcd 100644 --- a/templates/web/base/report/new/category.html +++ b/templates/web/base/report/new/category.html @@ -5,6 +5,7 @@ END; %] <label for='form_category' id="form_category_label"> [%- loc('Category') %] + </label> <select name='category' id='form_category'> [% FOREACH cat_op IN category_options %] [% cat_op_lc = cat_op | lower %] |