diff options
| -rw-r--r-- | locale/FixMyStreet.po | 148 | ||||
| -rw-r--r-- | locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po | 924 | ||||
| -rw-r--r-- | locale/de_DE.UTF-8/LC_MESSAGES/FixMyStreet.po | 191 | ||||
| -rw-r--r-- | locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po | 931 | ||||
| -rw-r--r-- | locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po | 921 |
5 files changed, 1765 insertions, 1350 deletions
diff --git a/locale/FixMyStreet.po b/locale/FixMyStreet.po index dfe83f074..7636ca2ed 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: 2012-10-24 11:20+0100\n" +"POT-Creation-Date: 2012-11-19 17:55+0000\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:563 perllib/FixMyStreet/DB/ResultSet/Problem.pm:339 +#: perllib/FixMyStreet/DB/Result/Problem.pm:560 perllib/FixMyStreet/DB/ResultSet/Problem.pm:339 msgid " and " msgstr "" @@ -53,7 +53,7 @@ msgstr "" msgid "%d questionnaires sent – %d answered (%s%%)" msgstr "" -#: templates/web/fixmystreet/report/_support.html:3 +#: templates/web/default/report/_support.html:3 msgid "%d supporters" msgstr "" @@ -61,7 +61,7 @@ msgstr "" msgid "%s - Summary reports" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:613 +#: perllib/FixMyStreet/DB/Result/Problem.pm:610 msgid "%s ref: %s" msgstr "" @@ -133,11 +133,11 @@ msgstr "" msgid "*unknown*" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:630 perllib/FixMyStreet/App/Controller/Report/New.pm:658 perllib/FixMyStreet/DB/Result/Problem.pm:353 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:629 perllib/FixMyStreet/App/Controller/Report/New.pm:657 perllib/FixMyStreet/DB/Result/Problem.pm:353 msgid "-- Pick a category --" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:610 perllib/FixMyStreet/DB/Result/Problem.pm:359 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:609 perllib/FixMyStreet/DB/Result/Problem.pm:359 msgid "-- Pick a property type --" msgstr "" @@ -145,7 +145,7 @@ msgstr "" msgid ". You can <a href=\"%s%s\">view the problem on this site</a>." msgstr "" -#: templates/web/fixmystreet/report/_support.html:3 +#: templates/web/default/report/_support.html:3 msgid "1 supporter" msgstr "" @@ -163,7 +163,7 @@ msgid "" "</p>" msgstr "" -#: templates/web/fixmystreet/questionnaire/completed-open.html:1 +#: templates/web/fixmystreet/questionnaire/completed-open.html:6 msgid "" "<p style=\"font-size:150%\">We’re sorry to hear that. We have two\n" "suggestions: why not try <a href=\"http://www.writetothem.com/\">writing direct\n" @@ -173,7 +173,7 @@ msgid "" "</p>" msgstr "" -#: templates/web/default/questionnaire/completed-open.html:1 +#: templates/web/default/questionnaire/completed-open.html:6 msgid "" "<p style=\"font-size:150%\">We’re sorry to hear that. We have two\n" "suggestions: why not try writing to your local representative or, if it’s\n" @@ -221,7 +221,7 @@ msgstr "" msgid "<strong>%d</strong> live problems" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:182 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:195 msgid "<strong>No</strong> Let me confirm my report by email" msgstr "" @@ -245,7 +245,7 @@ msgstr "" msgid "<strong>No</strong>, let me confirm my update by email:" msgstr "" -#: templates/web/default/auth/general.html:37 templates/web/default/report/display.html:142 templates/web/default/report/new/fill_in_details_form.html:140 templates/web/fixmystreet/auth/general.html:36 templates/web/fixmystreet/auth/general.html:38 templates/web/fixmystreet/report/display.html:147 templates/web/fixmystreet/report/new/fill_in_details_form.html:158 +#: templates/web/default/auth/general.html:37 templates/web/default/report/display.html:142 templates/web/default/report/new/fill_in_details_form.html:140 templates/web/fixmystreet/auth/general.html:36 templates/web/fixmystreet/auth/general.html:38 templates/web/fixmystreet/report/display.html:147 templates/web/fixmystreet/report/new/fill_in_details_form.html:171 msgid "<strong>Yes</strong> I have a password" msgstr "" @@ -365,7 +365,7 @@ msgstr "" msgid "Can't see the map? <a href='%s' rel='nofollow'>Skip this step</a>" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 perllib/FixMyStreet/App/Controller/Report/New.pm:660 templates/web/bromley/report/new/fill_in_details_form.html:68 templates/web/default/admin/council_contacts.html:37 templates/web/default/admin/index.html:36 templates/web/default/admin/list_flagged.html:14 templates/web/default/admin/search_reports.html:17 templates/web/fixmystreet/report/new/fill_in_details_form.html:74 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 perllib/FixMyStreet/App/Controller/Report/New.pm:659 templates/web/bromley/report/new/fill_in_details_form.html:68 templates/web/default/admin/council_contacts.html:37 templates/web/default/admin/index.html:36 templates/web/default/admin/list_flagged.html:14 templates/web/default/admin/search_reports.html:17 templates/web/fixmystreet/report/new/fill_in_details_form.html:74 msgid "Category" msgstr "" @@ -385,7 +385,7 @@ msgstr "" msgid "Change Password" msgstr "" -#: templates/web/fixmystreet/around/_report_banner.html:2 +#: templates/web/default/js/validation_strings.html:22 templates/web/fixmystreet/around/_report_banner.html:2 msgid "Click map to report a problem" msgstr "" @@ -393,7 +393,7 @@ msgstr "" msgid "Closed" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:698 +#: perllib/FixMyStreet/DB/Result/Problem.pm:695 msgid "Closed by council" msgstr "" @@ -453,11 +453,11 @@ msgstr "" msgid "Confirm account" msgstr "" -#: templates/web/fixmystreet/report/display.html:165 templates/web/fixmystreet/report/new/fill_in_details_form.html:176 +#: templates/web/fixmystreet/report/display.html:165 templates/web/fixmystreet/report/new/fill_in_details_form.html:189 msgid "Confirm by email below, providing a new password at that point. When you confirm, your password will be updated." msgstr "" -#: templates/web/default/questionnaire/creator_fixed.html:1 templates/web/default/tokens/confirm_problem.html:1 templates/web/default/tokens/confirm_problem.html:3 templates/web/default/tokens/confirm_update.html:1 templates/web/default/tokens/confirm_update.html:3 templates/web/emptyhomes/tokens/confirm_problem.html:1 templates/web/emptyhomes/tokens/confirm_problem.html:3 +#: templates/web/default/questionnaire/creator_fixed.html:1 templates/web/default/tokens/confirm_problem.html:1 templates/web/default/tokens/confirm_problem.html:3 templates/web/default/tokens/confirm_update.html:1 templates/web/default/tokens/confirm_update.html:3 templates/web/emptyhomes/tokens/confirm_problem.html:1 templates/web/emptyhomes/tokens/confirm_problem.html:3 templates/web/southampton/tokens/confirm_problem.html:1 templates/web/southampton/tokens/confirm_problem.html:3 msgid "Confirmation" msgstr "" @@ -569,7 +569,7 @@ msgstr "" msgid "Do you have a FixMyBarangay password?" msgstr "" -#: templates/web/default/auth/general.html:32 templates/web/fixmystreet/auth/general.html:32 templates/web/fixmystreet/report/display.html:144 templates/web/fixmystreet/report/new/fill_in_details_form.html:154 +#: templates/web/default/auth/general.html:32 templates/web/fixmystreet/auth/general.html:32 templates/web/fixmystreet/report/display.html:144 templates/web/fixmystreet/report/new/fill_in_details_form.html:167 msgid "Do you have a FixMyStreet password?" msgstr "" @@ -621,15 +621,15 @@ msgstr "" msgid "Email:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:612 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:611 msgid "Empty flat or maisonette" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:611 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:610 msgid "Empty house or bungalow" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:614 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:613 msgid "Empty office or other commercial" msgstr "" @@ -637,11 +637,11 @@ msgstr "" msgid "Empty property details form" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:615 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:614 msgid "Empty pub or bar" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:616 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:615 msgid "Empty public building - school, hospital, etc." msgstr "" @@ -677,11 +677,11 @@ msgstr "" msgid "Enter a new password:" msgstr "" -#: templates/web/bromley/report/display.html:148 templates/web/bromley/report/new/fill_in_details_form.html:189 templates/web/fixmystreet/auth/general.html:61 templates/web/fixmystreet/report/display.html:182 templates/web/fixmystreet/report/new/fill_in_details_form.html:210 +#: templates/web/bromley/report/display.html:148 templates/web/bromley/report/new/fill_in_details_form.html:189 templates/web/fixmystreet/auth/general.html:61 templates/web/fixmystreet/report/display.html:182 templates/web/fixmystreet/report/new/fill_in_details_form.html:223 msgid "Enter a password" msgstr "" -#: templates/web/default/index.html:33 templates/web/emptyhomes/index.html:58 templates/web/fixmystreet/index.html:46 +#: templates/web/default/index-steps.html:11 templates/web/emptyhomes/index.html:58 msgid "Enter details of the problem" msgstr "" @@ -786,7 +786,7 @@ msgstr "" msgid "For council(s):" msgstr "" -#: templates/web/fixmystreet/report/display.html:164 templates/web/fixmystreet/report/new/fill_in_details_form.html:175 +#: templates/web/fixmystreet/report/display.html:164 templates/web/fixmystreet/report/new/fill_in_details_form.html:188 msgid "Forgotten your password?" msgstr "" @@ -870,7 +870,7 @@ msgstr "" msgid "History" msgstr "" -#: templates/web/default/index.html:28 templates/web/emptyhomes/index.html:53 templates/web/fixmystreet/index.html:36 +#: templates/web/default/index-steps.html:1 templates/web/emptyhomes/index.html:53 msgid "How to report a problem" msgstr "" @@ -965,7 +965,7 @@ msgstr "" msgid "It is worth noting however that the process can sometimes be slow, especially if the property is in very poor repair or the owner is unwilling to act. In most cases it can take six months or more before you can expect to see anything change and sometimes there may be considerable barries to a property being brought back into use. This doesn’t mean the council isn’t doing anything. We encourage councils to update the website so you can see what is happening. It may be a long process, but you reporting your concerns about this property to the council is a valuable first step." msgstr "" -#: templates/web/bromley/report/display.html:166 templates/web/bromley/report/new/fill_in_details_form.html:209 templates/web/default/auth/general.html:44 templates/web/default/report/display.html:151 templates/web/default/report/new/fill_in_details_form.html:149 templates/web/fixmystreet/auth/general.html:46 templates/web/fixmystreet/report/display.html:160 templates/web/fixmystreet/report/new/fill_in_details_form.html:171 +#: templates/web/bromley/report/display.html:166 templates/web/bromley/report/new/fill_in_details_form.html:209 templates/web/default/auth/general.html:44 templates/web/default/report/display.html:151 templates/web/default/report/new/fill_in_details_form.html:149 templates/web/fixmystreet/auth/general.html:46 templates/web/fixmystreet/report/display.html:160 templates/web/fixmystreet/report/new/fill_in_details_form.html:184 msgid "Keep me signed in on this computer" msgstr "" @@ -1009,7 +1009,7 @@ msgstr "" msgid "Local alerts" msgstr "" -#: templates/web/default/index.html:32 templates/web/emptyhomes/index.html:57 templates/web/fixmystreet/index.html:45 +#: templates/web/default/index-steps.html:10 templates/web/emptyhomes/index.html:57 msgid "Locate the problem on a map of the area" msgstr "" @@ -1037,7 +1037,7 @@ msgstr "" msgid "More problems nearby" msgstr "" -#: templates/web/default/admin/list_flagged.html:11 templates/web/default/admin/list_flagged.html:34 templates/web/default/admin/list_updates.html:7 templates/web/default/admin/search_reports.html:14 templates/web/default/admin/search_users.html:12 templates/web/default/reports/index.html:15 templates/web/emptyhomes/reports/index.html:10 templates/web/fiksgatami/nn/reports/index.html:9 templates/web/fiksgatami/reports/index.html:9 templates/web/fixmystreet/auth/general.html:56 templates/web/fixmystreet/report/display.html:199 templates/web/fixmystreet/report/new/fill_in_details_form.html:119 templates/web/fixmystreet/report/new/fill_in_details_form.html:186 +#: templates/web/default/admin/list_flagged.html:11 templates/web/default/admin/list_flagged.html:34 templates/web/default/admin/list_updates.html:7 templates/web/default/admin/search_reports.html:14 templates/web/default/admin/search_users.html:12 templates/web/default/reports/index.html:15 templates/web/emptyhomes/reports/index.html:10 templates/web/fiksgatami/nn/reports/index.html:9 templates/web/fiksgatami/reports/index.html:9 templates/web/fixmystreet/auth/general.html:56 templates/web/fixmystreet/report/display.html:199 templates/web/fixmystreet/report/new/fill_in_details_form.html:122 templates/web/fixmystreet/report/new/fill_in_details_form.html:199 msgid "Name" msgstr "" @@ -1175,7 +1175,7 @@ msgstr "" msgid "No problems have been reported yet." msgstr "" -#: templates/web/fixmystreet/report/_support.html:3 +#: templates/web/default/report/_support.html:3 msgid "No supporters" msgstr "" @@ -1191,7 +1191,7 @@ msgstr "" msgid "Not reported before" msgstr "" -#: templates/web/default/report/_main.html:11 templates/web/emptyhomes/report/display.html:24 templates/web/fixmystreet/report/_main.html:13 +#: templates/web/default/report/_main.html:14 templates/web/emptyhomes/report/display.html:24 msgid "Not reported to council" msgstr "" @@ -1211,7 +1211,7 @@ msgstr "" msgid "Note: <strong>%s</strong>" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:153 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:166 msgid "Now to submit your report…" msgstr "" @@ -1287,7 +1287,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:1008 perllib/FixMyStreet/App/Controller/Report/New.pm:658 perllib/FixMyStreet/App/Controller/Report/New.pm:659 perllib/FixMyStreet/DB/Result/Problem.pm:505 perllib/FixMyStreet/DB/Result/Problem.pm:515 perllib/FixMyStreet/DB/Result/Problem.pm:525 perllib/FixMyStreet/DB/Result/Problem.pm:537 perllib/FixMyStreet/DB/ResultSet/Problem.pm:331 perllib/FixMyStreet/DB/ResultSet/Problem.pm:340 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1007 perllib/FixMyStreet/App/Controller/Report/New.pm:657 perllib/FixMyStreet/App/Controller/Report/New.pm:658 perllib/FixMyStreet/DB/Result/Problem.pm:505 perllib/FixMyStreet/DB/Result/Problem.pm:515 perllib/FixMyStreet/DB/Result/Problem.pm:525 perllib/FixMyStreet/DB/Result/Problem.pm:537 perllib/FixMyStreet/DB/ResultSet/Problem.pm:331 perllib/FixMyStreet/DB/ResultSet/Problem.pm:340 msgid "Other" msgstr "" @@ -1307,7 +1307,7 @@ msgstr "" msgid "Partial" msgstr "" -#: templates/web/bromley/report/display.html:145 templates/web/bromley/report/new/fill_in_details_form.html:186 templates/web/fixmystreet/auth/general.html:59 templates/web/fixmystreet/report/display.html:179 templates/web/fixmystreet/report/new/fill_in_details_form.html:207 +#: templates/web/bromley/report/display.html:145 templates/web/bromley/report/new/fill_in_details_form.html:186 templates/web/fixmystreet/auth/general.html:59 templates/web/fixmystreet/report/display.html:179 templates/web/fixmystreet/report/new/fill_in_details_form.html:220 msgid "Password (optional)" msgstr "" @@ -1315,7 +1315,7 @@ msgstr "" msgid "Password:" msgstr "" -#: templates/web/bromley/report/new/fill_in_details_form.html:136 templates/web/bromley/report/new/fill_in_details_form.html:183 templates/web/fixmystreet/report/new/fill_in_details_form.html:137 templates/web/fixmystreet/report/new/fill_in_details_form.html:204 +#: templates/web/bromley/report/new/fill_in_details_form.html:136 templates/web/bromley/report/new/fill_in_details_form.html:183 templates/web/fixmystreet/report/new/fill_in_details_form.html:150 templates/web/fixmystreet/report/new/fill_in_details_form.html:217 msgid "Phone number (optional)" msgstr "" @@ -1359,7 +1359,7 @@ msgstr "" msgid "Please check your email address is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:824 perllib/FixMyStreet/App/Controller/Report/New.pm:831 perllib/FixMyStreet/App/Controller/Report/New.pm:850 perllib/FixMyStreet/App/Controller/Report/New.pm:893 perllib/FixMyStreet/DB/Result/Problem.pm:355 templates/web/default/js/validation_strings.html:9 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:823 perllib/FixMyStreet/App/Controller/Report/New.pm:830 perllib/FixMyStreet/App/Controller/Report/New.pm:849 perllib/FixMyStreet/App/Controller/Report/New.pm:892 perllib/FixMyStreet/DB/Result/Problem.pm:355 templates/web/default/js/validation_strings.html:9 msgid "Please choose a category" msgstr "" @@ -1378,10 +1378,14 @@ msgid "" "please <a href=\"/\">go to the front page</a> and follow the instructions." msgstr "" -#: templates/web/default/report/new/notes.html:7 templates/web/fixmystreet/report/new/notes.html:6 +#: templates/web/default/report/new/notes.html:7 msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "" +#: templates/web/fixmystreet/report/new/notes.html:6 +msgid "Please do not be abusive — abusing your council devalues the service for all users." +msgstr "" + #: perllib/FixMyStreet/DB/Result/Comment.pm:146 templates/web/default/js/validation_strings.html:2 msgid "Please enter a message" msgstr "" @@ -1410,7 +1414,7 @@ msgstr "" msgid "Please enter your email" msgstr "" -#: templates/web/bromley/report/new/fill_in_details_form.html:149 templates/web/fixmystreet/report/new/fill_in_details_form.html:150 +#: templates/web/bromley/report/new/fill_in_details_form.html:149 templates/web/fixmystreet/report/new/fill_in_details_form.html:163 msgid "Please enter your email address" msgstr "" @@ -1631,7 +1635,7 @@ msgstr "" msgid "Properties recently reported as put back to use on reportemptyhomes.com" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:618 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:617 msgid "Property type:" msgstr "" @@ -1647,7 +1651,7 @@ msgstr "" msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports." msgstr "" -#: templates/web/bromley/report/display.html:142 templates/web/default/report/display.html:175 templates/web/default/report/new/fill_in_details_form.html:173 templates/web/fixmystreet/report/display.html:176 templates/web/fixmystreet/report/new/fill_in_details_form.html:201 +#: templates/web/bromley/report/display.html:142 templates/web/default/report/display.html:175 templates/web/default/report/new/fill_in_details_form.html:173 templates/web/fixmystreet/report/display.html:176 templates/web/fixmystreet/report/new/fill_in_details_form.html:214 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "" @@ -1731,7 +1735,7 @@ msgstr "" msgid "Recently fixed" msgstr "" -#: templates/web/default/index.html:50 templates/web/fixmystreet/index.html:68 +#: templates/web/default/index.html:37 templates/web/fixmystreet/index.html:45 msgid "Recently reported problems" msgstr "" @@ -1767,7 +1771,7 @@ msgstr "" msgid "Report empty properties" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:277 +#: perllib/FixMyStreet/App/Controller/Rss.pm:286 msgid "Report on %s" msgstr "" @@ -1867,7 +1871,7 @@ msgstr "" msgid "Select which type of alert you'd like and click the button for an RSS feed, or enter your email address to subscribe to an email alert." msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:626 +#: perllib/FixMyStreet/DB/Result/Problem.pm:623 msgid "Sent to %s %s later" msgstr "" @@ -1900,7 +1904,7 @@ msgid "" " significant contribution to the supply of affordable homes in Wales." msgstr "" -#: templates/web/bromley/report/display.html:203 templates/web/bromley/report/new/fill_in_details_form.html:129 templates/web/bromley/report/new/fill_in_details_form.html:175 templates/web/default/report/display.html:208 templates/web/default/report/new/fill_in_details_form.html:210 templates/web/fixmystreet/report/display.html:207 templates/web/fixmystreet/report/new/fill_in_details_form.html:128 templates/web/fixmystreet/report/new/fill_in_details_form.html:196 +#: templates/web/bromley/report/display.html:203 templates/web/bromley/report/new/fill_in_details_form.html:129 templates/web/bromley/report/new/fill_in_details_form.html:175 templates/web/default/report/display.html:208 templates/web/default/report/new/fill_in_details_form.html:210 templates/web/fixmystreet/report/display.html:207 templates/web/fixmystreet/report/new/fill_in_details_form.html:141 templates/web/fixmystreet/report/new/fill_in_details_form.html:209 msgid "Show my name publicly" msgstr "" @@ -1956,7 +1960,7 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:213 perllib/FixMyStreet/Geocode.pm:27 perllib/FixMyStreet/Geocode/Bing.pm:51 perllib/FixMyStreet/Geocode/Google.pm:69 perllib/FixMyStreet/Geocode/OSM.pm:61 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:212 perllib/FixMyStreet/Geocode.pm:27 perllib/FixMyStreet/Geocode/Bing.pm:51 perllib/FixMyStreet/Geocode/Google.pm:69 perllib/FixMyStreet/Geocode/OSM.pm:61 msgid "Sorry, we could not find that location." msgstr "" @@ -2004,7 +2008,7 @@ msgstr "" msgid "Subject:" msgstr "" -#: templates/web/bromley/report/new/fill_in_details_form.html:140 templates/web/bromley/report/new/fill_in_details_form.html:190 templates/web/bromley/report/new/fill_in_details_form.html:204 templates/web/default/questionnaire/creator_fixed.html:19 templates/web/default/report/new/fill_in_details_form.html:114 templates/web/default/report/new/fill_in_details_form.html:154 templates/web/default/report/new/fill_in_details_form.html:176 templates/web/fixmystreet/report/new/fill_in_details_form.html:141 templates/web/fixmystreet/report/new/fill_in_details_form.html:166 templates/web/fixmystreet/report/new/fill_in_details_form.html:211 +#: templates/web/bromley/report/new/fill_in_details_form.html:140 templates/web/bromley/report/new/fill_in_details_form.html:190 templates/web/bromley/report/new/fill_in_details_form.html:204 templates/web/default/questionnaire/creator_fixed.html:19 templates/web/default/report/new/fill_in_details_form.html:114 templates/web/default/report/new/fill_in_details_form.html:154 templates/web/default/report/new/fill_in_details_form.html:176 templates/web/fixmystreet/report/new/fill_in_details_form.html:154 templates/web/fixmystreet/report/new/fill_in_details_form.html:179 templates/web/fixmystreet/report/new/fill_in_details_form.html:224 msgid "Submit" msgstr "" @@ -2096,7 +2100,7 @@ msgstr "" msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Council.pm:91 +#: perllib/FixMyStreet/App/Controller/Council.pm:90 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "" @@ -2243,7 +2247,7 @@ msgstr "" msgid "There was a problem showing this page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:738 perllib/FixMyStreet/App/Controller/Report/Update.pm:134 templates/web/default/auth/general.html:23 templates/web/fixmystreet/auth/general.html:24 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:737 perllib/FixMyStreet/App/Controller/Report/Update.pm:134 templates/web/default/auth/general.html:23 templates/web/fixmystreet/auth/general.html:24 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 "" @@ -2275,7 +2279,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:870 perllib/FixMyStreet/Cobrand/UK.pm:54 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:869 perllib/FixMyStreet/Cobrand/UK.pm:54 msgid "This information is required" msgstr "" @@ -2371,7 +2375,7 @@ msgstr "" msgid "Unknown" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:164 +#: perllib/FixMyStreet/App/Controller/Rss.pm:173 msgid "Unknown alert type" msgstr "" @@ -2495,7 +2499,7 @@ msgstr "" msgid "We never show your email" msgstr "" -#: templates/web/bromley/report/new/fill_in_details_form.html:133 templates/web/bromley/report/new/fill_in_details_form.html:179 templates/web/fixmystreet/report/new/fill_in_details_form.html:133 templates/web/fixmystreet/report/new/fill_in_details_form.html:200 +#: templates/web/bromley/report/new/fill_in_details_form.html:133 templates/web/bromley/report/new/fill_in_details_form.html:179 templates/web/fixmystreet/report/new/fill_in_details_form.html:146 templates/web/fixmystreet/report/new/fill_in_details_form.html:213 msgid "We never show your email address or phone number." msgstr "" @@ -2503,7 +2507,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/default/index.html:34 templates/web/emptyhomes/index.html:59 templates/web/fixmystreet/index.html:50 +#: templates/web/default/index-steps.html:15 templates/web/emptyhomes/index.html:59 msgid "We send it to the council on your behalf" msgstr "" @@ -2531,7 +2535,7 @@ msgstr "" msgid "When sent" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:613 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:612 msgid "Whole block of empty flats" msgstr "" @@ -2563,7 +2567,7 @@ msgstr "" msgid "Yes" msgstr "" -#: templates/web/bromley/report/display.html:155 templates/web/bromley/report/new/fill_in_details_form.html:198 templates/web/fixmystreet/report/display.html:149 templates/web/fixmystreet/report/new/fill_in_details_form.html:160 +#: templates/web/bromley/report/display.html:155 templates/web/bromley/report/new/fill_in_details_form.html:198 templates/web/fixmystreet/report/display.html:149 templates/web/fixmystreet/report/new/fill_in_details_form.html:173 msgid "Yes I have a password" msgstr "" @@ -2627,7 +2631,7 @@ msgstr "" msgid "You have successfully deleted your alert." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:745 perllib/FixMyStreet/App/Controller/Report/Update.pm:140 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:744 perllib/FixMyStreet/App/Controller/Report/Update.pm:140 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "" @@ -2643,7 +2647,7 @@ msgstr "" msgid "Your Reports" msgstr "" -#: templates/web/bromley/report/display.html:41 templates/web/bromley/report/display.html:43 templates/web/bromley/report/new/fill_in_details_form.html:145 templates/web/fixmystreet/alert/_list.html:89 templates/web/fixmystreet/alert/updates.html:19 templates/web/fixmystreet/alert/updates.html:22 templates/web/fixmystreet/contact/index.html:72 templates/web/fixmystreet/report/display.html:49 templates/web/fixmystreet/report/display.html:51 templates/web/fixmystreet/report/new/fill_in_details_form.html:146 +#: templates/web/bromley/report/display.html:41 templates/web/bromley/report/display.html:43 templates/web/bromley/report/new/fill_in_details_form.html:145 templates/web/fixmystreet/alert/_list.html:89 templates/web/fixmystreet/alert/updates.html:19 templates/web/fixmystreet/alert/updates.html:22 templates/web/fixmystreet/contact/index.html:72 templates/web/fixmystreet/report/display.html:49 templates/web/fixmystreet/report/display.html:51 templates/web/fixmystreet/report/new/fill_in_details_form.html:117 templates/web/fixmystreet/report/new/fill_in_details_form.html:159 msgid "Your email" msgstr "" @@ -2671,7 +2675,7 @@ msgstr "" msgid "Your last name" msgstr "" -#: templates/web/fixmystreet/auth/general.html:57 templates/web/fixmystreet/contact/index.html:65 templates/web/fixmystreet/report/display.html:203 templates/web/fixmystreet/report/new/fill_in_details_form.html:123 templates/web/fixmystreet/report/new/fill_in_details_form.html:191 +#: templates/web/fixmystreet/auth/general.html:57 templates/web/fixmystreet/contact/index.html:65 templates/web/fixmystreet/report/display.html:203 templates/web/fixmystreet/report/new/fill_in_details_form.html:126 templates/web/fixmystreet/report/new/fill_in_details_form.html:204 msgid "Your name" msgstr "" @@ -2679,7 +2683,7 @@ msgstr "" msgid "Your name:" msgstr "" -#: templates/web/bromley/report/display.html:160 templates/web/bromley/report/new/fill_in_details_form.html:203 templates/web/fixmystreet/auth/general.html:41 templates/web/fixmystreet/report/display.html:154 templates/web/fixmystreet/report/new/fill_in_details_form.html:165 +#: templates/web/bromley/report/display.html:160 templates/web/bromley/report/new/fill_in_details_form.html:203 templates/web/fixmystreet/auth/general.html:41 templates/web/fixmystreet/report/display.html:154 templates/web/fixmystreet/report/new/fill_in_details_form.html:178 msgid "Your password" msgstr "" @@ -2687,7 +2691,7 @@ msgstr "" msgid "Your password has been changed" msgstr "" -#: templates/web/bromley/report/new/fill_in_details_form.html:137 templates/web/bromley/report/new/fill_in_details_form.html:184 templates/web/fixmystreet/report/new/fill_in_details_form.html:138 templates/web/fixmystreet/report/new/fill_in_details_form.html:205 +#: templates/web/bromley/report/new/fill_in_details_form.html:137 templates/web/bromley/report/new/fill_in_details_form.html:184 templates/web/fixmystreet/report/new/fill_in_details_form.html:151 templates/web/fixmystreet/report/new/fill_in_details_form.html:218 msgid "Your phone number" msgstr "" @@ -2715,7 +2719,7 @@ msgstr "" msgid "council" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 +#: perllib/FixMyStreet/DB/Result/Problem.pm:608 msgid "council ref: %s" msgstr "" @@ -2731,7 +2735,7 @@ msgstr "" msgid "from %d different users" msgstr "" -#: perllib/Utils.pm:295 +#: perllib/Utils.pm:267 msgid "less than a minute" msgstr "" @@ -2751,6 +2755,10 @@ msgstr "" msgid "or" msgstr "" +#: templates/web/default/js/validation_strings.html:21 +msgid "or locate me automatically" +msgstr "" + #: templates/web/default/admin/report_edit.html:15 msgid "originally entered" msgstr "" @@ -2771,7 +2779,7 @@ msgstr "" msgid "the local council" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:549 +#: templates/web/default/report/_main.html:6 msgid "there is no pin shown as the user did not use the map" msgstr "" @@ -2779,7 +2787,7 @@ msgstr "" msgid "this type of local problem" msgstr "" -#: perllib/Utils.pm:269 +#: perllib/Utils.pm:241 msgid "today" msgstr "" @@ -2823,21 +2831,21 @@ msgstr "" msgid "your update will not be posted" msgstr "" -#: templates/web/default/front/stats.html:17 +#: templates/web/emptyhomes/front/stats.html:17 #, perl-format msgid "<big>%s</big> report recently" msgid_plural "<big>%s</big> reports recently" msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:314 +#: perllib/Utils.pm:286 #, perl-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:316 +#: perllib/Utils.pm:288 #, perl-format msgid "%d minute" msgid_plural "%d minutes" @@ -2851,21 +2859,21 @@ msgid_plural "<big>%s</big> updates on reports" msgstr[0] "" msgstr[1] "" -#: templates/web/default/report/new/councils_text_none.html:5 +#: templates/web/emptyhomes/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." msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:310 +#: perllib/Utils.pm:282 #, perl-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "" msgstr[1] "" -#: templates/web/default/front/stats.html:12 +#: templates/web/emptyhomes/front/stats.html:12 #, perl-format msgid "<big>%s</big> report in past week" msgid_plural "<big>%s</big> reports in past week" @@ -2886,7 +2894,7 @@ msgid_plural "We do <strong>not</strong> yet have details for the other councils msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:312 +#: perllib/Utils.pm:284 #, perl-format msgid "%d day" msgid_plural "%d days" diff --git a/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po b/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po index be85a97c5..7540ba367 100644 --- a/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po +++ b/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2012-08-21 09:54+0100\n" +"POT-Creation-Date: 2012-11-19 17:55+0000\n" "PO-Revision-Date: 2009-07-10 14:20-0000\n" "Last-Translator: Mark Smith <Mark.Smith@trosol.co.uk>\n" "Language-Team: mySociety\n" @@ -20,8 +20,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:555 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:337 +#: perllib/FixMyStreet/DB/Result/Problem.pm:560 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:339 msgid " and " msgstr "" @@ -56,58 +56,22 @@ msgstr "" msgid "%d council contacts – %d confirmed, %d unconfirmed" msgstr "" -#: perllib/Utils.pm:293 -#, fuzzy -msgid "%d day" -msgstr "diwrnod" - -#: perllib/Utils.pm:293 -#, fuzzy -msgid "%d days" -msgstr "diwrnod" - #: templates/web/default/admin/council_list.html:27 msgid "%d edits by %s" msgstr "" -#: perllib/Utils.pm:294 -#, fuzzy -msgid "%d hour" -msgstr "awr" - -#: perllib/Utils.pm:294 -#, fuzzy -msgid "%d hours" -msgstr "awr" - #: templates/web/default/admin/index.html:16 #, fuzzy msgid "%d live updates" msgstr "Anfonwch ddiweddariadau ataf i drwy'r e-bost" -#: perllib/Utils.pm:295 -#, fuzzy -msgid "%d minute" -msgstr "munud" - -#: perllib/Utils.pm:295 -#, fuzzy -msgid "%d minutes" -msgstr "munud" - #: templates/web/default/admin/index.html:18 msgid "%d questionnaires sent – %d answered (%s%%)" msgstr "" -#: perllib/Utils.pm:292 -#, fuzzy -msgid "%d week" -msgstr "wythnos" - -#: perllib/Utils.pm:292 -#, fuzzy -msgid "%d weeks" -msgstr "wythnos" +#: templates/web/default/report/_support.html:3 +msgid "%d supporters" +msgstr "" #: templates/web/default/reports/council.html:0 #: templates/web/default/reports/council.html:26 @@ -116,32 +80,27 @@ msgstr "wythnos" msgid "%s - Summary reports" msgstr "%s - Adroddiadau cryno" -#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:610 msgid "%s ref: %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:288 perllib/FixMyStreet/Cobrand/UK.pm:300 +#: perllib/FixMyStreet/Cobrand/UK.pm:279 perllib/FixMyStreet/Cobrand/UK.pm:291 msgid "%s ward, %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:488 +#: perllib/FixMyStreet/DB/Result/Problem.pm:496 msgid "%s, reported anonymously at %s" msgstr "Rhoddodd %s wybod yn ddi-enw am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:490 +#: perllib/FixMyStreet/DB/Result/Problem.pm:498 msgid "%s, reported by %s at %s" msgstr "Adroddwyd am %s gan %s am %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:315 perllib/FixMyStreet/Cobrand/UK.pm:327 +#: perllib/FixMyStreet/Cobrand/UK.pm:306 perllib/FixMyStreet/Cobrand/UK.pm:318 #, fuzzy msgid "%s, within %s ward" msgstr "Eiddo gwag yn ward %s" -#: templates/web/default/admin/stats.html:5 -#, fuzzy -msgid "%sreports between %s and %s" -msgstr "Adroddwyd am %s gan %s am %s" - #: templates/web/default/email_sent.html:28 msgid "(Don't worry — %s)" msgstr "" @@ -173,7 +132,7 @@ msgid "(returned to use)" msgstr "(wedi'i adfer i'w ddefnyddio)" #: templates/web/default/index.html:12 templates/web/default/index.html:8 -#: templates/web/fixmystreet/around/postcode_form.html:7 +#: templates/web/fixmystreet/around/postcode_form.html:10 msgid " " msgstr " " @@ -202,19 +161,19 @@ msgstr "(nid ydym byth yn dangos eich cyfeiriad e-bost na'ch rhif ffôn)" msgid "(we never show your email)" msgstr "(nid ydym byth yn dangos eich cyfeiriad e-bost na'ch rhif ffôn)" -#: perllib/FixMyStreet/App/Controller/Admin.pm:284 +#: perllib/FixMyStreet/App/Controller/Admin.pm:285 msgid "*unknown*" msgstr "" #: perllib/FixMyStreet/App/Controller/Report/New.pm:629 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:655 -#: perllib/FixMyStreet/DB/Result/Problem.pm:345 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:657 +#: perllib/FixMyStreet/DB/Result/Problem.pm:353 #, fuzzy msgid "-- Pick a category --" msgstr "-- Dewiswch fath o eiddo --" #: perllib/FixMyStreet/App/Controller/Report/New.pm:609 -#: perllib/FixMyStreet/DB/Result/Problem.pm:351 +#: perllib/FixMyStreet/DB/Result/Problem.pm:359 msgid "-- Pick a property type --" msgstr "-- Dewiswch fath o eiddo --" @@ -224,6 +183,10 @@ msgstr "-- Dewiswch fath o eiddo --" msgid ". You can <a href=\"%s%s\">view the empty property on this site</a>." msgstr ". Gallwch <a href=\"%s\">weld yr eiddo gwag ar y safle hwn</a>." +#: templates/web/default/report/_support.html:3 +msgid "1 supporter" +msgstr "" + #: templates/web/default/questionnaire/completed.html:20 #, fuzzy msgid "" @@ -255,7 +218,7 @@ msgstr "" "chyhoeddi</a>?\n" "</p>\n" -#: templates/web/fixmystreet/questionnaire/completed-open.html:1 +#: templates/web/fixmystreet/questionnaire/completed-open.html:6 #, fuzzy msgid "" "<p style=\"font-size:150%\">We’re sorry to hear that. We have two\n" @@ -277,7 +240,7 @@ msgstr "" "chyhoeddi</a>?\n" "</p>\n" -#: templates/web/default/questionnaire/completed-open.html:1 +#: templates/web/default/questionnaire/completed-open.html:6 #, fuzzy msgid "" "<p style=\"font-size:150%\">We’re sorry to hear that. We have two\n" @@ -376,8 +339,8 @@ msgstr "" "mwy o wybodaeth am statws eich eiddo gwag, dewch yn ôl i'r safle\n" "a rhowch ddiweddariad yno.</p>\n" -#: templates/web/default/around/display_location.html:70 -#: templates/web/default/around/display_location.html:72 +#: templates/web/default/around/_report_banner.html:3 +#: templates/web/default/around/_report_banner.html:5 #: templates/web/emptyhomes/around/display_location.html:36 #: templates/web/emptyhomes/around/display_location.html:38 #, fuzzy @@ -393,17 +356,17 @@ msgstr "" msgid "<strong>%d</strong> live empty properties" msgstr "Adrodd am eiddo gwag a gweld y rhain" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:172 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:195 #, fuzzy msgid "<strong>No</strong> Let me confirm my report by email" msgstr "Adrodd am eiddo gwag a gweld y rhain" -#: templates/web/fixmystreet/report/display.html:148 +#: templates/web/fixmystreet/report/display.html:170 #, fuzzy msgid "<strong>No</strong> Let me confirm my update by email" msgstr "Adrodd am eiddo gwag a gweld y rhain" -#: templates/web/fixmystreet/auth/general.html:46 +#: templates/web/fixmystreet/auth/general.html:50 #, fuzzy msgid "<strong>No</strong> let me sign in by email" msgstr "Adrodd am eiddo gwag a gweld y rhain" @@ -425,10 +388,10 @@ msgstr "Adrodd am eiddo gwag a gweld y rhain" #: templates/web/default/auth/general.html:37 #: templates/web/default/report/display.html:142 #: templates/web/default/report/new/fill_in_details_form.html:140 -#: templates/web/fixmystreet/auth/general.html:32 -#: templates/web/fixmystreet/auth/general.html:34 -#: templates/web/fixmystreet/report/display.html:131 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:154 +#: templates/web/fixmystreet/auth/general.html:36 +#: templates/web/fixmystreet/auth/general.html:38 +#: templates/web/fixmystreet/report/display.html:147 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:171 #, fuzzy msgid "<strong>Yes</strong> I have a password" msgstr "Adrodd am eiddo gwag a gweld y rhain" @@ -441,11 +404,11 @@ msgstr "Adrodd am eiddo gwag a gweld y rhain" msgid "About us" msgstr "Amdanom ni" -#: templates/web/default/admin/council_contacts.html:66 +#: templates/web/default/admin/council_contacts.html:72 msgid "Add new category" msgstr "" -#: templates/web/default/my/my.html:56 templates/web/fixmystreet/my/my.html:56 +#: templates/web/default/my/my.html:56 templates/web/fixmystreet/my/my.html:60 msgid "Added %s" msgstr "" @@ -463,14 +426,10 @@ msgstr "" #: templates/web/bromley/report/display.html:207 #: templates/web/default/report/display.html:214 -#: templates/web/fixmystreet/report/display.html:189 +#: templates/web/fixmystreet/report/display.html:211 msgid "Alert me to future updates" msgstr "Rhowch wybod i mi am ddiweddariadau yn y dyfodol" -#: templates/web/default/admin/stats.html:5 -msgid "All" -msgstr "" - #: templates/web/default/reports/index.html:3 #, fuzzy msgid "All Reports" @@ -484,11 +443,17 @@ msgstr "" #: templates/web/bromley/header.html:77 templates/web/default/footer.html:11 #: templates/web/fiksgatami/footer.html:7 #: templates/web/fiksgatami/nn/footer.html:7 +#: templates/web/fixmybarangay/footer.html:20 #: templates/web/fixmystreet/footer.html:49 #: templates/web/reading/footer.html:8 msgid "Reports" msgstr "Adroddiadau" +#: templates/web/default/admin/stats.html:5 +#, fuzzy +msgid "Reports between %s and %s" +msgstr "Adroddwyd am %s gan %s am %s" + #: templates/web/default/report/new/councils_text_some.html:2 msgid "All the information you provide here will be sent to" msgstr "" @@ -593,6 +558,12 @@ msgstr "" msgid "Ban email address" msgstr "Eich cyfeiriad e-bost:" +#: templates/web/fixmybarangay/report/new/notes.html:7 +msgid "" +"Be sure to choose the right category, because we use that to determine to " +"whom the report is sent." +msgstr "" + #: templates/web/fiksgatami/footer.html:16 #: templates/web/fiksgatami/nn/footer.html:16 msgid "" @@ -604,8 +575,8 @@ msgstr "" msgid "By Date" msgstr "" -#: templates/web/fixmystreet/around/display_location.html:80 -#: templates/web/fixmystreet/around/display_location.html:82 +#: templates/web/fixmystreet/around/_report_banner.html:10 +#: templates/web/fixmystreet/around/_report_banner.html:8 #, fuzzy msgid "Can't see the map? <a href='%s' rel='nofollow'>Skip this step</a>" msgstr "" @@ -613,13 +584,13 @@ msgstr "" " i'r cam hwn</a>.</small>" #: perllib/FixMyStreet/App/Controller/Report/New.pm:632 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:657 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:659 #: templates/web/bromley/report/new/fill_in_details_form.html:68 -#: templates/web/default/admin/council_contacts.html:35 +#: templates/web/default/admin/council_contacts.html:37 #: templates/web/default/admin/index.html:36 #: templates/web/default/admin/list_flagged.html:14 #: templates/web/default/admin/search_reports.html:17 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:72 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:74 #, fuzzy msgid "Category" msgstr "Categori:" @@ -628,14 +599,14 @@ msgstr "Categori:" msgid "Category fix rate for empty properties > 4 weeks old" msgstr "" -#: templates/web/default/admin/council_contacts.html:72 +#: templates/web/default/admin/council_contacts.html:78 #: templates/web/default/admin/council_edit.html:23 #: templates/web/default/admin/report_edit.html:25 #: templates/web/default/report/new/fill_in_details_form.html:67 msgid "Category:" msgstr "Categori:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:334 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:336 #, fuzzy msgid "Category: %s" msgstr "Categori:" @@ -646,8 +617,8 @@ msgstr "Categori:" msgid "Change Password" msgstr "" -#: templates/web/fixmystreet/around/display_location.html:72 -#: templates/web/fixmystreet/around/display_location.html:73 +#: templates/web/default/js/validation_strings.html:22 +#: templates/web/fixmystreet/around/_report_banner.html:2 #, fuzzy msgid "Click map to report an empty property" msgstr "Sut i roi gwybod am eiddo gwag" @@ -656,22 +627,22 @@ msgstr "Sut i roi gwybod am eiddo gwag" #: templates/web/bromley/report/display.html:82 #: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/report_edit.html:20 -#: templates/web/default/dashboard/index.html:136 #: templates/web/default/dashboard/index.html:138 +#: templates/web/default/dashboard/index.html:140 #: templates/web/default/report/display.html:79 #: templates/web/default/report/display.html:81 #: templates/web/fixmystreet/report/banner.html:15 -#: templates/web/fixmystreet/report/display.html:74 -#: templates/web/fixmystreet/report/display.html:76 +#: templates/web/fixmystreet/report/display.html:90 +#: templates/web/fixmystreet/report/display.html:92 msgid "Closed" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:690 +#: perllib/FixMyStreet/DB/Result/Problem.pm:695 #, fuzzy msgid "Closed by council" msgstr "Ni roddwyd gwybod i'r cyngor am hyn" -#: templates/web/default/my/my.html:32 templates/web/fixmystreet/my/my.html:32 +#: templates/web/default/my/my.html:32 templates/web/fixmystreet/my/my.html:36 #, fuzzy msgid "Closed reports" msgstr "Cuddio hen adroddiadau " @@ -680,8 +651,8 @@ msgstr "Cuddio hen adroddiadau " msgid "Closed:" msgstr "" -#: templates/web/default/around/display_location.html:103 -#: templates/web/default/around/display_location.html:105 +#: templates/web/default/around/tabbed_lists.html:10 +#: templates/web/default/around/tabbed_lists.html:12 msgid "Closest nearby empty properties <small>(within %skm)</small>" msgstr "Yr eiddo gwag cyfagos agosaf <small>(within %skm)</small>" @@ -705,24 +676,29 @@ msgstr "" msgid "Cobrand:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:358 +#: perllib/FixMyStreet/App/Controller/Admin.pm:365 #, fuzzy msgid "Configuration updated" msgstr "Cadarnhau" -#: perllib/FixMyStreet/App/Controller/Admin.pm:372 +#: perllib/FixMyStreet/App/Controller/Admin.pm:380 msgid "Configuration updated - contacts will be generated automatically later" msgstr "" -#: templates/web/default/admin/council_contacts.html:153 +#: templates/web/default/admin/council_edit.html:34 +#, fuzzy +msgid "Configure Endpoint" +msgstr "Cadarnhau" + +#: templates/web/default/admin/council_contacts.html:168 msgid "Configure Open311" msgstr "" -#: templates/web/default/admin/council_contacts.html:105 +#: templates/web/default/admin/council_contacts.html:116 msgid "Configure Open311 integration" msgstr "" -#: templates/web/default/admin/council_contacts.html:42 +#: templates/web/default/admin/council_contacts.html:46 #, fuzzy msgid "Confirm" msgstr "Cadarnhau" @@ -732,6 +708,13 @@ msgstr "Cadarnhau" msgid "Confirm account" msgstr "Cadarnhau" +#: templates/web/fixmystreet/report/display.html:165 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:189 +msgid "" +"Confirm by email below, providing a new password at that point. When you " +"confirm, your password will be updated." +msgstr "" + #: templates/web/default/questionnaire/creator_fixed.html:1 #: templates/web/default/tokens/confirm_problem.html:1 #: templates/web/default/tokens/confirm_problem.html:3 @@ -739,18 +722,24 @@ msgstr "Cadarnhau" #: templates/web/default/tokens/confirm_update.html:3 #: templates/web/emptyhomes/tokens/confirm_problem.html:1 #: templates/web/emptyhomes/tokens/confirm_problem.html:3 +#: templates/web/southampton/tokens/confirm_problem.html:1 +#: templates/web/southampton/tokens/confirm_problem.html:3 msgid "Confirmation" msgstr "Cadarnhau" -#: templates/web/default/admin/council_contacts.html:37 -#: templates/web/default/admin/council_contacts.html:82 +#: templates/web/default/admin/council_contacts.html:39 +#: templates/web/default/admin/council_contacts.html:88 #: templates/web/default/admin/council_edit.html:28 -#: templates/web/default/admin/council_edit.html:43 -#: templates/web/default/admin/stats.html:5 +#: templates/web/default/admin/council_edit.html:71 #, fuzzy msgid "Confirmed" msgstr "Cadarnhau" +#: templates/web/default/admin/stats.html:5 +#, fuzzy +msgid "Confirmed reports between %s and %s" +msgstr "Adroddwyd am %s gan %s am %s" + #: templates/web/default/admin/problem_row.html:23 #: templates/web/default/admin/report_edit.html:34 #, fuzzy @@ -783,8 +772,8 @@ msgstr "Cysylltwch â Ni" msgid "Contact the team" msgstr "Cysylltu â'r tîm" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1150 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1178 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1164 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 msgid "Could not find user" msgstr "" @@ -796,7 +785,7 @@ msgstr "" msgid "Council" msgstr "cyngor" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1022 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 #: templates/web/default/admin/council_list.html:1 #, fuzzy msgid "Council contacts" @@ -829,7 +818,7 @@ msgstr "Cysylltu" msgid "Create a report" msgstr "Categori:" -#: templates/web/default/admin/council_contacts.html:96 +#: templates/web/default/admin/council_contacts.html:107 #, fuzzy msgid "Create category" msgstr "Categori:" @@ -858,15 +847,15 @@ msgstr "" msgid "Dashboard" msgstr "" -#: templates/web/default/admin/council_contacts.html:38 -#: templates/web/default/admin/council_contacts.html:85 +#: templates/web/default/admin/council_contacts.html:40 +#: templates/web/default/admin/council_contacts.html:91 #: templates/web/default/admin/council_edit.html:29 -#: templates/web/default/admin/council_edit.html:44 +#: templates/web/default/admin/council_edit.html:72 msgid "Deleted" msgstr "" #: templates/web/bromley/report/new/fill_in_details_form.html:54 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:64 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66 #, fuzzy msgid "Details" msgstr "Manylion:" @@ -876,14 +865,23 @@ msgstr "Manylion:" msgid "Details:" msgstr "Manylion:" +#: templates/web/default/admin/council_contacts.html:41 +msgid "Devolved" +msgstr "" + #: templates/web/default/admin/council_list.html:23 msgid "Diligency prize league table" msgstr "" +#: templates/web/fixmystreet/auth/general.html:30 +#, fuzzy +msgid "Do you have a FixMyBarangay password?" +msgstr "Diweddariadau i reportemptyhomes.com" + #: templates/web/default/auth/general.html:32 -#: templates/web/fixmystreet/auth/general.html:29 -#: templates/web/fixmystreet/report/display.html:128 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:150 +#: templates/web/fixmystreet/auth/general.html:32 +#: templates/web/fixmystreet/report/display.html:144 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:167 #, fuzzy msgid "Do you have a reportemptyhomes.com password?" msgstr "Diweddariadau i reportemptyhomes.com" @@ -914,13 +912,13 @@ msgstr "Cyflwyno'ch diweddariad" msgid "Editing user %d" msgstr "Cyflwyno'ch diweddariad" -#: templates/web/default/admin/council_edit.html:45 +#: templates/web/default/admin/council_edit.html:73 msgid "Editor" msgstr "" #: templates/web/bromley/report/display.html:126 -#: templates/web/default/admin/council_contacts.html:36 -#: templates/web/default/admin/council_edit.html:42 +#: templates/web/default/admin/council_contacts.html:38 +#: templates/web/default/admin/council_edit.html:70 #: templates/web/default/admin/list_flagged.html:12 #: templates/web/default/admin/list_flagged.html:35 #: templates/web/default/admin/list_updates.html:8 @@ -928,20 +926,20 @@ msgstr "" #: templates/web/default/admin/search_reports.html:15 #: templates/web/default/admin/search_users.html:13 #: templates/web/fixmystreet/auth/general.html:20 -#: templates/web/fixmystreet/report/display.html:120 +#: templates/web/fixmystreet/report/display.html:136 #, fuzzy msgid "Email" msgstr "E-bost:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1126 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1140 msgid "Email added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1123 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1137 msgid "Email already in abuse list" msgstr "" -#: templates/web/default/around/display_location.html:85 +#: templates/web/default/around/_updates.html:5 msgid "Email me new local empty properties" msgstr "Anfonwch fanylion eiddo gwag lleol newydd ataf i drwy'r e-bost" @@ -949,7 +947,7 @@ msgstr "Anfonwch fanylion eiddo gwag lleol newydd ataf i drwy'r e-bost" msgid "Email me updates" msgstr "Anfonwch ddiweddariadau ataf i drwy'r e-bost" -#: templates/web/default/admin/council_contacts.html:77 +#: templates/web/default/admin/council_contacts.html:83 #: templates/web/default/admin/council_edit.html:26 #: templates/web/default/admin/report_edit.html:31 #: templates/web/default/admin/update_edit.html:24 @@ -1013,8 +1011,8 @@ msgstr "Cofnodwch god post Prydeinig, neu enw stryd ac ardal gerllaw:" #: templates/web/default/around/postcode_form.html:1 #: templates/web/default/around/postcode_form.html:2 -#: templates/web/fixmystreet/around/postcode_form.html:10 -#: templates/web/fixmystreet/around/postcode_form.html:11 +#: templates/web/fixmystreet/around/postcode_form.html:13 +#: templates/web/fixmystreet/around/postcode_form.html:14 #, fuzzy msgid "Enter a nearby street name and area" msgstr "Cofnodwch god post Prydeinig, neu enw stryd ac ardal gerllaw:" @@ -1028,15 +1026,15 @@ msgstr "Ychwanegwch neges" #: templates/web/bromley/report/display.html:148 #: templates/web/bromley/report/new/fill_in_details_form.html:189 -#: templates/web/fixmystreet/auth/general.html:57 -#: templates/web/fixmystreet/report/display.html:160 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:200 +#: templates/web/fixmystreet/auth/general.html:61 +#: templates/web/fixmystreet/report/display.html:182 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:223 #, fuzzy msgid "Enter a password" msgstr "Ychwanegwch neges" -#: templates/web/default/index.html:33 templates/web/emptyhomes/index.html:58 -#: templates/web/fixmystreet/index.html:41 +#: templates/web/default/index-steps.html:11 +#: templates/web/emptyhomes/index.html:58 msgid "Enter details of the empty property" msgstr "Rhowch fanylion yr eiddo gwag" @@ -1050,7 +1048,7 @@ msgstr "Rhowch fanylion yr eiddo gwag" msgid "Error" msgstr "Gwall" -#: templates/web/default/admin/council_contacts.html:11 +#: templates/web/default/admin/council_contacts.html:13 #: templates/web/default/admin/council_edit.html:18 msgid "Example postcode %s" msgstr "" @@ -1148,13 +1146,13 @@ msgstr "" #: templates/web/default/admin/index.html:36 #: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/report_edit.html:20 -#: templates/web/default/dashboard/index.html:136 #: templates/web/default/dashboard/index.html:138 +#: templates/web/default/dashboard/index.html:140 #: templates/web/default/report/display.html:79 #: templates/web/default/report/display.html:81 #: templates/web/fixmystreet/report/banner.html:12 -#: templates/web/fixmystreet/report/display.html:74 -#: templates/web/fixmystreet/report/display.html:76 +#: templates/web/fixmystreet/report/display.html:90 +#: templates/web/fixmystreet/report/display.html:92 msgid "Fixed" msgstr "" @@ -1170,7 +1168,7 @@ msgstr "cyngor" msgid "Fixed - User" msgstr "Cuddio hen adroddiadau " -#: templates/web/default/my/my.html:27 templates/web/fixmystreet/my/my.html:27 +#: templates/web/default/my/my.html:27 templates/web/fixmystreet/my/my.html:31 #, fuzzy msgid "Fixed reports" msgstr "Cuddio hen adroddiadau " @@ -1203,11 +1201,18 @@ msgstr "" msgid "For council(s):" msgstr "cyngor" +#: templates/web/fixmystreet/report/display.html:164 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:188 +#, fuzzy +msgid "Forgotten your password?" +msgstr "Adroddiadau" + #: templates/web/default/faq/faq-en-gb.html:1 #: templates/web/emptyhomes/faq/faq-cy.html:1 #: templates/web/emptyhomes/faq/faq-en-gb.html:1 #: templates/web/fiksgatami/faq/faq-nb.html:1 #: templates/web/fiksgatami/nn/faq/faq-nn.html:1 +#: templates/web/fixmybarangay/faq/faq-en-gb.html:1 #: templates/web/fixmystreet/faq/faq-en-gb.html:1 #: templates/web/fixmystreet/static/privacy.html:1 #: templates/web/zurich/faq/faq-de.html:1 @@ -1223,7 +1228,7 @@ msgid "GeoRSS on Google Maps" msgstr "" #: templates/web/bromley/report/display.html:30 -#: templates/web/fixmystreet/report/display.html:23 +#: templates/web/fixmystreet/report/display.html:27 #, fuzzy msgid "Get updates" msgstr "Anfonwch ddiweddariadau ataf i drwy'r e-bost" @@ -1241,6 +1246,7 @@ msgid "Get updates of empty properties in this %s" msgstr "Porthiant RSS o eiddo gwag yn yr %s hwn" #: templates/web/default/alert/_list.html:83 +#: templates/web/fixmybarangay/alert/_list.html:28 #: templates/web/fixmystreet/alert/_list.html:82 msgid "Give me an RSS feed" msgstr "Rhowch borthiant RSS i mi" @@ -1248,7 +1254,7 @@ msgstr "Rhowch borthiant RSS i mi" #: templates/web/default/alert/index.html:34 #: templates/web/default/around/postcode_form.html:8 #: templates/web/emptyhomes/index.html:47 -#: templates/web/fixmystreet/around/postcode_form.html:18 +#: templates/web/fixmystreet/around/postcode_form.html:24 msgid "Go" msgstr "Ewch" @@ -1285,6 +1291,7 @@ msgstr "" #: templates/web/emptyhomes/header.html:28 #: templates/web/fiksgatami/footer.html:9 #: templates/web/fiksgatami/nn/footer.html:9 +#: templates/web/fixmybarangay/footer.html:24 #: templates/web/fixmystreet/footer.html:53 #: templates/web/reading/footer.html:10 msgid "FAQs" @@ -1298,7 +1305,7 @@ msgstr "" #: templates/web/barnet/header.html:70 templates/web/bromley/header.html:64 #: templates/web/bromley/header.html:99 -#: templates/web/fixmybarangay/header.html.orig:42 +#: templates/web/fixmybarangay/header.html:66 #: templates/web/fixmystreet/header.html:47 #: templates/web/zurich/header.html:47 msgid "Hi %s" @@ -1311,26 +1318,24 @@ msgstr "" msgid "Hidden" msgstr "Cuddio pinnau" -#: templates/web/default/around/display_location.html:58 -#: templates/web/fixmystreet/around/display_location.html:58 +#: templates/web/default/around/display_location.html:63 msgid "Hide old" msgstr "" -#: templates/web/default/around/display_location.html:53 -#: templates/web/fixmystreet/around/display_location.html:54 +#: templates/web/default/around/display_location.html:58 msgid "Hide pins" msgstr "Cuddio pinnau" -#: templates/web/default/admin/council_edit.html:38 +#: templates/web/default/admin/council_edit.html:66 msgid "History" msgstr "" -#: templates/web/default/index.html:28 templates/web/emptyhomes/index.html:53 -#: templates/web/fixmystreet/index.html:36 +#: templates/web/default/index-steps.html:1 +#: templates/web/emptyhomes/index.html:53 msgid "How to report an empty property" msgstr "Sut i roi gwybod am eiddo gwag" -#: perllib/FixMyStreet/App/Controller/Admin.pm:637 +#: perllib/FixMyStreet/App/Controller/Admin.pm:648 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "" @@ -1418,12 +1423,12 @@ msgstr "Dewis porthiant annilys" #: templates/web/bromley/report/display.html:82 #: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/report_edit.html:20 -#: templates/web/default/dashboard/index.html:136 #: templates/web/default/dashboard/index.html:138 +#: templates/web/default/dashboard/index.html:140 #: templates/web/default/report/display.html:79 #: templates/web/default/report/display.html:81 -#: templates/web/fixmystreet/report/display.html:74 -#: templates/web/fixmystreet/report/display.html:76 +#: templates/web/fixmystreet/report/display.html:90 +#: templates/web/fixmystreet/report/display.html:92 msgid "In Progress" msgstr "" @@ -1452,7 +1457,7 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:942 +#: perllib/FixMyStreet/App/Controller/Admin.pm:956 #, fuzzy msgid "Invalid end date" msgstr "Rhowch ddiweddariad" @@ -1461,7 +1466,7 @@ msgstr "Rhowch ddiweddariad" msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:932 +#: perllib/FixMyStreet/App/Controller/Admin.pm:946 msgid "Invalid start date" msgstr "" @@ -1469,12 +1474,12 @@ msgstr "" #: templates/web/bromley/report/display.html:81 #: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/report_edit.html:19 -#: templates/web/default/dashboard/index.html:136 -#: templates/web/default/dashboard/index.html:137 +#: templates/web/default/dashboard/index.html:138 +#: templates/web/default/dashboard/index.html:139 #: templates/web/default/report/display.html:79 #: templates/web/default/report/display.html:80 -#: templates/web/fixmystreet/report/display.html:74 -#: templates/web/fixmystreet/report/display.html:75 +#: templates/web/fixmystreet/report/display.html:90 +#: templates/web/fixmystreet/report/display.html:91 #, fuzzy msgid "Investigating" msgstr "Mordwyo " @@ -1508,9 +1513,9 @@ msgstr "" #: templates/web/default/auth/general.html:44 #: templates/web/default/report/display.html:151 #: templates/web/default/report/new/fill_in_details_form.html:149 -#: templates/web/fixmystreet/auth/general.html:42 -#: templates/web/fixmystreet/report/display.html:144 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:167 +#: templates/web/fixmystreet/auth/general.html:46 +#: templates/web/fixmystreet/report/display.html:160 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:184 msgid "Keep me signed in on this computer" msgstr "" @@ -1521,7 +1526,7 @@ msgstr "" msgid "Last Name" msgstr "Anfonwch ddiweddariadau ataf i drwy'r e-bost" -#: templates/web/default/admin/council_contacts.html:39 +#: templates/web/default/admin/council_contacts.html:42 msgid "Last editor" msgstr "" @@ -1534,19 +1539,19 @@ msgstr "Anfonwch ddiweddariadau ataf i drwy'r e-bost" msgid "Last update:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1028 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 msgid "List Flagged" msgstr "" -#: templates/web/default/admin/council_contacts.html:14 #: templates/web/default/admin/council_contacts.html:16 +#: templates/web/default/admin/council_contacts.html:18 #, fuzzy msgid "List all reported empty properties" msgstr "Eiddo gwag yr adroddwyd amdanynt yn ddiweddar" #: templates/web/bromley/report/new/fill_in_details_form.html:69 #: templates/web/default/report/new/fill_in_details_form.html:68 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:73 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:75 msgid "Loading..." msgstr "" @@ -1561,6 +1566,8 @@ msgstr "" #: templates/web/default/tokens/confirm_alert.html:3 #: templates/web/emptyhomes/alert/index.html:1 #: templates/web/emptyhomes/alert/index.html:3 +#: templates/web/fixmybarangay/alert/index.html:1 +#: templates/web/fixmybarangay/alert/index.html:3 #: templates/web/fixmystreet/alert/updates.html:1 msgid "Local RSS feeds and email alerts" msgstr "Porthiannau RSS a hysbysiadau e-bost lleol" @@ -1577,13 +1584,14 @@ msgstr "Porthiannau RSS a hysbysiadau e-bost lleol" #: templates/web/bromley/header.html:79 templates/web/default/footer.html:13 #: templates/web/fiksgatami/footer.html:8 #: templates/web/fiksgatami/nn/footer.html:8 +#: templates/web/fixmybarangay/footer.html:22 #: templates/web/fixmystreet/footer.html:51 #: templates/web/reading/footer.html:9 msgid "Get local reports" msgstr "Gweld adroddiadau lleol" -#: templates/web/default/index.html:32 templates/web/emptyhomes/index.html:57 -#: templates/web/fixmystreet/index.html:40 +#: templates/web/default/index-steps.html:10 +#: templates/web/emptyhomes/index.html:57 msgid "Locate the empty property on a map of the area" msgstr "Chwiliwch am leoliad yr eiddo gwag ar fap o'r ardal" @@ -1625,10 +1633,10 @@ msgstr "Mwy o eiddo gwag cyfagos" #: templates/web/emptyhomes/reports/index.html:10 #: templates/web/fiksgatami/nn/reports/index.html:9 #: templates/web/fiksgatami/reports/index.html:9 -#: templates/web/fixmystreet/auth/general.html:52 -#: templates/web/fixmystreet/report/display.html:177 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:117 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:176 +#: templates/web/fixmystreet/auth/general.html:56 +#: templates/web/fixmystreet/report/display.html:199 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:122 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:199 msgid "Name" msgstr "Enw" @@ -1644,26 +1652,26 @@ msgstr "Enw:" msgid "Navigation" msgstr "Mordwyo " -#: perllib/FixMyStreet/Geocode/OSM.pm:159 +#: perllib/FixMyStreet/Geocode/OSM.pm:161 msgid "" "Nearest named road to the pin placed on the map (automatically generated " "using OpenStreetMap): %s%s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:161 +#: perllib/FixMyStreet/Cobrand/UK.pm:152 msgid "" "Nearest postcode to the pin placed on the map (automatically generated): %s " "(%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:404 -#: perllib/FixMyStreet/Cobrand/Default.pm:444 +#: perllib/FixMyStreet/Cobrand/Default.pm:406 +#: perllib/FixMyStreet/Cobrand/Default.pm:446 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing " "Maps): %s" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:245 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:265 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing " "Maps): %s\n" @@ -1679,7 +1687,7 @@ msgstr "" msgid "New <br>empty properties" msgstr "Adroddiadau newydd am eiddo gwag" -#: perllib/FixMyStreet/App/Controller/Admin.pm:314 +#: perllib/FixMyStreet/App/Controller/Admin.pm:320 msgid "New category contact added" msgstr "" @@ -1762,8 +1770,9 @@ msgstr "" msgid "New!" msgstr "Newydd!" -#: templates/web/default/admin/council_contacts.html:48 -#: templates/web/default/admin/council_contacts.html:49 +#: templates/web/default/admin/council_contacts.html:52 +#: templates/web/default/admin/council_contacts.html:53 +#: templates/web/default/admin/council_contacts.html:54 #: templates/web/default/admin/council_edit.html:4 #: templates/web/default/admin/list_updates.html:30 #: templates/web/default/admin/list_updates.html:31 @@ -1786,7 +1795,7 @@ msgstr "Nac ydw" msgid "No council" msgstr "cyngor" -#: perllib/FixMyStreet/DB/Result/Problem.pm:328 +#: perllib/FixMyStreet/DB/Result/Problem.pm:336 msgid "No council selected" msgstr "Ni ddewiswyd cyngor" @@ -1817,6 +1826,14 @@ msgstr "Ni ddaethpwyd o hyd i unrhyw eiddo gwag." msgid "No empty properties have been reported yet." msgstr "Ni roddwyd gwybod eto am unrhyw eiddo gwag." +#: templates/web/default/report/_support.html:3 +msgid "No supporters" +msgstr "" + +#: templates/web/default/admin/council_contacts.html:57 +msgid "Non Public" +msgstr "" + #: templates/web/default/admin/council_list.html:5 #: templates/web/default/admin/report_edit.html:16 #, fuzzy @@ -1828,14 +1845,13 @@ msgstr "Nac ydw" msgid "Not reported before" msgstr "Wedi adrodd o'r blaen" -#: templates/web/default/report/_main.html:11 +#: templates/web/default/report/_main.html:14 #: templates/web/emptyhomes/report/display.html:24 -#: templates/web/fixmystreet/report/_main.html:13 msgid "Not reported to council" msgstr "Ni roddwyd gwybod i'r cyngor am hyn" -#: templates/web/default/admin/council_contacts.html:40 -#: templates/web/default/admin/council_edit.html:46 +#: templates/web/default/admin/council_contacts.html:43 +#: templates/web/default/admin/council_edit.html:74 #, fuzzy msgid "Note" msgstr "Nac ydw" @@ -1847,8 +1863,8 @@ msgid "" "numbers may jump about a little" msgstr "" -#: templates/web/default/admin/council_contacts.html:89 -#: templates/web/default/admin/council_edit.html:31 +#: templates/web/default/admin/council_contacts.html:95 +#: templates/web/default/admin/council_edit.html:32 #, fuzzy msgid "Note:" msgstr "Nac ydw" @@ -1857,7 +1873,7 @@ msgstr "Nac ydw" msgid "Note: <strong>%s</strong>" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:149 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:166 msgid "Now to submit your report…" msgstr "" @@ -1867,7 +1883,7 @@ msgid "" "password?" msgstr "" -#: templates/web/fixmystreet/report/display.html:127 +#: templates/web/fixmystreet/report/display.html:143 msgid "Now to submit your update…" msgstr "" @@ -1921,13 +1937,13 @@ msgstr "Adroddiadau hŷn o eiddo gwag" #: templates/web/bromley/report/display.html:80 #: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/update_edit.html:19 -#: templates/web/default/dashboard/index.html:136 +#: templates/web/default/dashboard/index.html:138 #: templates/web/default/report/display.html:79 -#: templates/web/fixmystreet/report/display.html:74 +#: templates/web/fixmystreet/report/display.html:90 msgid "Open" msgstr "" -#: templates/web/default/my/my.html:22 templates/web/fixmystreet/my/my.html:22 +#: templates/web/default/my/my.html:22 templates/web/fixmystreet/my/my.html:26 #, fuzzy msgid "Open reports" msgstr "Cuddio hen adroddiadau " @@ -1959,15 +1975,15 @@ msgstr "" "Neu, gallwch danysgrifio am hysbysiad yn ôl pa ward neu gyngor yr ydych yn " "byw ynddo:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:655 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:656 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:999 -#: perllib/FixMyStreet/DB/Result/Problem.pm:497 -#: perllib/FixMyStreet/DB/Result/Problem.pm:507 -#: perllib/FixMyStreet/DB/Result/Problem.pm:517 -#: perllib/FixMyStreet/DB/Result/Problem.pm:529 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:329 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:338 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1007 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:657 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 +#: perllib/FixMyStreet/DB/Result/Problem.pm:505 +#: perllib/FixMyStreet/DB/Result/Problem.pm:515 +#: perllib/FixMyStreet/DB/Result/Problem.pm:525 +#: perllib/FixMyStreet/DB/Result/Problem.pm:537 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:331 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:340 msgid "Other" msgstr "Arall" @@ -1994,9 +2010,9 @@ msgstr "" #: templates/web/bromley/report/display.html:145 #: templates/web/bromley/report/new/fill_in_details_form.html:186 -#: templates/web/fixmystreet/auth/general.html:55 -#: templates/web/fixmystreet/report/display.html:157 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:197 +#: templates/web/fixmystreet/auth/general.html:59 +#: templates/web/fixmystreet/report/display.html:179 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:220 #, fuzzy msgid "Password (optional)" msgstr "(dewisol)" @@ -2007,13 +2023,13 @@ msgstr "" #: templates/web/bromley/report/new/fill_in_details_form.html:136 #: templates/web/bromley/report/new/fill_in_details_form.html:183 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:133 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:194 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:150 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:217 #, fuzzy msgid "Phone number (optional)" msgstr "(dewisol)" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:260 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:262 #: templates/web/default/admin/report_edit.html:32 #: templates/web/default/report/new/fill_in_details_form.html:215 msgid "Phone:" @@ -2021,8 +2037,8 @@ msgstr "Rhif ffôn:" #: templates/web/bromley/report/display.html:109 #: templates/web/bromley/report/new/fill_in_details_form.html:104 -#: templates/web/fixmystreet/report/display.html:103 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:108 +#: templates/web/fixmystreet/report/display.html:119 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:110 #, fuzzy msgid "Photo" msgstr "Ffotograff:" @@ -2042,12 +2058,12 @@ msgstr "Ffotograffau o adroddiadau cyfagos diweddar" #: templates/web/bromley/report/display.html:81 #: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/report_edit.html:19 -#: templates/web/default/dashboard/index.html:136 -#: templates/web/default/dashboard/index.html:137 +#: templates/web/default/dashboard/index.html:138 +#: templates/web/default/dashboard/index.html:139 #: templates/web/default/report/display.html:79 #: templates/web/default/report/display.html:80 -#: templates/web/fixmystreet/report/display.html:74 -#: templates/web/fixmystreet/report/display.html:75 +#: templates/web/fixmystreet/report/display.html:90 +#: templates/web/fixmystreet/report/display.html:91 msgid "Planned" msgstr "" @@ -2081,16 +2097,16 @@ msgstr "Rhowch eich cyfeiriad e-bost" msgid "Please check your email address is correct" msgstr "Rhowch gyfeiriad e-bost dilys" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:819 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:826 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:845 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:884 -#: perllib/FixMyStreet/DB/Result/Problem.pm:347 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:823 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:830 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:849 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:892 +#: perllib/FixMyStreet/DB/Result/Problem.pm:355 #: templates/web/default/js/validation_strings.html:9 msgid "Please choose a category" msgstr "Dewiswch gategori" -#: perllib/FixMyStreet/DB/Result/Problem.pm:353 +#: perllib/FixMyStreet/DB/Result/Problem.pm:361 msgid "Please choose a property type" msgstr "Dewiswch fath o eiddo" @@ -2116,12 +2132,17 @@ msgstr "" "dilynwch y cyfarwyddiadau." #: templates/web/default/report/new/notes.html:7 -#: templates/web/fixmystreet/report/new/notes.html:6 msgid "" "Please do not be abusive — abusing your council devalues the service " "for all users." msgstr "" +#: templates/web/fixmystreet/report/new/notes.html:6 +msgid "" +"Please do not be abusive — abusing your council devalues the " +"service for all users." +msgstr "" + #: perllib/FixMyStreet/DB/Result/Comment.pm:146 #: templates/web/default/js/validation_strings.html:2 msgid "Please enter a message" @@ -2134,7 +2155,7 @@ msgid "Please enter a password" msgstr "Ychwanegwch neges" #: perllib/FixMyStreet/App/Controller/Contact.pm:97 -#: perllib/FixMyStreet/DB/Result/Problem.pm:322 +#: perllib/FixMyStreet/DB/Result/Problem.pm:330 #: templates/web/default/js/validation_strings.html:3 msgid "Please enter a subject" msgstr "Rhowch enw'r pwnc" @@ -2150,7 +2171,7 @@ msgstr "Cofnodwch gyfeiriad e-bost dilys" msgid "Please enter a valid email address" msgstr "Cofnodwch gyfeiriad e-bost dilys" -#: perllib/FixMyStreet/DB/Result/Problem.pm:325 +#: perllib/FixMyStreet/DB/Result/Problem.pm:333 #: templates/web/default/js/validation_strings.html:4 msgid "Please enter some details" msgstr "Cofnodwch fanylion" @@ -2167,7 +2188,7 @@ msgid "Please enter your email" msgstr "Cofnodwch eich cyfeiriad e-bost" #: templates/web/bromley/report/new/fill_in_details_form.html:149 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:146 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:163 #, fuzzy msgid "Please enter your email address" msgstr "Cofnodwch eich cyfeiriad e-bost" @@ -2177,7 +2198,7 @@ msgstr "Cofnodwch eich cyfeiriad e-bost" msgid "Please enter your first name" msgstr "Cofnodwch eich enw" -#: perllib/FixMyStreet/DB/Result/Problem.pm:340 +#: perllib/FixMyStreet/DB/Result/Problem.pm:348 #: templates/web/default/js/validation_strings.html:7 #, fuzzy msgid "" @@ -2189,7 +2210,7 @@ msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:95 #: perllib/FixMyStreet/DB/Result/Comment.pm:143 -#: perllib/FixMyStreet/DB/Result/Problem.pm:333 +#: perllib/FixMyStreet/DB/Result/Problem.pm:341 #: perllib/FixMyStreet/DB/Result/User.pm:97 #: templates/web/default/js/validation_strings.html:6 msgid "Please enter your name" @@ -2227,11 +2248,22 @@ msgstr "" #: templates/web/default/report/new/fill_in_details_text.html:1 #: templates/web/default/report/new/fill_in_details_text.html:11 +#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:1 +#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:10 #: templates/web/fixmystreet/report/new/fill_in_details_text.html:1 #: templates/web/fixmystreet/report/new/fill_in_details_text.html:11 msgid "Please fill in details of the empty property below." msgstr "Llenwch fanylion yr eiddo gwag isod." +#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:1 +#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:3 +msgid "" +"Please fill in details of the empty property below. Leave as much detail as " +"you can, \n" +"and if possible describe the exact location of\n" +"the empty property (e.g. if there is a streetlight number or road name)." +msgstr "" + #: templates/web/default/report/new/fill_in_details_text.html:1 #: templates/web/default/report/new/fill_in_details_text.html:3 msgid "" @@ -2244,14 +2276,14 @@ msgid "" "photo of the empty property if you have one), etc." msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:68 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:70 #, fuzzy msgid "Please fill in details of the empty property." msgstr "Llenwch fanylion yr eiddo gwag isod." #: templates/web/bromley/report/new/fill_in_details_form.html:28 #: templates/web/default/report/new/fill_in_details_form.html:27 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:34 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:35 #, fuzzy msgid "" "Please fill in the form below with details of the empty property, and " @@ -2260,7 +2292,7 @@ msgstr "" "Llenwch y ffurflen isod gyda manylion yr eiddo gwag,\n" "a disgrifiwch y lleoliad mor fanwl ag y bo modd yn y blwch manylion." -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:241 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Nodwch a fyddech chi'n hoffi derbyn holiadur arall" @@ -2284,27 +2316,28 @@ msgstr "" #: templates/web/bromley/report/new/fill_in_details_form.html:23 #: templates/web/default/report/new/fill_in_details_form.html:5 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:25 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:26 msgid "" "Please note your report has <strong>not yet been sent</strong>. Choose a " "category and add further information below, then submit." msgstr "" #: templates/web/default/report/new/notes.html:1 +#: templates/web/fixmybarangay/report/new/notes.html:1 #: templates/web/fixmystreet/report/new/notes.html:1 msgid "Please note:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:244 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:246 msgid "Please provide some explanation as to why you're reopening this report" msgstr "Rhowch ychydig o esboniad pam rydych yn ailagor yr adroddiad hwn" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:251 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253 msgid "Please provide some text as well as a photo" msgstr "Rhowch rywfaint o destun yn ogystal â ffotograff" #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:237 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:239 msgid "" "Please say whether you've ever reported an empty property to your council " "before" @@ -2320,7 +2353,7 @@ msgstr "Dewiswch y porthiant rydych chi eisiau ei gael" msgid "Please select the type of alert you want" msgstr "Dewiswch y math o hysbysiad rydych chi eisiau ei gael" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:233 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:235 msgid "Please state whether or not the empty property has been returned to use" msgstr "" "Cofnodwch a yw'r eiddo gwag wedi cael ei adfer i'w ddefnyddio, ai peidio" @@ -2329,11 +2362,11 @@ msgstr "" msgid "Please take a look at the updates that have been left." msgstr "Ewch i fwrw golwg ar y diweddariadau sydd wedi cael eu gadael." -#: perllib/FixMyStreet/App/Controller/Photo.pm:176 +#: perllib/FixMyStreet/App/Controller/Photo.pm:175 msgid "Please upload a JPEG image only" msgstr "Dim ond llun JPEG y dylech lwytho i fyny." -#: perllib/FixMyStreet/App/Controller/Photo.pm:183 +#: perllib/FixMyStreet/App/Controller/Photo.pm:182 #, fuzzy msgid "Please upload a JPEG image only\n" msgstr "Dim ond llun JPEG y dylech lwytho i fyny." @@ -2343,7 +2376,7 @@ msgid "Please write a message" msgstr "Ysgrifennwch neges" #: templates/web/bromley/report/display.html:70 -#: templates/web/fixmystreet/report/display.html:69 +#: templates/web/fixmystreet/report/display.html:85 #, fuzzy msgid "Please write your update here" msgstr "Rhowch eich enw" @@ -2356,9 +2389,9 @@ msgstr "Rhowch eich enw" #: templates/web/default/report/display.html:156 #: templates/web/default/report/display.html:178 #: templates/web/fixmystreet/contact/index.html:93 -#: templates/web/fixmystreet/report/display.html:115 -#: templates/web/fixmystreet/report/display.html:139 -#: templates/web/fixmystreet/report/display.html:161 +#: templates/web/fixmystreet/report/display.html:131 +#: templates/web/fixmystreet/report/display.html:155 +#: templates/web/fixmystreet/report/display.html:183 msgid "Post" msgstr "Postio" @@ -2375,6 +2408,12 @@ msgstr "Cofnodwyd gan %s am %s" msgid "Posted by %s at %s" msgstr "Cofnodwyd gan %s am %s" +#: templates/web/default/admin/council_contacts.html:100 +#: templates/web/default/admin/council_edit.html:30 +#: templates/web/default/admin/report_edit.html:43 +msgid "Private" +msgstr "" + #: templates/web/default/maps/openlayers.html:85 msgid "Empty property" msgstr "Eiddo gwag" @@ -2399,7 +2438,7 @@ msgstr "Eiddo gwag yn %s" msgid "Empty property breakdown by state" msgstr "ni fydd eich eiddo gwag yn cael ei bostio" -#: perllib/FixMyStreet/App/Controller/Admin.pm:819 +#: perllib/FixMyStreet/App/Controller/Admin.pm:833 #, fuzzy msgid "Empty property marked as open." msgstr "Ffurflen manylion eiddo gwag" @@ -2413,18 +2452,18 @@ msgstr "" msgid "Empty properties" msgstr "Eiddo gwag" -#: templates/web/default/around/display_location.html:81 +#: templates/web/default/around/_updates.html:1 msgid "Empty properties in this area" msgstr "Eiddo gwag yn yr ardal hon" #: templates/web/bromley/report/display.html:31 -#: templates/web/fixmystreet/around/display_location.html:98 -#: templates/web/fixmystreet/report/display.html:24 +#: templates/web/fixmystreet/around/tabbed_lists.html:4 +#: templates/web/fixmystreet/report/display.html:31 #, fuzzy msgid "Empty properties nearby" msgstr "Mwy o eiddo gwag cyfagos" -#: templates/web/fixmystreet/around/display_location.html:97 +#: templates/web/fixmystreet/around/tabbed_lists.html:3 #, fuzzy msgid "Empty properties on the map" msgstr "Eiddo gwag yn yr ardal hon" @@ -2443,15 +2482,15 @@ msgstr "" msgid "Empty properties within %.1fkm of this location" msgstr "Eiddo gwag o fewn %skm o'r lleoliad hwn" -#: perllib/FixMyStreet/Cobrand/Default.pm:609 +#: perllib/FixMyStreet/Cobrand/Default.pm:611 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:95 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:162 -#: perllib/FixMyStreet/Cobrand/UK.pm:240 +#: perllib/FixMyStreet/Cobrand/UK.pm:231 msgid "Empty properties within %s" msgstr "Eiddo gwag yn %s" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:103 -#: perllib/FixMyStreet/Cobrand/UK.pm:254 +#: perllib/FixMyStreet/Cobrand/UK.pm:245 msgid "Empty properties within %s ward" msgstr "Eiddo gwag yn ward %s" @@ -2461,6 +2500,7 @@ msgid "Empty properties within %s, reportemptyhomes.com" msgstr "Eiddo gwag o fewn %s, reportemptyhomes.com" #: templates/web/default/alert/_list.html:40 +#: templates/web/fixmybarangay/alert/_list.html:13 #: templates/web/fixmystreet/alert/_list.html:42 msgid "Empty properties within the boundary of:" msgstr "Eiddo gwag o fewn ffiniau:" @@ -2476,14 +2516,14 @@ msgid "Property type:" msgstr "Math o eiddo:" #: templates/web/bromley/report/new/fill_in_details_form.html:52 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:62 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:64 #, fuzzy msgid "Provide a title" msgstr "Rhowch ddiweddariad" #: templates/web/bromley/report/display.html:57 #: templates/web/default/report/display.html:51 -#: templates/web/fixmystreet/report/display.html:50 +#: templates/web/fixmystreet/report/display.html:66 msgid "Provide an update" msgstr "Rhowch ddiweddariad" @@ -2496,13 +2536,18 @@ msgstr "" #: templates/web/bromley/report/display.html:142 #: templates/web/default/report/display.html:175 #: templates/web/default/report/new/fill_in_details_form.html:173 -#: templates/web/fixmystreet/report/display.html:154 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:191 +#: templates/web/fixmystreet/report/display.html:176 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:214 msgid "" "Providing a password is optional, but doing so will allow you to more easily " "report empty properties, leave updates and manage your reports." msgstr "" +#: templates/web/default/admin/council_contacts.html:44 +#: templates/web/default/admin/council_contacts.html:57 +msgid "Public" +msgstr "" + #: templates/web/default/questionnaire/completed.html:1 #: templates/web/default/questionnaire/completed.html:2 #: templates/web/default/questionnaire/index.html:0 @@ -2525,7 +2570,7 @@ msgstr "Llenwyd yr holiadur gan yr unigolyn a roddodd wybod am yr eiddo gwag" msgid "Questionnaire %d sent for empty property %d" msgstr "Llenwyd yr holiadur gan yr unigolyn a roddodd wybod am yr eiddo gwag" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:190 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 msgid "Questionnaire filled in by empty property reporter" msgstr "Llenwyd yr holiadur gan yr unigolyn a roddodd wybod am yr eiddo gwag" @@ -2537,18 +2582,16 @@ msgstr "Llenwyd yr holiadur gan yr unigolyn a roddodd wybod am yr eiddo gwag" #: templates/web/default/reports/_rss.html:1 #: templates/web/fixmystreet/alert/_list.html:22 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/around/display_location.html:1 -#: templates/web/fixmystreet/around/display_location.html:3 -#: templates/web/fixmystreet/report/display.html:30 +#: templates/web/fixmystreet/report/display.html:45 msgid "RSS feed" msgstr "Porthiant RSS" -#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 +#: perllib/FixMyStreet/Cobrand/UK.pm:274 perllib/FixMyStreet/Cobrand/UK.pm:286 #, fuzzy msgid "RSS feed for %s" msgstr "Porthiant RSS %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:289 perllib/FixMyStreet/Cobrand/UK.pm:301 +#: perllib/FixMyStreet/Cobrand/UK.pm:280 perllib/FixMyStreet/Cobrand/UK.pm:292 #, fuzzy msgid "RSS feed for %s ward, %s" msgstr "Porthiant RSS %s" @@ -2557,11 +2600,11 @@ msgstr "Porthiant RSS %s" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:186 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:196 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:204 -#: perllib/FixMyStreet/Cobrand/UK.pm:309 perllib/FixMyStreet/Cobrand/UK.pm:321 +#: perllib/FixMyStreet/Cobrand/UK.pm:300 perllib/FixMyStreet/Cobrand/UK.pm:312 msgid "RSS feed of %s" msgstr "Porthiant RSS %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:314 perllib/FixMyStreet/Cobrand/UK.pm:326 +#: perllib/FixMyStreet/Cobrand/UK.pm:305 perllib/FixMyStreet/Cobrand/UK.pm:317 #, fuzzy msgid "RSS feed of %s, within %s ward" msgstr "Porthiant RSS %s" @@ -2575,31 +2618,29 @@ msgstr "Porthiant RSS o eiddo gwag sydd gerllaw" msgid "RSS feed of empty properties in this %s" msgstr "Porthiant RSS o eiddo gwag yn yr %s hwn" -#: perllib/FixMyStreet/Cobrand/Default.pm:610 +#: perllib/FixMyStreet/Cobrand/Default.pm:612 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:96 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:161 -#: perllib/FixMyStreet/Cobrand/UK.pm:247 +#: perllib/FixMyStreet/Cobrand/UK.pm:238 #, fuzzy msgid "RSS feed of empty properties within %s" msgstr "Porthiant RSS o eiddo gwag yn yr %s hwn" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:102 -#: perllib/FixMyStreet/Cobrand/UK.pm:253 +#: perllib/FixMyStreet/Cobrand/UK.pm:244 #, fuzzy msgid "RSS feed of empty properties within %s ward" msgstr "Porthiant RSS o eiddo gwag yn yr %s hwn" #: templates/web/default/around/display_location.html:1 #: templates/web/default/around/display_location.html:4 -#: templates/web/fixmystreet/around/display_location.html:1 -#: templates/web/fixmystreet/around/display_location.html:4 msgid "RSS feed of recent local empty properties" msgstr "Porthiant RSS o eiddo gwag lleol diweddar" #: templates/web/bromley/report/display.html:37 #: templates/web/default/report/display.html:42 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/report/display.html:30 +#: templates/web/fixmystreet/report/display.html:45 msgid "RSS feed of updates to this empty property" msgstr "Porthiant RSS o ddiweddariadau i'r eiddo gwag hwn" @@ -2607,7 +2648,7 @@ msgstr "Porthiant RSS o ddiweddariadau i'r eiddo gwag hwn" #: templates/web/default/alert/updates.html:9 #: templates/web/default/report/display.html:33 #: templates/web/fixmystreet/alert/updates.html:14 -#: templates/web/fixmystreet/report/display.html:32 +#: templates/web/fixmystreet/report/display.html:47 msgid "Receive email when updates are left on this empty property." msgstr "" "Derbyn neges e-bost pan fydd diweddariadau'n cael eu rhoi am yr eiddo gwag " @@ -2615,8 +2656,6 @@ msgstr "" #: templates/web/default/around/display_location.html:0 #: templates/web/default/around/display_location.html:34 -#: templates/web/fixmystreet/around/display_location.html:0 -#: templates/web/fixmystreet/around/display_location.html:34 msgid "Recent local empty properties, reportemptyhomes.com" msgstr "Eiddo gwag lleol diweddar, reportemptyhomes.com" @@ -2631,7 +2670,7 @@ msgstr "Wedi'u hadfer i'w defnyddio'n ddiweddar" msgid "Recently returned to use" msgstr "Wedi'u hadfer i'w defnyddio'n ddiweddar" -#: templates/web/default/index.html:50 templates/web/fixmystreet/index.html:62 +#: templates/web/default/index.html:37 templates/web/fixmystreet/index.html:45 msgid "Recently reported empty properties" msgstr "Eiddo gwag yr adroddwyd amdanynt yn ddiweddar" @@ -2644,11 +2683,17 @@ msgid "" "council directly using their own website." msgstr "" +#: templates/web/fixmybarangay/report/new/notes.html:9 +msgid "" +"Remember that, for the pilot project, FixMyBarangay is only for reporting " +"potholes and streetlights in bgy. Luz or Basak San Nicolas." +msgstr "" + #: templates/web/default/admin/report_blocks.html:16 msgid "Remove flag" msgstr "" -#: templates/web/default/admin/report_edit.html:53 +#: templates/web/default/admin/report_edit.html:54 #: templates/web/default/admin/update_edit.html:48 msgid "Remove photo (can't be undone!)" msgstr "" @@ -2667,7 +2712,7 @@ msgid "Report a property" msgstr "Rhoi gwybod am eiddo" #: templates/web/bromley/report/display.html:28 -#: templates/web/fixmystreet/report/display.html:22 +#: templates/web/fixmystreet/report/display.html:26 #, fuzzy msgid "Report abuse" msgstr "Adroddiadau" @@ -2677,13 +2722,13 @@ msgstr "Adroddiadau" msgid "Report empty properties" msgstr "Adrodd am eiddo gwag a gweld y rhain" -#: perllib/FixMyStreet/App/Controller/Rss.pm:277 +#: perllib/FixMyStreet/App/Controller/Rss.pm:286 #, fuzzy msgid "Report on %s" msgstr "Adroddiadau" #: templates/web/default/index.html:15 -#: templates/web/fixmystreet/around/postcode_form.html:6 +#: templates/web/fixmystreet/around/postcode_form.html:9 msgid "Report and view empty properties" msgstr "Adrodd am eiddo gwag a gweld y rhain" @@ -2697,7 +2742,7 @@ msgstr "Adroddiadau" msgid "Reported %s, to %s" msgstr "Adroddwyd gan %s am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:512 +#: perllib/FixMyStreet/DB/Result/Problem.pm:520 #: templates/web/default/contact/index.html:45 #: templates/web/fixmystreet/contact/index.html:46 msgid "Reported anonymously at %s" @@ -2709,33 +2754,33 @@ msgstr "Adroddwyd yn ddi-enw am %s" msgid "Reported before" msgstr "Wedi adrodd o'r blaen" -#: perllib/FixMyStreet/DB/Result/Problem.pm:504 +#: perllib/FixMyStreet/DB/Result/Problem.pm:512 msgid "Reported by %s anonymously at %s" msgstr "Adroddwyd gan %s yn ddi-enw am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:535 +#: perllib/FixMyStreet/DB/Result/Problem.pm:543 #: templates/web/default/contact/index.html:47 #: templates/web/fixmystreet/contact/index.html:48 msgid "Reported by %s at %s" msgstr "Adroddwyd gan %s am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:526 +#: perllib/FixMyStreet/DB/Result/Problem.pm:534 msgid "Reported by %s by %s at %s" msgstr "Adroddwyd gan %s trwy %s am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:500 +#: perllib/FixMyStreet/DB/Result/Problem.pm:508 msgid "Reported by %s in the %s category anonymously at %s" msgstr "Adroddwyd am hyn gan %s yn y categori %s yn ddi-enw, am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:520 +#: perllib/FixMyStreet/DB/Result/Problem.pm:528 msgid "Reported by %s in the %s category by %s at %s" msgstr "Adroddwyd gan %s yn y categori %s trwy %s am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:508 +#: perllib/FixMyStreet/DB/Result/Problem.pm:516 msgid "Reported in the %s category anonymously at %s" msgstr "Adroddiwyd yn y categori %s yn ddi-enw am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:530 +#: perllib/FixMyStreet/DB/Result/Problem.pm:538 msgid "Reported in the %s category by %s at %s" msgstr "Adroddwyd yn y categori %s gan %s am %s" @@ -2750,7 +2795,7 @@ msgstr "Adroddwyd yn y categori %s gan %s am %s" msgid "Reporting an empty property" msgstr "Adrodd am eiddo gwag" -#: templates/web/default/around/display_location.html:95 +#: templates/web/default/around/tabbed_lists.html:3 msgid "Reports on and around the map" msgstr "Adroddiadau ar ac yng nghyffiniau'r map" @@ -2759,21 +2804,21 @@ msgstr "Adroddiadau ar ac yng nghyffiniau'r map" msgid "Resend report" msgstr "Cuddio hen adroddiadau " -#: perllib/FixMyStreet/Geocode/OSM.pm:166 +#: perllib/FixMyStreet/Geocode/OSM.pm:168 msgid "" "Road operator for this named road (derived from road reference number and " "type): %s" msgstr "" -#: perllib/FixMyStreet/Geocode/OSM.pm:163 +#: perllib/FixMyStreet/Geocode/OSM.pm:165 msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: templates/web/default/admin/council_edit.html:35 +#: templates/web/default/admin/council_edit.html:63 msgid "Save changes" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1027 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1041 #, fuzzy msgid "Search Abuse" msgstr "Adroddiadau cryno" @@ -2782,14 +2827,14 @@ msgstr "Adroddiadau cryno" msgid "Search Abuse Table" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1023 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1037 #: templates/web/default/admin/list_flagged.html:1 #: templates/web/default/admin/search_reports.html:1 #, fuzzy msgid "Search Reports" msgstr "Adroddiadau cryno" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1026 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1040 #: templates/web/default/admin/search_users.html:1 #, fuzzy msgid "Search Users" @@ -2812,7 +2857,7 @@ msgstr "" "porthiant RSS,\n" "neu rhowch eich cyfeiriad e-bost i danysgrifio am hysbysiad e-bost." -#: perllib/FixMyStreet/DB/Result/Problem.pm:618 +#: perllib/FixMyStreet/DB/Result/Problem.pm:623 msgid "Sent to %s %s later" msgstr "Anfonwyd at %s %s yn ddiweddarach" @@ -2825,6 +2870,10 @@ msgstr "Pwnc:" msgid "Service:" msgstr "" +#: templates/web/fixmystreet/report/display.html:29 +msgid "Share" +msgstr "" + #: templates/web/emptyhomes/static/about.html:21 msgid "Shelter Cymru" msgstr "" @@ -2870,28 +2919,26 @@ msgstr "" #: templates/web/bromley/report/new/fill_in_details_form.html:175 #: templates/web/default/report/display.html:208 #: templates/web/default/report/new/fill_in_details_form.html:210 -#: templates/web/fixmystreet/report/display.html:185 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:126 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:186 +#: templates/web/fixmystreet/report/display.html:207 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:141 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:209 msgid "Show my name publicly" msgstr "" -#: templates/web/default/around/display_location.html:60 -#: templates/web/fixmystreet/around/display_location.html:60 +#: templates/web/default/around/display_location.html:65 msgid "Show old" msgstr "" -#: templates/web/default/around/display_location.html:51 -#: templates/web/fixmystreet/around/display_location.html:52 +#: templates/web/default/around/display_location.html:56 msgid "Show pins" msgstr "Dangos pinnau" #: templates/web/default/auth/general.html:3 #: templates/web/default/auth/general.html:49 -#: templates/web/fixmybarangay/header.html.orig:46 +#: templates/web/fixmybarangay/header.html:70 #: templates/web/fixmystreet/auth/general.html:3 -#: templates/web/fixmystreet/auth/general.html:38 -#: templates/web/fixmystreet/auth/general.html:58 +#: templates/web/fixmystreet/auth/general.html:42 +#: templates/web/fixmystreet/auth/general.html:62 #: templates/web/fixmystreet/header.html:51 #: templates/web/zurich/header.html:51 msgid "Sign in" @@ -2927,11 +2974,13 @@ msgid "Signed in as %s" msgstr "" #: templates/web/default/report/new/fill_in_details_text.html:1 +#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:1 #: templates/web/fixmystreet/report/new/fill_in_details_text.html:1 msgid "Some categories may require additional information." msgstr "" #: templates/web/default/alert/index.html:42 +#: templates/web/fixmybarangay/alert/index.html:32 msgid "Some photos of recent reports" msgstr "Rhai ffotograffau o adroddiadau diweddar" @@ -2944,7 +2993,7 @@ msgstr "" msgid "Some unconfirmeds" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:97 +#: perllib/FixMyStreet/Cobrand/UK.pm:89 msgid "" "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" @@ -2953,15 +3002,15 @@ msgstr "" msgid "Sorry, there has been an error confirming your empty property." msgstr "Sori, bu gwall wrth gadarnhau eich eiddo gwag." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:214 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:212 #: perllib/FixMyStreet/Geocode.pm:27 perllib/FixMyStreet/Geocode/Bing.pm:51 #: perllib/FixMyStreet/Geocode/Google.pm:69 +#: perllib/FixMyStreet/Geocode/OSM.pm:61 msgid "Sorry, we could not find that location." msgstr "Sori, ni fu modd i ni ddod o hyd i'r lleoliad hwnnw." #: perllib/FixMyStreet/Geocode/Bing.pm:46 #: perllib/FixMyStreet/Geocode/Google.pm:64 -#: perllib/FixMyStreet/Geocode/OSM.pm:59 msgid "Sorry, we could not parse that location. Please try again." msgstr "" "Sori, ni fu modd i ni ddosrannu'r lleoliad hwnnw. Rhowch gynnig arall arni." @@ -2989,7 +3038,7 @@ msgstr "" #: templates/web/default/admin/list_flagged.html:18 #: templates/web/default/admin/list_updates.html:6 #: templates/web/default/admin/search_reports.html:21 -#: templates/web/fixmystreet/report/display.html:72 +#: templates/web/fixmystreet/report/display.html:88 #, fuzzy msgid "State" msgstr "Diweddariad:" @@ -3001,7 +3050,7 @@ msgstr "Diweddariad:" msgid "State:" msgstr "Diweddariad:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1029 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1043 #: templates/web/default/admin/stats.html:1 #, fuzzy msgid "Stats" @@ -3014,7 +3063,7 @@ msgstr "Anfon yr holiadur" #: templates/web/bromley/report/new/fill_in_details_form.html:48 #: templates/web/fixmystreet/contact/index.html:79 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:58 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:60 #, fuzzy msgid "Subject" msgstr "Pwnc:" @@ -3032,13 +3081,13 @@ msgstr "Pwnc:" #: templates/web/default/report/new/fill_in_details_form.html:114 #: templates/web/default/report/new/fill_in_details_form.html:154 #: templates/web/default/report/new/fill_in_details_form.html:176 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:137 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:162 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:201 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:154 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:179 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:224 msgid "Submit" msgstr "Anfon" -#: templates/web/default/admin/report_edit.html:56 +#: templates/web/default/admin/report_edit.html:57 #: templates/web/default/admin/update_edit.html:51 #: templates/web/default/admin/user_edit.html:20 #, fuzzy @@ -3054,16 +3103,24 @@ msgstr "Anfon yr holiadur" #: templates/web/default/alert/updates.html:17 #: templates/web/default/report/display.html:38 #: templates/web/fixmystreet/alert/updates.html:23 -#: templates/web/fixmystreet/report/display.html:37 +#: templates/web/fixmystreet/report/display.html:52 msgid "Subscribe" msgstr "Tanysgrifio" #: templates/web/default/alert/_list.html:97 +#: templates/web/fixmybarangay/alert/_list.html:42 #: templates/web/fixmystreet/alert/_list.html:92 msgid "Subscribe me to an email alert" msgstr "Dymunaf danysgrifio i rybuddion drwy e-bost" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1021 +#: templates/web/fixmybarangay/alert/_list.html:6 +#, fuzzy +msgid "Subscribe to an alert based upon what baranagay you’re in:" +msgstr "" +"Neu, gallwch danysgrifio am hysbysiad yn ôl pa ward neu gyngor yr ydych yn " +"byw ynddo:" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1035 #: templates/web/default/admin/index.html:1 #, fuzzy msgid "Summary" @@ -3076,7 +3133,7 @@ msgstr "Adroddiadau cryno" msgid "Summary reports" msgstr "Adroddiadau cryno" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1025 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1039 #: templates/web/default/admin/questionnaire.html:1 msgid "Survey Results" msgstr "" @@ -3085,7 +3142,7 @@ msgstr "" msgid "Text" msgstr "" -#: templates/web/default/admin/council_contacts.html:18 +#: templates/web/default/admin/council_contacts.html:20 msgid "Text only version" msgstr "" @@ -3185,14 +3242,14 @@ msgstr "" "i ni'ch holi chi, a ydych erioed wedi rhoi gwybod i'r cyngor am eiddo gwag " "cyn hyn?" -#: perllib/FixMyStreet/App/Controller/Photo.pm:190 +#: perllib/FixMyStreet/App/Controller/Photo.pm:189 msgid "" "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" "Nid yw'n ymddangos bod y ddelwedd honno wedi llwytho i fyny'n gywir (%s), " "rhowch gynnig arni eto." -#: perllib/FixMyStreet/App/Controller/Council.pm:91 +#: perllib/FixMyStreet/App/Controller/Council.pm:90 #, fuzzy msgid "" "That location does not appear to be covered by a council; perhaps it is " @@ -3201,7 +3258,7 @@ msgstr "" "Nid yw'n ymddangos bod cyngor yn gyfrifol am y lleoliad hwnnw, efallai ei " "fod ar y môr - chwiliwch am fan mwy penodol." -#: perllib/FixMyStreet/App/Controller/Location.pm:107 +#: perllib/FixMyStreet/App/Controller/Location.pm:120 #, fuzzy msgid "That location does not appear to be in the UK; please try again." msgstr "" @@ -3209,16 +3266,21 @@ msgstr "" "arni." #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:63 -#: perllib/FixMyStreet/Cobrand/UK.pm:90 +#: perllib/FixMyStreet/Cobrand/UK.pm:82 msgid "That postcode was not recognised, sorry." msgstr "Ni chafodd y cod post hwnnw ei gydnabod, sori." -#: perllib/FixMyStreet/App/Controller/Admin.pm:605 +#: perllib/FixMyStreet/App/Controller/Admin.pm:616 #, fuzzy msgid "That empty property will now be resent." msgstr "ni fydd eich eiddo gwag yn cael ei bostio" -#: perllib/FixMyStreet/App/Controller/Report.pm:75 +#: perllib/FixMyStreet/App/Controller/Report.pm:98 +#, fuzzy +msgid "That report cannot be viewed on reportemptyhomes.com." +msgstr "Mae'r adroddiad hwnnw wedi cael ei dynnu oddi ar reportemptyhomes.com" + +#: perllib/FixMyStreet/App/Controller/Report.pm:92 msgid "That report has been removed from reportemptyhomes.com." msgstr "Mae'r adroddiad hwnnw wedi cael ei dynnu oddi ar reportemptyhomes.com" @@ -3295,8 +3357,8 @@ msgid "" msgstr "Mae manylion eich eiddo gwag ar gael ar ochr dde'r dudalen hon." #: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 -#: perllib/FixMyStreet/App/Controller/Reports.pm:44 -#: perllib/FixMyStreet/App/Controller/Reports.pm:75 +#: perllib/FixMyStreet/App/Controller/Reports.pm:43 +#: perllib/FixMyStreet/App/Controller/Reports.pm:74 #, fuzzy msgid "The error was: %s" msgstr "Testun y gwall oedd:" @@ -3308,7 +3370,7 @@ msgid "" "requested_datetime, updated_datetime, service_code and service_name." msgstr "" -#: perllib/FixMyStreet/Geocode/OSM.pm:158 +#: perllib/FixMyStreet/Geocode/OSM.pm:160 msgid "" "The following information about the nearest road might be inaccurate or " "irrelevant, if the empty property is close to several roads or close to a " @@ -3410,7 +3472,7 @@ msgid "" "if you give us permission." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:269 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:271 msgid "" "The user could not locate the empty property on a map, but to see the area " "around the location they entered" @@ -3418,7 +3480,7 @@ msgstr "" "Ni allai'r defnyddiwr leoli'r eiddo gwag ar fap, ond i weld yr ardal o " "gwmpas y lleoliad a gofnodwyd ganddynt " -#: perllib/FixMyStreet/App/Controller/Reports.pm:72 +#: perllib/FixMyStreet/App/Controller/Reports.pm:71 msgid "" "There was an empty property showing the All Reports page. Please try again " "later." @@ -3429,8 +3491,8 @@ msgstr "" msgid "There was an empty property showing this page. Please try again later." msgstr "Cafwyd anhawsterau gyda'ch diweddariad. Gweler isod" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:733 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:130 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:737 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 #: templates/web/default/auth/general.html:23 #: templates/web/fixmystreet/auth/general.html:24 msgid "" @@ -3445,7 +3507,7 @@ msgid "" "again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:256 #, fuzzy msgid "There was an empty property with your update. Please try again." msgstr "Cafwyd anhawsterau gyda'ch diweddariad. Gweler isod" @@ -3454,7 +3516,7 @@ msgstr "Cafwyd anhawsterau gyda'ch diweddariad. Gweler isod" msgid "There were problems with your report. Please see below." msgstr "Cafwyd anhawsterau gyda'ch adroddiad. Gweler isod." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:279 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:283 msgid "There were problems with your update. Please see below." msgstr "Cafwyd anhawsterau gyda'ch diweddariad. Gweler isod" @@ -3464,7 +3526,7 @@ msgid "" "change without warnings in the future." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:339 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:341 msgid "" "This email has been sent to both councils covering the location of the empty " "property, as the user did not categorise it; please ignore it if you're not " @@ -3472,15 +3534,15 @@ msgid "" "empty property this is so we can add it to our system." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:342 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:344 msgid "" "This email has been sent to several councils covering the location of the " "empty property, 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:865 -#: perllib/FixMyStreet/Cobrand/UK.pm:62 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:869 +#: perllib/FixMyStreet/Cobrand/UK.pm:54 msgid "This information is required" msgstr "" @@ -3519,13 +3581,13 @@ msgstr "Mae'r eiddo gwag hwn wedi cael ei adfer i'w ddefnyddio" #: templates/web/default/report/banner.html:12 #: templates/web/default/report/display.html:95 #: templates/web/emptyhomes/report/display.html:12 -#: templates/web/fixmystreet/report/display.html:90 +#: templates/web/fixmystreet/report/display.html:106 msgid "This empty property has been returned to use" msgstr "Mae'r eiddo gwag hwn wedi cael ei adfer i'w ddefnyddio" #: templates/web/bromley/report/display.html:90 #: templates/web/default/report/display.html:90 -#: templates/web/fixmystreet/report/display.html:84 +#: templates/web/fixmystreet/report/display.html:100 #, fuzzy msgid "This empty property has not been returned to use" msgstr "Mae'r eiddo gwag hwn wedi cael ei adfer i'w ddefnyddio" @@ -3539,21 +3601,21 @@ msgstr "Mae'r eiddo gwag hwn wedi cael ei adfer i'w ddefnyddio" msgid "This empty property is old and of unknown status." msgstr "Mae'r eiddo gwag hwn yn hen ac nid yw ei statws yn hysbys." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:83 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86 #, fuzzy msgid "This report is currently marked as closed." msgstr "Mae'r eiddo gwag hwn wedi cael ei adfer i'w ddefnyddio" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:81 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:84 #, fuzzy msgid "This report is currently marked as returned to use." msgstr "Mae'r eiddo gwag hwn wedi cael ei adfer i'w ddefnyddio" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:85 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:88 msgid "This report is currently marked as open." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:262 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:264 msgid "" "This web page also contains a photo of the empty property, provided by the " "user." @@ -3561,7 +3623,7 @@ msgstr "" "Mae'r dudalen we hon hefyd yn cynnwys ffotograff o'r eiddo gwag, wedi'i " "ddarparu gan y defnyddiwr." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1024 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1038 #: templates/web/default/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -3571,7 +3633,7 @@ msgstr "" msgid "Title" msgstr "" -#: templates/web/default/around/display_location.html:69 +#: templates/web/default/around/_report_banner.html:2 #, fuzzy msgid "" "To <strong>report an empty property</strong>, click on the map at the " @@ -3599,7 +3661,7 @@ msgstr "" "ward chi,\n" "cofnodwch eich cod post Prydeinig neu enw stryd ac ardal:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:268 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:270 msgid "To view a map of the precise location of this issue" msgstr "Gweld map o union leoliad y broblem hon" @@ -3610,7 +3672,7 @@ msgstr "Gweld map o union leoliad y broblem hon" msgid "Total" msgstr "" -#: perllib/FixMyStreet/App/Controller/Reports.pm:43 +#: perllib/FixMyStreet/App/Controller/Reports.pm:42 msgid "Unable to look up areas in MaPit. Please try again later." msgstr "" @@ -3624,17 +3686,17 @@ msgstr "" msgid "Unknown" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:164 +#: perllib/FixMyStreet/App/Controller/Rss.pm:173 #, fuzzy msgid "Unknown alert type" msgstr "ID eiddo gwag anhysbys" -#: perllib/FixMyStreet/App/Controller/Report.pm:70 +#: perllib/FixMyStreet/App/Controller/Report.pm:87 msgid "Unknown empty property ID" msgstr "ID eiddo gwag anhysbys" #: templates/web/bromley/report/display.html:66 -#: templates/web/fixmystreet/report/display.html:65 +#: templates/web/fixmystreet/report/display.html:81 #, fuzzy msgid "Update" msgstr "Diweddariad:" @@ -3682,7 +3744,7 @@ msgstr "" msgid "Update reopened empty property" msgstr "Sut i roi gwybod am eiddo gwag" -#: templates/web/default/admin/council_contacts.html:62 +#: templates/web/default/admin/council_contacts.html:68 #, fuzzy msgid "Update statuses" msgstr "Diweddariadau" @@ -3691,9 +3753,9 @@ msgstr "Diweddariadau" msgid "Update:" msgstr "Diweddariad:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:694 -#: perllib/FixMyStreet/App/Controller/Admin.pm:809 -#: perllib/FixMyStreet/App/Controller/Admin.pm:889 +#: perllib/FixMyStreet/App/Controller/Admin.pm:708 +#: perllib/FixMyStreet/App/Controller/Admin.pm:823 +#: perllib/FixMyStreet/App/Controller/Admin.pm:903 #, fuzzy msgid "Updated!" msgstr "Diweddariadau" @@ -3717,11 +3779,11 @@ msgstr "Diweddariadau am {{title}}" msgid "Updates to this empty property, reportemptyhomes.com" msgstr "Diweddariadau i'r eiddo gwag hwn, reportemptyhomes.com" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1182 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1196 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1154 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1168 msgid "User flagged" msgstr "" @@ -3729,8 +3791,8 @@ msgstr "" msgid "Users" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:309 -#: perllib/FixMyStreet/App/Controller/Admin.pm:339 +#: perllib/FixMyStreet/App/Controller/Admin.pm:315 +#: perllib/FixMyStreet/App/Controller/Admin.pm:345 #, fuzzy msgid "Values updated" msgstr "Anfonwch ddiweddariadau ataf i drwy'r e-bost" @@ -3754,13 +3816,12 @@ msgstr "Gweld eich adroddiad" #: templates/web/default/around/display_location.html:33 #: templates/web/emptyhomes/around/display_location.html:0 #: templates/web/emptyhomes/around/display_location.html:16 -#: templates/web/fixmystreet/around/display_location.html:0 -#: templates/web/fixmystreet/around/display_location.html:33 msgid "Viewing a location" msgstr "Gweld lleoliad" #: templates/web/bromley/report/display.html:0 #: templates/web/default/report/display.html:0 +#: templates/web/emptyhomes/report/display.html:1 #: templates/web/emptyhomes/report/display.html:2 #: templates/web/fixmystreet/report/display.html:0 msgid "Viewing an empty property" @@ -3794,28 +3855,28 @@ msgid "" msgstr "" #: templates/web/bromley/report/display.html:141 -#: templates/web/fixmystreet/report/display.html:153 +#: templates/web/fixmystreet/report/display.html:175 #, fuzzy msgid "We never show your email" msgstr "(nid ydym byth yn dangos eich cyfeiriad e-bost na'ch rhif ffôn)" #: templates/web/bromley/report/new/fill_in_details_form.html:133 #: templates/web/bromley/report/new/fill_in_details_form.html:179 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:130 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:190 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:146 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:213 #, fuzzy msgid "We never show your email address or phone number." msgstr "(nid ydym byth yn dangos eich cyfeiriad e-bost na'ch rhif ffôn)" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:349 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:351 msgid "" "We realise this empty property 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/default/index.html:34 templates/web/emptyhomes/index.html:59 -#: templates/web/fixmystreet/index.html:45 +#: templates/web/default/index-steps.html:15 +#: templates/web/emptyhomes/index.html:59 msgid "" "The details will be sent directly to the right person in the local council " "for them to take action" @@ -3825,6 +3886,7 @@ msgstr "" #: templates/web/bromley/report/new/fill_in_details_form.html:217 #: templates/web/default/report/new/notes.html:5 +#: templates/web/fixmybarangay/report/new/notes.html:5 msgid "" "We will only use your personal information in accordance with our <a href=\"/" "faq#privacy\">privacy policy.</a>" @@ -3856,8 +3918,8 @@ msgstr "" "Byddai'n dda gennym glywed eich barn am y wefan hon. Llenwch y ffurflen, neu " "anfonwch neges e-bost at <a href='mailto:%s'>%s</a>:" -#: templates/web/default/admin/council_contacts.html:41 -#: templates/web/default/admin/council_edit.html:41 +#: templates/web/default/admin/council_contacts.html:45 +#: templates/web/default/admin/council_edit.html:69 msgid "When edited" msgstr "" @@ -3899,6 +3961,7 @@ msgid "" msgstr "" #: templates/web/default/report/new/notes.html:8 +#: templates/web/fixmybarangay/report/new/notes.html:8 #: templates/web/fixmystreet/report/new/notes.html:7 msgid "" "Writing your message entirely in block capitals makes it hard to read, as " @@ -3909,8 +3972,9 @@ msgstr "" msgid "Year" msgstr "" -#: templates/web/default/admin/council_contacts.html:48 -#: templates/web/default/admin/council_contacts.html:49 +#: templates/web/default/admin/council_contacts.html:52 +#: templates/web/default/admin/council_contacts.html:53 +#: templates/web/default/admin/council_contacts.html:54 #: templates/web/default/admin/council_edit.html:5 #: templates/web/default/admin/list_updates.html:30 #: templates/web/default/admin/list_updates.html:31 @@ -3930,8 +3994,8 @@ msgstr "Ydw" #: templates/web/bromley/report/display.html:155 #: templates/web/bromley/report/new/fill_in_details_form.html:198 -#: templates/web/fixmystreet/report/display.html:133 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:156 +#: templates/web/fixmystreet/report/display.html:149 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:173 #, fuzzy msgid "Yes I have a password" msgstr "Adrodd am eiddo gwag a gweld y rhain" @@ -3989,7 +4053,7 @@ msgstr "" #: templates/web/default/questionnaire/index.html:92 #: templates/web/default/report/new/fill_in_details_form.html:93 #: templates/web/fixmystreet/questionnaire/index.html:87 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:101 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:103 msgid "" "You have already attached a photo to this report, attaching another one will " "replace it." @@ -3997,7 +4061,7 @@ msgstr "" #: templates/web/bromley/report/display.html:106 #: templates/web/default/report/display.html:106 -#: templates/web/fixmystreet/report/display.html:100 +#: templates/web/fixmystreet/report/display.html:116 msgid "" "You have already attached a photo to this update, attaching another one will " "replace it." @@ -4009,7 +4073,7 @@ msgstr "" #: templates/web/bromley/report/new/fill_in_details_form.html:25 #: templates/web/default/report/new/fill_in_details_form.html:7 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:27 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:28 #, fuzzy msgid "" "You have located the empty property at the point marked with a green pin on " @@ -4046,8 +4110,8 @@ msgstr "Rydych wedi dileu'ch hysbysiad yn llwyddiannus." msgid "You have successfully deleted your alert." msgstr "Rydych wedi dileu'ch hysbysiad yn llwyddiannus." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:740 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:136 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:744 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:140 #, fuzzy msgid "" "You have successfully signed in; please check and confirm your details are " @@ -4079,16 +4143,17 @@ msgstr "Adroddiadau" #: templates/web/fixmystreet/alert/updates.html:19 #: templates/web/fixmystreet/alert/updates.html:22 #: templates/web/fixmystreet/contact/index.html:72 -#: templates/web/fixmystreet/report/display.html:34 -#: templates/web/fixmystreet/report/display.html:36 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:142 +#: templates/web/fixmystreet/report/display.html:49 +#: templates/web/fixmystreet/report/display.html:51 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:117 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:159 #, fuzzy msgid "Your email" msgstr "Eich cyfeiriad e-bost:" #: templates/web/bromley/report/display.html:130 #: templates/web/fixmystreet/auth/general.html:26 -#: templates/web/fixmystreet/report/display.html:124 +#: templates/web/fixmystreet/report/display.html:140 #, fuzzy msgid "Your email address" msgstr "Eich cyfeiriad e-bost:" @@ -4101,6 +4166,7 @@ msgstr "Eich cyfeiriad e-bost:" #: templates/web/default/alert/_list.html:92 #: templates/web/default/report/display.html:128 #: templates/web/default/report/new/fill_in_details_form.html:124 +#: templates/web/fixmybarangay/alert/_list.html:37 msgid "Your email:" msgstr "Eich cyfeiriad e-bost:" @@ -4124,11 +4190,11 @@ msgstr "" msgid "Your last name" msgstr "Eich enw:" -#: templates/web/fixmystreet/auth/general.html:53 +#: templates/web/fixmystreet/auth/general.html:57 #: templates/web/fixmystreet/contact/index.html:65 -#: templates/web/fixmystreet/report/display.html:181 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:121 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:181 +#: templates/web/fixmystreet/report/display.html:203 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:126 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:204 #, fuzzy msgid "Your name" msgstr "Eich enw:" @@ -4142,9 +4208,9 @@ msgstr "Eich enw:" #: templates/web/bromley/report/display.html:160 #: templates/web/bromley/report/new/fill_in_details_form.html:203 -#: templates/web/fixmystreet/auth/general.html:37 -#: templates/web/fixmystreet/report/display.html:138 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:161 +#: templates/web/fixmystreet/auth/general.html:41 +#: templates/web/fixmystreet/report/display.html:154 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:178 #, fuzzy msgid "Your password" msgstr "Adroddiadau" @@ -4155,8 +4221,8 @@ msgstr "" #: templates/web/bromley/report/new/fill_in_details_form.html:137 #: templates/web/bromley/report/new/fill_in_details_form.html:184 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:134 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:195 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:151 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:218 msgid "Your phone number" msgstr "" @@ -4175,7 +4241,7 @@ msgstr "Adroddiadau" msgid "Your reports" msgstr "Adroddiadau" -#: templates/web/default/my/my.html:45 templates/web/fixmystreet/my/my.html:45 +#: templates/web/default/my/my.html:45 templates/web/fixmystreet/my/my.html:49 #, fuzzy msgid "Your updates" msgstr "Adroddiadau" @@ -4195,12 +4261,16 @@ msgstr "" msgid "council" msgstr "cyngor" +#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +msgid "council ref: %s" +msgstr "" + #: templates/web/default/admin/report_edit.html:15 msgid "didn't use map" msgstr "" #: templates/web/default/alert/index.html:33 -#: templates/web/fixmystreet/around/postcode_form.html:17 +#: templates/web/fixmystreet/around/postcode_form.html:23 msgid "e.g. ‘%s’ or ‘%s’" msgstr "" @@ -4208,7 +4278,7 @@ msgstr "" msgid "from %d different users" msgstr "" -#: perllib/Utils.pm:289 +#: perllib/Utils.pm:267 msgid "less than a minute" msgstr "llai na munud" @@ -4220,17 +4290,22 @@ msgstr "" msgid "marked as returned to use" msgstr "cofnodwyd bod hyn wedi'i adfer i'w ddefnyddio" -#: perllib/FixMyStreet/App/Controller/Admin.pm:112 +#: perllib/FixMyStreet/App/Controller/Admin.pm:113 #: templates/web/default/admin/questionnaire.html:15 #: templates/web/default/admin/questionnaire.html:16 msgid "n/a" msgstr "" #: templates/web/default/alert/_list.html:87 +#: templates/web/fixmybarangay/alert/_list.html:32 #: templates/web/fixmystreet/alert/_list.html:85 msgid "or" msgstr "neu" +#: templates/web/default/js/validation_strings.html:21 +msgid "or locate me automatically" +msgstr "" + #: templates/web/default/admin/report_edit.html:15 msgid "originally entered" msgstr "" @@ -4245,7 +4320,7 @@ msgstr "wedi'i ailagor" #: templates/web/barnet/header.html:71 templates/web/bromley/header.html:100 #: templates/web/bromley/header.html:65 -#: templates/web/fixmybarangay/header.html.orig:43 +#: templates/web/fixmybarangay/header.html:67 #: templates/web/fixmystreet/header.html:48 #: templates/web/zurich/header.html:48 msgid "sign out" @@ -4261,21 +4336,16 @@ msgstr "" msgid "the local council" msgstr "Ni roddwyd gwybod i'r cyngor am hyn" -#: perllib/FixMyStreet/DB/Result/Problem.pm:541 -msgid "the map was not used so pin location may be inaccurate" +#: templates/web/default/report/_main.html:6 +msgid "there is no pin shown as the user did not use the map" msgstr "" -"ni ddefnyddiwyd y map felly mae'n bosibl na fydd lleoliad y pin yn gywir" -#: perllib/FixMyStreet/DB/Result/Problem.pm:603 -msgid "their ref: %s" -msgstr "" - -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:330 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:332 #, fuzzy msgid "this type of local empty property" msgstr "Anfonwch fanylion eiddo gwag lleol newydd ataf i drwy'r e-bost" -#: perllib/Utils.pm:263 +#: perllib/Utils.pm:241 msgid "today" msgstr "heddiw" @@ -4332,6 +4402,34 @@ msgstr "ni fydd eich eiddo gwag yn cael ei bostio" msgid "your update will not be posted" msgstr "ni fydd eich diweddariad yn cael ei bostio" +#: templates/web/emptyhomes/front/stats.html:17 +#, perl-format +msgid "<big>%s</big> report recently" +msgid_plural "<big>%s</big> reports recently" +msgstr[0] "<big>%s</big> adroddiad yn ddiweddar" +msgstr[1] "<big>%s</big> o adroddiadau yn ddiweddar" + +#: perllib/Utils.pm:286 +#, fuzzy, perl-format +msgid "%d hour" +msgid_plural "%d hours" +msgstr[0] "awr" +msgstr[1] "awr" + +#: perllib/Utils.pm:288 +#, fuzzy, perl-format +msgid "%d minute" +msgid_plural "%d minutes" +msgstr[0] "munud" +msgstr[1] "munud" + +#: templates/web/default/front/stats.html:29 +#, perl-format +msgid "<big>%s</big> update on reports" +msgid_plural "<big>%s</big> updates on reports" +msgstr[0] "<big>%s</big> diweddariad ar adroddiadau" +msgstr[1] "<big>%s</big> diweddariad ar adroddiadau" + #: templates/web/emptyhomes/report/new/councils_text_none.html:3 #, perl-format msgid "We do not yet have details for the council that covers this location." @@ -4340,12 +4438,12 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: templates/web/emptyhomes/front/stats.html:17 -#, perl-format -msgid "<big>%s</big> report recently" -msgid_plural "<big>%s</big> reports recently" -msgstr[0] "<big>%s</big> adroddiad yn ddiweddar" -msgstr[1] "<big>%s</big> o adroddiadau yn ddiweddar" +#: perllib/Utils.pm:282 +#, fuzzy, perl-format +msgid "%d week" +msgid_plural "%d weeks" +msgstr[0] "wythnos" +msgstr[1] "wythnos" #: templates/web/emptyhomes/front/stats.html:12 #, perl-format @@ -4372,12 +4470,32 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: templates/web/default/front/stats.html:29 -#, perl-format -msgid "<big>%s</big> update on reports" -msgid_plural "<big>%s</big> updates on reports" -msgstr[0] "<big>%s</big> diweddariad ar adroddiadau" -msgstr[1] "<big>%s</big> diweddariad ar adroddiadau" +#: perllib/Utils.pm:284 +#, fuzzy, perl-format +msgid "%d day" +msgid_plural "%d days" +msgstr[0] "diwrnod" +msgstr[1] "diwrnod" + +#, fuzzy +#~ msgid "%d days" +#~ msgstr "diwrnod" + +#, fuzzy +#~ msgid "%d hours" +#~ msgstr "awr" + +#, fuzzy +#~ msgid "%d minutes" +#~ msgstr "munud" + +#, fuzzy +#~ msgid "%d weeks" +#~ msgstr "wythnos" + +#~ msgid "the map was not used so pin location may be inaccurate" +#~ msgstr "" +#~ "ni ddefnyddiwyd y map felly mae'n bosibl na fydd lleoliad y pin yn gywir" #, fuzzy #~ msgid "reportemptyhomes.com for Councils" diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/de_DE.UTF-8/LC_MESSAGES/FixMyStreet.po index fe10dd015..c96fe9dc9 100644 --- a/locale/de_DE.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/de_DE.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -6,16 +6,17 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2012-10-24 11:20+0100\n" +"POT-Creation-Date: 2012-11-19 17:55+0000\n" "PO-Revision-Date: 2012-11-19 13:41+0100\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <team@fixmystreet.com>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:563 +#: perllib/FixMyStreet/DB/Result/Problem.pm:560 #: perllib/FixMyStreet/DB/ResultSet/Problem.pm:339 msgid " and " msgstr "und" @@ -61,7 +62,7 @@ msgstr "" msgid "%d questionnaires sent – %d answered (%s%%)" msgstr "" -#: templates/web/fixmystreet/report/_support.html:3 +#: templates/web/default/report/_support.html:3 msgid "%d supporters" msgstr "" @@ -72,7 +73,7 @@ msgstr "" msgid "%s - Summary reports" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:613 +#: perllib/FixMyStreet/DB/Result/Problem.pm:610 msgid "%s ref: %s" msgstr "" @@ -154,13 +155,13 @@ msgstr "(ihre E-Mail Adresse wird nie angezeigt)" msgid "*unknown*" msgstr "*unbekannt*" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:630 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:629 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:657 #: perllib/FixMyStreet/DB/Result/Problem.pm:353 msgid "-- Pick a category --" msgstr "-- Wählen Sie eine Kategorie --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:610 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:609 #: perllib/FixMyStreet/DB/Result/Problem.pm:359 msgid "-- Pick a property type --" msgstr "" @@ -173,7 +174,7 @@ msgstr "" "Danke &mdash; Sie können Ihre aktualisierte Meldung <a href=\"%s" "\">auf der Webseite anschauen</a>" -#: templates/web/fixmystreet/report/_support.html:3 +#: templates/web/default/report/_support.html:3 msgid "1 supporter" msgstr "" @@ -194,7 +195,7 @@ msgid "" "</p>" msgstr "" -#: templates/web/fixmystreet/questionnaire/completed-open.html:1 +#: templates/web/fixmystreet/questionnaire/completed-open.html:6 msgid "" "<p style=\"font-size:150%\">We’re sorry to hear that. We have two\n" "suggestions: why not try <a href=\"http://www.writetothem.com/\">writing " @@ -206,7 +207,7 @@ msgid "" "</p>" msgstr "" -#: templates/web/default/questionnaire/completed-open.html:1 +#: templates/web/default/questionnaire/completed-open.html:6 msgid "" "<p style=\"font-size:150%\">We’re sorry to hear that. We have two\n" "suggestions: why not try writing to your local representative or, if " @@ -274,7 +275,7 @@ msgstr "" msgid "<strong>%d</strong> live problems" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:182 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:195 msgid "<strong>No</strong> Let me confirm my report by email" msgstr "Meldung per E-Mail bestätigen" @@ -304,7 +305,7 @@ msgstr "" #: templates/web/fixmystreet/auth/general.html:36 #: templates/web/fixmystreet/auth/general.html:38 #: templates/web/fixmystreet/report/display.html:147 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:158 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:171 msgid "<strong>Yes</strong> I have a password" msgstr "" @@ -473,8 +474,8 @@ msgstr "" "Karte nicht sichtbar? <a href='%s' rel='nofollow'>Überspringen Sie " "diesen Schritt</a>" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:660 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:659 #: templates/web/bromley/report/new/fill_in_details_form.html:68 #: templates/web/default/admin/council_contacts.html:37 #: templates/web/default/admin/index.html:36 @@ -505,6 +506,7 @@ msgstr "Kategorie: %s" msgid "Change Password" msgstr "Passwort ändern" +#: templates/web/default/js/validation_strings.html:22 #: templates/web/fixmystreet/around/_report_banner.html:2 msgid "Click map to report a problem" msgstr "Mangel lokalisieren" @@ -523,7 +525,7 @@ msgstr "Mangel lokalisieren" msgid "Closed" msgstr "Geschlossen" -#: perllib/FixMyStreet/DB/Result/Problem.pm:698 +#: perllib/FixMyStreet/DB/Result/Problem.pm:695 msgid "Closed by council" msgstr "" @@ -589,7 +591,7 @@ msgid "Confirm account" msgstr "" #: templates/web/fixmystreet/report/display.html:165 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:176 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:189 msgid "" "Confirm by email below, providing a new password at that point. When you " "confirm, your password will be updated." @@ -602,6 +604,8 @@ msgstr "" #: templates/web/default/tokens/confirm_update.html:3 #: templates/web/emptyhomes/tokens/confirm_problem.html:1 #: templates/web/emptyhomes/tokens/confirm_problem.html:3 +#: templates/web/southampton/tokens/confirm_problem.html:1 +#: templates/web/southampton/tokens/confirm_problem.html:3 msgid "Confirmation" msgstr "Bestätigung" @@ -746,7 +750,7 @@ msgstr "" #: templates/web/default/auth/general.html:32 #: templates/web/fixmystreet/auth/general.html:32 #: templates/web/fixmystreet/report/display.html:144 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:154 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:167 msgid "Do you have a FixMyStreet password?" msgstr "" @@ -817,15 +821,15 @@ msgstr "Schicken sie mir Aktualisierungen" msgid "Email:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:612 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:611 msgid "Empty flat or maisonette" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:611 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:610 msgid "Empty house or bungalow" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:614 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:613 msgid "Empty office or other commercial" msgstr "" @@ -833,11 +837,11 @@ msgstr "" msgid "Empty property details form" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:615 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:614 msgid "Empty pub or bar" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:616 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:615 msgid "Empty public building - school, hospital, etc." msgstr "" @@ -884,12 +888,12 @@ msgstr "" #: templates/web/bromley/report/new/fill_in_details_form.html:189 #: templates/web/fixmystreet/auth/general.html:61 #: templates/web/fixmystreet/report/display.html:182 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:210 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:223 msgid "Enter a password" msgstr "" -#: templates/web/default/index.html:33 templates/web/emptyhomes/index.html:58 -#: templates/web/fixmystreet/index.html:46 +#: templates/web/default/index-steps.html:11 +#: templates/web/emptyhomes/index.html:58 msgid "Enter details of the problem" msgstr "Beschreiben Sie den Mangel" @@ -1032,7 +1036,7 @@ msgid "For council(s):" msgstr "" #: templates/web/fixmystreet/report/display.html:164 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:175 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:188 #, fuzzy msgid "Forgotten your password?" msgstr "Ihr Passwort" @@ -1152,8 +1156,8 @@ msgstr "Stecknadeln ausblenden" msgid "History" msgstr "History" -#: templates/web/default/index.html:28 templates/web/emptyhomes/index.html:53 -#: templates/web/fixmystreet/index.html:36 +#: templates/web/default/index-steps.html:1 +#: templates/web/emptyhomes/index.html:53 msgid "How to report a problem" msgstr "Erfasse eine neue Meldung:" @@ -1306,7 +1310,7 @@ msgstr "" #: templates/web/default/report/new/fill_in_details_form.html:149 #: templates/web/fixmystreet/auth/general.html:46 #: templates/web/fixmystreet/report/display.html:160 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:171 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:184 msgid "Keep me signed in on this computer" msgstr "" @@ -1379,8 +1383,8 @@ msgstr "" msgid "Local alerts" msgstr "RSS" -#: templates/web/default/index.html:32 templates/web/emptyhomes/index.html:57 -#: templates/web/fixmystreet/index.html:45 +#: templates/web/default/index-steps.html:10 +#: templates/web/emptyhomes/index.html:57 msgid "Locate the problem on a map of the area" msgstr "Lokalisieren Sie den Mangel auf der Karte" @@ -1422,8 +1426,8 @@ msgstr "Meldungen in der Nähe" #: templates/web/fiksgatami/reports/index.html:9 #: templates/web/fixmystreet/auth/general.html:56 #: templates/web/fixmystreet/report/display.html:199 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:119 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:186 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:122 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:199 msgid "Name" msgstr "Name" @@ -1596,7 +1600,7 @@ msgstr "Keine Meldungen gefunden." msgid "No problems have been reported yet." msgstr "Bisher wurden noch keine Meldungen erfasst." -#: templates/web/fixmystreet/report/_support.html:3 +#: templates/web/default/report/_support.html:3 msgid "No supporters" msgstr "" @@ -1613,9 +1617,8 @@ msgstr "Keine" msgid "Not reported before" msgstr "" -#: templates/web/default/report/_main.html:11 +#: templates/web/default/report/_main.html:14 #: templates/web/emptyhomes/report/display.html:24 -#: templates/web/fixmystreet/report/_main.html:13 msgid "Not reported to council" msgstr "" @@ -1640,7 +1643,7 @@ msgstr "" msgid "Note: <strong>%s</strong>" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:153 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:166 msgid "Now to submit your report…" msgstr "" @@ -1731,9 +1734,9 @@ msgid "" "re in:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1008 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1007 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:657 #: perllib/FixMyStreet/App/Controller/Report/New.pm:658 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:659 #: perllib/FixMyStreet/DB/Result/Problem.pm:505 #: perllib/FixMyStreet/DB/Result/Problem.pm:515 #: perllib/FixMyStreet/DB/Result/Problem.pm:525 @@ -1767,7 +1770,7 @@ msgstr "" #: templates/web/bromley/report/new/fill_in_details_form.html:186 #: templates/web/fixmystreet/auth/general.html:59 #: templates/web/fixmystreet/report/display.html:179 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:207 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:220 msgid "Password (optional)" msgstr "" @@ -1777,8 +1780,8 @@ msgstr "" #: templates/web/bromley/report/new/fill_in_details_form.html:136 #: templates/web/bromley/report/new/fill_in_details_form.html:183 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:137 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:204 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:150 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:217 msgid "Phone number (optional)" msgstr "Telefonnummer (optional)" @@ -1846,10 +1849,10 @@ msgstr "Bitte überprüfen sie ihr E-Mail" msgid "Please check your email address is correct" msgstr "Bitte überprüfen Sie ob Ihre E-Mail Adresse korrekt ist" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:824 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:831 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:850 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:893 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:823 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:830 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:849 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:892 #: perllib/FixMyStreet/DB/Result/Problem.pm:355 #: templates/web/default/js/validation_strings.html:9 msgid "Please choose a category" @@ -1874,12 +1877,17 @@ msgid "" msgstr "" #: templates/web/default/report/new/notes.html:7 -#: templates/web/fixmystreet/report/new/notes.html:6 msgid "" -"Please do not be abusive — abusing your council devalues the service " +"Please do not be abusive — abusing your council devalues the service " "for all users." msgstr "" +#: templates/web/fixmystreet/report/new/notes.html:6 +msgid "" +"Please do not be abusive — abusing your council devalues the " +"service for all users." +msgstr "" + #: perllib/FixMyStreet/DB/Result/Comment.pm:146 #: templates/web/default/js/validation_strings.html:2 msgid "Please enter a message" @@ -1924,7 +1932,7 @@ msgid "Please enter your email" msgstr "Bitte geben Sie Ihre E-Mail Adresse an" #: templates/web/bromley/report/new/fill_in_details_form.html:149 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:150 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:163 msgid "Please enter your email address" msgstr "Bitte geben Sie Ihre E-Mail Adresse an." @@ -2222,7 +2230,7 @@ msgstr "" msgid "Properties recently reported as put back to use on reportemptyhomes.com" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:618 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:617 msgid "Property type:" msgstr "" @@ -2247,7 +2255,7 @@ msgstr "" #: templates/web/default/report/display.html:175 #: templates/web/default/report/new/fill_in_details_form.html:173 #: templates/web/fixmystreet/report/display.html:176 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:201 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:214 msgid "" "Providing a password is optional, but doing so will allow you to more easily " "report problems, leave updates and manage your reports." @@ -2370,7 +2378,7 @@ msgstr "Kürzlich <br>gelöst" msgid "Recently fixed" msgstr "Kürzlich gelöst" -#: templates/web/default/index.html:50 templates/web/fixmystreet/index.html:68 +#: templates/web/default/index.html:37 templates/web/fixmystreet/index.html:45 msgid "Recently reported problems" msgstr "Kürzlich erfasste Meldungen:" @@ -2425,7 +2433,7 @@ msgstr "Missbrauch melden" msgid "Report empty properties" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:277 +#: perllib/FixMyStreet/App/Controller/Rss.pm:286 msgid "Report on %s" msgstr "" @@ -2549,7 +2557,7 @@ msgid "" "or enter your email address to subscribe to an email alert." msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:626 +#: perllib/FixMyStreet/DB/Result/Problem.pm:623 msgid "Sent to %s %s later" msgstr "" @@ -2592,8 +2600,8 @@ msgstr "" #: templates/web/default/report/display.html:208 #: templates/web/default/report/new/fill_in_details_form.html:210 #: templates/web/fixmystreet/report/display.html:207 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:128 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:196 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:141 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:209 msgid "Show my name publicly" msgstr "" @@ -2674,7 +2682,7 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:213 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:212 #: perllib/FixMyStreet/Geocode.pm:27 perllib/FixMyStreet/Geocode/Bing.pm:51 #: perllib/FixMyStreet/Geocode/Google.pm:69 #: perllib/FixMyStreet/Geocode/OSM.pm:61 @@ -2745,9 +2753,9 @@ msgstr "Titel:" #: templates/web/default/report/new/fill_in_details_form.html:114 #: templates/web/default/report/new/fill_in_details_form.html:154 #: templates/web/default/report/new/fill_in_details_form.html:176 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:141 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:166 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:211 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:154 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:179 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:224 msgid "Submit" msgstr "Abschicken" @@ -2880,7 +2888,7 @@ msgid "" "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Council.pm:91 +#: perllib/FixMyStreet/App/Controller/Council.pm:90 msgid "" "That location does not appear to be covered by a council; perhaps it is " "offshore or outside the country. Please try again." @@ -2945,7 +2953,7 @@ msgstr "" #: templates/web/fixmystreet/report/new/fill_in_details_text.html:1 #: templates/web/fixmystreet/report/new/fill_in_details_text.html:3 msgid "" -"The council won't be able to help unless you leave as much\n" +"The council won’t be able to help unless you leave as much\n" "detail as you can. Please describe the exact location of the problem (e.g. " "on a\n" "wall), what it is, how long it has been there, a description (and a photo " @@ -3074,7 +3082,7 @@ msgstr "" msgid "There was a problem showing this page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:738 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:737 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 #: templates/web/default/auth/general.html:23 #: templates/web/fixmystreet/auth/general.html:24 @@ -3122,7 +3130,7 @@ msgid "" "it if you're not the correct council to deal with the issue." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:870 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:869 #: perllib/FixMyStreet/Cobrand/UK.pm:54 msgid "This information is required" msgstr "Diese Information wird benötigt" @@ -3247,7 +3255,7 @@ msgstr "Unbestätigt" msgid "Unknown" msgstr "Unbekannt" -#: perllib/FixMyStreet/App/Controller/Rss.pm:164 +#: perllib/FixMyStreet/App/Controller/Rss.pm:173 msgid "Unknown alert type" msgstr "" @@ -3403,8 +3411,8 @@ msgstr "Ihr E-Mail wird nie angezeigt" #: templates/web/bromley/report/new/fill_in_details_form.html:133 #: templates/web/bromley/report/new/fill_in_details_form.html:179 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:133 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:200 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:146 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:213 msgid "We never show your email address or phone number." msgstr "Ihre E-Mail Adresse oder Telefonnummer werden nie angezeigt" @@ -3415,8 +3423,8 @@ msgid "" "contact address, please do get in touch." msgstr "" -#: templates/web/default/index.html:34 templates/web/emptyhomes/index.html:59 -#: templates/web/fixmystreet/index.html:50 +#: templates/web/default/index-steps.html:15 +#: templates/web/emptyhomes/index.html:59 msgid "We send it to the council on your behalf" msgstr "" @@ -3461,7 +3469,7 @@ msgstr "Wann editiert" msgid "When sent" msgstr "Wann gesendet" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:613 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:612 msgid "Whole block of empty flats" msgstr "" @@ -3529,7 +3537,7 @@ msgstr "Ja" #: templates/web/bromley/report/display.html:155 #: templates/web/bromley/report/new/fill_in_details_form.html:198 #: templates/web/fixmystreet/report/display.html:149 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:160 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:173 msgid "Yes I have a password" msgstr "" @@ -3628,7 +3636,7 @@ msgstr "" msgid "You have successfully deleted your alert." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:745 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:744 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:140 msgid "" "You have successfully signed in; please check and confirm your details are " @@ -3661,7 +3669,8 @@ msgstr "" #: templates/web/fixmystreet/contact/index.html:72 #: templates/web/fixmystreet/report/display.html:49 #: templates/web/fixmystreet/report/display.html:51 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:146 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:117 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:159 msgid "Your email" msgstr "Ihre E-Mail Adresse" @@ -3708,8 +3717,8 @@ msgstr "Ihr Name" #: templates/web/fixmystreet/auth/general.html:57 #: templates/web/fixmystreet/contact/index.html:65 #: templates/web/fixmystreet/report/display.html:203 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:123 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:191 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:126 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:204 msgid "Your name" msgstr "Ihr Name" @@ -3724,7 +3733,7 @@ msgstr "Ihr Name:" #: templates/web/bromley/report/new/fill_in_details_form.html:203 #: templates/web/fixmystreet/auth/general.html:41 #: templates/web/fixmystreet/report/display.html:154 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:165 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:178 msgid "Your password" msgstr "Ihr Passwort" @@ -3734,8 +3743,8 @@ msgstr "Ihr Passwort wurde geändert" #: templates/web/bromley/report/new/fill_in_details_form.html:137 #: templates/web/bromley/report/new/fill_in_details_form.html:184 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:138 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:205 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:151 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:218 msgid "Your phone number" msgstr "Ihre Telefonnummer" @@ -3771,7 +3780,7 @@ msgstr "" msgid "council" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 +#: perllib/FixMyStreet/DB/Result/Problem.pm:608 msgid "council ref: %s" msgstr "" @@ -3788,7 +3797,7 @@ msgstr "" msgid "from %d different users" msgstr "" -#: perllib/Utils.pm:295 +#: perllib/Utils.pm:267 msgid "less than a minute" msgstr "weniger als einer Minute" @@ -3812,6 +3821,10 @@ msgstr "" msgid "or" msgstr "oder" +#: templates/web/default/js/validation_strings.html:21 +msgid "or locate me automatically" +msgstr "" + #: templates/web/default/admin/report_edit.html:15 msgid "originally entered" msgstr "" @@ -3841,7 +3854,7 @@ msgstr "ausloggen" msgid "the local council" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:549 +#: templates/web/default/report/_main.html:6 msgid "there is no pin shown as the user did not use the map" msgstr "" @@ -3849,7 +3862,7 @@ msgstr "" msgid "this type of local problem" msgstr "" -#: perllib/Utils.pm:269 +#: perllib/Utils.pm:241 msgid "today" msgstr "heute" @@ -3902,21 +3915,21 @@ msgstr "" msgid "your update will not be posted" msgstr "" -#: templates/web/default/front/stats.html:17 +#: templates/web/emptyhomes/front/stats.html:17 #, perl-format msgid "<big>%s</big> report recently" msgid_plural "<big>%s</big> reports recently" msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:314 +#: perllib/Utils.pm:286 #, perl-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d Stunde" msgstr[1] "%d Stunden" -#: perllib/Utils.pm:316 +#: perllib/Utils.pm:288 #, perl-format msgid "%d minute" msgid_plural "%d minutes" @@ -3930,21 +3943,21 @@ msgid_plural "<big>%s</big> updates on reports" msgstr[0] "<big>%s</big> Meldung bearbeitet" msgstr[1] "<big>%s</big> Meldungen bearbeitet" -#: templates/web/default/report/new/councils_text_none.html:5 +#: templates/web/emptyhomes/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." msgstr[0] "" -#: perllib/Utils.pm:310 +#: perllib/Utils.pm:282 #, perl-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d Woche" msgstr[1] "%d Wochen" -#: templates/web/default/front/stats.html:12 +#: templates/web/emptyhomes/front/stats.html:12 #, perl-format msgid "<big>%s</big> report in past week" msgid_plural "<big>%s</big> reports in past week" @@ -3969,7 +3982,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:312 +#: perllib/Utils.pm:284 #, perl-format msgid "%d day" msgid_plural "%d days" diff --git a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po index bcf77f56c..84e223c0f 100644 --- a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -10,20 +10,20 @@ msgid "" msgstr "" "Project-Id-Version: FixMyStreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2012-08-21 09:54+0100\n" +"POT-Creation-Date: 2012-11-19 17:55+0000\n" "PO-Revision-Date: 2012-09-14 00:22+0100\n" "Last-Translator: Anders Einar Hilden <hildenae@gmail.com>\n" "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n" +"Language: Norwegian Bokmål\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: KBabel 1.11.4\n" "X-Poedit-Basepath: ../../../\n" -"Language: Norwegian Bokmål\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:555 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:337 +#: perllib/FixMyStreet/DB/Result/Problem.pm:560 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:339 msgid " and " msgstr " og " @@ -56,49 +56,21 @@ msgstr "%d bekreftede varsler, %d ubekreftede" msgid "%d council contacts – %d confirmed, %d unconfirmed" msgstr "%d administrasjonskontakter – %d bekreftet, %d ubekreftet" -#: perllib/Utils.pm:293 -msgid "%d day" -msgstr "%d dag" - -#: perllib/Utils.pm:293 -msgid "%d days" -msgstr "%d dager" - #: templates/web/default/admin/council_list.html:27 msgid "%d edits by %s" msgstr "%d redigeringer av %s" -#: perllib/Utils.pm:294 -msgid "%d hour" -msgstr "%d time" - -#: perllib/Utils.pm:294 -msgid "%d hours" -msgstr "%d timer" - #: templates/web/default/admin/index.html:16 msgid "%d live updates" msgstr "%d aktive oppdateringer" -#: perllib/Utils.pm:295 -msgid "%d minute" -msgstr "%d minutt" - -#: perllib/Utils.pm:295 -msgid "%d minutes" -msgstr "%d minutter" - #: templates/web/default/admin/index.html:18 msgid "%d questionnaires sent – %d answered (%s%%)" msgstr "%d spørreskjema sendt – %d besvart (%s%%)" -#: perllib/Utils.pm:292 -msgid "%d week" -msgstr "%d uke" - -#: perllib/Utils.pm:292 -msgid "%d weeks" -msgstr "%d uker" +#: templates/web/default/report/_support.html:3 +msgid "%d supporters" +msgstr "" #: templates/web/default/reports/council.html:0 #: templates/web/default/reports/council.html:26 @@ -107,30 +79,26 @@ msgstr "%d uker" msgid "%s - Summary reports" msgstr "%s - oppsummeringsrapporter" -#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:610 msgid "%s ref: %s" msgstr "%s ref: %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:288 perllib/FixMyStreet/Cobrand/UK.pm:300 +#: perllib/FixMyStreet/Cobrand/UK.pm:279 perllib/FixMyStreet/Cobrand/UK.pm:291 msgid "%s ward, %s" msgstr "%s bydel, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:488 +#: perllib/FixMyStreet/DB/Result/Problem.pm:496 msgid "%s, reported anonymously at %s" msgstr "%s, rapportert anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:490 +#: perllib/FixMyStreet/DB/Result/Problem.pm:498 msgid "%s, reported by %s at %s" msgstr "%s, rapportert av %s %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:315 perllib/FixMyStreet/Cobrand/UK.pm:327 +#: perllib/FixMyStreet/Cobrand/UK.pm:306 perllib/FixMyStreet/Cobrand/UK.pm:318 msgid "%s, within %s ward" msgstr "%s, innefor bydel %s" -#: templates/web/default/admin/stats.html:5 -msgid "%sreports between %s and %s" -msgstr "%srapporter mellom %s og %s" - #: templates/web/default/email_sent.html:28 msgid "(Don't worry — %s)" msgstr "(Ingen grunn til bekymring — %s)" @@ -162,7 +130,7 @@ msgid "(fixed)" msgstr "(løst)" #: templates/web/default/index.html:12 templates/web/default/index.html:8 -#: templates/web/fixmystreet/around/postcode_form.html:7 +#: templates/web/fixmystreet/around/postcode_form.html:10 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(som tagging, søppel, hull i veien, eller ødelagte gatelys)" @@ -189,18 +157,18 @@ msgstr "(vi viser aldri din e-postadresse eller telefonnummer)" msgid "(we never show your email)" msgstr "(vi viser aldri din e-postadresse)" -#: perllib/FixMyStreet/App/Controller/Admin.pm:284 +#: perllib/FixMyStreet/App/Controller/Admin.pm:285 msgid "*unknown*" msgstr "*ukjent*" #: perllib/FixMyStreet/App/Controller/Report/New.pm:629 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:655 -#: perllib/FixMyStreet/DB/Result/Problem.pm:345 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:657 +#: perllib/FixMyStreet/DB/Result/Problem.pm:353 msgid "-- Pick a category --" msgstr "-- Velg en kategori --" #: perllib/FixMyStreet/App/Controller/Report/New.pm:609 -#: perllib/FixMyStreet/DB/Result/Problem.pm:351 +#: perllib/FixMyStreet/DB/Result/Problem.pm:359 msgid "-- Pick a property type --" msgstr "-- Velg en eiendomsstype --" @@ -210,6 +178,10 @@ msgstr "-- Velg en eiendomsstype --" msgid ". You can <a href=\"%s%s\">view the problem on this site</a>." msgstr ". Du kan <a href=\"%s\">lese om problemet på denne siden</a>." +#: templates/web/default/report/_support.html:3 +msgid "1 supporter" +msgstr "" + #: templates/web/default/questionnaire/completed.html:20 msgid "" "<p style=\"font-size:150%\">Thank you very much for filling in our " @@ -236,7 +208,7 @@ msgstr "" "av folk i nabolaget som jobber sammen, hva med å <a href=\"http://www." "pledgebank.com/new\">publisere en utfordring om å bidra</a>?</p>" -#: templates/web/fixmystreet/questionnaire/completed-open.html:1 +#: templates/web/fixmystreet/questionnaire/completed-open.html:6 msgid "" "<p style=\"font-size:150%\">We’re sorry to hear that. We have two\n" "suggestions: why not try <a href=\"http://www.writetothem.com/\">writing " @@ -254,7 +226,7 @@ msgstr "" "av folk i nabolaget som jobber sammen, hva med å <a href=\"http://www." "pledgebank.com/new\">publisere en utfordring om å bidra</a>?</p>" -#: templates/web/default/questionnaire/completed-open.html:1 +#: templates/web/default/questionnaire/completed-open.html:6 msgid "" "<p style=\"font-size:150%\">We’re sorry to hear that. We have two\n" "suggestions: why not try writing to your local representative or, if " @@ -317,8 +289,8 @@ msgstr "" "hit til\n" "nettstedet og legg igjen en oppdatering.</p>" -#: templates/web/default/around/display_location.html:70 -#: templates/web/default/around/display_location.html:72 +#: templates/web/default/around/_report_banner.html:3 +#: templates/web/default/around/_report_banner.html:5 #: templates/web/emptyhomes/around/display_location.html:36 #: templates/web/emptyhomes/around/display_location.html:38 msgid "" @@ -332,15 +304,15 @@ msgstr "" msgid "<strong>%d</strong> live problems" msgstr "<strong>%d</strong> aktive problemer" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:172 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:195 msgid "<strong>No</strong> Let me confirm my report by email" msgstr "<strong>Nei</strong> La meg bekrefte min rapport med e-post" -#: templates/web/fixmystreet/report/display.html:148 +#: templates/web/fixmystreet/report/display.html:170 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/fixmystreet/auth/general.html:46 +#: templates/web/fixmystreet/auth/general.html:50 msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>Nei</strong>, la meg logge inn med e-post:" @@ -359,10 +331,10 @@ msgstr "<strong>Nei</strong>, la meg bekrefte min oppdatering med e-post:" #: templates/web/default/auth/general.html:37 #: templates/web/default/report/display.html:142 #: templates/web/default/report/new/fill_in_details_form.html:140 -#: templates/web/fixmystreet/auth/general.html:32 -#: templates/web/fixmystreet/auth/general.html:34 -#: templates/web/fixmystreet/report/display.html:131 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:154 +#: templates/web/fixmystreet/auth/general.html:36 +#: templates/web/fixmystreet/auth/general.html:38 +#: templates/web/fixmystreet/report/display.html:147 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:171 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Ja</strong> Jeg har et passord" @@ -374,11 +346,11 @@ msgstr "<strong>Ja</strong> Jeg har et passord" msgid "About us" msgstr "Om oss" -#: templates/web/default/admin/council_contacts.html:66 +#: templates/web/default/admin/council_contacts.html:72 msgid "Add new category" msgstr "Legg til ny kategori" -#: templates/web/default/my/my.html:56 templates/web/fixmystreet/my/my.html:56 +#: templates/web/default/my/my.html:56 templates/web/fixmystreet/my/my.html:60 msgid "Added %s" msgstr "La til %s" @@ -396,14 +368,10 @@ msgstr "Varsel %d koblet ut (opprettet %s)" #: templates/web/bromley/report/display.html:207 #: templates/web/default/report/display.html:214 -#: templates/web/fixmystreet/report/display.html:189 +#: templates/web/fixmystreet/report/display.html:211 msgid "Alert me to future updates" msgstr "Send meg varsel ved fremtidige oppdateringer" -#: templates/web/default/admin/stats.html:5 -msgid "All" -msgstr "Alle" - #: templates/web/default/reports/index.html:3 msgid "All Reports" msgstr "Alle rapporter" @@ -416,11 +384,17 @@ msgstr "Alle bekreftet" #: templates/web/bromley/header.html:77 templates/web/default/footer.html:11 #: templates/web/fiksgatami/footer.html:7 #: templates/web/fiksgatami/nn/footer.html:7 +#: templates/web/fixmybarangay/footer.html:20 #: templates/web/fixmystreet/footer.html:49 #: templates/web/reading/footer.html:8 msgid "All reports" msgstr "Alle rapporter" +#: templates/web/default/admin/stats.html:5 +#, fuzzy +msgid "All reports between %s and %s" +msgstr "%srapporter mellom %s og %s" + #: templates/web/default/report/new/councils_text_some.html:2 msgid "All the information you provide here will be sent to" msgstr "All informasjonen du har lagt inn her vil bli sendt til" @@ -519,6 +493,12 @@ msgstr "For øyeblikket er det kun søk etter og å se på rapporter som fungere msgid "Ban email address" msgstr "Bannlys epostadresse" +#: templates/web/fixmybarangay/report/new/notes.html:7 +msgid "" +"Be sure to choose the right category, because we use that to determine to " +"whom the report is sent." +msgstr "" + #: templates/web/fiksgatami/footer.html:16 #: templates/web/fiksgatami/nn/footer.html:16 msgid "" @@ -532,21 +512,21 @@ msgstr "" msgid "By Date" msgstr "På dato" -#: templates/web/fixmystreet/around/display_location.html:80 -#: templates/web/fixmystreet/around/display_location.html:82 +#: templates/web/fixmystreet/around/_report_banner.html:10 +#: templates/web/fixmystreet/around/_report_banner.html:8 msgid "Can't see the map? <a href='%s' rel='nofollow'>Skip this step</a>" msgstr "" "Hvis du ikke kan se kartet, <a href='%s' rel='nofollow'>hopp over dette " "steget</a>." #: perllib/FixMyStreet/App/Controller/Report/New.pm:632 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:657 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:659 #: templates/web/bromley/report/new/fill_in_details_form.html:68 -#: templates/web/default/admin/council_contacts.html:35 +#: templates/web/default/admin/council_contacts.html:37 #: templates/web/default/admin/index.html:36 #: templates/web/default/admin/list_flagged.html:14 #: templates/web/default/admin/search_reports.html:17 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:72 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:74 msgid "Category" msgstr "Kategori" @@ -554,14 +534,14 @@ msgstr "Kategori" msgid "Category fix rate for problems > 4 weeks old" msgstr "Løsningsrate fordelt på kategori for problemer > 4 uker gamle" -#: templates/web/default/admin/council_contacts.html:72 +#: templates/web/default/admin/council_contacts.html:78 #: templates/web/default/admin/council_edit.html:23 #: templates/web/default/admin/report_edit.html:25 #: templates/web/default/report/new/fill_in_details_form.html:67 msgid "Category:" msgstr "Kategori:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:334 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:336 msgid "Category: %s" msgstr "Kategori: %s" @@ -571,8 +551,8 @@ msgstr "Kategori: %s" msgid "Change Password" msgstr "Bytt passord" -#: templates/web/fixmystreet/around/display_location.html:72 -#: templates/web/fixmystreet/around/display_location.html:73 +#: templates/web/default/js/validation_strings.html:22 +#: templates/web/fixmystreet/around/_report_banner.html:2 msgid "Click map to report a problem" msgstr "Klikk i kartet for å rapportere et problem" @@ -580,21 +560,21 @@ msgstr "Klikk i kartet for å rapportere et problem" #: templates/web/bromley/report/display.html:82 #: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/report_edit.html:20 -#: templates/web/default/dashboard/index.html:136 #: templates/web/default/dashboard/index.html:138 +#: templates/web/default/dashboard/index.html:140 #: templates/web/default/report/display.html:79 #: templates/web/default/report/display.html:81 #: templates/web/fixmystreet/report/banner.html:15 -#: templates/web/fixmystreet/report/display.html:74 -#: templates/web/fixmystreet/report/display.html:76 +#: templates/web/fixmystreet/report/display.html:90 +#: templates/web/fixmystreet/report/display.html:92 msgid "Closed" msgstr "Lukket" -#: perllib/FixMyStreet/DB/Result/Problem.pm:690 +#: perllib/FixMyStreet/DB/Result/Problem.pm:695 msgid "Closed by council" msgstr "(ikke rapportert til administrasjonen)" -#: templates/web/default/my/my.html:32 templates/web/fixmystreet/my/my.html:32 +#: templates/web/default/my/my.html:32 templates/web/fixmystreet/my/my.html:36 msgid "Closed reports" msgstr "Fiksede rapporter" @@ -602,8 +582,8 @@ msgstr "Fiksede rapporter" msgid "Closed:" msgstr "Lukket:" -#: templates/web/default/around/display_location.html:103 -#: templates/web/default/around/display_location.html:105 +#: templates/web/default/around/tabbed_lists.html:10 +#: templates/web/default/around/tabbed_lists.html:12 msgid "Closest nearby problems <small>(within %skm)</small>" msgstr "De nærmeste problemene <small>(innenfor %skm)</small>" @@ -627,23 +607,28 @@ msgstr "Merkevaresamarbeidsdata:" msgid "Cobrand:" msgstr "Merkevaresamarbeid:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:358 +#: perllib/FixMyStreet/App/Controller/Admin.pm:365 msgid "Configuration updated" msgstr "Oppsett oppdatert" -#: perllib/FixMyStreet/App/Controller/Admin.pm:372 +#: perllib/FixMyStreet/App/Controller/Admin.pm:380 msgid "Configuration updated - contacts will be generated automatically later" msgstr "Oppsett oppdatert - kontakter vil bli generert automatisk senere" -#: templates/web/default/admin/council_contacts.html:153 +#: templates/web/default/admin/council_edit.html:34 +#, fuzzy +msgid "Configure Endpoint" +msgstr "Sett opp Open311" + +#: templates/web/default/admin/council_contacts.html:168 msgid "Configure Open311" msgstr "Sett opp Open311" -#: templates/web/default/admin/council_contacts.html:105 +#: templates/web/default/admin/council_contacts.html:116 msgid "Configure Open311 integration" msgstr "Sett opp Open311-integrasjon" -#: templates/web/default/admin/council_contacts.html:42 +#: templates/web/default/admin/council_contacts.html:46 msgid "Confirm" msgstr "Bekreft" @@ -651,6 +636,13 @@ msgstr "Bekreft" msgid "Confirm account" msgstr "Bekreft konto" +#: templates/web/fixmystreet/report/display.html:165 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:189 +msgid "" +"Confirm by email below, providing a new password at that point. When you " +"confirm, your password will be updated." +msgstr "" + #: templates/web/default/questionnaire/creator_fixed.html:1 #: templates/web/default/tokens/confirm_problem.html:1 #: templates/web/default/tokens/confirm_problem.html:3 @@ -658,17 +650,23 @@ msgstr "Bekreft konto" #: templates/web/default/tokens/confirm_update.html:3 #: templates/web/emptyhomes/tokens/confirm_problem.html:1 #: templates/web/emptyhomes/tokens/confirm_problem.html:3 +#: templates/web/southampton/tokens/confirm_problem.html:1 +#: templates/web/southampton/tokens/confirm_problem.html:3 msgid "Confirmation" msgstr "Bekreftelse" -#: templates/web/default/admin/council_contacts.html:37 -#: templates/web/default/admin/council_contacts.html:82 +#: templates/web/default/admin/council_contacts.html:39 +#: templates/web/default/admin/council_contacts.html:88 #: templates/web/default/admin/council_edit.html:28 -#: templates/web/default/admin/council_edit.html:43 -#: templates/web/default/admin/stats.html:5 +#: templates/web/default/admin/council_edit.html:71 msgid "Confirmed" msgstr "Bekreftet" +#: templates/web/default/admin/stats.html:5 +#, fuzzy +msgid "Confirmed reports between %s and %s" +msgstr "%srapporter mellom %s og %s" + #: templates/web/default/admin/problem_row.html:23 #: templates/web/default/admin/report_edit.html:34 msgid "Confirmed:" @@ -699,8 +697,8 @@ msgstr "Kontakt oss" msgid "Contact the team" msgstr "Kontakt prosjektgruppen" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1150 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1178 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1164 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 msgid "Could not find user" msgstr "Kunne ikke finne bruker" @@ -711,7 +709,7 @@ msgstr "Kunne ikke finne bruker" msgid "Council" msgstr "Administrasjon" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1022 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 #: templates/web/default/admin/council_list.html:1 msgid "Council contacts" msgstr "Administrasjonskontakter" @@ -739,7 +737,7 @@ msgstr "Antall" msgid "Create a report" msgstr "Lag en rapport" -#: templates/web/default/admin/council_contacts.html:96 +#: templates/web/default/admin/council_contacts.html:107 msgid "Create category" msgstr "Lag kategori" @@ -767,15 +765,15 @@ msgstr "For tiden har 1+ slettet" msgid "Dashboard" msgstr "Oversikt" -#: templates/web/default/admin/council_contacts.html:38 -#: templates/web/default/admin/council_contacts.html:85 +#: templates/web/default/admin/council_contacts.html:40 +#: templates/web/default/admin/council_contacts.html:91 #: templates/web/default/admin/council_edit.html:29 -#: templates/web/default/admin/council_edit.html:44 +#: templates/web/default/admin/council_edit.html:72 msgid "Deleted" msgstr "Slettet" #: templates/web/bromley/report/new/fill_in_details_form.html:54 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:64 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66 msgid "Details" msgstr "Detaljer" @@ -784,14 +782,23 @@ msgstr "Detaljer" msgid "Details:" msgstr "Detaljer:" +#: templates/web/default/admin/council_contacts.html:41 +msgid "Devolved" +msgstr "" + #: templates/web/default/admin/council_list.html:23 msgid "Diligency prize league table" msgstr "Arbeidshester" +#: templates/web/fixmystreet/auth/general.html:30 +#, fuzzy +msgid "Do you have a FixMyBarangay password?" +msgstr "Har du et FiksGataMi-passord?" + #: templates/web/default/auth/general.html:32 -#: templates/web/fixmystreet/auth/general.html:29 -#: templates/web/fixmystreet/report/display.html:128 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:150 +#: templates/web/fixmystreet/auth/general.html:32 +#: templates/web/fixmystreet/report/display.html:144 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:167 msgid "Do you have a FixMyStreet password?" msgstr "Har du et FiksGataMi-passord?" @@ -818,13 +825,13 @@ msgstr "Redigerer oppdatering %d" msgid "Editing user %d" msgstr "Redigerer bruker %d" -#: templates/web/default/admin/council_edit.html:45 +#: templates/web/default/admin/council_edit.html:73 msgid "Editor" msgstr "Oppdatert av" #: templates/web/bromley/report/display.html:126 -#: templates/web/default/admin/council_contacts.html:36 -#: templates/web/default/admin/council_edit.html:42 +#: templates/web/default/admin/council_contacts.html:38 +#: templates/web/default/admin/council_edit.html:70 #: templates/web/default/admin/list_flagged.html:12 #: templates/web/default/admin/list_flagged.html:35 #: templates/web/default/admin/list_updates.html:8 @@ -832,19 +839,19 @@ msgstr "Oppdatert av" #: templates/web/default/admin/search_reports.html:15 #: templates/web/default/admin/search_users.html:13 #: templates/web/fixmystreet/auth/general.html:20 -#: templates/web/fixmystreet/report/display.html:120 +#: templates/web/fixmystreet/report/display.html:136 msgid "Email" msgstr "E-post" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1126 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1140 msgid "Email added to abuse list" msgstr "Epost lagt til misbruksliste" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1123 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1137 msgid "Email already in abuse list" msgstr "Epost allerede i misbrukslisten" -#: templates/web/default/around/display_location.html:85 +#: templates/web/default/around/_updates.html:5 msgid "Email me new local problems" msgstr "Send meg e-post om lokale problemer" @@ -852,7 +859,7 @@ msgstr "Send meg e-post om lokale problemer" msgid "Email me updates" msgstr "Send meg oppdateringer" -#: templates/web/default/admin/council_contacts.html:77 +#: templates/web/default/admin/council_contacts.html:83 #: templates/web/default/admin/council_edit.html:26 #: templates/web/default/admin/report_edit.html:31 #: templates/web/default/admin/update_edit.html:24 @@ -915,8 +922,8 @@ msgstr "Skriv inn postnummer i nærheten, eller veinavn og sted" # Kan "Oppgi" være bedre? #: templates/web/default/around/postcode_form.html:1 #: templates/web/default/around/postcode_form.html:2 -#: templates/web/fixmystreet/around/postcode_form.html:10 -#: templates/web/fixmystreet/around/postcode_form.html:11 +#: templates/web/fixmystreet/around/postcode_form.html:13 +#: templates/web/fixmystreet/around/postcode_form.html:14 msgid "Enter a nearby street name and area" msgstr "Skriv inn et veinavn og sted" @@ -928,14 +935,14 @@ msgstr "Skriv inn et nytt passord:" #: templates/web/bromley/report/display.html:148 #: templates/web/bromley/report/new/fill_in_details_form.html:189 -#: templates/web/fixmystreet/auth/general.html:57 -#: templates/web/fixmystreet/report/display.html:160 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:200 +#: templates/web/fixmystreet/auth/general.html:61 +#: templates/web/fixmystreet/report/display.html:182 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:223 msgid "Enter a password" msgstr "Skriv inn et nytt passord" -#: templates/web/default/index.html:33 templates/web/emptyhomes/index.html:58 -#: templates/web/fixmystreet/index.html:41 +#: templates/web/default/index-steps.html:11 +#: templates/web/emptyhomes/index.html:58 msgid "Enter details of the problem" msgstr "Legg inn detaljer om problemet" @@ -949,7 +956,7 @@ msgstr "Legg inn detaljer om problemet" msgid "Error" msgstr "Feil" -#: templates/web/default/admin/council_contacts.html:11 +#: templates/web/default/admin/council_contacts.html:13 #: templates/web/default/admin/council_edit.html:18 msgid "Example postcode %s" msgstr "Eksempel-postnummer %s" @@ -1035,13 +1042,13 @@ msgstr "" #: templates/web/default/admin/index.html:36 #: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/report_edit.html:20 -#: templates/web/default/dashboard/index.html:136 #: templates/web/default/dashboard/index.html:138 +#: templates/web/default/dashboard/index.html:140 #: templates/web/default/report/display.html:79 #: templates/web/default/report/display.html:81 #: templates/web/fixmystreet/report/banner.html:12 -#: templates/web/fixmystreet/report/display.html:74 -#: templates/web/fixmystreet/report/display.html:76 +#: templates/web/fixmystreet/report/display.html:90 +#: templates/web/fixmystreet/report/display.html:92 msgid "Fixed" msgstr "Løst" @@ -1055,7 +1062,7 @@ msgstr "Løst - Administrasjon" msgid "Fixed - User" msgstr "Løst - Bruker" -#: templates/web/default/my/my.html:27 templates/web/fixmystreet/my/my.html:27 +#: templates/web/default/my/my.html:27 templates/web/fixmystreet/my/my.html:31 msgid "Fixed reports" msgstr "Fiksede rapporter" @@ -1086,11 +1093,18 @@ msgstr "Følg en bydelslenke for å kun se rapporter innenfor den bydelen." msgid "For council(s):" msgstr "For administrasjon(ene):" +#: templates/web/fixmystreet/report/display.html:164 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:188 +#, fuzzy +msgid "Forgotten your password?" +msgstr "Ditt passord" + #: templates/web/default/faq/faq-en-gb.html:1 #: templates/web/emptyhomes/faq/faq-cy.html:1 #: templates/web/emptyhomes/faq/faq-en-gb.html:1 #: templates/web/fiksgatami/faq/faq-nb.html:1 #: templates/web/fiksgatami/nn/faq/faq-nn.html:1 +#: templates/web/fixmybarangay/faq/faq-en-gb.html:1 #: templates/web/fixmystreet/faq/faq-en-gb.html:1 #: templates/web/fixmystreet/static/privacy.html:1 #: templates/web/zurich/faq/faq-de.html:1 @@ -1106,7 +1120,7 @@ msgid "GeoRSS on Google Maps" msgstr "GeoRSS på Google Maps" #: templates/web/bromley/report/display.html:30 -#: templates/web/fixmystreet/report/display.html:23 +#: templates/web/fixmystreet/report/display.html:27 msgid "Get updates" msgstr "Få oppdateringer" @@ -1121,6 +1135,7 @@ msgid "Get updates of problems in this %s" msgstr "Få oppdateringer for problemer i denne %s" #: templates/web/default/alert/_list.html:83 +#: templates/web/fixmybarangay/alert/_list.html:28 #: templates/web/fixmystreet/alert/_list.html:82 msgid "Give me an RSS feed" msgstr "Gi meg en RSS-strøm" @@ -1128,7 +1143,7 @@ msgstr "Gi meg en RSS-strøm" #: templates/web/default/alert/index.html:34 #: templates/web/default/around/postcode_form.html:8 #: templates/web/emptyhomes/index.html:47 -#: templates/web/fixmystreet/around/postcode_form.html:18 +#: templates/web/fixmystreet/around/postcode_form.html:24 msgid "Go" msgstr "Fortsett" @@ -1165,6 +1180,7 @@ msgstr "" #: templates/web/emptyhomes/header.html:28 #: templates/web/fiksgatami/footer.html:9 #: templates/web/fiksgatami/nn/footer.html:9 +#: templates/web/fixmybarangay/footer.html:24 #: templates/web/fixmystreet/footer.html:53 #: templates/web/reading/footer.html:10 msgid "Help" @@ -1178,7 +1194,7 @@ msgstr "" #: templates/web/barnet/header.html:70 templates/web/bromley/header.html:64 #: templates/web/bromley/header.html:99 -#: templates/web/fixmybarangay/header.html.orig:42 +#: templates/web/fixmybarangay/header.html:66 #: templates/web/fixmystreet/header.html:47 #: templates/web/zurich/header.html:47 msgid "Hi %s" @@ -1190,26 +1206,24 @@ msgstr "Hei, %s" msgid "Hidden" msgstr "Skjul" -#: templates/web/default/around/display_location.html:58 -#: templates/web/fixmystreet/around/display_location.html:58 +#: templates/web/default/around/display_location.html:63 msgid "Hide old" msgstr "Skjul gamle" -#: templates/web/default/around/display_location.html:53 -#: templates/web/fixmystreet/around/display_location.html:54 +#: templates/web/default/around/display_location.html:58 msgid "Hide pins" msgstr "Skjul nåler" -#: templates/web/default/admin/council_edit.html:38 +#: templates/web/default/admin/council_edit.html:66 msgid "History" msgstr "Historie" -#: templates/web/default/index.html:28 templates/web/emptyhomes/index.html:53 -#: templates/web/fixmystreet/index.html:36 +#: templates/web/default/index-steps.html:1 +#: templates/web/emptyhomes/index.html:53 msgid "How to report a problem" msgstr "Hvordan rapportere et problem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:637 +#: perllib/FixMyStreet/App/Controller/Admin.pm:648 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "Jeg er redd du ikke kan bekrefte ubekreftede rapporter." @@ -1294,12 +1308,12 @@ msgstr "Ugyldig valg av feed" #: templates/web/bromley/report/display.html:82 #: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/report_edit.html:20 -#: templates/web/default/dashboard/index.html:136 #: templates/web/default/dashboard/index.html:138 +#: templates/web/default/dashboard/index.html:140 #: templates/web/default/report/display.html:79 #: templates/web/default/report/display.html:81 -#: templates/web/fixmystreet/report/display.html:74 -#: templates/web/fixmystreet/report/display.html:76 +#: templates/web/fixmystreet/report/display.html:90 +#: templates/web/fixmystreet/report/display.html:92 msgid "In Progress" msgstr "Under arbeid" @@ -1331,7 +1345,7 @@ msgstr "Feil has_photo-verdi \"%s\"" msgid "Invalid agency_responsible value %s" msgstr "Ugyldig agency_responsible-verdi %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:942 +#: perllib/FixMyStreet/App/Controller/Admin.pm:956 msgid "Invalid end date" msgstr "Ugyldig slutt-dato" @@ -1339,7 +1353,7 @@ msgstr "Ugyldig slutt-dato" msgid "Invalid format %s specified." msgstr "Ugyldig format %s oppgitt." -#: perllib/FixMyStreet/App/Controller/Admin.pm:932 +#: perllib/FixMyStreet/App/Controller/Admin.pm:946 msgid "Invalid start date" msgstr "Ugyldig startdato" @@ -1347,12 +1361,12 @@ msgstr "Ugyldig startdato" #: templates/web/bromley/report/display.html:81 #: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/report_edit.html:19 -#: templates/web/default/dashboard/index.html:136 -#: templates/web/default/dashboard/index.html:137 +#: templates/web/default/dashboard/index.html:138 +#: templates/web/default/dashboard/index.html:139 #: templates/web/default/report/display.html:79 #: templates/web/default/report/display.html:80 -#: templates/web/fixmystreet/report/display.html:74 -#: templates/web/fixmystreet/report/display.html:75 +#: templates/web/fixmystreet/report/display.html:90 +#: templates/web/fixmystreet/report/display.html:91 msgid "Investigating" msgstr "Undersøkes" @@ -1374,9 +1388,9 @@ msgstr "" #: templates/web/default/auth/general.html:44 #: templates/web/default/report/display.html:151 #: templates/web/default/report/new/fill_in_details_form.html:149 -#: templates/web/fixmystreet/auth/general.html:42 -#: templates/web/fixmystreet/report/display.html:144 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:167 +#: templates/web/fixmystreet/auth/general.html:46 +#: templates/web/fixmystreet/report/display.html:160 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:184 msgid "Keep me signed in on this computer" msgstr "Husk min innlogging på denne datamaskinen" @@ -1386,7 +1400,7 @@ msgstr "Husk min innlogging på denne datamaskinen" msgid "Last Name" msgstr "Etternavn" -#: templates/web/default/admin/council_contacts.html:39 +#: templates/web/default/admin/council_contacts.html:42 msgid "Last editor" msgstr "Sist redigert av" @@ -1398,18 +1412,18 @@ msgstr "Siste oppdatering:" msgid "Last update:" msgstr "Siste oppdatering:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1028 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 msgid "List Flagged" msgstr "List flagget" -#: templates/web/default/admin/council_contacts.html:14 #: templates/web/default/admin/council_contacts.html:16 +#: templates/web/default/admin/council_contacts.html:18 msgid "List all reported problems" msgstr "List alle rapporterte problemer" #: templates/web/bromley/report/new/fill_in_details_form.html:69 #: templates/web/default/report/new/fill_in_details_form.html:68 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:73 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:75 msgid "Loading..." msgstr "Laster..." @@ -1424,6 +1438,8 @@ msgstr "Laster..." #: templates/web/default/tokens/confirm_alert.html:3 #: templates/web/emptyhomes/alert/index.html:1 #: templates/web/emptyhomes/alert/index.html:3 +#: templates/web/fixmybarangay/alert/index.html:1 +#: templates/web/fixmybarangay/alert/index.html:3 #: templates/web/fixmystreet/alert/updates.html:1 msgid "Local RSS feeds and email alerts" msgstr "Lokal RSS-strøm og e-postvarsel" @@ -1439,13 +1455,14 @@ msgstr "Lokal RSS-strøm og e-postvarsel for ‘%s’" #: templates/web/bromley/header.html:79 templates/web/default/footer.html:13 #: templates/web/fiksgatami/footer.html:8 #: templates/web/fiksgatami/nn/footer.html:8 +#: templates/web/fixmybarangay/footer.html:22 #: templates/web/fixmystreet/footer.html:51 #: templates/web/reading/footer.html:9 msgid "Local alerts" msgstr "Lokale varsler" -#: templates/web/default/index.html:32 templates/web/emptyhomes/index.html:57 -#: templates/web/fixmystreet/index.html:40 +#: templates/web/default/index-steps.html:10 +#: templates/web/emptyhomes/index.html:57 msgid "Locate the problem on a map of the area" msgstr "Lokaliser problemet på kartet over området" @@ -1488,10 +1505,10 @@ msgstr "Flere problemer i nærheten" #: templates/web/emptyhomes/reports/index.html:10 #: templates/web/fiksgatami/nn/reports/index.html:9 #: templates/web/fiksgatami/reports/index.html:9 -#: templates/web/fixmystreet/auth/general.html:52 -#: templates/web/fixmystreet/report/display.html:177 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:117 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:176 +#: templates/web/fixmystreet/auth/general.html:56 +#: templates/web/fixmystreet/report/display.html:199 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:122 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:199 msgid "Name" msgstr "Navn" @@ -1507,7 +1524,7 @@ msgstr "Navn:" msgid "Navigation" msgstr "Navigasjon" -#: perllib/FixMyStreet/Geocode/OSM.pm:159 +#: perllib/FixMyStreet/Geocode/OSM.pm:161 msgid "" "Nearest named road to the pin placed on the map (automatically generated " "using OpenStreetMap): %s%s" @@ -1515,7 +1532,7 @@ msgstr "" "Nærmeste navngitte vei til nålen plassert på kartet (automatisk generert ved " "hjelp av OpenStreetMap): %s%s" -#: perllib/FixMyStreet/Cobrand/UK.pm:161 +#: perllib/FixMyStreet/Cobrand/UK.pm:152 msgid "" "Nearest postcode to the pin placed on the map (automatically generated): %s " "(%sm away)" @@ -1523,8 +1540,8 @@ msgstr "" "Nærmeste postnummer til nålen plassert på kartet (automatisk generert): %s " "(%sm unna)" -#: perllib/FixMyStreet/Cobrand/Default.pm:404 -#: perllib/FixMyStreet/Cobrand/Default.pm:444 +#: perllib/FixMyStreet/Cobrand/Default.pm:406 +#: perllib/FixMyStreet/Cobrand/Default.pm:446 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing " "Maps): %s" @@ -1532,7 +1549,7 @@ msgstr "" "Nærmeste vei til nålen plassert på kartet (automatisk generert ved hjelp av " "Bing Maps): %s" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:245 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:265 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing " "Maps): %s\n" @@ -1550,7 +1567,7 @@ msgstr "Nesten ferdig! Nå må du sjekke e-posten din..." msgid "New <br>problems" msgstr "Nye <br>problemer" -#: perllib/FixMyStreet/App/Controller/Admin.pm:314 +#: perllib/FixMyStreet/App/Controller/Admin.pm:320 msgid "New category contact added" msgstr "Ny kategorikontakt lagt til" @@ -1620,8 +1637,9 @@ msgstr "Ny tilstand" msgid "New!" msgstr "Ny!" -#: templates/web/default/admin/council_contacts.html:48 -#: templates/web/default/admin/council_contacts.html:49 +#: templates/web/default/admin/council_contacts.html:52 +#: templates/web/default/admin/council_contacts.html:53 +#: templates/web/default/admin/council_contacts.html:54 #: templates/web/default/admin/council_edit.html:4 #: templates/web/default/admin/list_updates.html:30 #: templates/web/default/admin/list_updates.html:31 @@ -1643,7 +1661,7 @@ msgstr "Nei" msgid "No council" msgstr "Ingen administrasjon" -#: perllib/FixMyStreet/DB/Result/Problem.pm:328 +#: perllib/FixMyStreet/DB/Result/Problem.pm:336 msgid "No council selected" msgstr "Ingen administrasjon er valgt" @@ -1673,6 +1691,14 @@ msgstr "Ingen problemer ble funnet." msgid "No problems have been reported yet." msgstr "Ingen problemer er rapportert" +#: templates/web/default/report/_support.html:3 +msgid "No supporters" +msgstr "" + +#: templates/web/default/admin/council_contacts.html:57 +msgid "Non Public" +msgstr "" + #: templates/web/default/admin/council_list.html:5 #: templates/web/default/admin/report_edit.html:16 msgid "None" @@ -1682,14 +1708,13 @@ msgstr "Ingen" msgid "Not reported before" msgstr "Ikke rapportert tidligere" -#: templates/web/default/report/_main.html:11 +#: templates/web/default/report/_main.html:14 #: templates/web/emptyhomes/report/display.html:24 -#: templates/web/fixmystreet/report/_main.html:13 msgid "Not reported to council" msgstr "Ikke rapportert til administrasjonen" -#: templates/web/default/admin/council_contacts.html:40 -#: templates/web/default/admin/council_edit.html:46 +#: templates/web/default/admin/council_contacts.html:43 +#: templates/web/default/admin/council_edit.html:74 msgid "Note" msgstr "Merk" @@ -1703,8 +1728,8 @@ msgstr "" "opprettet, hvilket ikke trenger være den samme måneden som rapporten var " "bekreftet, så tallene kan hoppe litt opp og ned." -#: templates/web/default/admin/council_contacts.html:89 -#: templates/web/default/admin/council_edit.html:31 +#: templates/web/default/admin/council_contacts.html:95 +#: templates/web/default/admin/council_edit.html:32 msgid "Note:" msgstr "Merk:" @@ -1712,7 +1737,7 @@ msgstr "Merk:" msgid "Note: <strong>%s</strong>" msgstr "Note: <strong>%d</strong>" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:149 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:166 msgid "Now to submit your report…" msgstr "På tide å sende din rapport…" @@ -1720,7 +1745,7 @@ msgstr "På tide å sende din rapport…" msgid "Now to submit your report… do you have a FixMyStreet password?" msgstr "På tide å sende din rapport… har du et FiksGataMi-passord?" -#: templates/web/fixmystreet/report/display.html:127 +#: templates/web/fixmystreet/report/display.html:143 msgid "Now to submit your update…" msgstr "På tide å registrere din oppdatering…" @@ -1770,13 +1795,13 @@ msgstr "Eldre problemer" #: templates/web/bromley/report/display.html:80 #: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/update_edit.html:19 -#: templates/web/default/dashboard/index.html:136 +#: templates/web/default/dashboard/index.html:138 #: templates/web/default/report/display.html:79 -#: templates/web/fixmystreet/report/display.html:74 +#: templates/web/fixmystreet/report/display.html:90 msgid "Open" msgstr "Åpen" -#: templates/web/default/my/my.html:22 templates/web/fixmystreet/my/my.html:22 +#: templates/web/default/my/my.html:22 templates/web/fixmystreet/my/my.html:26 msgid "Open reports" msgstr "Åpne rapporter" @@ -1806,15 +1831,15 @@ msgstr "" "Eller du kan abonnere på varsel basert på bydel eller administrasjon du " "hører inn under:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:655 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:656 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:999 -#: perllib/FixMyStreet/DB/Result/Problem.pm:497 -#: perllib/FixMyStreet/DB/Result/Problem.pm:507 -#: perllib/FixMyStreet/DB/Result/Problem.pm:517 -#: perllib/FixMyStreet/DB/Result/Problem.pm:529 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:329 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:338 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1007 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:657 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 +#: perllib/FixMyStreet/DB/Result/Problem.pm:505 +#: perllib/FixMyStreet/DB/Result/Problem.pm:515 +#: perllib/FixMyStreet/DB/Result/Problem.pm:525 +#: perllib/FixMyStreet/DB/Result/Problem.pm:537 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:331 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:340 msgid "Other" msgstr "Annet" @@ -1842,9 +1867,9 @@ msgstr "Delvis" #: templates/web/bromley/report/display.html:145 #: templates/web/bromley/report/new/fill_in_details_form.html:186 -#: templates/web/fixmystreet/auth/general.html:55 -#: templates/web/fixmystreet/report/display.html:157 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:197 +#: templates/web/fixmystreet/auth/general.html:59 +#: templates/web/fixmystreet/report/display.html:179 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:220 msgid "Password (optional)" msgstr "Passord (valgfritt)" @@ -1854,12 +1879,12 @@ msgstr "Passord:" #: templates/web/bromley/report/new/fill_in_details_form.html:136 #: templates/web/bromley/report/new/fill_in_details_form.html:183 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:133 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:194 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:150 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:217 msgid "Phone number (optional)" msgstr "Telefonnummer (valgfritt)" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:260 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:262 #: templates/web/default/admin/report_edit.html:32 #: templates/web/default/report/new/fill_in_details_form.html:215 msgid "Phone:" @@ -1867,8 +1892,8 @@ msgstr "Telefon:" #: templates/web/bromley/report/display.html:109 #: templates/web/bromley/report/new/fill_in_details_form.html:104 -#: templates/web/fixmystreet/report/display.html:103 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:108 +#: templates/web/fixmystreet/report/display.html:119 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:110 msgid "Photo" msgstr "Bilde" @@ -1887,12 +1912,12 @@ msgstr "Bilder av nye problemer i nærheten" #: templates/web/bromley/report/display.html:81 #: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/report_edit.html:19 -#: templates/web/default/dashboard/index.html:136 -#: templates/web/default/dashboard/index.html:137 +#: templates/web/default/dashboard/index.html:138 +#: templates/web/default/dashboard/index.html:139 #: templates/web/default/report/display.html:79 #: templates/web/default/report/display.html:80 -#: templates/web/fixmystreet/report/display.html:74 -#: templates/web/fixmystreet/report/display.html:75 +#: templates/web/fixmystreet/report/display.html:90 +#: templates/web/fixmystreet/report/display.html:91 msgid "Planned" msgstr "Planlagt" @@ -1925,16 +1950,16 @@ msgstr "Vennligst sjekk e-posten du oppgav" msgid "Please check your email address is correct" msgstr "Vennligst sjekk at du har skrevet en gyldig e-postadresse" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:819 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:826 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:845 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:884 -#: perllib/FixMyStreet/DB/Result/Problem.pm:347 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:823 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:830 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:849 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:892 +#: perllib/FixMyStreet/DB/Result/Problem.pm:355 #: templates/web/default/js/validation_strings.html:9 msgid "Please choose a category" msgstr "Velg en kategori" -#: perllib/FixMyStreet/DB/Result/Problem.pm:353 +#: perllib/FixMyStreet/DB/Result/Problem.pm:361 msgid "Please choose a property type" msgstr "Velg en type egenskap" @@ -1960,7 +1985,6 @@ msgstr "" "vennligst <a href=\"/\">gå til forsiden</a> og følg instruksjonene." #: templates/web/default/report/new/notes.html:7 -#: templates/web/fixmystreet/report/new/notes.html:6 msgid "" "Please do not be abusive — abusing your council devalues the service " "for all users." @@ -1968,6 +1992,15 @@ msgstr "" "Ikke vær ufin — å kjefte på din administrasjon skader verdien av " "tjenesten for alle brukerne." +#: templates/web/fixmystreet/report/new/notes.html:6 +#, fuzzy +msgid "" +"Please do not be abusive — abusing your council devalues the " +"service for all users." +msgstr "" +"Ikke vær ufin — å kjefte på din administrasjon skader verdien av " +"tjenesten for alle brukerne." + #: perllib/FixMyStreet/DB/Result/Comment.pm:146 #: templates/web/default/js/validation_strings.html:2 msgid "Please enter a message" @@ -1979,7 +2012,7 @@ msgid "Please enter a password" msgstr "Skriv inn et passord" #: perllib/FixMyStreet/App/Controller/Contact.pm:97 -#: perllib/FixMyStreet/DB/Result/Problem.pm:322 +#: perllib/FixMyStreet/DB/Result/Problem.pm:330 #: templates/web/default/js/validation_strings.html:3 msgid "Please enter a subject" msgstr "Vennligst legg inn et emne" @@ -1995,7 +2028,7 @@ msgstr "Legg til en gyldig e-post" msgid "Please enter a valid email address" msgstr "Legg inn din e-post" -#: perllib/FixMyStreet/DB/Result/Problem.pm:325 +#: perllib/FixMyStreet/DB/Result/Problem.pm:333 #: templates/web/default/js/validation_strings.html:4 msgid "Please enter some details" msgstr "Legg inn opplysninger om problemet" @@ -2012,7 +2045,7 @@ msgid "Please enter your email" msgstr "Legg inn din e-post" #: templates/web/bromley/report/new/fill_in_details_form.html:149 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:146 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:163 msgid "Please enter your email address" msgstr "Vennligst tast inn din e-postadresse" @@ -2020,7 +2053,7 @@ msgstr "Vennligst tast inn din e-postadresse" msgid "Please enter your first name" msgstr "Vennligst tast inn ditt fornavn" -#: perllib/FixMyStreet/DB/Result/Problem.pm:340 +#: perllib/FixMyStreet/DB/Result/Problem.pm:348 #: templates/web/default/js/validation_strings.html:7 msgid "" "Please enter your full name, councils need this information – if you do not " @@ -2032,7 +2065,7 @@ msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:95 #: perllib/FixMyStreet/DB/Result/Comment.pm:143 -#: perllib/FixMyStreet/DB/Result/Problem.pm:333 +#: perllib/FixMyStreet/DB/Result/Problem.pm:341 #: perllib/FixMyStreet/DB/Result/User.pm:97 #: templates/web/default/js/validation_strings.html:6 msgid "Please enter your name" @@ -2061,11 +2094,29 @@ msgstr "" #: templates/web/default/report/new/fill_in_details_text.html:1 #: templates/web/default/report/new/fill_in_details_text.html:11 +#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:1 +#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:10 #: templates/web/fixmystreet/report/new/fill_in_details_text.html:1 #: templates/web/fixmystreet/report/new/fill_in_details_text.html:11 msgid "Please fill in details of the problem below." msgstr "Vennligst fyll ut detaljer om problemet under" +#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:1 +#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:3 +#, fuzzy +msgid "" +"Please fill in details of the problem below. Leave as much detail as you " +"can, \n" +"and if possible describe the exact location of\n" +"the problem (e.g. if there is a streetlight number or road name)." +msgstr "" +"Vennligst fyll inn detaljene om problemet under. Administrasjonen vil ikke " +"være i stand\n" +"til å hjelpe med mindre du legger inn så mange detaljer som du kan. Beskriv\n" +"eksakt plassering for problemet (f.eks. på en vegg), hva det er, hvor lenge " +"det har\n" +"vært der, en beskrivelse (og et bilde av problemet hvis du har et), osv." + #: templates/web/default/report/new/fill_in_details_text.html:1 #: templates/web/default/report/new/fill_in_details_text.html:3 msgid "" @@ -2083,13 +2134,13 @@ msgstr "" "det har\n" "vært der, en beskrivelse (og et bilde av problemet hvis du har et), osv." -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:68 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:70 msgid "Please fill in details of the problem." msgstr "Vennligst fyll ut detaljer om problemet." #: templates/web/bromley/report/new/fill_in_details_form.html:28 #: templates/web/default/report/new/fill_in_details_form.html:27 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:34 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:35 msgid "" "Please fill in the form below with details of the problem, and describe the " "location as precisely as possible in the details box." @@ -2097,7 +2148,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:241 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Vennligst indiker om du ønsker å motta et nytt spørreskjema" @@ -2131,7 +2182,7 @@ msgstr "" #: templates/web/bromley/report/new/fill_in_details_form.html:23 #: templates/web/default/report/new/fill_in_details_form.html:5 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:25 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:26 msgid "" "Please note your report has <strong>not yet been sent</strong>. Choose a " "category and add further information below, then submit." @@ -2140,22 +2191,23 @@ msgstr "" "legg til mer informasjon under før du sender inn." #: templates/web/default/report/new/notes.html:1 +#: templates/web/fixmybarangay/report/new/notes.html:1 #: templates/web/fixmystreet/report/new/notes.html:1 msgid "Please note:" msgstr "Vennligst merk deg:" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:244 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:246 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:251 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253 msgid "Please provide some text as well as a photo" msgstr "Vennligst bidra med litt tekst i tilegg til et bilde" #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:237 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:239 msgid "" "Please say whether you've ever reported a problem to your council before" msgstr "" @@ -2170,7 +2222,7 @@ 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:233 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:235 msgid "Please state whether or not the problem has been fixed" msgstr "Vennligs oppgi om dette problemet er blitt fikset eller ikke" @@ -2178,11 +2230,11 @@ msgstr "Vennligs oppgi om dette problemet er blitt fikset eller ikke" msgid "Please take a look at the updates that have been left." msgstr "Vennligst se over oppdateringene som har blitt lagt inn." -#: perllib/FixMyStreet/App/Controller/Photo.pm:176 +#: perllib/FixMyStreet/App/Controller/Photo.pm:175 msgid "Please upload a JPEG image only" msgstr "Vennligst last opp kun JPEG-bilder" -#: perllib/FixMyStreet/App/Controller/Photo.pm:183 +#: perllib/FixMyStreet/App/Controller/Photo.pm:182 msgid "Please upload a JPEG image only\n" msgstr "Vennligst last opp kun JPEG eller JPG-bilder\n" @@ -2191,7 +2243,7 @@ msgid "Please write a message" msgstr "Skriv inn en melding" #: templates/web/bromley/report/display.html:70 -#: templates/web/fixmystreet/report/display.html:69 +#: templates/web/fixmystreet/report/display.html:85 msgid "Please write your update here" msgstr "Vennligst skriv inn din oppdatering her" @@ -2203,9 +2255,9 @@ msgstr "Vennligst skriv inn din oppdatering her" #: templates/web/default/report/display.html:156 #: templates/web/default/report/display.html:178 #: templates/web/fixmystreet/contact/index.html:93 -#: templates/web/fixmystreet/report/display.html:115 -#: templates/web/fixmystreet/report/display.html:139 -#: templates/web/fixmystreet/report/display.html:161 +#: templates/web/fixmystreet/report/display.html:131 +#: templates/web/fixmystreet/report/display.html:155 +#: templates/web/fixmystreet/report/display.html:183 msgid "Post" msgstr "Send inn" @@ -2221,6 +2273,12 @@ msgstr "Lagt inn av %s (<strong>%s</strong>) %s" msgid "Posted by %s at %s" msgstr "Sendt inn av %s %s" +#: templates/web/default/admin/council_contacts.html:100 +#: templates/web/default/admin/council_edit.html:30 +#: templates/web/default/admin/report_edit.html:43 +msgid "Private" +msgstr "" + #: templates/web/default/maps/openlayers.html:85 msgid "Problem" msgstr "Problem" @@ -2241,7 +2299,7 @@ msgstr "Problem %s sendt til administrasjon %s" msgid "Problem breakdown by state" msgstr "Tilstandsfordeling av problemer" -#: perllib/FixMyStreet/App/Controller/Admin.pm:819 +#: perllib/FixMyStreet/App/Controller/Admin.pm:833 msgid "Problem marked as open." msgstr "Problem markert som åpent." @@ -2253,17 +2311,17 @@ msgstr "Problemtilstandsendring basert på spørreundersøkelsesresultater" msgid "Problems" msgstr "Problemer" -#: templates/web/default/around/display_location.html:81 +#: templates/web/default/around/_updates.html:1 msgid "Problems in this area" msgstr "Problemer i dette området" #: templates/web/bromley/report/display.html:31 -#: templates/web/fixmystreet/around/display_location.html:98 -#: templates/web/fixmystreet/report/display.html:24 +#: templates/web/fixmystreet/around/tabbed_lists.html:4 +#: templates/web/fixmystreet/report/display.html:31 msgid "Problems nearby" msgstr "Problemer i nærheten" -#: templates/web/fixmystreet/around/display_location.html:97 +#: templates/web/fixmystreet/around/tabbed_lists.html:3 msgid "Problems on the map" msgstr "Problemer på kartet" @@ -2276,15 +2334,15 @@ msgstr "Problemer nylig rapportert fikset på FiksGataMi" msgid "Problems within %.1fkm of this location" msgstr "Problemer innenfor %.1fkm av denne posisjonen" -#: perllib/FixMyStreet/Cobrand/Default.pm:609 +#: perllib/FixMyStreet/Cobrand/Default.pm:611 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:95 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:162 -#: perllib/FixMyStreet/Cobrand/UK.pm:240 +#: perllib/FixMyStreet/Cobrand/UK.pm:231 msgid "Problems within %s" msgstr "Problemer innenfor %s" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:103 -#: perllib/FixMyStreet/Cobrand/UK.pm:254 +#: perllib/FixMyStreet/Cobrand/UK.pm:245 msgid "Problems within %s ward" msgstr "Problemer innenfor %s bydel" @@ -2294,6 +2352,7 @@ msgid "Problems within %s, FixMyStreet" msgstr "Problemer innenfor %s, Fiksgatami" #: templates/web/default/alert/_list.html:40 +#: templates/web/fixmybarangay/alert/_list.html:13 #: templates/web/fixmystreet/alert/_list.html:42 msgid "Problems within the boundary of:" msgstr "Problemer innenfor grensene av:" @@ -2308,13 +2367,13 @@ msgid "Property type:" msgstr "Type egenskap:" #: templates/web/bromley/report/new/fill_in_details_form.html:52 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:62 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:64 msgid "Provide a title" msgstr "Oppgi en tittel" #: templates/web/bromley/report/display.html:57 #: templates/web/default/report/display.html:51 -#: templates/web/fixmystreet/report/display.html:50 +#: templates/web/fixmystreet/report/display.html:66 msgid "Provide an update" msgstr "Bidra med en oppdatering" @@ -2330,8 +2389,8 @@ msgstr "" #: templates/web/bromley/report/display.html:142 #: templates/web/default/report/display.html:175 #: templates/web/default/report/new/fill_in_details_form.html:173 -#: templates/web/fixmystreet/report/display.html:154 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:191 +#: templates/web/fixmystreet/report/display.html:176 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:214 msgid "" "Providing a password is optional, but doing so will allow you to more easily " "report problems, leave updates and manage your reports." @@ -2340,6 +2399,11 @@ msgstr "" "for deg å rapportere problemer, legge inn oppdateringer og holde oversikt " "over dine rapporter" +#: templates/web/default/admin/council_contacts.html:44 +#: templates/web/default/admin/council_contacts.html:57 +msgid "Public" +msgstr "" + #: templates/web/default/questionnaire/completed.html:1 #: templates/web/default/questionnaire/completed.html:2 #: templates/web/default/questionnaire/index.html:0 @@ -2360,7 +2424,7 @@ 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:190 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 msgid "Questionnaire filled in by problem reporter" msgstr "Spørreskjema fylt inn av feilrapportøren" @@ -2372,17 +2436,15 @@ msgstr "Spørreskjema fylt inn av feilrapportøren" #: templates/web/default/reports/_rss.html:1 #: templates/web/fixmystreet/alert/_list.html:22 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/around/display_location.html:1 -#: templates/web/fixmystreet/around/display_location.html:3 -#: templates/web/fixmystreet/report/display.html:30 +#: templates/web/fixmystreet/report/display.html:45 msgid "RSS feed" msgstr "RSS-strøm" -#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 +#: perllib/FixMyStreet/Cobrand/UK.pm:274 perllib/FixMyStreet/Cobrand/UK.pm:286 msgid "RSS feed for %s" msgstr "RSS-strøm for %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:289 perllib/FixMyStreet/Cobrand/UK.pm:301 +#: perllib/FixMyStreet/Cobrand/UK.pm:280 perllib/FixMyStreet/Cobrand/UK.pm:292 msgid "RSS feed for %s ward, %s" msgstr "RSS-strøm for %s bydel, %s" @@ -2390,11 +2452,11 @@ msgstr "RSS-strøm for %s bydel, %s" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:186 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:196 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:204 -#: perllib/FixMyStreet/Cobrand/UK.pm:309 perllib/FixMyStreet/Cobrand/UK.pm:321 +#: perllib/FixMyStreet/Cobrand/UK.pm:300 perllib/FixMyStreet/Cobrand/UK.pm:312 msgid "RSS feed of %s" msgstr "RSS-strøm fra %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:314 perllib/FixMyStreet/Cobrand/UK.pm:326 +#: perllib/FixMyStreet/Cobrand/UK.pm:305 perllib/FixMyStreet/Cobrand/UK.pm:317 msgid "RSS feed of %s, within %s ward" msgstr "RSS-strøm av %s, innenfor %s bydel" @@ -2407,29 +2469,27 @@ msgstr "RSS-strøm med problemer i nærheten" msgid "RSS feed of problems in this %s" msgstr "RSS-strøm for problemer i denne %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:610 +#: perllib/FixMyStreet/Cobrand/Default.pm:612 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:96 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:161 -#: perllib/FixMyStreet/Cobrand/UK.pm:247 +#: perllib/FixMyStreet/Cobrand/UK.pm:238 msgid "RSS feed of problems within %s" msgstr "RSS-strøm for problemer innenfor %s" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:102 -#: perllib/FixMyStreet/Cobrand/UK.pm:253 +#: perllib/FixMyStreet/Cobrand/UK.pm:244 msgid "RSS feed of problems within %s ward" msgstr "RSS-strøm for problemer innenfor %s bydel" #: templates/web/default/around/display_location.html:1 #: templates/web/default/around/display_location.html:4 -#: templates/web/fixmystreet/around/display_location.html:1 -#: templates/web/fixmystreet/around/display_location.html:4 msgid "RSS feed of recent local problems" msgstr "RSS-strøm med nylige lokale problemer" #: templates/web/bromley/report/display.html:37 #: templates/web/default/report/display.html:42 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/report/display.html:30 +#: templates/web/fixmystreet/report/display.html:45 msgid "RSS feed of updates to this problem" msgstr "RSS-strøm med oppdateringer for dette problemet" @@ -2437,14 +2497,12 @@ msgstr "RSS-strøm med oppdateringer for dette problemet" #: templates/web/default/alert/updates.html:9 #: templates/web/default/report/display.html:33 #: templates/web/fixmystreet/alert/updates.html:14 -#: templates/web/fixmystreet/report/display.html:32 +#: templates/web/fixmystreet/report/display.html:47 msgid "Receive email when updates are left on this problem." msgstr "Motta e-post når det er oppdateringer på dette problemet" #: templates/web/default/around/display_location.html:0 #: templates/web/default/around/display_location.html:34 -#: templates/web/fixmystreet/around/display_location.html:0 -#: templates/web/fixmystreet/around/display_location.html:34 msgid "Recent local problems, FixMyStreet" msgstr "Nylige lokale problemer, FiksGataMi." @@ -2458,7 +2516,7 @@ msgstr "Nylig løste <br>problemer" msgid "Recently fixed" msgstr "Nylig løste problemer" -#: templates/web/default/index.html:50 templates/web/fixmystreet/index.html:62 +#: templates/web/default/index.html:37 templates/web/fixmystreet/index.html:45 msgid "Recently reported problems" msgstr "Nylig meldte problemer" @@ -2475,11 +2533,17 @@ msgstr "" "tjenesten, husk at du kan kontakte administrasjonen direkte via deres egen " "nettside." +#: templates/web/fixmybarangay/report/new/notes.html:9 +msgid "" +"Remember that, for the pilot project, FixMyBarangay is only for reporting " +"potholes and streetlights in bgy. Luz or Basak San Nicolas." +msgstr "" + #: templates/web/default/admin/report_blocks.html:16 msgid "Remove flag" msgstr "Fjern flagg" -#: templates/web/default/admin/report_edit.html:53 +#: templates/web/default/admin/report_edit.html:54 #: templates/web/default/admin/update_edit.html:48 msgid "Remove photo (can't be undone!)" msgstr "Fjern bilde (kan ikke gjøres om!)" @@ -2498,7 +2562,7 @@ msgid "Report a problem" msgstr "Rapporter et problem" #: templates/web/bromley/report/display.html:28 -#: templates/web/fixmystreet/report/display.html:22 +#: templates/web/fixmystreet/report/display.html:26 msgid "Report abuse" msgstr "Rapporter misbruk" @@ -2506,12 +2570,12 @@ msgstr "Rapporter misbruk" msgid "Report empty properties" msgstr "Rapporter tomme hjem" -#: perllib/FixMyStreet/App/Controller/Rss.pm:277 +#: perllib/FixMyStreet/App/Controller/Rss.pm:286 msgid "Report on %s" msgstr "Rapport på %s" #: templates/web/default/index.html:15 -#: templates/web/fixmystreet/around/postcode_form.html:6 +#: templates/web/fixmystreet/around/postcode_form.html:9 msgid "Report, view, or discuss local problems" msgstr "Rapporter, finn eller diskuter lokale problemer" @@ -2523,7 +2587,7 @@ msgstr "Rapportert %s" msgid "Reported %s, to %s" msgstr "Rapportert %s, til %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:512 +#: perllib/FixMyStreet/DB/Result/Problem.pm:520 #: templates/web/default/contact/index.html:45 #: templates/web/fixmystreet/contact/index.html:46 msgid "Reported anonymously at %s" @@ -2535,33 +2599,33 @@ msgstr "Rapportert anonymt %s" msgid "Reported before" msgstr "Rapportert tidligere" -#: perllib/FixMyStreet/DB/Result/Problem.pm:504 +#: perllib/FixMyStreet/DB/Result/Problem.pm:512 msgid "Reported by %s anonymously at %s" msgstr "Publisert av %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:535 +#: perllib/FixMyStreet/DB/Result/Problem.pm:543 #: templates/web/default/contact/index.html:47 #: templates/web/fixmystreet/contact/index.html:48 msgid "Reported by %s at %s" msgstr "Publisert av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:526 +#: perllib/FixMyStreet/DB/Result/Problem.pm:534 msgid "Reported by %s by %s at %s" msgstr "Rapporter av %s av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:500 +#: perllib/FixMyStreet/DB/Result/Problem.pm:508 msgid "Reported by %s in the %s category anonymously at %s" msgstr "Rapportert av %s i kategorien %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:520 +#: perllib/FixMyStreet/DB/Result/Problem.pm:528 msgid "Reported by %s in the %s category by %s at %s" msgstr "Rapportert av %s i kategorien %s av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:508 +#: perllib/FixMyStreet/DB/Result/Problem.pm:516 msgid "Reported in the %s category anonymously at %s" msgstr "Rapportert i kategorien %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:530 +#: perllib/FixMyStreet/DB/Result/Problem.pm:538 msgid "Reported in the %s category by %s at %s" msgstr "Rapportert i kategorien %s av %s %s" @@ -2576,7 +2640,7 @@ msgstr "Rapportert i kategorien %s av %s %s" msgid "Reporting a problem" msgstr "Legger til et problem" -#: templates/web/default/around/display_location.html:95 +#: templates/web/default/around/tabbed_lists.html:3 msgid "Reports on and around the map" msgstr "Problemer i og rundt kartet" @@ -2584,7 +2648,7 @@ msgstr "Problemer i og rundt kartet" msgid "Resend report" msgstr "Send rapport på nytt" -#: perllib/FixMyStreet/Geocode/OSM.pm:166 +#: perllib/FixMyStreet/Geocode/OSM.pm:168 msgid "" "Road operator for this named road (derived from road reference number and " "type): %s" @@ -2592,15 +2656,15 @@ msgstr "" "Veioperatør for denne navngitte veien (utledet fra veiens referansenummer og " "type) %s" -#: perllib/FixMyStreet/Geocode/OSM.pm:163 +#: perllib/FixMyStreet/Geocode/OSM.pm:165 msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Veioperatør for denne navngitte veien (fra OpenStreetMap): %s" -#: templates/web/default/admin/council_edit.html:35 +#: templates/web/default/admin/council_edit.html:63 msgid "Save changes" msgstr "Lagre endringer" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1027 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1041 msgid "Search Abuse" msgstr "Søk etter misbruk" @@ -2608,13 +2672,13 @@ msgstr "Søk etter misbruk" msgid "Search Abuse Table" msgstr "Søk i misbrukstabell" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1023 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1037 #: templates/web/default/admin/list_flagged.html:1 #: templates/web/default/admin/search_reports.html:1 msgid "Search Reports" msgstr "Søk i rapporter" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1026 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1040 #: templates/web/default/admin/search_users.html:1 msgid "Search Users" msgstr "Søk i brukere" @@ -2634,7 +2698,7 @@ msgstr "" "Velg hvilken type varsel du ønsker og klikk på knappen for en RSS-kilde, " "eller skriv inn din e-postadresse for å abonnere på et e-postvarsel." -#: perllib/FixMyStreet/DB/Result/Problem.pm:618 +#: perllib/FixMyStreet/DB/Result/Problem.pm:623 msgid "Sent to %s %s later" msgstr "Sendt til %s %s senere" @@ -2646,6 +2710,10 @@ msgstr "Sendt:" msgid "Service:" msgstr "Tjeneste:" +#: templates/web/fixmystreet/report/display.html:29 +msgid "Share" +msgstr "" + #: templates/web/emptyhomes/static/about.html:21 msgid "Shelter Cymru" msgstr "Shelter Cymru" @@ -2672,28 +2740,26 @@ msgstr "" #: templates/web/bromley/report/new/fill_in_details_form.html:175 #: templates/web/default/report/display.html:208 #: templates/web/default/report/new/fill_in_details_form.html:210 -#: templates/web/fixmystreet/report/display.html:185 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:126 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:186 +#: templates/web/fixmystreet/report/display.html:207 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:141 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:209 msgid "Show my name publicly" msgstr "Vis mitt navn offentlig" -#: templates/web/default/around/display_location.html:60 -#: templates/web/fixmystreet/around/display_location.html:60 +#: templates/web/default/around/display_location.html:65 msgid "Show old" msgstr "Vis gamle" -#: templates/web/default/around/display_location.html:51 -#: templates/web/fixmystreet/around/display_location.html:52 +#: templates/web/default/around/display_location.html:56 msgid "Show pins" msgstr "Vis nåler" #: templates/web/default/auth/general.html:3 #: templates/web/default/auth/general.html:49 -#: templates/web/fixmybarangay/header.html.orig:46 +#: templates/web/fixmybarangay/header.html:70 #: templates/web/fixmystreet/auth/general.html:3 -#: templates/web/fixmystreet/auth/general.html:38 -#: templates/web/fixmystreet/auth/general.html:58 +#: templates/web/fixmystreet/auth/general.html:42 +#: templates/web/fixmystreet/auth/general.html:62 #: templates/web/fixmystreet/header.html:51 #: templates/web/zurich/header.html:51 msgid "Sign in" @@ -2729,11 +2795,13 @@ msgid "Signed in as %s" msgstr "Logget inn som %s" #: templates/web/default/report/new/fill_in_details_text.html:1 +#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:1 #: templates/web/fixmystreet/report/new/fill_in_details_text.html:1 msgid "Some categories may require additional information." msgstr "Noen kategorier krever kanskje mer informasjon" #: templates/web/default/alert/index.html:42 +#: templates/web/fixmybarangay/alert/index.html:32 msgid "Some photos of recent reports" msgstr "Noen bilder av nylig meldte problemer" @@ -2746,7 +2814,7 @@ msgstr "Noe tekst å oversette" msgid "Some unconfirmeds" msgstr "Noen ubekreftede" -#: perllib/FixMyStreet/Cobrand/UK.pm:97 +#: perllib/FixMyStreet/Cobrand/UK.pm:89 msgid "" "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" @@ -2759,15 +2827,15 @@ msgstr "" "Beklager, men det oppsto et problem når vi forsøkte å bekrefte " "problemrapporten din" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:214 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:212 #: perllib/FixMyStreet/Geocode.pm:27 perllib/FixMyStreet/Geocode/Bing.pm:51 #: perllib/FixMyStreet/Geocode/Google.pm:69 +#: perllib/FixMyStreet/Geocode/OSM.pm:61 msgid "Sorry, we could not find that location." msgstr "Beklager, vi kunne ikke finne det stedet." #: perllib/FixMyStreet/Geocode/Bing.pm:46 #: perllib/FixMyStreet/Geocode/Google.pm:64 -#: perllib/FixMyStreet/Geocode/OSM.pm:59 msgid "Sorry, we could not parse that location. Please try again." msgstr "Beklager, vi kunne ikke tolke den posisjonen. Vennligst prøv på nytt." @@ -2792,7 +2860,7 @@ msgstr "Startmåned:" #: templates/web/default/admin/list_flagged.html:18 #: templates/web/default/admin/list_updates.html:6 #: templates/web/default/admin/search_reports.html:21 -#: templates/web/fixmystreet/report/display.html:72 +#: templates/web/fixmystreet/report/display.html:88 msgid "State" msgstr "Tilstand" @@ -2802,7 +2870,7 @@ msgstr "Tilstand" msgid "State:" msgstr "Tilstand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1029 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1043 #: templates/web/default/admin/stats.html:1 msgid "Stats" msgstr "Statistikk" @@ -2813,7 +2881,7 @@ msgstr "Fortsatt åpen via spørreskjema, %s" #: templates/web/bromley/report/new/fill_in_details_form.html:48 #: templates/web/fixmystreet/contact/index.html:79 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:58 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:60 msgid "Subject" msgstr "Emne" @@ -2830,13 +2898,13 @@ msgstr "Emne:" #: templates/web/default/report/new/fill_in_details_form.html:114 #: templates/web/default/report/new/fill_in_details_form.html:154 #: templates/web/default/report/new/fill_in_details_form.html:176 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:137 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:162 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:201 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:154 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:179 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:224 msgid "Submit" msgstr "Send inn" -#: templates/web/default/admin/report_edit.html:56 +#: templates/web/default/admin/report_edit.html:57 #: templates/web/default/admin/update_edit.html:51 #: templates/web/default/admin/user_edit.html:20 msgid "Submit changes" @@ -2851,16 +2919,24 @@ msgstr "Send inn spørreskjema" #: templates/web/default/alert/updates.html:17 #: templates/web/default/report/display.html:38 #: templates/web/fixmystreet/alert/updates.html:23 -#: templates/web/fixmystreet/report/display.html:37 +#: templates/web/fixmystreet/report/display.html:52 msgid "Subscribe" msgstr "Abonner" #: templates/web/default/alert/_list.html:97 +#: templates/web/fixmybarangay/alert/_list.html:42 #: templates/web/fixmystreet/alert/_list.html:92 msgid "Subscribe me to an email alert" msgstr "Jeg ønsker å abonnere på e-postvarsel" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1021 +#: templates/web/fixmybarangay/alert/_list.html:6 +#, fuzzy +msgid "Subscribe to an alert based upon what baranagay you’re in:" +msgstr "" +"Eller du kan abonnere på varsel basert på bydel eller administrasjon du " +"hører inn under:" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1035 #: templates/web/default/admin/index.html:1 msgid "Summary" msgstr "Oppsummering" @@ -2872,7 +2948,7 @@ msgstr "Oppsummering" msgid "Summary reports" msgstr "Oppsummeringsrapporter" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1025 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1039 #: templates/web/default/admin/questionnaire.html:1 msgid "Survey Results" msgstr "Resultater fra spørreundersøkelsen" @@ -2881,7 +2957,7 @@ msgstr "Resultater fra spørreundersøkelsen" msgid "Text" msgstr "Tekst" -#: templates/web/default/admin/council_contacts.html:18 +#: templates/web/default/admin/council_contacts.html:20 msgid "Text only version" msgstr "Tekst-versjon" @@ -2967,12 +3043,12 @@ 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/Controller/Photo.pm:190 +#: perllib/FixMyStreet/App/Controller/Photo.pm:189 msgid "" "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "Bildet ser ikke ut til å blitt lastet opp riktig (%s), prøv på nytt." -#: perllib/FixMyStreet/App/Controller/Council.pm:91 +#: perllib/FixMyStreet/App/Controller/Council.pm:90 msgid "" "That location does not appear to be covered by a council; perhaps it is " "offshore or outside the country. Please try again." @@ -2981,20 +3057,25 @@ msgstr "" "utenfor lander - vennligst forsøk et annet sted." # Should this be "Norge" or "Storbritannia" ? -#: perllib/FixMyStreet/App/Controller/Location.pm:107 +#: perllib/FixMyStreet/App/Controller/Location.pm:120 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." #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:63 -#: perllib/FixMyStreet/Cobrand/UK.pm:90 +#: perllib/FixMyStreet/Cobrand/UK.pm:82 msgid "That postcode was not recognised, sorry." msgstr "Det postnummeret ble ikke gjenkjent, beklager." -#: perllib/FixMyStreet/App/Controller/Admin.pm:605 +#: perllib/FixMyStreet/App/Controller/Admin.pm:616 msgid "That problem will now be resent." msgstr "Det problemet vil nå bli sendt på nytt." -#: perllib/FixMyStreet/App/Controller/Report.pm:75 +#: perllib/FixMyStreet/App/Controller/Report.pm:98 +#, fuzzy +msgid "That report cannot be viewed on FixMyStreet." +msgstr "Den rapporten har blitt fjernet fra FiksGataMi." + +#: perllib/FixMyStreet/App/Controller/Report.pm:92 msgid "That report has been removed from FixMyStreet." msgstr "Den rapporten har blitt fjernet fra FiksGataMi." @@ -3039,6 +3120,7 @@ msgstr "" #: templates/web/fixmystreet/report/new/fill_in_details_text.html:1 #: templates/web/fixmystreet/report/new/fill_in_details_text.html:3 +#, fuzzy msgid "" "The council won’t be able to help unless you leave as much\n" "detail as you can. Please describe the exact location of the problem (e.g. " @@ -3067,8 +3149,8 @@ msgstr "" "Detaljene om ditt problem er tilgjengelig på høyre kant av denne siden." #: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 -#: perllib/FixMyStreet/App/Controller/Reports.pm:44 -#: perllib/FixMyStreet/App/Controller/Reports.pm:75 +#: perllib/FixMyStreet/App/Controller/Reports.pm:43 +#: perllib/FixMyStreet/App/Controller/Reports.pm:74 msgid "The error was: %s" msgstr "Feilen var: %s" @@ -3082,7 +3164,7 @@ msgstr "" "service_request_id, description, lat, long, media_url, status, " "requested_datetime, updated_datetime, service_code and service_name." -#: perllib/FixMyStreet/Geocode/OSM.pm:158 +#: perllib/FixMyStreet/Geocode/OSM.pm:160 msgid "" "The following information about the nearest road might be inaccurate or " "irrelevant, if the problem is close to several roads or close to a road " @@ -3171,7 +3253,7 @@ msgstr "" "Tittelen og detaljene for problemet vil bli offentlig, pluss navnet ditt\n" "hvis du gir oss tillatelse til det." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:269 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:271 msgid "" "The user could not locate the problem on a map, but to see the area around " "the location they entered" @@ -3179,7 +3261,7 @@ msgstr "" "Brukeren kunne ikke plassere problemet på et kart, men sjekk området rundt " "stedet de skrev inn" -#: perllib/FixMyStreet/App/Controller/Reports.pm:72 +#: perllib/FixMyStreet/App/Controller/Reports.pm:71 msgid "" "There was a problem showing the All Reports page. Please try again later." msgstr "" @@ -3190,8 +3272,8 @@ msgstr "" 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:733 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:130 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:737 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 #: templates/web/default/auth/general.html:23 #: templates/web/fixmystreet/auth/general.html:24 msgid "" @@ -3210,7 +3292,7 @@ msgstr "" "Det var problemer med din epost/passord-kombinasjon. Vær så snill å forsøk " "igjen." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:256 msgid "There was a problem with your update. Please try again." msgstr "Det var problemer med din oppdatering. Vær så snill å forsøk igjen." @@ -3218,7 +3300,7 @@ msgstr "Det var problemer med din oppdatering. Vær så snill å forsøk igjen. msgid "There were problems with your report. Please see below." msgstr "Det var problemer med din rapport. Vennligst se under." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:279 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:283 msgid "There were problems with your update. Please see below." msgstr "Det var problemer med din oppdatering. Vennligst se under." @@ -3230,7 +3312,7 @@ msgstr "" "Denne API-implementasjonen er under arbeid og ennå ikke stabil. Den vil " "endre seg uten advarsel i fremtiden." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:339 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:341 msgid "" "This email has been sent to both councils covering the location of the " "problem, as the user did not categorise it; please ignore it if you're not " @@ -3243,7 +3325,7 @@ msgstr "" "eller gi oss beskjed om hvilken kategori av problemer dette er så vi kan " "legge det til i vårt system." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:342 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:344 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 " @@ -3254,8 +3336,8 @@ msgstr "" "snill å ignorere e-posten hvis dere ikke er korrekt administrasjon for å " "håndtere denne saken." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:865 -#: perllib/FixMyStreet/Cobrand/UK.pm:62 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:869 +#: perllib/FixMyStreet/Cobrand/UK.pm:54 msgid "This information is required" msgstr "Denne informasjonen er påkrevd" @@ -3294,13 +3376,13 @@ msgstr "Dette problemet er lukket" #: templates/web/default/report/banner.html:12 #: templates/web/default/report/display.html:95 #: templates/web/emptyhomes/report/display.html:12 -#: templates/web/fixmystreet/report/display.html:90 +#: templates/web/fixmystreet/report/display.html:106 msgid "This problem has been fixed" msgstr "Dette problemet er løst" #: templates/web/bromley/report/display.html:90 #: templates/web/default/report/display.html:90 -#: templates/web/fixmystreet/report/display.html:84 +#: templates/web/fixmystreet/report/display.html:100 msgid "This problem has not been fixed" msgstr "Dette problemet har ikke blitt løst" @@ -3312,25 +3394,25 @@ msgstr "Dette problemet er under arbeid" msgid "This problem is old and of unknown status." msgstr "Dette problemet er gammel og med ukjent status." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:83 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86 msgid "This report is currently marked as closed." msgstr "Denne rapporten er for tiden markert som lukket." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:81 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:84 msgid "This report is currently marked as fixed." msgstr "Denne rapporten er for tiden markert som fikset." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:85 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:88 msgid "This report is currently marked as open." msgstr "Denne rapporten er for tiden markert som åpen." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:262 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:264 msgid "" "This web page also contains a photo of the problem, provided by the user." msgstr "" "Denne nettsiden inneholder også et bilde av problemet, sendt inn av brukeren." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1024 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1038 #: templates/web/default/admin/timeline.html:1 msgid "Timeline" msgstr "Tidslinje" @@ -3340,7 +3422,7 @@ msgstr "Tidslinje" msgid "Title" msgstr "Tittel" -#: templates/web/default/around/display_location.html:69 +#: templates/web/default/around/_report_banner.html:2 msgid "" "To <strong>report a problem</strong>, click on the map at the correct " "location." @@ -3361,7 +3443,7 @@ msgid "" msgstr "" "Du finner lokale problemer ved å søke på ditt postnummer, veinavn eller sted" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:268 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:270 msgid "To view a map of the precise location of this issue" msgstr "For å se en kart med en mer presis plassering for dette problemet." @@ -3372,7 +3454,7 @@ msgstr "For å se en kart med en mer presis plassering for dette problemet." msgid "Total" msgstr "Totalt" -#: perllib/FixMyStreet/App/Controller/Reports.pm:43 +#: perllib/FixMyStreet/App/Controller/Reports.pm:42 msgid "Unable to look up areas in MaPit. Please try again later." msgstr "Klarte ikke slå opp områder i MaPit. Vennligst forsøk igjen senere." @@ -3386,16 +3468,16 @@ msgstr "Ubekreftet" msgid "Unknown" msgstr "Ukjent" -#: perllib/FixMyStreet/App/Controller/Rss.pm:164 +#: perllib/FixMyStreet/App/Controller/Rss.pm:173 msgid "Unknown alert type" msgstr "Ukjent varsel-type" -#: perllib/FixMyStreet/App/Controller/Report.pm:70 +#: perllib/FixMyStreet/App/Controller/Report.pm:87 msgid "Unknown problem ID" msgstr "Ukjent problem-Id" #: templates/web/bromley/report/display.html:66 -#: templates/web/fixmystreet/report/display.html:65 +#: templates/web/fixmystreet/report/display.html:81 msgid "Update" msgstr "Oppdatering" @@ -3433,7 +3515,7 @@ msgstr "En oppdatering markerte dette problemet som fikset." msgid "Update reopened problem" msgstr "En oppdatering gjennåpnet problemet" -#: templates/web/default/admin/council_contacts.html:62 +#: templates/web/default/admin/council_contacts.html:68 msgid "Update statuses" msgstr "Oppdater tilstanden" @@ -3441,9 +3523,9 @@ msgstr "Oppdater tilstanden" msgid "Update:" msgstr "Oppdatering:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:694 -#: perllib/FixMyStreet/App/Controller/Admin.pm:809 -#: perllib/FixMyStreet/App/Controller/Admin.pm:889 +#: perllib/FixMyStreet/App/Controller/Admin.pm:708 +#: perllib/FixMyStreet/App/Controller/Admin.pm:823 +#: perllib/FixMyStreet/App/Controller/Admin.pm:903 msgid "Updated!" msgstr "Oppdatert!" @@ -3466,11 +3548,11 @@ msgstr "Oppdateringer av {{title}}" msgid "Updates to this problem, FixMyStreet" msgstr "Oppdateringer til dette problemet, FiksGataMi" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1182 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1196 msgid "User flag removed" msgstr "Brukerflagg fjernet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1154 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1168 msgid "User flagged" msgstr "Bruker flagget" @@ -3478,8 +3560,8 @@ msgstr "Bruker flagget" msgid "Users" msgstr "Brukere" -#: perllib/FixMyStreet/App/Controller/Admin.pm:309 -#: perllib/FixMyStreet/App/Controller/Admin.pm:339 +#: perllib/FixMyStreet/App/Controller/Admin.pm:315 +#: perllib/FixMyStreet/App/Controller/Admin.pm:345 msgid "Values updated" msgstr "Verdier oppdatert" @@ -3500,13 +3582,12 @@ msgstr "Vis din rapport" #: templates/web/default/around/display_location.html:33 #: templates/web/emptyhomes/around/display_location.html:0 #: templates/web/emptyhomes/around/display_location.html:16 -#: templates/web/fixmystreet/around/display_location.html:0 -#: templates/web/fixmystreet/around/display_location.html:33 msgid "Viewing a location" msgstr "Ser på et sted" #: templates/web/bromley/report/display.html:0 #: templates/web/default/report/display.html:0 +#: templates/web/emptyhomes/report/display.html:1 #: templates/web/emptyhomes/report/display.html:2 #: templates/web/fixmystreet/report/display.html:0 msgid "Viewing a problem" @@ -3542,18 +3623,18 @@ msgstr "" "endret seg med eiedommen du rapporterte." #: templates/web/bromley/report/display.html:141 -#: templates/web/fixmystreet/report/display.html:153 +#: templates/web/fixmystreet/report/display.html:175 msgid "We never show your email" msgstr "Vi viser aldri din e-postadresse" #: templates/web/bromley/report/new/fill_in_details_form.html:133 #: templates/web/bromley/report/new/fill_in_details_form.html:179 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:130 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:190 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:146 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:213 msgid "We never show your email address or phone number." msgstr "Vi viser aldri din e-postadresse eller ditt telefonnummer" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:349 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:351 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 " @@ -3563,13 +3644,14 @@ msgstr "" "tiden kontaktinformasjon for dem. Hvis du vet om en egnet kontaktadresse, ta " "kontakt med oss." -#: templates/web/default/index.html:34 templates/web/emptyhomes/index.html:59 -#: templates/web/fixmystreet/index.html:45 +#: templates/web/default/index-steps.html:15 +#: templates/web/emptyhomes/index.html:59 msgid "We send it to the council on your behalf" msgstr "Vi sender til administrasjon på dine vegne" #: templates/web/bromley/report/new/fill_in_details_form.html:217 #: templates/web/default/report/new/notes.html:5 +#: templates/web/fixmybarangay/report/new/notes.html:5 msgid "" "We will only use your personal information in accordance with our <a href=\"/" "faq#privacy\">privacy policy.</a>" @@ -3604,8 +3686,8 @@ 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>:" -#: templates/web/default/admin/council_contacts.html:41 -#: templates/web/default/admin/council_edit.html:41 +#: templates/web/default/admin/council_contacts.html:45 +#: templates/web/default/admin/council_edit.html:69 msgid "When edited" msgstr "Når redigert" @@ -3656,6 +3738,7 @@ msgstr "" "sjekke status?" #: templates/web/default/report/new/notes.html:8 +#: templates/web/fixmybarangay/report/new/notes.html:8 #: templates/web/fixmystreet/report/new/notes.html:7 msgid "" "Writing your message entirely in block capitals makes it hard to read, as " @@ -3668,8 +3751,9 @@ msgstr "" msgid "Year" msgstr "År" -#: templates/web/default/admin/council_contacts.html:48 -#: templates/web/default/admin/council_contacts.html:49 +#: templates/web/default/admin/council_contacts.html:52 +#: templates/web/default/admin/council_contacts.html:53 +#: templates/web/default/admin/council_contacts.html:54 #: templates/web/default/admin/council_edit.html:5 #: templates/web/default/admin/list_updates.html:30 #: templates/web/default/admin/list_updates.html:31 @@ -3689,8 +3773,8 @@ msgstr "Ja" #: templates/web/bromley/report/display.html:155 #: templates/web/bromley/report/new/fill_in_details_form.html:198 -#: templates/web/fixmystreet/report/display.html:133 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:156 +#: templates/web/fixmystreet/report/display.html:149 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:173 msgid "Yes I have a password" msgstr "<strong>Ja</strong>, jeg har et passord" @@ -3748,7 +3832,7 @@ msgstr "" #: templates/web/default/questionnaire/index.html:92 #: templates/web/default/report/new/fill_in_details_form.html:93 #: templates/web/fixmystreet/questionnaire/index.html:87 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:101 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:103 msgid "" "You have already attached a photo to this report, attaching another one will " "replace it." @@ -3758,7 +3842,7 @@ msgstr "" #: templates/web/bromley/report/display.html:106 #: templates/web/default/report/display.html:106 -#: templates/web/fixmystreet/report/display.html:100 +#: templates/web/fixmystreet/report/display.html:116 msgid "" "You have already attached a photo to this update, attaching another one will " "replace it." @@ -3772,7 +3856,7 @@ msgstr "Du er allerede logget ut" #: templates/web/bromley/report/new/fill_in_details_form.html:25 #: templates/web/default/report/new/fill_in_details_form.html:7 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:27 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:28 msgid "" "You have located the problem at the point marked with a green pin on the " "map. If this is not the correct location, simply click on the map again. " @@ -3807,8 +3891,8 @@ msgstr "Du har lykkes med å opprette ditt varsel." msgid "You have successfully deleted your alert." msgstr "Sletting av ditt varsel var vellykket." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:740 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:136 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:744 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:140 msgid "" "You have successfully signed in; please check and confirm your details are " "accurate:" @@ -3842,15 +3926,16 @@ msgstr "Dine rapporter" #: templates/web/fixmystreet/alert/updates.html:19 #: templates/web/fixmystreet/alert/updates.html:22 #: templates/web/fixmystreet/contact/index.html:72 -#: templates/web/fixmystreet/report/display.html:34 -#: templates/web/fixmystreet/report/display.html:36 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:142 +#: templates/web/fixmystreet/report/display.html:49 +#: templates/web/fixmystreet/report/display.html:51 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:117 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:159 msgid "Your email" msgstr "Din e-post" #: templates/web/bromley/report/display.html:130 #: templates/web/fixmystreet/auth/general.html:26 -#: templates/web/fixmystreet/report/display.html:124 +#: templates/web/fixmystreet/report/display.html:140 msgid "Your email address" msgstr "Din e-postadresse" @@ -3861,6 +3946,7 @@ msgstr "Din e-postadresse:" #: templates/web/default/alert/_list.html:92 #: templates/web/default/report/display.html:128 #: templates/web/default/report/new/fill_in_details_form.html:124 +#: templates/web/fixmybarangay/alert/_list.html:37 msgid "Your email:" msgstr "Din e-post" @@ -3884,11 +3970,11 @@ msgstr "" msgid "Your last name" msgstr "Ditt etternavn" -#: templates/web/fixmystreet/auth/general.html:53 +#: templates/web/fixmystreet/auth/general.html:57 #: templates/web/fixmystreet/contact/index.html:65 -#: templates/web/fixmystreet/report/display.html:181 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:121 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:181 +#: templates/web/fixmystreet/report/display.html:203 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:126 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:204 msgid "Your name" msgstr "Ditt navn" @@ -3901,9 +3987,9 @@ msgstr "Ditt navn:" #: templates/web/bromley/report/display.html:160 #: templates/web/bromley/report/new/fill_in_details_form.html:203 -#: templates/web/fixmystreet/auth/general.html:37 -#: templates/web/fixmystreet/report/display.html:138 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:161 +#: templates/web/fixmystreet/auth/general.html:41 +#: templates/web/fixmystreet/report/display.html:154 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:178 msgid "Your password" msgstr "Ditt passord" @@ -3913,8 +3999,8 @@ msgstr "Ditt passord har blitt endret" #: templates/web/bromley/report/new/fill_in_details_form.html:137 #: templates/web/bromley/report/new/fill_in_details_form.html:184 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:134 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:195 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:151 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:218 msgid "Your phone number" msgstr "Ditt telefonnummer" @@ -3931,7 +4017,7 @@ msgstr "Dine rapporter" msgid "Your reports" msgstr "Dine oppdateringer" -#: templates/web/default/my/my.html:45 templates/web/fixmystreet/my/my.html:45 +#: templates/web/default/my/my.html:45 templates/web/fixmystreet/my/my.html:49 msgid "Your updates" msgstr "Dine oppdateringer" @@ -3950,12 +4036,17 @@ msgstr "av %s" msgid "council" msgstr "administrasjon" +#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#, fuzzy +msgid "council ref: %s" +msgstr "%s ref: %s" + #: templates/web/default/admin/report_edit.html:15 msgid "didn't use map" msgstr "brukte ikke kart" #: templates/web/default/alert/index.html:33 -#: templates/web/fixmystreet/around/postcode_form.html:17 +#: templates/web/fixmystreet/around/postcode_form.html:23 msgid "e.g. ‘%s’ or ‘%s’" msgstr "for eksempel «%s» eller «%s»" @@ -3963,7 +4054,7 @@ msgstr "for eksempel «%s» eller «%s»" msgid "from %d different users" msgstr "fra %d forskjellige brukere" -#: perllib/Utils.pm:289 +#: perllib/Utils.pm:267 msgid "less than a minute" msgstr "mindre enn et minutt" @@ -3975,17 +4066,22 @@ msgstr "markert som %s" msgid "marked as fixed" msgstr "markert som fikset" -#: perllib/FixMyStreet/App/Controller/Admin.pm:112 +#: perllib/FixMyStreet/App/Controller/Admin.pm:113 #: templates/web/default/admin/questionnaire.html:15 #: templates/web/default/admin/questionnaire.html:16 msgid "n/a" msgstr "n/a" #: templates/web/default/alert/_list.html:87 +#: templates/web/fixmybarangay/alert/_list.html:32 #: templates/web/fixmystreet/alert/_list.html:85 msgid "or" msgstr "eller" +#: templates/web/default/js/validation_strings.html:21 +msgid "or locate me automatically" +msgstr "" + #: templates/web/default/admin/report_edit.html:15 msgid "originally entered" msgstr "søkte etter" @@ -4000,7 +4096,7 @@ msgstr "åpnet på nytt" #: templates/web/barnet/header.html:71 templates/web/bromley/header.html:100 #: templates/web/bromley/header.html:65 -#: templates/web/fixmybarangay/header.html.orig:43 +#: templates/web/fixmybarangay/header.html:67 #: templates/web/fixmystreet/header.html:48 #: templates/web/zurich/header.html:48 msgid "sign out" @@ -4015,19 +4111,15 @@ msgstr "logg ut" msgid "the local council" msgstr "den lokale administrasjonen" -#: perllib/FixMyStreet/DB/Result/Problem.pm:541 -msgid "the map was not used so pin location may be inaccurate" -msgstr "kartet ble ikke brukt, så nåleposisjon kan være unøyaktig" - -#: perllib/FixMyStreet/DB/Result/Problem.pm:603 -msgid "their ref: %s" -msgstr "deres ref: %s" +#: templates/web/default/report/_main.html:6 +msgid "there is no pin shown as the user did not use the map" +msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:330 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:332 msgid "this type of local problem" msgstr "denne type lokalt problem" -#: perllib/Utils.pm:263 +#: perllib/Utils.pm:241 msgid "today" msgstr "idag" @@ -4080,6 +4172,34 @@ msgstr "vil ditt problem ikke bli publisert" msgid "your update will not be posted" msgstr "din oppdatering vil ikke bli publisert" +#: templates/web/emptyhomes/front/stats.html:17 +#, perl-format +msgid "<big>%s</big> report recently" +msgid_plural "<big>%s</big> reports recently" +msgstr[0] "<big>%s</big> rapportert<br>nylig" +msgstr[1] "<big>%s</big> rapportert<br>nylig" + +#: perllib/Utils.pm:286 +#, fuzzy, perl-format +msgid "%d hour" +msgid_plural "%d hours" +msgstr[0] "%d time" +msgstr[1] "%d time" + +#: perllib/Utils.pm:288 +#, fuzzy, perl-format +msgid "%d minute" +msgid_plural "%d minutes" +msgstr[0] "%d minutt" +msgstr[1] "%d minutt" + +#: templates/web/default/front/stats.html:29 +#, perl-format +msgid "<big>%s</big> update on reports" +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 #, perl-format msgid "We do not yet have details for the council that covers this location." @@ -4090,12 +4210,12 @@ msgstr[0] "" msgstr[1] "" "Vi har ennå ikke detaljer for administrasjonene som dekker dette stedet." -#: templates/web/emptyhomes/front/stats.html:17 -#, perl-format -msgid "<big>%s</big> report recently" -msgid_plural "<big>%s</big> reports recently" -msgstr[0] "<big>%s</big> rapportert<br>nylig" -msgstr[1] "<big>%s</big> rapportert<br>nylig" +#: perllib/Utils.pm:282 +#, fuzzy, perl-format +msgid "%d week" +msgid_plural "%d weeks" +msgstr[0] "%d uke" +msgstr[1] "%d uke" #: templates/web/emptyhomes/front/stats.html:12 #, perl-format @@ -4126,12 +4246,33 @@ msgstr[1] "" "Vi har ennå <strong>ikke</strong> detaljene for de andre administrasjonene " "som dekker dette stedet." -#: templates/web/default/front/stats.html:29 -#, perl-format -msgid "<big>%s</big> update on reports" -msgid_plural "<big>%s</big> updates on reports" -msgstr[0] "<big>%s</big> rapport-<br>oppdatering" -msgstr[1] "<big>%s</big> rapport-<br>oppdateringer" +#: perllib/Utils.pm:284 +#, fuzzy, perl-format +msgid "%d day" +msgid_plural "%d days" +msgstr[0] "%d dag" +msgstr[1] "%d dag" + +#~ msgid "%d days" +#~ msgstr "%d dager" + +#~ msgid "%d hours" +#~ msgstr "%d timer" + +#~ msgid "%d minutes" +#~ msgstr "%d minutter" + +#~ msgid "%d weeks" +#~ msgstr "%d uker" + +#~ msgid "All" +#~ msgstr "Alle" + +#~ msgid "the map was not used so pin location may be inaccurate" +#~ msgstr "kartet ble ikke brukt, så nåleposisjon kan være unøyaktig" + +#~ msgid "their ref: %s" +#~ msgstr "deres ref: %s" #~ msgid "FixMyStreet for Councils" #~ msgstr "FiksGataMi for det offentlige" diff --git a/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po index 22a04be64..3f2adbdc8 100644 --- a/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2012-08-21 09:54+0100\n" +"POT-Creation-Date: 2012-11-19 17:55+0000\n" "PO-Revision-Date: 2011-12-08 10:56+0100\n" "Last-Translator: Anders Einar Hilden <hildenae@gmail.com>\n" "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n" @@ -21,8 +21,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:555 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:337 +#: perllib/FixMyStreet/DB/Result/Problem.pm:560 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:339 msgid " and " msgstr " og " @@ -55,49 +55,21 @@ msgstr "%d stadfesta varsel, %d ikkje stadfesta" msgid "%d council contacts – %d confirmed, %d unconfirmed" msgstr "%d administrasjonskontaktar – %d stadfesta, %d ikkje stadfesta" -#: perllib/Utils.pm:293 -msgid "%d day" -msgstr "%d dag" - -#: perllib/Utils.pm:293 -msgid "%d days" -msgstr "%d dagar" - #: templates/web/default/admin/council_list.html:27 msgid "%d edits by %s" msgstr "%d redigeringar av %s" -#: perllib/Utils.pm:294 -msgid "%d hour" -msgstr "%d time" - -#: perllib/Utils.pm:294 -msgid "%d hours" -msgstr "%d timar" - #: templates/web/default/admin/index.html:16 msgid "%d live updates" msgstr "%d aktive oppdateringar" -#: perllib/Utils.pm:295 -msgid "%d minute" -msgstr "%d minutt" - -#: perllib/Utils.pm:295 -msgid "%d minutes" -msgstr "%d minutt" - #: templates/web/default/admin/index.html:18 msgid "%d questionnaires sent – %d answered (%s%%)" msgstr "%d spørjeskjema sendt – %d svart (%s%%)" -#: perllib/Utils.pm:292 -msgid "%d week" -msgstr "%d veke" - -#: perllib/Utils.pm:292 -msgid "%d weeks" -msgstr "%d veker" +#: templates/web/default/report/_support.html:3 +msgid "%d supporters" +msgstr "" #: templates/web/default/reports/council.html:0 #: templates/web/default/reports/council.html:26 @@ -106,30 +78,26 @@ msgstr "%d veker" msgid "%s - Summary reports" msgstr "%s – oppsummeringsrapportar" -#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:610 msgid "%s ref: %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:288 perllib/FixMyStreet/Cobrand/UK.pm:300 +#: perllib/FixMyStreet/Cobrand/UK.pm:279 perllib/FixMyStreet/Cobrand/UK.pm:291 msgid "%s ward, %s" msgstr "%s bydel, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:488 +#: perllib/FixMyStreet/DB/Result/Problem.pm:496 msgid "%s, reported anonymously at %s" msgstr "%s, rapportert anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:490 +#: perllib/FixMyStreet/DB/Result/Problem.pm:498 msgid "%s, reported by %s at %s" msgstr "%s, rapportert av %s %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:315 perllib/FixMyStreet/Cobrand/UK.pm:327 +#: perllib/FixMyStreet/Cobrand/UK.pm:306 perllib/FixMyStreet/Cobrand/UK.pm:318 msgid "%s, within %s ward" msgstr "%s, innanfor bydelen %s" -#: templates/web/default/admin/stats.html:5 -msgid "%sreports between %s and %s" -msgstr "%srapportar mellom %s og %s" - #: templates/web/default/email_sent.html:28 msgid "(Don't worry — %s)" msgstr "(Ingen grunn til å uroa seg — %s)" @@ -162,7 +130,7 @@ msgid "(fixed)" msgstr "(løyst)" #: templates/web/default/index.html:12 templates/web/default/index.html:8 -#: templates/web/fixmystreet/around/postcode_form.html:7 +#: templates/web/fixmystreet/around/postcode_form.html:10 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(som tagging, søppel, hol i vegen, eller øydelagte gatelys)" @@ -188,18 +156,18 @@ msgstr "(vi viser aldri e-postadressa di eller telefonnummeret ditt)" msgid "(we never show your email)" msgstr "(vi viser aldri e-postadressa di)" -#: perllib/FixMyStreet/App/Controller/Admin.pm:284 +#: perllib/FixMyStreet/App/Controller/Admin.pm:285 msgid "*unknown*" msgstr "*ukjent*" #: perllib/FixMyStreet/App/Controller/Report/New.pm:629 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:655 -#: perllib/FixMyStreet/DB/Result/Problem.pm:345 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:657 +#: perllib/FixMyStreet/DB/Result/Problem.pm:353 msgid "-- Pick a category --" msgstr "-- Vel ein kategori --" #: perllib/FixMyStreet/App/Controller/Report/New.pm:609 -#: perllib/FixMyStreet/DB/Result/Problem.pm:351 +#: perllib/FixMyStreet/DB/Result/Problem.pm:359 msgid "-- Pick a property type --" msgstr "-- Vel ein eigedomstype --" @@ -209,6 +177,10 @@ msgstr "-- Vel ein eigedomstype --" msgid ". You can <a href=\"%s%s\">view the problem on this site</a>." msgstr ". Du kan <a href=\"%s\">lesa om problemet på portalen</a>." +#: templates/web/default/report/_support.html:3 +msgid "1 supporter" +msgstr "" + #: templates/web/default/questionnaire/completed.html:20 msgid "" "<p style=\"font-size:150%\">Thank you very much for filling in our " @@ -235,7 +207,7 @@ msgstr "" "av folk i nabolaget som jobbar saman, kva med å <a href=\"http://www." "pledgebank.com/new\">publisera ei utfordring om å bidra</a>?</p>" -#: templates/web/fixmystreet/questionnaire/completed-open.html:1 +#: templates/web/fixmystreet/questionnaire/completed-open.html:6 #, fuzzy msgid "" "<p style=\"font-size:150%\">We’re sorry to hear that. We have two\n" @@ -254,7 +226,7 @@ msgstr "" "av folk i nabolaget som jobbar saman, kva med å <a href=\"http://www." "pledgebank.com/new\">publisera ei utfordring om å bidra</a>?</p>" -#: templates/web/default/questionnaire/completed-open.html:1 +#: templates/web/default/questionnaire/completed-open.html:6 #, fuzzy msgid "" "<p style=\"font-size:150%\">We’re sorry to hear that. We have two\n" @@ -317,8 +289,8 @@ msgstr "" "informasjon om status for problemet ditt, ver så snill og kom tilbake\n" "til nettstaden og legg igjen ei oppdatering.</p>" -#: templates/web/default/around/display_location.html:70 -#: templates/web/default/around/display_location.html:72 +#: templates/web/default/around/_report_banner.html:3 +#: templates/web/default/around/_report_banner.html:5 #: templates/web/emptyhomes/around/display_location.html:36 #: templates/web/emptyhomes/around/display_location.html:38 msgid "" @@ -332,17 +304,17 @@ msgstr "" msgid "<strong>%d</strong> live problems" msgstr "<strong>%d</strong> aktive problem" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:172 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:195 #, fuzzy msgid "<strong>No</strong> Let me confirm my report by email" msgstr "<strong>Nei</strong>, la meg stadfesta rapporten min med e-post:" -#: templates/web/fixmystreet/report/display.html:148 +#: templates/web/fixmystreet/report/display.html:170 #, fuzzy msgid "<strong>No</strong> Let me confirm my update by email" msgstr "<strong>Nei</strong>, la meg stadfesta oppdateringa mi med e-post:" -#: templates/web/fixmystreet/auth/general.html:46 +#: templates/web/fixmystreet/auth/general.html:50 #, fuzzy msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>Nei</strong>, det gjer eg ikkje. La meg logga inn med e-post:" @@ -362,10 +334,10 @@ msgstr "<strong>Nei</strong>, la meg stadfesta oppdateringa mi med e-post:" #: templates/web/default/auth/general.html:37 #: templates/web/default/report/display.html:142 #: templates/web/default/report/new/fill_in_details_form.html:140 -#: templates/web/fixmystreet/auth/general.html:32 -#: templates/web/fixmystreet/auth/general.html:34 -#: templates/web/fixmystreet/report/display.html:131 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:154 +#: templates/web/fixmystreet/auth/general.html:36 +#: templates/web/fixmystreet/auth/general.html:38 +#: templates/web/fixmystreet/report/display.html:147 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:171 #, fuzzy msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Ja</strong>, eg har eit passord:" @@ -378,11 +350,11 @@ msgstr "<strong>Ja</strong>, eg har eit passord:" msgid "About us" msgstr "Om oss" -#: templates/web/default/admin/council_contacts.html:66 +#: templates/web/default/admin/council_contacts.html:72 msgid "Add new category" msgstr "Legg til ny kategori" -#: templates/web/default/my/my.html:56 templates/web/fixmystreet/my/my.html:56 +#: templates/web/default/my/my.html:56 templates/web/fixmystreet/my/my.html:60 msgid "Added %s" msgstr "La til %s" @@ -400,14 +372,10 @@ msgstr "Varsel %d kobla ut (oppretta %s)" #: templates/web/bromley/report/display.html:207 #: templates/web/default/report/display.html:214 -#: templates/web/fixmystreet/report/display.html:189 +#: templates/web/fixmystreet/report/display.html:211 msgid "Alert me to future updates" msgstr "Send meg varsel ved framtidige oppdateringar" -#: templates/web/default/admin/stats.html:5 -msgid "All" -msgstr "Alle" - #: templates/web/default/reports/index.html:3 #, fuzzy msgid "All Reports" @@ -421,11 +389,17 @@ msgstr "Alle stadfesta" #: templates/web/bromley/header.html:77 templates/web/default/footer.html:11 #: templates/web/fiksgatami/footer.html:7 #: templates/web/fiksgatami/nn/footer.html:7 +#: templates/web/fixmybarangay/footer.html:20 #: templates/web/fixmystreet/footer.html:49 #: templates/web/reading/footer.html:8 msgid "All reports" msgstr "Alle rapportar" +#: templates/web/default/admin/stats.html:5 +#, fuzzy +msgid "All reports between %s and %s" +msgstr "%srapportar mellom %s og %s" + #: templates/web/default/report/new/councils_text_some.html:2 msgid "All the information you provide here will be sent to" msgstr "All informasjonen du har lagt inn her vil sendast til" @@ -525,6 +499,12 @@ msgstr "For augneblunken går det berre an å søkja etter og å sjå på rappor msgid "Ban email address" msgstr "Bannlys e-postadresse" +#: templates/web/fixmybarangay/report/new/notes.html:7 +msgid "" +"Be sure to choose the right category, because we use that to determine to " +"whom the report is sent." +msgstr "" + #: templates/web/fiksgatami/footer.html:16 #: templates/web/fiksgatami/nn/footer.html:16 msgid "" @@ -538,8 +518,8 @@ msgstr "" msgid "By Date" msgstr "På dato" -#: templates/web/fixmystreet/around/display_location.html:80 -#: templates/web/fixmystreet/around/display_location.html:82 +#: templates/web/fixmystreet/around/_report_banner.html:10 +#: templates/web/fixmystreet/around/_report_banner.html:8 #, fuzzy msgid "Can't see the map? <a href='%s' rel='nofollow'>Skip this step</a>" msgstr "" @@ -547,13 +527,13 @@ msgstr "" "dette steget</a>.</small>" #: perllib/FixMyStreet/App/Controller/Report/New.pm:632 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:657 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:659 #: templates/web/bromley/report/new/fill_in_details_form.html:68 -#: templates/web/default/admin/council_contacts.html:35 +#: templates/web/default/admin/council_contacts.html:37 #: templates/web/default/admin/index.html:36 #: templates/web/default/admin/list_flagged.html:14 #: templates/web/default/admin/search_reports.html:17 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:72 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:74 msgid "Category" msgstr "Kategori" @@ -561,14 +541,14 @@ msgstr "Kategori" msgid "Category fix rate for problems > 4 weeks old" msgstr "Løysingsrate fordelt på kategori for problem > 4 veker gamle" -#: templates/web/default/admin/council_contacts.html:72 +#: templates/web/default/admin/council_contacts.html:78 #: templates/web/default/admin/council_edit.html:23 #: templates/web/default/admin/report_edit.html:25 #: templates/web/default/report/new/fill_in_details_form.html:67 msgid "Category:" msgstr "Kategori:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:334 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:336 msgid "Category: %s" msgstr "Kategori: %s" @@ -578,8 +558,8 @@ msgstr "Kategori: %s" msgid "Change Password" msgstr "Byt passord" -#: templates/web/fixmystreet/around/display_location.html:72 -#: templates/web/fixmystreet/around/display_location.html:73 +#: templates/web/default/js/validation_strings.html:22 +#: templates/web/fixmystreet/around/_report_banner.html:2 #, fuzzy msgid "Click map to report a problem" msgstr "Korleis rapportera eit problem" @@ -588,22 +568,22 @@ msgstr "Korleis rapportera eit problem" #: templates/web/bromley/report/display.html:82 #: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/report_edit.html:20 -#: templates/web/default/dashboard/index.html:136 #: templates/web/default/dashboard/index.html:138 +#: templates/web/default/dashboard/index.html:140 #: templates/web/default/report/display.html:79 #: templates/web/default/report/display.html:81 #: templates/web/fixmystreet/report/banner.html:15 -#: templates/web/fixmystreet/report/display.html:74 -#: templates/web/fixmystreet/report/display.html:76 +#: templates/web/fixmystreet/report/display.html:90 +#: templates/web/fixmystreet/report/display.html:92 msgid "Closed" msgstr "Lukka" # skal det vera forskjellig tyding frå engelsken her? --KBU -#: perllib/FixMyStreet/DB/Result/Problem.pm:690 +#: perllib/FixMyStreet/DB/Result/Problem.pm:695 msgid "Closed by council" msgstr "(ikkje rapportert til administrasjonen)" -#: templates/web/default/my/my.html:32 templates/web/fixmystreet/my/my.html:32 +#: templates/web/default/my/my.html:32 templates/web/fixmystreet/my/my.html:36 msgid "Closed reports" msgstr "Lukka rapportar" @@ -611,8 +591,8 @@ msgstr "Lukka rapportar" msgid "Closed:" msgstr "Lukka:" -#: templates/web/default/around/display_location.html:103 -#: templates/web/default/around/display_location.html:105 +#: templates/web/default/around/tabbed_lists.html:10 +#: templates/web/default/around/tabbed_lists.html:12 msgid "Closest nearby problems <small>(within %skm)</small>" msgstr "Dei næraste problema <small>(innanfor %skm)</small>" @@ -636,23 +616,28 @@ msgstr "Data om merkevaresamarbeid:" msgid "Cobrand:" msgstr "Merkevaresamarbeid:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:358 +#: perllib/FixMyStreet/App/Controller/Admin.pm:365 msgid "Configuration updated" msgstr "Oppsett oppdatert" -#: perllib/FixMyStreet/App/Controller/Admin.pm:372 +#: perllib/FixMyStreet/App/Controller/Admin.pm:380 msgid "Configuration updated - contacts will be generated automatically later" msgstr "Oppsett oppdatert - kontaktar vil genererast automatisk seinare" -#: templates/web/default/admin/council_contacts.html:153 +#: templates/web/default/admin/council_edit.html:34 +#, fuzzy +msgid "Configure Endpoint" +msgstr "Sett opp Open311" + +#: templates/web/default/admin/council_contacts.html:168 msgid "Configure Open311" msgstr "Sett opp Open311" -#: templates/web/default/admin/council_contacts.html:105 +#: templates/web/default/admin/council_contacts.html:116 msgid "Configure Open311 integration" msgstr "Sett opp Open311-integrasjon" -#: templates/web/default/admin/council_contacts.html:42 +#: templates/web/default/admin/council_contacts.html:46 msgid "Confirm" msgstr "Stadfest" @@ -660,6 +645,13 @@ msgstr "Stadfest" msgid "Confirm account" msgstr "Stadfest konto" +#: templates/web/fixmystreet/report/display.html:165 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:189 +msgid "" +"Confirm by email below, providing a new password at that point. When you " +"confirm, your password will be updated." +msgstr "" + #: templates/web/default/questionnaire/creator_fixed.html:1 #: templates/web/default/tokens/confirm_problem.html:1 #: templates/web/default/tokens/confirm_problem.html:3 @@ -667,17 +659,23 @@ msgstr "Stadfest konto" #: templates/web/default/tokens/confirm_update.html:3 #: templates/web/emptyhomes/tokens/confirm_problem.html:1 #: templates/web/emptyhomes/tokens/confirm_problem.html:3 +#: templates/web/southampton/tokens/confirm_problem.html:1 +#: templates/web/southampton/tokens/confirm_problem.html:3 msgid "Confirmation" msgstr "Stadfesting" -#: templates/web/default/admin/council_contacts.html:37 -#: templates/web/default/admin/council_contacts.html:82 +#: templates/web/default/admin/council_contacts.html:39 +#: templates/web/default/admin/council_contacts.html:88 #: templates/web/default/admin/council_edit.html:28 -#: templates/web/default/admin/council_edit.html:43 -#: templates/web/default/admin/stats.html:5 +#: templates/web/default/admin/council_edit.html:71 msgid "Confirmed" msgstr "Stadfesta" +#: templates/web/default/admin/stats.html:5 +#, fuzzy +msgid "Confirmed reports between %s and %s" +msgstr "%srapportar mellom %s og %s" + #: templates/web/default/admin/problem_row.html:23 #: templates/web/default/admin/report_edit.html:34 msgid "Confirmed:" @@ -708,8 +706,8 @@ msgstr "Kontakt oss" msgid "Contact the team" msgstr "Kontakt prosjektgruppa" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1150 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1178 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1164 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 msgid "Could not find user" msgstr "Kunne ikkje finna brukaren" @@ -720,7 +718,7 @@ msgstr "Kunne ikkje finna brukaren" msgid "Council" msgstr "Administrasjon" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1022 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 #: templates/web/default/admin/council_list.html:1 msgid "Council contacts" msgstr "Administrasjonskontaktar" @@ -748,7 +746,7 @@ msgstr "Mengd" msgid "Create a report" msgstr "Lag ein rapport" -#: templates/web/default/admin/council_contacts.html:96 +#: templates/web/default/admin/council_contacts.html:107 msgid "Create category" msgstr "Lag kategori" @@ -776,15 +774,15 @@ msgstr "For tida har 1+ sletta" msgid "Dashboard" msgstr "" -#: templates/web/default/admin/council_contacts.html:38 -#: templates/web/default/admin/council_contacts.html:85 +#: templates/web/default/admin/council_contacts.html:40 +#: templates/web/default/admin/council_contacts.html:91 #: templates/web/default/admin/council_edit.html:29 -#: templates/web/default/admin/council_edit.html:44 +#: templates/web/default/admin/council_edit.html:72 msgid "Deleted" msgstr "Sletta" #: templates/web/bromley/report/new/fill_in_details_form.html:54 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:64 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66 #, fuzzy msgid "Details" msgstr "Detaljar:" @@ -794,14 +792,23 @@ msgstr "Detaljar:" msgid "Details:" msgstr "Detaljar:" +#: templates/web/default/admin/council_contacts.html:41 +msgid "Devolved" +msgstr "" + #: templates/web/default/admin/council_list.html:23 msgid "Diligency prize league table" msgstr "Arbeidshestar" +#: templates/web/fixmystreet/auth/general.html:30 +#, fuzzy +msgid "Do you have a FixMyBarangay password?" +msgstr "Har du eit FiksGataMi-passord?" + #: templates/web/default/auth/general.html:32 -#: templates/web/fixmystreet/auth/general.html:29 -#: templates/web/fixmystreet/report/display.html:128 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:150 +#: templates/web/fixmystreet/auth/general.html:32 +#: templates/web/fixmystreet/report/display.html:144 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:167 msgid "Do you have a FixMyStreet password?" msgstr "Har du eit FiksGataMi-passord?" @@ -828,13 +835,13 @@ msgstr "Redigerer oppdatering %d" msgid "Editing user %d" msgstr "Redigerer brukar %d" -#: templates/web/default/admin/council_edit.html:45 +#: templates/web/default/admin/council_edit.html:73 msgid "Editor" msgstr "Oppdatert av" #: templates/web/bromley/report/display.html:126 -#: templates/web/default/admin/council_contacts.html:36 -#: templates/web/default/admin/council_edit.html:42 +#: templates/web/default/admin/council_contacts.html:38 +#: templates/web/default/admin/council_edit.html:70 #: templates/web/default/admin/list_flagged.html:12 #: templates/web/default/admin/list_flagged.html:35 #: templates/web/default/admin/list_updates.html:8 @@ -842,19 +849,19 @@ msgstr "Oppdatert av" #: templates/web/default/admin/search_reports.html:15 #: templates/web/default/admin/search_users.html:13 #: templates/web/fixmystreet/auth/general.html:20 -#: templates/web/fixmystreet/report/display.html:120 +#: templates/web/fixmystreet/report/display.html:136 msgid "Email" msgstr "E-post" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1126 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1140 msgid "Email added to abuse list" msgstr "E-post lagd til misbrukliste" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1123 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1137 msgid "Email already in abuse list" msgstr "E-post allereie i misbruklista" -#: templates/web/default/around/display_location.html:85 +#: templates/web/default/around/_updates.html:5 msgid "Email me new local problems" msgstr "Send meg e-post om lokale problem" @@ -862,7 +869,7 @@ msgstr "Send meg e-post om lokale problem" msgid "Email me updates" msgstr "Send meg oppdateringar" -#: templates/web/default/admin/council_contacts.html:77 +#: templates/web/default/admin/council_contacts.html:83 #: templates/web/default/admin/council_edit.html:26 #: templates/web/default/admin/report_edit.html:31 #: templates/web/default/admin/update_edit.html:24 @@ -925,8 +932,8 @@ msgstr "Skriv inn postnummer i nærleiken, eller vegnamn og stad" #: templates/web/default/around/postcode_form.html:1 #: templates/web/default/around/postcode_form.html:2 -#: templates/web/fixmystreet/around/postcode_form.html:10 -#: templates/web/fixmystreet/around/postcode_form.html:11 +#: templates/web/fixmystreet/around/postcode_form.html:13 +#: templates/web/fixmystreet/around/postcode_form.html:14 #, fuzzy msgid "Enter a nearby street name and area" msgstr "Skriv inn postnummer i nærleiken, eller vegnamn og stad" @@ -939,15 +946,15 @@ msgstr "Skriv inn eit nytt passord:" #: templates/web/bromley/report/display.html:148 #: templates/web/bromley/report/new/fill_in_details_form.html:189 -#: templates/web/fixmystreet/auth/general.html:57 -#: templates/web/fixmystreet/report/display.html:160 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:200 +#: templates/web/fixmystreet/auth/general.html:61 +#: templates/web/fixmystreet/report/display.html:182 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:223 #, fuzzy msgid "Enter a password" msgstr "Skriv inn eit nytt passord:" -#: templates/web/default/index.html:33 templates/web/emptyhomes/index.html:58 -#: templates/web/fixmystreet/index.html:41 +#: templates/web/default/index-steps.html:11 +#: templates/web/emptyhomes/index.html:58 msgid "Enter details of the problem" msgstr "Legg inn detaljar om problemet" @@ -961,7 +968,7 @@ msgstr "Legg inn detaljar om problemet" msgid "Error" msgstr "Feil" -#: templates/web/default/admin/council_contacts.html:11 +#: templates/web/default/admin/council_contacts.html:13 #: templates/web/default/admin/council_edit.html:18 msgid "Example postcode %s" msgstr "Postnummerdøme %s" @@ -1050,13 +1057,13 @@ msgstr "" #: templates/web/default/admin/index.html:36 #: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/report_edit.html:20 -#: templates/web/default/dashboard/index.html:136 #: templates/web/default/dashboard/index.html:138 +#: templates/web/default/dashboard/index.html:140 #: templates/web/default/report/display.html:79 #: templates/web/default/report/display.html:81 #: templates/web/fixmystreet/report/banner.html:12 -#: templates/web/fixmystreet/report/display.html:74 -#: templates/web/fixmystreet/report/display.html:76 +#: templates/web/fixmystreet/report/display.html:90 +#: templates/web/fixmystreet/report/display.html:92 msgid "Fixed" msgstr "Løyst" @@ -1070,7 +1077,7 @@ msgstr "Løyst – Administrasjon" msgid "Fixed - User" msgstr "Løyst – Brukar" -#: templates/web/default/my/my.html:27 templates/web/fixmystreet/my/my.html:27 +#: templates/web/default/my/my.html:27 templates/web/fixmystreet/my/my.html:31 msgid "Fixed reports" msgstr "Løyste rapportar" @@ -1101,11 +1108,18 @@ msgstr "Følg ei bydellenkje for å berre sjå rapportar innanfor den bydelen." msgid "For council(s):" msgstr "For administrasjon(ane):" +#: templates/web/fixmystreet/report/display.html:164 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:188 +#, fuzzy +msgid "Forgotten your password?" +msgstr "Rapportane dine" + #: templates/web/default/faq/faq-en-gb.html:1 #: templates/web/emptyhomes/faq/faq-cy.html:1 #: templates/web/emptyhomes/faq/faq-en-gb.html:1 #: templates/web/fiksgatami/faq/faq-nb.html:1 #: templates/web/fiksgatami/nn/faq/faq-nn.html:1 +#: templates/web/fixmybarangay/faq/faq-en-gb.html:1 #: templates/web/fixmystreet/faq/faq-en-gb.html:1 #: templates/web/fixmystreet/static/privacy.html:1 #: templates/web/zurich/faq/faq-de.html:1 @@ -1121,7 +1135,7 @@ msgid "GeoRSS on Google Maps" msgstr "GeoRSS på Google Maps" #: templates/web/bromley/report/display.html:30 -#: templates/web/fixmystreet/report/display.html:23 +#: templates/web/fixmystreet/report/display.html:27 #, fuzzy msgid "Get updates" msgstr "Siste oppdatering:" @@ -1139,6 +1153,7 @@ msgid "Get updates of problems in this %s" msgstr "RSS-straum for problem i denne %s-en" #: templates/web/default/alert/_list.html:83 +#: templates/web/fixmybarangay/alert/_list.html:28 #: templates/web/fixmystreet/alert/_list.html:82 msgid "Give me an RSS feed" msgstr "Gje meg ein RSS-straum" @@ -1146,7 +1161,7 @@ msgstr "Gje meg ein RSS-straum" #: templates/web/default/alert/index.html:34 #: templates/web/default/around/postcode_form.html:8 #: templates/web/emptyhomes/index.html:47 -#: templates/web/fixmystreet/around/postcode_form.html:18 +#: templates/web/fixmystreet/around/postcode_form.html:24 msgid "Go" msgstr "Hald fram" @@ -1183,6 +1198,7 @@ msgstr "" #: templates/web/emptyhomes/header.html:28 #: templates/web/fiksgatami/footer.html:9 #: templates/web/fiksgatami/nn/footer.html:9 +#: templates/web/fixmybarangay/footer.html:24 #: templates/web/fixmystreet/footer.html:53 #: templates/web/reading/footer.html:10 msgid "Help" @@ -1195,7 +1211,7 @@ msgstr "Her er dei ulike typane lokale problemvarsel for «%s»." #: templates/web/barnet/header.html:70 templates/web/bromley/header.html:64 #: templates/web/bromley/header.html:99 -#: templates/web/fixmybarangay/header.html.orig:42 +#: templates/web/fixmybarangay/header.html:66 #: templates/web/fixmystreet/header.html:47 #: templates/web/zurich/header.html:47 msgid "Hi %s" @@ -1207,26 +1223,24 @@ msgstr "" msgid "Hidden" msgstr "Skjult" -#: templates/web/default/around/display_location.html:58 -#: templates/web/fixmystreet/around/display_location.html:58 +#: templates/web/default/around/display_location.html:63 msgid "Hide old" msgstr "" -#: templates/web/default/around/display_location.html:53 -#: templates/web/fixmystreet/around/display_location.html:54 +#: templates/web/default/around/display_location.html:58 msgid "Hide pins" msgstr "Skjul nåler" -#: templates/web/default/admin/council_edit.html:38 +#: templates/web/default/admin/council_edit.html:66 msgid "History" msgstr "Historie" -#: templates/web/default/index.html:28 templates/web/emptyhomes/index.html:53 -#: templates/web/fixmystreet/index.html:36 +#: templates/web/default/index-steps.html:1 +#: templates/web/emptyhomes/index.html:53 msgid "How to report a problem" msgstr "Korleis rapportera eit problem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:637 +#: perllib/FixMyStreet/App/Controller/Admin.pm:648 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "Eg er redd du ikkje kan stadfesta ustadfesta rapportar." @@ -1311,12 +1325,12 @@ msgstr "Ugyldig val av straum" #: templates/web/bromley/report/display.html:82 #: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/report_edit.html:20 -#: templates/web/default/dashboard/index.html:136 #: templates/web/default/dashboard/index.html:138 +#: templates/web/default/dashboard/index.html:140 #: templates/web/default/report/display.html:79 #: templates/web/default/report/display.html:81 -#: templates/web/fixmystreet/report/display.html:74 -#: templates/web/fixmystreet/report/display.html:76 +#: templates/web/fixmystreet/report/display.html:90 +#: templates/web/fixmystreet/report/display.html:92 msgid "In Progress" msgstr "Under arbeid" @@ -1349,7 +1363,7 @@ msgstr "Feil has_photo-verdi «%s»" msgid "Invalid agency_responsible value %s" msgstr "Ugyldig agency_responsible-verdi %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:942 +#: perllib/FixMyStreet/App/Controller/Admin.pm:956 msgid "Invalid end date" msgstr "Ugyldig slutt-dato" @@ -1357,7 +1371,7 @@ msgstr "Ugyldig slutt-dato" msgid "Invalid format %s specified." msgstr "Ugyldig format %s oppgjeve." -#: perllib/FixMyStreet/App/Controller/Admin.pm:932 +#: perllib/FixMyStreet/App/Controller/Admin.pm:946 msgid "Invalid start date" msgstr "Ugyldig startdato" @@ -1365,12 +1379,12 @@ msgstr "Ugyldig startdato" #: templates/web/bromley/report/display.html:81 #: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/report_edit.html:19 -#: templates/web/default/dashboard/index.html:136 -#: templates/web/default/dashboard/index.html:137 +#: templates/web/default/dashboard/index.html:138 +#: templates/web/default/dashboard/index.html:139 #: templates/web/default/report/display.html:79 #: templates/web/default/report/display.html:80 -#: templates/web/fixmystreet/report/display.html:74 -#: templates/web/fixmystreet/report/display.html:75 +#: templates/web/fixmystreet/report/display.html:90 +#: templates/web/fixmystreet/report/display.html:91 msgid "Investigating" msgstr "Undersøkjer" @@ -1392,9 +1406,9 @@ msgstr "" #: templates/web/default/auth/general.html:44 #: templates/web/default/report/display.html:151 #: templates/web/default/report/new/fill_in_details_form.html:149 -#: templates/web/fixmystreet/auth/general.html:42 -#: templates/web/fixmystreet/report/display.html:144 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:167 +#: templates/web/fixmystreet/auth/general.html:46 +#: templates/web/fixmystreet/report/display.html:160 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:184 msgid "Keep me signed in on this computer" msgstr "Hugs mi innlogging på denne datamaskina" @@ -1405,7 +1419,7 @@ msgstr "Hugs mi innlogging på denne datamaskina" msgid "Last Name" msgstr "Siste oppdatering:" -#: templates/web/default/admin/council_contacts.html:39 +#: templates/web/default/admin/council_contacts.html:42 msgid "Last editor" msgstr "Sist redigert av" @@ -1417,18 +1431,18 @@ msgstr "Siste oppdatering:" msgid "Last update:" msgstr "Siste oppdatering:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1028 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 msgid "List Flagged" msgstr "Vis flagga" -#: templates/web/default/admin/council_contacts.html:14 #: templates/web/default/admin/council_contacts.html:16 +#: templates/web/default/admin/council_contacts.html:18 msgid "List all reported problems" msgstr "Vis alle rapporterte problem" #: templates/web/bromley/report/new/fill_in_details_form.html:69 #: templates/web/default/report/new/fill_in_details_form.html:68 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:73 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:75 msgid "Loading..." msgstr "Lastar …" @@ -1443,6 +1457,8 @@ msgstr "Lastar …" #: templates/web/default/tokens/confirm_alert.html:3 #: templates/web/emptyhomes/alert/index.html:1 #: templates/web/emptyhomes/alert/index.html:3 +#: templates/web/fixmybarangay/alert/index.html:1 +#: templates/web/fixmybarangay/alert/index.html:3 #: templates/web/fixmystreet/alert/updates.html:1 msgid "Local RSS feeds and email alerts" msgstr "Lokal RSS-straum og e-postvarsel" @@ -1458,13 +1474,14 @@ msgstr "Lokal RSS-straum og e-postvarsel for «%s»" #: templates/web/bromley/header.html:79 templates/web/default/footer.html:13 #: templates/web/fiksgatami/footer.html:8 #: templates/web/fiksgatami/nn/footer.html:8 +#: templates/web/fixmybarangay/footer.html:22 #: templates/web/fixmystreet/footer.html:51 #: templates/web/reading/footer.html:9 msgid "Local alerts" msgstr "Lokale varsel" -#: templates/web/default/index.html:32 templates/web/emptyhomes/index.html:57 -#: templates/web/fixmystreet/index.html:40 +#: templates/web/default/index-steps.html:10 +#: templates/web/emptyhomes/index.html:57 msgid "Locate the problem on a map of the area" msgstr "Lokaliser problemet på kartet over området" @@ -1508,10 +1525,10 @@ msgstr "Fleire problem i nærleiken" #: templates/web/emptyhomes/reports/index.html:10 #: templates/web/fiksgatami/nn/reports/index.html:9 #: templates/web/fiksgatami/reports/index.html:9 -#: templates/web/fixmystreet/auth/general.html:52 -#: templates/web/fixmystreet/report/display.html:177 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:117 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:176 +#: templates/web/fixmystreet/auth/general.html:56 +#: templates/web/fixmystreet/report/display.html:199 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:122 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:199 msgid "Name" msgstr "Namn" @@ -1527,7 +1544,7 @@ msgstr "Namn:" msgid "Navigation" msgstr "Navigasjon" -#: perllib/FixMyStreet/Geocode/OSM.pm:159 +#: perllib/FixMyStreet/Geocode/OSM.pm:161 msgid "" "Nearest named road to the pin placed on the map (automatically generated " "using OpenStreetMap): %s%s" @@ -1535,7 +1552,7 @@ msgstr "" "Næraste namngjevne veg til nålen plassert på kartet (automatisk generert ved " "hjelp av OpenStreetMap): %s%s" -#: perllib/FixMyStreet/Cobrand/UK.pm:161 +#: perllib/FixMyStreet/Cobrand/UK.pm:152 msgid "" "Nearest postcode to the pin placed on the map (automatically generated): %s " "(%sm away)" @@ -1543,8 +1560,8 @@ msgstr "" "Næraste postnummer til nålen plassert på kartet (automatisk generert): %s " "(%sm unna)" -#: perllib/FixMyStreet/Cobrand/Default.pm:404 -#: perllib/FixMyStreet/Cobrand/Default.pm:444 +#: perllib/FixMyStreet/Cobrand/Default.pm:406 +#: perllib/FixMyStreet/Cobrand/Default.pm:446 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing " "Maps): %s" @@ -1552,7 +1569,7 @@ msgstr "" "Næraste veg til nålen plassert på karta (automatisk generert ved hjelp av " "Bing Maps): %s" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:245 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:265 #, fuzzy msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing " @@ -1571,7 +1588,7 @@ msgstr "Nesten ferdig! No må du sjekka e-posten din …" msgid "New <br>problems" msgstr "Nye problem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:314 +#: perllib/FixMyStreet/App/Controller/Admin.pm:320 msgid "New category contact added" msgstr "Ny kategorikontakt lagt til" @@ -1641,8 +1658,9 @@ msgstr "Ny tilstand" msgid "New!" msgstr "Ny!" -#: templates/web/default/admin/council_contacts.html:48 -#: templates/web/default/admin/council_contacts.html:49 +#: templates/web/default/admin/council_contacts.html:52 +#: templates/web/default/admin/council_contacts.html:53 +#: templates/web/default/admin/council_contacts.html:54 #: templates/web/default/admin/council_edit.html:4 #: templates/web/default/admin/list_updates.html:30 #: templates/web/default/admin/list_updates.html:31 @@ -1664,7 +1682,7 @@ msgstr "Nei" msgid "No council" msgstr "Ingen administrasjon" -#: perllib/FixMyStreet/DB/Result/Problem.pm:328 +#: perllib/FixMyStreet/DB/Result/Problem.pm:336 msgid "No council selected" msgstr "Ingen administrasjon er vald" @@ -1694,6 +1712,14 @@ msgstr "Fann ingen problem." msgid "No problems have been reported yet." msgstr "Ingen problem er rapporterte" +#: templates/web/default/report/_support.html:3 +msgid "No supporters" +msgstr "" + +#: templates/web/default/admin/council_contacts.html:57 +msgid "Non Public" +msgstr "" + #: templates/web/default/admin/council_list.html:5 #: templates/web/default/admin/report_edit.html:16 msgid "None" @@ -1703,14 +1729,13 @@ msgstr "Ingen" msgid "Not reported before" msgstr "Ikkje rapportert tidlegare" -#: templates/web/default/report/_main.html:11 +#: templates/web/default/report/_main.html:14 #: templates/web/emptyhomes/report/display.html:24 -#: templates/web/fixmystreet/report/_main.html:13 msgid "Not reported to council" msgstr "Ikkje rapportert til administrasjonen" -#: templates/web/default/admin/council_contacts.html:40 -#: templates/web/default/admin/council_edit.html:46 +#: templates/web/default/admin/council_contacts.html:43 +#: templates/web/default/admin/council_edit.html:74 msgid "Note" msgstr "Merk" @@ -1724,8 +1749,8 @@ msgstr "" "var oppretta. Det treng vera den same månaden som rapporten var stadfesta, " "så tala kan hoppa litt opp og ned." -#: templates/web/default/admin/council_contacts.html:89 -#: templates/web/default/admin/council_edit.html:31 +#: templates/web/default/admin/council_contacts.html:95 +#: templates/web/default/admin/council_edit.html:32 msgid "Note:" msgstr "Merk:" @@ -1733,7 +1758,7 @@ msgstr "Merk:" msgid "Note: <strong>%s</strong>" msgstr "Merk: <strong>%s</strong>" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:149 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:166 #, fuzzy msgid "Now to submit your report…" msgstr "På tide å senda rapporten din, har du eit FiksGataMi-passord?" @@ -1742,7 +1767,7 @@ msgstr "På tide å senda rapporten din, har du eit FiksGataMi-passord?" msgid "Now to submit your report… do you have a FixMyStreet password?" msgstr "På tide å senda rapporten din, har du eit FiksGataMi-passord?" -#: templates/web/fixmystreet/report/display.html:127 +#: templates/web/fixmystreet/report/display.html:143 #, fuzzy msgid "Now to submit your update…" msgstr "På tide å registrera oppdateringa di, har du eit FiksGataMi-passord?" @@ -1795,13 +1820,13 @@ msgstr "Eldre problem" #: templates/web/bromley/report/display.html:80 #: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/update_edit.html:19 -#: templates/web/default/dashboard/index.html:136 +#: templates/web/default/dashboard/index.html:138 #: templates/web/default/report/display.html:79 -#: templates/web/fixmystreet/report/display.html:74 +#: templates/web/fixmystreet/report/display.html:90 msgid "Open" msgstr "Opne" -#: templates/web/default/my/my.html:22 templates/web/fixmystreet/my/my.html:22 +#: templates/web/default/my/my.html:22 templates/web/fixmystreet/my/my.html:26 msgid "Open reports" msgstr "Opne rapportar" @@ -1831,15 +1856,15 @@ msgstr "" "Eller du kan abonnera på varsel basert på bydel eller administrasjon du " "høyrer til under:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:655 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:656 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:999 -#: perllib/FixMyStreet/DB/Result/Problem.pm:497 -#: perllib/FixMyStreet/DB/Result/Problem.pm:507 -#: perllib/FixMyStreet/DB/Result/Problem.pm:517 -#: perllib/FixMyStreet/DB/Result/Problem.pm:529 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:329 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:338 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1007 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:657 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 +#: perllib/FixMyStreet/DB/Result/Problem.pm:505 +#: perllib/FixMyStreet/DB/Result/Problem.pm:515 +#: perllib/FixMyStreet/DB/Result/Problem.pm:525 +#: perllib/FixMyStreet/DB/Result/Problem.pm:537 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:331 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:340 msgid "Other" msgstr "Anna" @@ -1867,9 +1892,9 @@ msgstr "Delvis" #: templates/web/bromley/report/display.html:145 #: templates/web/bromley/report/new/fill_in_details_form.html:186 -#: templates/web/fixmystreet/auth/general.html:55 -#: templates/web/fixmystreet/report/display.html:157 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:197 +#: templates/web/fixmystreet/auth/general.html:59 +#: templates/web/fixmystreet/report/display.html:179 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:220 #, fuzzy msgid "Password (optional)" msgstr "(valfritt)" @@ -1880,13 +1905,13 @@ msgstr "Passord:" #: templates/web/bromley/report/new/fill_in_details_form.html:136 #: templates/web/bromley/report/new/fill_in_details_form.html:183 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:133 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:194 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:150 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:217 #, fuzzy msgid "Phone number (optional)" msgstr "(valfritt)" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:260 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:262 #: templates/web/default/admin/report_edit.html:32 #: templates/web/default/report/new/fill_in_details_form.html:215 msgid "Phone:" @@ -1894,8 +1919,8 @@ msgstr "Telefon:" #: templates/web/bromley/report/display.html:109 #: templates/web/bromley/report/new/fill_in_details_form.html:104 -#: templates/web/fixmystreet/report/display.html:103 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:108 +#: templates/web/fixmystreet/report/display.html:119 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:110 #, fuzzy msgid "Photo" msgstr "Bilete:" @@ -1915,12 +1940,12 @@ msgstr "Bilete av nye problem i nærleiken" #: templates/web/bromley/report/display.html:81 #: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/report_edit.html:19 -#: templates/web/default/dashboard/index.html:136 -#: templates/web/default/dashboard/index.html:137 +#: templates/web/default/dashboard/index.html:138 +#: templates/web/default/dashboard/index.html:139 #: templates/web/default/report/display.html:79 #: templates/web/default/report/display.html:80 -#: templates/web/fixmystreet/report/display.html:74 -#: templates/web/fixmystreet/report/display.html:75 +#: templates/web/fixmystreet/report/display.html:90 +#: templates/web/fixmystreet/report/display.html:91 msgid "Planned" msgstr "Planlagt" @@ -1952,16 +1977,16 @@ msgstr "Ver venleg og sjekk e-posten du oppgav" 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/Report/New.pm:819 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:826 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:845 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:884 -#: perllib/FixMyStreet/DB/Result/Problem.pm:347 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:823 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:830 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:849 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:892 +#: perllib/FixMyStreet/DB/Result/Problem.pm:355 #: templates/web/default/js/validation_strings.html:9 msgid "Please choose a category" msgstr "Vel ein kategori" -#: perllib/FixMyStreet/DB/Result/Problem.pm:353 +#: perllib/FixMyStreet/DB/Result/Problem.pm:361 msgid "Please choose a property type" msgstr "Vel ein type eigenskap" @@ -1984,7 +2009,6 @@ msgstr "" "til forsida</a> og følg instruksjonane." #: templates/web/default/report/new/notes.html:7 -#: templates/web/fixmystreet/report/new/notes.html:6 msgid "" "Please do not be abusive — abusing your council devalues the service " "for all users." @@ -1992,6 +2016,15 @@ msgstr "" "Ikkje ver ufin — å kjefta på administrasjonen din skader verdet av " "tenesta for alle brukarane." +#: templates/web/fixmystreet/report/new/notes.html:6 +#, fuzzy +msgid "" +"Please do not be abusive — abusing your council devalues the " +"service for all users." +msgstr "" +"Ikkje ver ufin — å kjefta på administrasjonen din skader verdet av " +"tenesta for alle brukarane." + #: perllib/FixMyStreet/DB/Result/Comment.pm:146 #: templates/web/default/js/validation_strings.html:2 msgid "Please enter a message" @@ -2003,7 +2036,7 @@ msgid "Please enter a password" msgstr "Skriv inn eit passord" #: perllib/FixMyStreet/App/Controller/Contact.pm:97 -#: perllib/FixMyStreet/DB/Result/Problem.pm:322 +#: perllib/FixMyStreet/DB/Result/Problem.pm:330 #: templates/web/default/js/validation_strings.html:3 msgid "Please enter a subject" msgstr "Ver venleg og legg inn eit emne" @@ -2019,7 +2052,7 @@ msgstr "Ver venleg og legg til ein gyldig e-post" msgid "Please enter a valid email address" msgstr "Ver venleg og legg inn e-postadressa di" -#: perllib/FixMyStreet/DB/Result/Problem.pm:325 +#: perllib/FixMyStreet/DB/Result/Problem.pm:333 #: templates/web/default/js/validation_strings.html:4 msgid "Please enter some details" msgstr "Ver venleg og legg inn opplysningar om problemet" @@ -2036,7 +2069,7 @@ msgid "Please enter your email" msgstr "Ver venleg og legg inn e-posten din" #: templates/web/bromley/report/new/fill_in_details_form.html:149 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:146 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:163 #, fuzzy msgid "Please enter your email address" msgstr "Ver venleg og legg inn e-posten din" @@ -2046,7 +2079,7 @@ msgstr "Ver venleg og legg inn e-posten din" msgid "Please enter your first name" msgstr "Ver venleg og legg inn namnet ditt" -#: perllib/FixMyStreet/DB/Result/Problem.pm:340 +#: perllib/FixMyStreet/DB/Result/Problem.pm:348 #: templates/web/default/js/validation_strings.html:7 #, fuzzy msgid "" @@ -2059,7 +2092,7 @@ msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:95 #: perllib/FixMyStreet/DB/Result/Comment.pm:143 -#: perllib/FixMyStreet/DB/Result/Problem.pm:333 +#: perllib/FixMyStreet/DB/Result/Problem.pm:341 #: perllib/FixMyStreet/DB/Result/User.pm:97 #: templates/web/default/js/validation_strings.html:6 msgid "Please enter your name" @@ -2090,11 +2123,28 @@ msgstr "" #: templates/web/default/report/new/fill_in_details_text.html:1 #: templates/web/default/report/new/fill_in_details_text.html:11 +#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:1 +#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:10 #: templates/web/fixmystreet/report/new/fill_in_details_text.html:1 #: templates/web/fixmystreet/report/new/fill_in_details_text.html:11 msgid "Please fill in details of the problem below." msgstr "Ver venleg og fyll ut detaljar om problemet under." +#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:1 +#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:3 +#, fuzzy +msgid "" +"Please fill in details of the problem below. Leave as much detail as you " +"can, \n" +"and if possible describe the exact location of\n" +"the problem (e.g. if there is a streetlight number or road name)." +msgstr "" +"Ver venlg og fyll inn detaljane om problemet under. Administrasjonen\n" +"vil ikkje vera i stand til å hjelpa med mindre du legg inn så mange\n" +"detaljar som du kan. Forklar den eksakte plasseringa for problemet\n" +"(t.d. på ein vegg), kva det er, kor lenge det har vore der, ei\n" +"skildring (og eit bilete av problemet viss du har eit), osb." + #: templates/web/default/report/new/fill_in_details_text.html:1 #: templates/web/default/report/new/fill_in_details_text.html:3 msgid "" @@ -2111,14 +2161,14 @@ msgstr "" "(t.d. på ein vegg), kva det er, kor lenge det har vore der, ei\n" "skildring (og eit bilete av problemet viss du har eit), osb." -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:68 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:70 #, fuzzy msgid "Please fill in details of the problem." msgstr "Ver venleg og fyll ut detaljar om problemet under." #: templates/web/bromley/report/new/fill_in_details_form.html:28 #: templates/web/default/report/new/fill_in_details_form.html:27 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:34 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:35 msgid "" "Please fill in the form below with details of the problem, and describe the " "location as precisely as possible in the details box." @@ -2126,7 +2176,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:241 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Ver venleg og indiker om du ynskjer å motta eit nytt spørjeskjema" @@ -2159,7 +2209,7 @@ msgstr "" #: templates/web/bromley/report/new/fill_in_details_form.html:23 #: templates/web/default/report/new/fill_in_details_form.html:5 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:25 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:26 msgid "" "Please note your report has <strong>not yet been sent</strong>. Choose a " "category and add further information below, then submit." @@ -2168,22 +2218,23 @@ msgstr "" "og legg til meir informasjon under før du sender inn." #: templates/web/default/report/new/notes.html:1 +#: templates/web/fixmybarangay/report/new/notes.html:1 #: templates/web/fixmystreet/report/new/notes.html:1 msgid "Please note:" msgstr "Merk:" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:244 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:246 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:251 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253 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:116 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:237 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:239 msgid "" "Please say whether you've ever reported a problem to your council before" msgstr "" @@ -2198,7 +2249,7 @@ 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:233 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:235 msgid "Please state whether or not the problem has been fixed" msgstr "Ver venleg og oppgje om dette problemet har vorte fiksa eller ikkje" @@ -2206,11 +2257,11 @@ msgstr "Ver venleg og oppgje om dette problemet har vorte fiksa eller ikkje" msgid "Please take a look at the updates that have been left." msgstr "Ver venleg og sjå over oppdateringane som er lagt inn." -#: perllib/FixMyStreet/App/Controller/Photo.pm:176 +#: perllib/FixMyStreet/App/Controller/Photo.pm:175 msgid "Please upload a JPEG image only" msgstr "Ver venleg og berre last opp JPEG-bilete" -#: perllib/FixMyStreet/App/Controller/Photo.pm:183 +#: perllib/FixMyStreet/App/Controller/Photo.pm:182 #, fuzzy msgid "Please upload a JPEG image only\n" msgstr "Ver venleg og berre last opp JPEG-bilete" @@ -2220,7 +2271,7 @@ msgid "Please write a message" msgstr "Skriv inn ei melding" #: templates/web/bromley/report/display.html:70 -#: templates/web/fixmystreet/report/display.html:69 +#: templates/web/fixmystreet/report/display.html:85 #, fuzzy msgid "Please write your update here" msgstr "Skriv inn ei melding" @@ -2233,9 +2284,9 @@ msgstr "Skriv inn ei melding" #: templates/web/default/report/display.html:156 #: templates/web/default/report/display.html:178 #: templates/web/fixmystreet/contact/index.html:93 -#: templates/web/fixmystreet/report/display.html:115 -#: templates/web/fixmystreet/report/display.html:139 -#: templates/web/fixmystreet/report/display.html:161 +#: templates/web/fixmystreet/report/display.html:131 +#: templates/web/fixmystreet/report/display.html:155 +#: templates/web/fixmystreet/report/display.html:183 msgid "Post" msgstr "Send inn" @@ -2251,6 +2302,12 @@ msgstr "Lagt inn av %s (<strong>%s</strong>) %s" msgid "Posted by %s at %s" msgstr "Sendt inn av %s %s" +#: templates/web/default/admin/council_contacts.html:100 +#: templates/web/default/admin/council_edit.html:30 +#: templates/web/default/admin/report_edit.html:43 +msgid "Private" +msgstr "" + #: templates/web/default/maps/openlayers.html:85 msgid "Problem" msgstr "Problem" @@ -2271,7 +2328,7 @@ msgstr "Problem %s sendt til administrasjon %s" msgid "Problem breakdown by state" msgstr "Tilstandsfordeling av problem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:819 +#: perllib/FixMyStreet/App/Controller/Admin.pm:833 msgid "Problem marked as open." msgstr "Problem markert som ope." @@ -2283,18 +2340,18 @@ msgstr "Endring av problemtilstand basert på spørjeundersøkingsresultat" msgid "Problems" msgstr "Problem" -#: templates/web/default/around/display_location.html:81 +#: templates/web/default/around/_updates.html:1 msgid "Problems in this area" msgstr "Problem i dette området" #: templates/web/bromley/report/display.html:31 -#: templates/web/fixmystreet/around/display_location.html:98 -#: templates/web/fixmystreet/report/display.html:24 +#: templates/web/fixmystreet/around/tabbed_lists.html:4 +#: templates/web/fixmystreet/report/display.html:31 #, fuzzy msgid "Problems nearby" msgstr "Fleire problem i nærleiken" -#: templates/web/fixmystreet/around/display_location.html:97 +#: templates/web/fixmystreet/around/tabbed_lists.html:3 #, fuzzy msgid "Problems on the map" msgstr "Problem i dette området" @@ -2308,15 +2365,15 @@ msgstr "Problem nyleg rapportert fiksa på FiksGataMi" msgid "Problems within %.1fkm of this location" msgstr "Problem innanfor %.1fkm av denne posisjonen" -#: perllib/FixMyStreet/Cobrand/Default.pm:609 +#: perllib/FixMyStreet/Cobrand/Default.pm:611 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:95 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:162 -#: perllib/FixMyStreet/Cobrand/UK.pm:240 +#: perllib/FixMyStreet/Cobrand/UK.pm:231 msgid "Problems within %s" msgstr "Problem innanfor %s" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:103 -#: perllib/FixMyStreet/Cobrand/UK.pm:254 +#: perllib/FixMyStreet/Cobrand/UK.pm:245 msgid "Problems within %s ward" msgstr "Problem innanfor %s bydel" @@ -2326,6 +2383,7 @@ msgid "Problems within %s, FixMyStreet" msgstr "Problem innanfor %s, FiksGataMi" #: templates/web/default/alert/_list.html:40 +#: templates/web/fixmybarangay/alert/_list.html:13 #: templates/web/fixmystreet/alert/_list.html:42 msgid "Problems within the boundary of:" msgstr "Problem innanfor grensene av:" @@ -2339,14 +2397,14 @@ msgid "Property type:" msgstr "Type eigenskap:" #: templates/web/bromley/report/new/fill_in_details_form.html:52 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:62 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:64 #, fuzzy msgid "Provide a title" msgstr "Bidra med ei oppdatering" #: templates/web/bromley/report/display.html:57 #: templates/web/default/report/display.html:51 -#: templates/web/fixmystreet/report/display.html:50 +#: templates/web/fixmystreet/report/display.html:66 msgid "Provide an update" msgstr "Bidra med ei oppdatering" @@ -2363,8 +2421,8 @@ msgstr "" #: templates/web/bromley/report/display.html:142 #: templates/web/default/report/display.html:175 #: templates/web/default/report/new/fill_in_details_form.html:173 -#: templates/web/fixmystreet/report/display.html:154 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:191 +#: templates/web/fixmystreet/report/display.html:176 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:214 msgid "" "Providing a password is optional, but doing so will allow you to more easily " "report problems, leave updates and manage your reports." @@ -2373,6 +2431,11 @@ msgstr "" "enklare for deg å rapportera problem, leggja inn oppdateringar og halda " "oversyn over rapportane dine" +#: templates/web/default/admin/council_contacts.html:44 +#: templates/web/default/admin/council_contacts.html:57 +msgid "Public" +msgstr "" + #: templates/web/default/questionnaire/completed.html:1 #: templates/web/default/questionnaire/completed.html:2 #: templates/web/default/questionnaire/index.html:0 @@ -2393,7 +2456,7 @@ 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:190 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 msgid "Questionnaire filled in by problem reporter" msgstr "Spørjeskjema fylt inn av feilrapportøren" @@ -2405,17 +2468,15 @@ msgstr "Spørjeskjema fylt inn av feilrapportøren" #: templates/web/default/reports/_rss.html:1 #: templates/web/fixmystreet/alert/_list.html:22 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/around/display_location.html:1 -#: templates/web/fixmystreet/around/display_location.html:3 -#: templates/web/fixmystreet/report/display.html:30 +#: templates/web/fixmystreet/report/display.html:45 msgid "RSS feed" msgstr "RSS-straum" -#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 +#: perllib/FixMyStreet/Cobrand/UK.pm:274 perllib/FixMyStreet/Cobrand/UK.pm:286 msgid "RSS feed for %s" msgstr "RSS-straum for %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:289 perllib/FixMyStreet/Cobrand/UK.pm:301 +#: perllib/FixMyStreet/Cobrand/UK.pm:280 perllib/FixMyStreet/Cobrand/UK.pm:292 msgid "RSS feed for %s ward, %s" msgstr "RSS-straum for %s bydel, %s" @@ -2423,11 +2484,11 @@ msgstr "RSS-straum for %s bydel, %s" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:186 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:196 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:204 -#: perllib/FixMyStreet/Cobrand/UK.pm:309 perllib/FixMyStreet/Cobrand/UK.pm:321 +#: perllib/FixMyStreet/Cobrand/UK.pm:300 perllib/FixMyStreet/Cobrand/UK.pm:312 msgid "RSS feed of %s" msgstr "RSS-straum frå %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:314 perllib/FixMyStreet/Cobrand/UK.pm:326 +#: perllib/FixMyStreet/Cobrand/UK.pm:305 perllib/FixMyStreet/Cobrand/UK.pm:317 msgid "RSS feed of %s, within %s ward" msgstr "RSS-straum av %s, innanfor %s bydel" @@ -2440,29 +2501,27 @@ msgstr "RSS-straum med problem i nærleiken" msgid "RSS feed of problems in this %s" msgstr "RSS-straum for problem i denne %s-en" -#: perllib/FixMyStreet/Cobrand/Default.pm:610 +#: perllib/FixMyStreet/Cobrand/Default.pm:612 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:96 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:161 -#: perllib/FixMyStreet/Cobrand/UK.pm:247 +#: perllib/FixMyStreet/Cobrand/UK.pm:238 msgid "RSS feed of problems within %s" msgstr "RSS-straum for problem innanfor %s" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:102 -#: perllib/FixMyStreet/Cobrand/UK.pm:253 +#: perllib/FixMyStreet/Cobrand/UK.pm:244 msgid "RSS feed of problems within %s ward" msgstr "RSS-straum for problem innanfor %s bydel" #: templates/web/default/around/display_location.html:1 #: templates/web/default/around/display_location.html:4 -#: templates/web/fixmystreet/around/display_location.html:1 -#: templates/web/fixmystreet/around/display_location.html:4 msgid "RSS feed of recent local problems" msgstr "RSS-straum med nye lokale problem" #: templates/web/bromley/report/display.html:37 #: templates/web/default/report/display.html:42 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/report/display.html:30 +#: templates/web/fixmystreet/report/display.html:45 msgid "RSS feed of updates to this problem" msgstr "RSS-straum med oppdateringar for dette problemet" @@ -2470,14 +2529,12 @@ msgstr "RSS-straum med oppdateringar for dette problemet" #: templates/web/default/alert/updates.html:9 #: templates/web/default/report/display.html:33 #: templates/web/fixmystreet/alert/updates.html:14 -#: templates/web/fixmystreet/report/display.html:32 +#: templates/web/fixmystreet/report/display.html:47 msgid "Receive email when updates are left on this problem." msgstr "Motta e-post når det er oppdateringar på dette problemet" #: templates/web/default/around/display_location.html:0 #: templates/web/default/around/display_location.html:34 -#: templates/web/fixmystreet/around/display_location.html:0 -#: templates/web/fixmystreet/around/display_location.html:34 msgid "Recent local problems, FixMyStreet" msgstr "Nye lokale problem, FiksGataMi." @@ -2492,7 +2549,7 @@ msgstr "Nyleg løyste problem" msgid "Recently fixed" msgstr "Nyleg løyste problem" -#: templates/web/default/index.html:50 templates/web/fixmystreet/index.html:62 +#: templates/web/default/index.html:37 templates/web/fixmystreet/index.html:45 msgid "Recently reported problems" msgstr "Nyleg melde problem" @@ -2509,11 +2566,17 @@ msgstr "" "tenesta, hugs at du kan kontakta administrasjonen direkte via deira eiga " "nettside." +#: templates/web/fixmybarangay/report/new/notes.html:9 +msgid "" +"Remember that, for the pilot project, FixMyBarangay is only for reporting " +"potholes and streetlights in bgy. Luz or Basak San Nicolas." +msgstr "" + #: templates/web/default/admin/report_blocks.html:16 msgid "Remove flag" msgstr "Fjern flagg" -#: templates/web/default/admin/report_edit.html:53 +#: templates/web/default/admin/report_edit.html:54 #: templates/web/default/admin/update_edit.html:48 msgid "Remove photo (can't be undone!)" msgstr "Fjern bilete (kan ikkje gjerast om!)" @@ -2532,7 +2595,7 @@ msgid "Report a problem" msgstr "Rapporter eit problem" #: templates/web/bromley/report/display.html:28 -#: templates/web/fixmystreet/report/display.html:22 +#: templates/web/fixmystreet/report/display.html:26 #, fuzzy msgid "Report abuse" msgstr "Rapporter eit problem" @@ -2542,12 +2605,12 @@ msgstr "Rapporter eit problem" msgid "Report empty properties" msgstr "Rapporter tomme heimar" -#: perllib/FixMyStreet/App/Controller/Rss.pm:277 +#: perllib/FixMyStreet/App/Controller/Rss.pm:286 msgid "Report on %s" msgstr "Rapport på %s" #: templates/web/default/index.html:15 -#: templates/web/fixmystreet/around/postcode_form.html:6 +#: templates/web/fixmystreet/around/postcode_form.html:9 msgid "Report, view, or discuss local problems" msgstr "Rapporter, finn eller diskuter lokale problem" @@ -2559,7 +2622,7 @@ msgstr "Rapportert %s" msgid "Reported %s, to %s" msgstr "Rapportert %s, til %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:512 +#: perllib/FixMyStreet/DB/Result/Problem.pm:520 #: templates/web/default/contact/index.html:45 #: templates/web/fixmystreet/contact/index.html:46 msgid "Reported anonymously at %s" @@ -2571,33 +2634,33 @@ msgstr "Rapportert anonymt %s" msgid "Reported before" msgstr "Rapportert tidlegare" -#: perllib/FixMyStreet/DB/Result/Problem.pm:504 +#: perllib/FixMyStreet/DB/Result/Problem.pm:512 msgid "Reported by %s anonymously at %s" msgstr "Publisert av %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:535 +#: perllib/FixMyStreet/DB/Result/Problem.pm:543 #: templates/web/default/contact/index.html:47 #: templates/web/fixmystreet/contact/index.html:48 msgid "Reported by %s at %s" msgstr "Publisert av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:526 +#: perllib/FixMyStreet/DB/Result/Problem.pm:534 msgid "Reported by %s by %s at %s" msgstr "Rapportert av %s av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:500 +#: perllib/FixMyStreet/DB/Result/Problem.pm:508 msgid "Reported by %s in the %s category anonymously at %s" msgstr "Rapportert av %s i kategorien %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:520 +#: perllib/FixMyStreet/DB/Result/Problem.pm:528 msgid "Reported by %s in the %s category by %s at %s" msgstr "Rapportert av %s i kategorien %s av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:508 +#: perllib/FixMyStreet/DB/Result/Problem.pm:516 msgid "Reported in the %s category anonymously at %s" msgstr "Rapportert i kategorien %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:530 +#: perllib/FixMyStreet/DB/Result/Problem.pm:538 msgid "Reported in the %s category by %s at %s" msgstr "Rapportert i kategorien %s av %s %s" @@ -2612,7 +2675,7 @@ msgstr "Rapportert i kategorien %s av %s %s" msgid "Reporting a problem" msgstr "Legger til eit problem" -#: templates/web/default/around/display_location.html:95 +#: templates/web/default/around/tabbed_lists.html:3 msgid "Reports on and around the map" msgstr "Problem i og rundt kartet" @@ -2620,7 +2683,7 @@ msgstr "Problem i og rundt kartet" msgid "Resend report" msgstr "Send rapport på nytt" -#: perllib/FixMyStreet/Geocode/OSM.pm:166 +#: perllib/FixMyStreet/Geocode/OSM.pm:168 msgid "" "Road operator for this named road (derived from road reference number and " "type): %s" @@ -2628,15 +2691,15 @@ msgstr "" "Vegoperatør for denne namngjevne vegen (utleia frå vegreferansenummer og " "type): %s" -#: perllib/FixMyStreet/Geocode/OSM.pm:163 +#: perllib/FixMyStreet/Geocode/OSM.pm:165 msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Vegoperatør for denne namngjevne vegen (frå OpenStreetMap): %s" -#: templates/web/default/admin/council_edit.html:35 +#: templates/web/default/admin/council_edit.html:63 msgid "Save changes" msgstr "Lagra endringar" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1027 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1041 msgid "Search Abuse" msgstr "Søk etter misbruk" @@ -2644,13 +2707,13 @@ msgstr "Søk etter misbruk" msgid "Search Abuse Table" msgstr "Søk i misbruktabell" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1023 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1037 #: templates/web/default/admin/list_flagged.html:1 #: templates/web/default/admin/search_reports.html:1 msgid "Search Reports" msgstr "Søk i rapportar" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1026 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1040 #: templates/web/default/admin/search_users.html:1 msgid "Search Users" msgstr "Søk i brukarar" @@ -2670,7 +2733,7 @@ msgstr "" "Vel kva for ein type varsel du ynskjer og klikk på knappen for ei RSS-" "kjelde, eller skriv inn e-postadressa di for å abonnera på eit e-postvarsel." -#: perllib/FixMyStreet/DB/Result/Problem.pm:618 +#: perllib/FixMyStreet/DB/Result/Problem.pm:623 msgid "Sent to %s %s later" msgstr "Sendt til %s %s seinare" @@ -2682,6 +2745,10 @@ msgstr "Sendt:" msgid "Service:" msgstr "Teneste:" +#: templates/web/fixmystreet/report/display.html:29 +msgid "Share" +msgstr "" + #: templates/web/emptyhomes/static/about.html:21 msgid "Shelter Cymru" msgstr "Shelter Cymru" @@ -2708,28 +2775,26 @@ msgstr "" #: templates/web/bromley/report/new/fill_in_details_form.html:175 #: templates/web/default/report/display.html:208 #: templates/web/default/report/new/fill_in_details_form.html:210 -#: templates/web/fixmystreet/report/display.html:185 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:126 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:186 +#: templates/web/fixmystreet/report/display.html:207 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:141 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:209 msgid "Show my name publicly" msgstr "Vis namnet mitt offentleg" -#: templates/web/default/around/display_location.html:60 -#: templates/web/fixmystreet/around/display_location.html:60 +#: templates/web/default/around/display_location.html:65 msgid "Show old" msgstr "" -#: templates/web/default/around/display_location.html:51 -#: templates/web/fixmystreet/around/display_location.html:52 +#: templates/web/default/around/display_location.html:56 msgid "Show pins" msgstr "Vis nåler" #: templates/web/default/auth/general.html:3 #: templates/web/default/auth/general.html:49 -#: templates/web/fixmybarangay/header.html.orig:46 +#: templates/web/fixmybarangay/header.html:70 #: templates/web/fixmystreet/auth/general.html:3 -#: templates/web/fixmystreet/auth/general.html:38 -#: templates/web/fixmystreet/auth/general.html:58 +#: templates/web/fixmystreet/auth/general.html:42 +#: templates/web/fixmystreet/auth/general.html:62 #: templates/web/fixmystreet/header.html:51 #: templates/web/zurich/header.html:51 msgid "Sign in" @@ -2765,11 +2830,13 @@ msgid "Signed in as %s" msgstr "Logga inn som %s" #: templates/web/default/report/new/fill_in_details_text.html:1 +#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:1 #: templates/web/fixmystreet/report/new/fill_in_details_text.html:1 msgid "Some categories may require additional information." msgstr "Somme kategoriar krev kanskje meir informasjon" #: templates/web/default/alert/index.html:42 +#: templates/web/fixmybarangay/alert/index.html:32 msgid "Some photos of recent reports" msgstr "Nokre bilete av nyleg melde problem" @@ -2782,7 +2849,7 @@ msgstr "Noko tekst å omsetja" msgid "Some unconfirmeds" msgstr "Nokre ustadfesta" -#: perllib/FixMyStreet/Cobrand/UK.pm:97 +#: perllib/FixMyStreet/Cobrand/UK.pm:89 msgid "" "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" @@ -2795,15 +2862,15 @@ msgstr "" "Orsak, men det oppstod eit problem når vi freista å stadfesta " "problemrapporten din" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:214 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:212 #: perllib/FixMyStreet/Geocode.pm:27 perllib/FixMyStreet/Geocode/Bing.pm:51 #: perllib/FixMyStreet/Geocode/Google.pm:69 +#: perllib/FixMyStreet/Geocode/OSM.pm:61 msgid "Sorry, we could not find that location." msgstr "Orsak, vi kunne ikkje finna den staden." #: perllib/FixMyStreet/Geocode/Bing.pm:46 #: perllib/FixMyStreet/Geocode/Google.pm:64 -#: perllib/FixMyStreet/Geocode/OSM.pm:59 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." @@ -2829,7 +2896,7 @@ msgstr "Startmånad:" #: templates/web/default/admin/list_flagged.html:18 #: templates/web/default/admin/list_updates.html:6 #: templates/web/default/admin/search_reports.html:21 -#: templates/web/fixmystreet/report/display.html:72 +#: templates/web/fixmystreet/report/display.html:88 msgid "State" msgstr "Tilstand" @@ -2839,7 +2906,7 @@ msgstr "Tilstand" msgid "State:" msgstr "Tilstand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1029 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1043 #: templates/web/default/admin/stats.html:1 msgid "Stats" msgstr "Statistikk" @@ -2851,7 +2918,7 @@ msgstr "Skal spørjeskjemaet sendast?" #: templates/web/bromley/report/new/fill_in_details_form.html:48 #: templates/web/fixmystreet/contact/index.html:79 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:58 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:60 #, fuzzy msgid "Subject" msgstr "Emne:" @@ -2869,13 +2936,13 @@ msgstr "Emne:" #: templates/web/default/report/new/fill_in_details_form.html:114 #: templates/web/default/report/new/fill_in_details_form.html:154 #: templates/web/default/report/new/fill_in_details_form.html:176 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:137 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:162 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:201 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:154 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:179 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:224 msgid "Submit" msgstr "Send inn" -#: templates/web/default/admin/report_edit.html:56 +#: templates/web/default/admin/report_edit.html:57 #: templates/web/default/admin/update_edit.html:51 #: templates/web/default/admin/user_edit.html:20 msgid "Submit changes" @@ -2890,16 +2957,24 @@ msgstr "Send inn spørjeskjema" #: templates/web/default/alert/updates.html:17 #: templates/web/default/report/display.html:38 #: templates/web/fixmystreet/alert/updates.html:23 -#: templates/web/fixmystreet/report/display.html:37 +#: templates/web/fixmystreet/report/display.html:52 msgid "Subscribe" msgstr "Abonner" #: templates/web/default/alert/_list.html:97 +#: templates/web/fixmybarangay/alert/_list.html:42 #: templates/web/fixmystreet/alert/_list.html:92 msgid "Subscribe me to an email alert" msgstr "Eg ynskjer å abonnera på e-postvarsel" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1021 +#: templates/web/fixmybarangay/alert/_list.html:6 +#, fuzzy +msgid "Subscribe to an alert based upon what baranagay you’re in:" +msgstr "" +"Eller du kan abonnera på varsel basert på bydel eller administrasjon du " +"høyrer til under:" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1035 #: templates/web/default/admin/index.html:1 msgid "Summary" msgstr "Oppsummering" @@ -2911,7 +2986,7 @@ msgstr "Oppsummering" msgid "Summary reports" msgstr "Oppsummeringsrapportar" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1025 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1039 #: templates/web/default/admin/questionnaire.html:1 msgid "Survey Results" msgstr "Resultat frå spørjeundersøkinga" @@ -2920,7 +2995,7 @@ msgstr "Resultat frå spørjeundersøkinga" msgid "Text" msgstr "Tekst" -#: templates/web/default/admin/council_contacts.html:18 +#: templates/web/default/admin/council_contacts.html:20 msgid "Text only version" msgstr "Tekst-utgåve" @@ -3008,13 +3083,13 @@ 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/Controller/Photo.pm:190 +#: perllib/FixMyStreet/App/Controller/Photo.pm:189 msgid "" "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" "Biletet ser ikkje ut til å ha vorte lasta opp riktig (%s), prøv på nytt." -#: perllib/FixMyStreet/App/Controller/Council.pm:91 +#: perllib/FixMyStreet/App/Controller/Council.pm:90 #, fuzzy msgid "" "That location does not appear to be covered by a council; perhaps it is " @@ -3023,22 +3098,27 @@ msgstr "" "Den staden vert ikkje dekt av nokon administrasjon, kanskje det er til\n" "havs – ver venleg og prøv ein meir spesifikk stad." -#: perllib/FixMyStreet/App/Controller/Location.pm:107 +#: perllib/FixMyStreet/App/Controller/Location.pm:120 #, fuzzy msgid "That location does not appear to be in the UK; please try again." msgstr "" "Den staden synest ikkje å vera i Storbritannia. Ver venleg og prøv igjen." #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:63 -#: perllib/FixMyStreet/Cobrand/UK.pm:90 +#: perllib/FixMyStreet/Cobrand/UK.pm:82 msgid "That postcode was not recognised, sorry." msgstr "Det postnummeret vart ikkje gjenkjent, orsak." -#: perllib/FixMyStreet/App/Controller/Admin.pm:605 +#: perllib/FixMyStreet/App/Controller/Admin.pm:616 msgid "That problem will now be resent." msgstr "Det problemet vil no sendast på nytt." -#: perllib/FixMyStreet/App/Controller/Report.pm:75 +#: perllib/FixMyStreet/App/Controller/Report.pm:98 +#, fuzzy +msgid "That report cannot be viewed on FixMyStreet." +msgstr "Den rapporten har vorte fjerna frå FiksGataMi." + +#: perllib/FixMyStreet/App/Controller/Report.pm:92 msgid "That report has been removed from FixMyStreet." msgstr "Den rapporten har vorte fjerna frå FiksGataMi." @@ -3112,8 +3192,8 @@ msgstr "" "Detaljane om problemet ditt er tilgjengelege på høgre kant av denne sida." #: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 -#: perllib/FixMyStreet/App/Controller/Reports.pm:44 -#: perllib/FixMyStreet/App/Controller/Reports.pm:75 +#: perllib/FixMyStreet/App/Controller/Reports.pm:43 +#: perllib/FixMyStreet/App/Controller/Reports.pm:74 msgid "The error was: %s" msgstr "Feilen var: %s" @@ -3127,7 +3207,7 @@ msgstr "" "service_request_id, description, lat, long, media_url, status, " "requested_datetime, updated_datetime, service_code og service_name." -#: perllib/FixMyStreet/Geocode/OSM.pm:158 +#: perllib/FixMyStreet/Geocode/OSM.pm:160 msgid "" "The following information about the nearest road might be inaccurate or " "irrelevant, if the problem is close to several roads or close to a road " @@ -3217,7 +3297,7 @@ msgstr "" "Tittelen og detaljane for problemet vil verta offentlege, pluss namnet ditt\n" "viss du gjev oss lov til det." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:269 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:271 msgid "" "The user could not locate the problem on a map, but to see the area around " "the location they entered" @@ -3225,7 +3305,7 @@ msgstr "" "Brukaren kunne ikkje plassera problemet på eit kart, men sjekk områdde rundt " "staden dei skreiv inn" -#: perllib/FixMyStreet/App/Controller/Reports.pm:72 +#: perllib/FixMyStreet/App/Controller/Reports.pm:71 msgid "" "There was a problem showing the All Reports page. Please try again later." msgstr "" @@ -3239,8 +3319,8 @@ msgstr "" "Det oppstod problem med å visa «Alle rapportar»-sida. Ver venleg og prøv " "igjen seinare." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:733 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:130 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:737 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 #: templates/web/default/auth/general.html:23 #: templates/web/fixmystreet/auth/general.html:24 #, fuzzy @@ -3261,7 +3341,7 @@ msgstr "" "Det var problem med e-post/passord-kombinasjonen din. Ver venleg og prøv " "igjen." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:256 msgid "There was a problem with your update. Please try again." msgstr "Det var problem med oppdateringa di. Ver venleg og prøv igjen." @@ -3269,7 +3349,7 @@ msgstr "Det var problem med oppdateringa di. Ver venleg og prøv igjen." msgid "There were problems with your report. Please see below." msgstr "Det var problem med rapporten din. Ver venleg og sjå under." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:279 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:283 msgid "There were problems with your update. Please see below." msgstr "Det var problem med oppdateringa di. Ver venleg og sjå under." @@ -3281,7 +3361,7 @@ msgstr "" "Denne API-implementasjonen er under arbeid og ikkje enno stabil. Han vil " "endra seg utan åtvaring i framtida." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:339 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:341 msgid "" "This email has been sent to both councils covering the location of the " "problem, as the user did not categorise it; please ignore it if you're not " @@ -3294,7 +3374,7 @@ msgstr "" "eller gjev oss melding om kva for ein kategori av problem dette er så vi kan " "leggja det til i systemet vårt." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:342 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:344 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 " @@ -3305,8 +3385,8 @@ msgstr "" "og ignorer e-posten viss de ikkje er korrekt administrasjon for å handtera " "denne saka." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:865 -#: perllib/FixMyStreet/Cobrand/UK.pm:62 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:869 +#: perllib/FixMyStreet/Cobrand/UK.pm:54 msgid "This information is required" msgstr "Denne informasjonen er påkravd" @@ -3345,13 +3425,13 @@ msgstr "Dette problemet er lukka" #: templates/web/default/report/banner.html:12 #: templates/web/default/report/display.html:95 #: templates/web/emptyhomes/report/display.html:12 -#: templates/web/fixmystreet/report/display.html:90 +#: templates/web/fixmystreet/report/display.html:106 msgid "This problem has been fixed" msgstr "Dette problemet er løyst" #: templates/web/bromley/report/display.html:90 #: templates/web/default/report/display.html:90 -#: templates/web/fixmystreet/report/display.html:84 +#: templates/web/fixmystreet/report/display.html:100 msgid "This problem has not been fixed" msgstr "Dette problemet har ikkje vorte løyst" @@ -3363,25 +3443,25 @@ msgstr "Dette problemet er under arbeid" msgid "This problem is old and of unknown status." msgstr "Dette problemet er gammalt og med ukjend status." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:83 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86 msgid "This report is currently marked as closed." msgstr "Denne rapporten er for tida markert som lukka." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:81 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:84 msgid "This report is currently marked as fixed." msgstr "Denne rapporten er for tida markert som fiksa." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:85 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:88 msgid "This report is currently marked as open." msgstr "Denne rapporten er for tida markert som open." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:262 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:264 msgid "" "This web page also contains a photo of the problem, provided by the user." msgstr "" "Denne nettsida inneheld òg eit bilete av problemet, sendt inn av brukaren." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1024 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1038 #: templates/web/default/admin/timeline.html:1 msgid "Timeline" msgstr "Tidslinje" @@ -3391,7 +3471,7 @@ msgstr "Tidslinje" msgid "Title" msgstr "Tittel" -#: templates/web/default/around/display_location.html:69 +#: templates/web/default/around/_report_banner.html:2 #, fuzzy msgid "" "To <strong>report a problem</strong>, click on the map at the correct " @@ -3416,7 +3496,7 @@ msgid "" msgstr "" "Du finn lokale problem ved å søkja på postnummeret ditt, vegnamn eller stad:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:268 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:270 msgid "To view a map of the precise location of this issue" msgstr "For å sjå eit kart med ei meir presis plassering for dette problemet" @@ -3427,7 +3507,7 @@ msgstr "For å sjå eit kart med ei meir presis plassering for dette problemet" msgid "Total" msgstr "Totalt" -#: perllib/FixMyStreet/App/Controller/Reports.pm:43 +#: perllib/FixMyStreet/App/Controller/Reports.pm:42 msgid "Unable to look up areas in MaPit. Please try again later." msgstr "" "Klarte ikkje slå opp område i MaPit. Ver venleg og prøv igjen seinare." @@ -3443,16 +3523,16 @@ msgstr "Ikkje stadfesta" msgid "Unknown" msgstr "*ukjent*" -#: perllib/FixMyStreet/App/Controller/Rss.pm:164 +#: perllib/FixMyStreet/App/Controller/Rss.pm:173 msgid "Unknown alert type" msgstr "Ukjend varsel-type" -#: perllib/FixMyStreet/App/Controller/Report.pm:70 +#: perllib/FixMyStreet/App/Controller/Report.pm:87 msgid "Unknown problem ID" msgstr "Ukjend problem-ID" #: templates/web/bromley/report/display.html:66 -#: templates/web/fixmystreet/report/display.html:65 +#: templates/web/fixmystreet/report/display.html:81 #, fuzzy msgid "Update" msgstr "Oppdatering:" @@ -3491,7 +3571,7 @@ msgstr "Ei oppdatering markerte dette problemet som fiksa." msgid "Update reopened problem" msgstr "Ei oppdatering gjenopna problemet" -#: templates/web/default/admin/council_contacts.html:62 +#: templates/web/default/admin/council_contacts.html:68 msgid "Update statuses" msgstr "Oppdater tilstanden" @@ -3499,9 +3579,9 @@ msgstr "Oppdater tilstanden" msgid "Update:" msgstr "Oppdatering:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:694 -#: perllib/FixMyStreet/App/Controller/Admin.pm:809 -#: perllib/FixMyStreet/App/Controller/Admin.pm:889 +#: perllib/FixMyStreet/App/Controller/Admin.pm:708 +#: perllib/FixMyStreet/App/Controller/Admin.pm:823 +#: perllib/FixMyStreet/App/Controller/Admin.pm:903 msgid "Updated!" msgstr "Oppdatert!" @@ -3524,11 +3604,11 @@ msgstr "Oppdateringar av {{title}}" msgid "Updates to this problem, FixMyStreet" msgstr "Oppdateringar til dette problemet, FiksGataMi" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1182 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1196 msgid "User flag removed" msgstr "Brukarflagg fjerna" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1154 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1168 msgid "User flagged" msgstr "Brukar flagga" @@ -3536,8 +3616,8 @@ msgstr "Brukar flagga" msgid "Users" msgstr "Brukarar" -#: perllib/FixMyStreet/App/Controller/Admin.pm:309 -#: perllib/FixMyStreet/App/Controller/Admin.pm:339 +#: perllib/FixMyStreet/App/Controller/Admin.pm:315 +#: perllib/FixMyStreet/App/Controller/Admin.pm:345 msgid "Values updated" msgstr "Verdi oppdatert" @@ -3559,13 +3639,12 @@ msgstr "Vis rapporten din" #: templates/web/default/around/display_location.html:33 #: templates/web/emptyhomes/around/display_location.html:0 #: templates/web/emptyhomes/around/display_location.html:16 -#: templates/web/fixmystreet/around/display_location.html:0 -#: templates/web/fixmystreet/around/display_location.html:33 msgid "Viewing a location" msgstr "Ser på ein stad" #: templates/web/bromley/report/display.html:0 #: templates/web/default/report/display.html:0 +#: templates/web/emptyhomes/report/display.html:1 #: templates/web/emptyhomes/report/display.html:2 #: templates/web/fixmystreet/report/display.html:0 msgid "Viewing a problem" @@ -3602,20 +3681,20 @@ msgstr "" "endra seg med eiedommen du rapporterte." #: templates/web/bromley/report/display.html:141 -#: templates/web/fixmystreet/report/display.html:153 +#: templates/web/fixmystreet/report/display.html:175 #, fuzzy msgid "We never show your email" msgstr "(vi viser aldri e-postadressa di)" #: templates/web/bromley/report/new/fill_in_details_form.html:133 #: templates/web/bromley/report/new/fill_in_details_form.html:179 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:130 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:190 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:146 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:213 #, fuzzy msgid "We never show your email address or phone number." msgstr "(vi viser aldri e-postadressa di eller telefonnummeret ditt)" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:349 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:351 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 " @@ -3625,13 +3704,14 @@ msgstr "" "tida kontaktinformasjon for dei. Viss du veit om ei eigna kontaktadresse, ta " "kontakt med oss." -#: templates/web/default/index.html:34 templates/web/emptyhomes/index.html:59 -#: templates/web/fixmystreet/index.html:45 +#: templates/web/default/index-steps.html:15 +#: templates/web/emptyhomes/index.html:59 msgid "We send it to the council on your behalf" msgstr "Vi sender til administrasjon på dine vegner" #: templates/web/bromley/report/new/fill_in_details_form.html:217 #: templates/web/default/report/new/notes.html:5 +#: templates/web/fixmybarangay/report/new/notes.html:5 msgid "" "We will only use your personal information in accordance with our <a href=\"/" "faq#privacy\">privacy policy.</a>" @@ -3667,8 +3747,8 @@ 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>:" -#: templates/web/default/admin/council_contacts.html:41 -#: templates/web/default/admin/council_edit.html:41 +#: templates/web/default/admin/council_contacts.html:45 +#: templates/web/default/admin/council_edit.html:69 msgid "When edited" msgstr "Når redigert" @@ -3718,6 +3798,7 @@ msgstr "" "å sjekka status?" #: templates/web/default/report/new/notes.html:8 +#: templates/web/fixmybarangay/report/new/notes.html:8 #: templates/web/fixmystreet/report/new/notes.html:7 msgid "" "Writing your message entirely in block capitals makes it hard to read, as " @@ -3730,8 +3811,9 @@ msgstr "" msgid "Year" msgstr "År" -#: templates/web/default/admin/council_contacts.html:48 -#: templates/web/default/admin/council_contacts.html:49 +#: templates/web/default/admin/council_contacts.html:52 +#: templates/web/default/admin/council_contacts.html:53 +#: templates/web/default/admin/council_contacts.html:54 #: templates/web/default/admin/council_edit.html:5 #: templates/web/default/admin/list_updates.html:30 #: templates/web/default/admin/list_updates.html:31 @@ -3751,8 +3833,8 @@ msgstr "Ja" #: templates/web/bromley/report/display.html:155 #: templates/web/bromley/report/new/fill_in_details_form.html:198 -#: templates/web/fixmystreet/report/display.html:133 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:156 +#: templates/web/fixmystreet/report/display.html:149 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:173 #, fuzzy msgid "Yes I have a password" msgstr "<strong>Ja</strong>, eg har eit passord:" @@ -3811,7 +3893,7 @@ msgstr "" #: templates/web/default/questionnaire/index.html:92 #: templates/web/default/report/new/fill_in_details_form.html:93 #: templates/web/fixmystreet/questionnaire/index.html:87 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:101 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:103 msgid "" "You have already attached a photo to this report, attaching another one will " "replace it." @@ -3821,7 +3903,7 @@ msgstr "" #: templates/web/bromley/report/display.html:106 #: templates/web/default/report/display.html:106 -#: templates/web/fixmystreet/report/display.html:100 +#: templates/web/fixmystreet/report/display.html:116 msgid "" "You have already attached a photo to this update, attaching another one will " "replace it." @@ -3835,7 +3917,7 @@ msgstr "Du er allereie logga ut" #: templates/web/bromley/report/new/fill_in_details_form.html:25 #: templates/web/default/report/new/fill_in_details_form.html:7 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:27 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:28 #, fuzzy msgid "" "You have located the problem at the point marked with a green pin on the " @@ -3870,8 +3952,8 @@ msgstr "Du har oppretta varselet ditt." msgid "You have successfully deleted your alert." msgstr "Sletting av varselet ditt var vellukka." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:740 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:136 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:744 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:140 msgid "" "You have successfully signed in; please check and confirm your details are " "accurate:" @@ -3905,16 +3987,17 @@ msgstr "Rapportane dine" #: templates/web/fixmystreet/alert/updates.html:19 #: templates/web/fixmystreet/alert/updates.html:22 #: templates/web/fixmystreet/contact/index.html:72 -#: templates/web/fixmystreet/report/display.html:34 -#: templates/web/fixmystreet/report/display.html:36 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:142 +#: templates/web/fixmystreet/report/display.html:49 +#: templates/web/fixmystreet/report/display.html:51 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:117 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:159 #, fuzzy msgid "Your email" msgstr "E-posten din" #: templates/web/bromley/report/display.html:130 #: templates/web/fixmystreet/auth/general.html:26 -#: templates/web/fixmystreet/report/display.html:124 +#: templates/web/fixmystreet/report/display.html:140 #, fuzzy msgid "Your email address" msgstr "e-postadressa di:" @@ -3926,6 +4009,7 @@ msgstr "e-postadressa di:" #: templates/web/default/alert/_list.html:92 #: templates/web/default/report/display.html:128 #: templates/web/default/report/new/fill_in_details_form.html:124 +#: templates/web/fixmybarangay/alert/_list.html:37 msgid "Your email:" msgstr "E-posten din" @@ -3952,11 +4036,11 @@ msgstr "" msgid "Your last name" msgstr "Namnet ditt:" -#: templates/web/fixmystreet/auth/general.html:53 +#: templates/web/fixmystreet/auth/general.html:57 #: templates/web/fixmystreet/contact/index.html:65 -#: templates/web/fixmystreet/report/display.html:181 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:121 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:181 +#: templates/web/fixmystreet/report/display.html:203 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:126 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:204 #, fuzzy msgid "Your name" msgstr "Namnet ditt:" @@ -3970,9 +4054,9 @@ msgstr "Namnet ditt:" #: templates/web/bromley/report/display.html:160 #: templates/web/bromley/report/new/fill_in_details_form.html:203 -#: templates/web/fixmystreet/auth/general.html:37 -#: templates/web/fixmystreet/report/display.html:138 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:161 +#: templates/web/fixmystreet/auth/general.html:41 +#: templates/web/fixmystreet/report/display.html:154 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:178 #, fuzzy msgid "Your password" msgstr "Rapportane dine" @@ -3983,8 +4067,8 @@ msgstr "Passordet ditt har vorte endra" #: templates/web/bromley/report/new/fill_in_details_form.html:137 #: templates/web/bromley/report/new/fill_in_details_form.html:184 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:134 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:195 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:151 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:218 msgid "Your phone number" msgstr "" @@ -4002,7 +4086,7 @@ msgstr "Oppdateringane dine" msgid "Your reports" msgstr "Oppdateringane dine" -#: templates/web/default/my/my.html:45 templates/web/fixmystreet/my/my.html:45 +#: templates/web/default/my/my.html:45 templates/web/fixmystreet/my/my.html:49 msgid "Your updates" msgstr "Oppdateringane dine" @@ -4021,12 +4105,16 @@ msgstr "av %s" msgid "council" msgstr "administrasjon" +#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +msgid "council ref: %s" +msgstr "" + #: templates/web/default/admin/report_edit.html:15 msgid "didn't use map" msgstr "brukte ikkje kart" #: templates/web/default/alert/index.html:33 -#: templates/web/fixmystreet/around/postcode_form.html:17 +#: templates/web/fixmystreet/around/postcode_form.html:23 msgid "e.g. ‘%s’ or ‘%s’" msgstr "" @@ -4034,7 +4122,7 @@ msgstr "" msgid "from %d different users" msgstr "frå %d ulike brukarar" -#: perllib/Utils.pm:289 +#: perllib/Utils.pm:267 msgid "less than a minute" msgstr "mindre enn eitt minutt" @@ -4046,17 +4134,22 @@ msgstr "markert som %s" msgid "marked as fixed" msgstr "markert som løyst" -#: perllib/FixMyStreet/App/Controller/Admin.pm:112 +#: perllib/FixMyStreet/App/Controller/Admin.pm:113 #: templates/web/default/admin/questionnaire.html:15 #: templates/web/default/admin/questionnaire.html:16 msgid "n/a" msgstr "i/t" #: templates/web/default/alert/_list.html:87 +#: templates/web/fixmybarangay/alert/_list.html:32 #: templates/web/fixmystreet/alert/_list.html:85 msgid "or" msgstr "eller" +#: templates/web/default/js/validation_strings.html:21 +msgid "or locate me automatically" +msgstr "" + #: templates/web/default/admin/report_edit.html:15 msgid "originally entered" msgstr "søkte etter" @@ -4071,7 +4164,7 @@ msgstr "opna på nytt" #: templates/web/barnet/header.html:71 templates/web/bromley/header.html:100 #: templates/web/bromley/header.html:65 -#: templates/web/fixmybarangay/header.html.orig:43 +#: templates/web/fixmybarangay/header.html:67 #: templates/web/fixmystreet/header.html:48 #: templates/web/zurich/header.html:48 #, fuzzy @@ -4087,19 +4180,15 @@ msgstr "Logg ut" msgid "the local council" msgstr "den lokale administrasjonen" -#: perllib/FixMyStreet/DB/Result/Problem.pm:541 -msgid "the map was not used so pin location may be inaccurate" -msgstr "karta vart ikkje brukt, så nåleposisjon kan vera unøyaktig" - -#: perllib/FixMyStreet/DB/Result/Problem.pm:603 -msgid "their ref: %s" +#: templates/web/default/report/_main.html:6 +msgid "there is no pin shown as the user did not use the map" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:330 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:332 msgid "this type of local problem" msgstr "denne typen lokalt problem" -#: perllib/Utils.pm:263 +#: perllib/Utils.pm:241 msgid "today" msgstr "i dag" @@ -4152,6 +4241,34 @@ msgstr "vil problemet ditt ikkje publiserast" msgid "your update will not be posted" msgstr "oppdateringa di vil ikkje publiserast" +#: templates/web/emptyhomes/front/stats.html:17 +#, perl-format +msgid "<big>%s</big> report recently" +msgid_plural "<big>%s</big> reports recently" +msgstr[0] "<big>%s</big> rapport nyleg" +msgstr[1] "<big>%s</big> rapportar nyleg" + +#: perllib/Utils.pm:286 +#, fuzzy, perl-format +msgid "%d hour" +msgid_plural "%d hours" +msgstr[0] "%d time" +msgstr[1] "%d time" + +#: perllib/Utils.pm:288 +#, fuzzy, perl-format +msgid "%d minute" +msgid_plural "%d minutes" +msgstr[0] "%d minutt" +msgstr[1] "%d minutt" + +#: templates/web/default/front/stats.html:29 +#, perl-format +msgid "<big>%s</big> update on reports" +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 #, perl-format msgid "We do not yet have details for the council that covers this location." @@ -4162,12 +4279,12 @@ msgstr[0] "" msgstr[1] "" "Vi har enno ikkje detaljar for administrasjonane som dekkjer denne staden." -#: templates/web/emptyhomes/front/stats.html:17 -#, perl-format -msgid "<big>%s</big> report recently" -msgid_plural "<big>%s</big> reports recently" -msgstr[0] "<big>%s</big> rapport nyleg" -msgstr[1] "<big>%s</big> rapportar nyleg" +#: perllib/Utils.pm:282 +#, fuzzy, perl-format +msgid "%d week" +msgid_plural "%d weeks" +msgstr[0] "%d veke" +msgstr[1] "%d veke" #: templates/web/emptyhomes/front/stats.html:12 #, perl-format @@ -4198,12 +4315,30 @@ msgstr[1] "" "Vi har enno <strong>ikkje</strong> detaljane for dei andre administrasjonane " "som dekkjer denne staden." -#: templates/web/default/front/stats.html:29 -#, perl-format -msgid "<big>%s</big> update on reports" -msgid_plural "<big>%s</big> updates on reports" -msgstr[0] "<big>%s</big> rapportoppdatering" -msgstr[1] "<big>%s</big> rapportoppdateringar" +#: perllib/Utils.pm:284 +#, fuzzy, perl-format +msgid "%d day" +msgid_plural "%d days" +msgstr[0] "%d dag" +msgstr[1] "%d dag" + +#~ msgid "%d days" +#~ msgstr "%d dagar" + +#~ msgid "%d hours" +#~ msgstr "%d timar" + +#~ msgid "%d minutes" +#~ msgstr "%d minutt" + +#~ msgid "%d weeks" +#~ msgstr "%d veker" + +#~ msgid "All" +#~ msgstr "Alle" + +#~ msgid "the map was not used so pin location may be inaccurate" +#~ msgstr "karta vart ikkje brukt, så nåleposisjon kan vera unøyaktig" #, fuzzy #~ msgid "FixMyStreet for Councils" |