diff options
| -rw-r--r-- | locale/FixMyStreet.po | 172 | ||||
| -rw-r--r-- | locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po | 222 | ||||
| -rw-r--r-- | locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po | 223 | ||||
| -rw-r--r-- | notes/catalyst-master-merge-todos.txt | 9 | ||||
| -rw-r--r-- | notes/osgb36_to_wgs84_notes.txt | 77 | ||||
| -rw-r--r-- | perllib/FixMyStreet/App/Controller/Root.pm | 4 | ||||
| -rw-r--r-- | templates/web/default/errors/page_error_410_gone.html | 20 | ||||
| -rw-r--r-- | templates/web/default/index.html | 10 |
8 files changed, 298 insertions, 439 deletions
diff --git a/locale/FixMyStreet.po b/locale/FixMyStreet.po index c8448514e..92c377365 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: 2011-06-09 18:49+0100\n" +"POT-Creation-Date: 2011-06-14 17:28+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <team@fixmystreet.com>\n" @@ -17,7 +17,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: bin/send-reports:173 +#: bin/send-reports:176 perllib/FixMyStreet/DB/Result/Problem.pm:377 msgid " and " msgstr "" @@ -89,7 +89,7 @@ msgstr "" msgid "%s - Summary reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 perllib/FixMyStreet/Cobrand/Default.pm:752 +#: perllib/FixMyStreet/Cobrand/Default.pm:763 perllib/FixMyStreet/Cobrand/Default.pm:777 msgid "%s ward, %s" msgstr "" @@ -101,7 +101,7 @@ msgstr "" msgid "%s, reported by %s at %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:769 perllib/FixMyStreet/Cobrand/Default.pm:783 +#: perllib/FixMyStreet/Cobrand/Default.pm:794 perllib/FixMyStreet/Cobrand/Default.pm:808 msgid "%s, within %s ward" msgstr "" @@ -125,7 +125,7 @@ msgstr "" msgid "(fixed)" msgstr "" -#: templates/web/default/index.html:4 templates/web/default/index.html:8 +#: templates/web/default/index.html:12 templates/web/default/index.html:8 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "" @@ -145,15 +145,15 @@ msgstr "" msgid "(we never show your email address or phone number)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:261 +#: perllib/FixMyStreet/App/Controller/Admin.pm:259 msgid "*unknown*" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:475 perllib/FixMyStreet/App/Controller/Report/New.pm:501 perllib/FixMyStreet/DB/Result/Problem.pm:204 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:476 perllib/FixMyStreet/App/Controller/Report/New.pm:504 perllib/FixMyStreet/DB/Result/Problem.pm:204 msgid "-- Pick a category --" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:461 perllib/FixMyStreet/DB/Result/Problem.pm:210 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:462 perllib/FixMyStreet/DB/Result/Problem.pm:210 msgid "-- Pick a property type --" msgstr "" @@ -297,11 +297,11 @@ msgstr "" msgid "Category" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:478 perllib/FixMyStreet/App/Controller/Report/New.pm:502 templates/web/default/admin/council_contacts.html:56 templates/web/default/admin/council_edit.html:23 templates/web/default/admin/report_edit.html:26 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:479 perllib/FixMyStreet/App/Controller/Report/New.pm:505 templates/web/default/admin/council_contacts.html:56 templates/web/default/admin/council_edit.html:23 templates/web/default/admin/report_edit.html:26 msgid "Category:" msgstr "" -#: bin/send-reports:170 +#: bin/send-reports:173 msgid "Category: %s" msgstr "" @@ -365,7 +365,7 @@ msgstr "" msgid "Council" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:598 templates/web/default/admin/council_list.html:1 +#: perllib/FixMyStreet/App/Controller/Admin.pm:596 templates/web/default/admin/council_list.html:1 msgid "Council contacts" msgstr "" @@ -449,15 +449,15 @@ msgstr "" msgid "Email:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:463 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:464 msgid "Empty flat or maisonette" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:462 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:463 msgid "Empty house or bungalow" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:465 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:466 msgid "Empty office or other commercial" msgstr "" @@ -465,23 +465,23 @@ msgstr "" msgid "Empty property details form" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:466 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:467 msgid "Empty pub or bar" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:467 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:468 msgid "Empty public building - school, hospital, etc." msgstr "" -#: templates/web/default/around/around_index.html:10 templates/web/default/around/around_index.html:13 templates/web/default/index.html:40 templates/web/default/index.html:43 +#: templates/web/default/around/around_index.html:10 templates/web/default/around/around_index.html:13 templates/web/default/index.html:38 templates/web/default/index.html:41 msgid "Enter a nearby GB postcode, or street name and area" msgstr "" -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:20 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:24 msgid "Enter a nearby postcode, or street name and area" msgstr "" -#: templates/web/default/index.html:61 +#: templates/web/default/index.html:59 msgid "Enter details of the problem" msgstr "" @@ -520,7 +520,7 @@ msgid "" "within a certain distance of a particular location." msgstr "" -#: templates/web/default/alert/list.html:101 +#: templates/web/default/alert/list.html:100 msgid "" "FixMyStreet sends different categories of problem\n" "to the appropriate council, so problems within the boundary of a particular council\n" @@ -554,15 +554,15 @@ msgstr "" msgid "Further information about our work on empty homes." msgstr "" -#: templates/web/default/index.html:22 +#: templates/web/default/index.html:26 msgid "Get FixMyStreet on your iPhone" msgstr "" -#: templates/web/default/alert/list.html:115 +#: templates/web/default/alert/list.html:112 msgid "Give me an RSS feed" msgstr "" -#: templates/web/default/alert/index.html:24 templates/web/default/around/around_index.html:17 templates/web/default/index.html:49 +#: templates/web/default/alert/index.html:24 templates/web/default/around/around_index.html:17 templates/web/default/index.html:47 msgid "Go" msgstr "" @@ -610,15 +610,15 @@ msgstr "" msgid "History" msgstr "" -#: templates/web/default/index.html:56 +#: templates/web/default/index.html:54 msgid "How to report a problem" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:516 +#: perllib/FixMyStreet/App/Controller/Admin.pm:514 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:93 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "" @@ -693,7 +693,7 @@ msgstr "" msgid "Local alerts" msgstr "" -#: templates/web/default/index.html:60 +#: templates/web/default/index.html:58 msgid "Locate the problem on a map of the area" msgstr "" @@ -749,7 +749,7 @@ msgstr "" msgid "Nearly Done! Now check your email..." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:291 +#: perllib/FixMyStreet/App/Controller/Admin.pm:289 msgid "New category contact added" msgstr "" @@ -805,7 +805,7 @@ msgstr "" msgid "New reports within {{NAME}}'s boundary on reportemptyhomes.com" msgstr "" -#: templates/web/default/index.html:23 +#: templates/web/default/index.html:27 msgid "New!" msgstr "" @@ -881,7 +881,7 @@ msgstr "" msgid "Open" msgstr "" -#: templates/web/default/alert/list.html:88 +#: templates/web/default/alert/list.html:87 msgid "Or problems reported to:" msgstr "" @@ -889,14 +889,10 @@ msgstr "" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "" -#: bin/send-reports:165 bin/send-reports:174 perllib/FixMyStreet/App/Controller/Report/New.pm:492 perllib/FixMyStreet/App/Controller/Report/New.pm:501 perllib/FixMyStreet/App/Controller/Report/New.pm:856 perllib/FixMyStreet/DB/Result/Problem.pm:316 perllib/FixMyStreet/DB/Result/Problem.pm:326 perllib/FixMyStreet/DB/Result/Problem.pm:336 perllib/FixMyStreet/DB/Result/Problem.pm:348 +#: bin/send-reports:168 bin/send-reports:177 perllib/FixMyStreet/App/Controller/Report/New.pm:495 perllib/FixMyStreet/App/Controller/Report/New.pm:504 perllib/FixMyStreet/App/Controller/Report/New.pm:855 perllib/FixMyStreet/DB/Result/Problem.pm:316 perllib/FixMyStreet/DB/Result/Problem.pm:326 perllib/FixMyStreet/DB/Result/Problem.pm:336 perllib/FixMyStreet/DB/Result/Problem.pm:348 msgid "Other" msgstr "" -#: templates/web/default/errors/page_error_410_gone.html:1 templates/web/default/errors/page_error_410_gone.html:3 -msgid "Page Gone" -msgstr "" - #: templates/web/default/errors/page_error_404_not_found.html:1 templates/web/default/errors/page_error_404_not_found.html:3 msgid "Page Not Found" msgstr "" @@ -921,7 +917,7 @@ msgstr "" msgid "Photos of recent nearby reports" msgstr "" -#: templates/web/default/index.html:78 +#: templates/web/default/index.html:76 msgid "Photos of recent reports" msgstr "" @@ -941,7 +937,7 @@ msgstr "" msgid "Please check your email address is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:640 perllib/FixMyStreet/App/Controller/Report/New.pm:660 perllib/FixMyStreet/App/Controller/Report/New.pm:676 perllib/FixMyStreet/DB/Result/Problem.pm:206 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:639 perllib/FixMyStreet/App/Controller/Report/New.pm:659 perllib/FixMyStreet/App/Controller/Report/New.pm:675 perllib/FixMyStreet/DB/Result/Problem.pm:206 msgid "Please choose a category" msgstr "" @@ -1022,7 +1018,7 @@ msgstr "" msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:239 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:242 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" @@ -1038,15 +1034,15 @@ msgstr "" msgid "Please note:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:242 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245 msgid "Please provide some explanation as to why you're reopening this report" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:252 msgid "Please provide some text as well as a photo" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:119 perllib/FixMyStreet/App/Controller/Questionnaire.pm:235 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:122 perllib/FixMyStreet/App/Controller/Questionnaire.pm:238 msgid "Please say whether you've ever reported a problem to your council before" msgstr "" @@ -1058,7 +1054,7 @@ msgstr "" msgid "Please select the type of alert you want" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:231 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:234 msgid "Please state whether or not the problem has been fixed" msgstr "" @@ -1066,7 +1062,7 @@ msgstr "" msgid "Please take a look at the updates that have been left." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:729 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:728 msgid "Please upload a JPEG image only" msgstr "" @@ -1106,7 +1102,7 @@ msgstr "" msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:745 +#: perllib/FixMyStreet/App/Controller/Admin.pm:743 msgid "Problem marked as open." msgstr "" @@ -1122,11 +1118,11 @@ msgstr "" msgid "Problems within %.1fkm of this location" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:694 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:161 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:123 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:161 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:127 msgid "Problems within %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:703 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:169 +#: perllib/FixMyStreet/Cobrand/Default.pm:728 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:169 msgid "Problems within %s ward" msgstr "" @@ -1142,7 +1138,7 @@ msgstr "" msgid "Properties recently reported as put back to use on reportemptyhomes.com" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:469 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:470 msgid "Property type:" msgstr "" @@ -1162,7 +1158,7 @@ msgstr "" msgid "Questionnaire %d sent for problem %d" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:185 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:188 msgid "Questionnaire filled in by problem reporter" msgstr "" @@ -1170,19 +1166,19 @@ msgstr "" msgid "RSS feed" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 perllib/FixMyStreet/Cobrand/Default.pm:746 +#: perllib/FixMyStreet/Cobrand/Default.pm:757 perllib/FixMyStreet/Cobrand/Default.pm:771 msgid "RSS feed for %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:739 perllib/FixMyStreet/Cobrand/Default.pm:753 +#: perllib/FixMyStreet/Cobrand/Default.pm:764 perllib/FixMyStreet/Cobrand/Default.pm:778 msgid "RSS feed for %s ward, %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:762 perllib/FixMyStreet/Cobrand/Default.pm:776 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:147 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:157 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:165 +#: perllib/FixMyStreet/Cobrand/Default.pm:787 perllib/FixMyStreet/Cobrand/Default.pm:801 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:143 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:151 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:161 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:169 msgid "RSS feed of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:768 perllib/FixMyStreet/Cobrand/Default.pm:782 +#: perllib/FixMyStreet/Cobrand/Default.pm:793 perllib/FixMyStreet/Cobrand/Default.pm:807 msgid "RSS feed of %s, within %s ward" msgstr "" @@ -1194,11 +1190,11 @@ msgstr "" msgid "RSS feed of problems in this %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:695 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:162 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:122 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:162 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:126 msgid "RSS feed of problems within %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:702 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:168 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:168 msgid "RSS feed of problems within %s ward" msgstr "" @@ -1222,7 +1218,7 @@ msgstr "" msgid "Recently fixed" msgstr "" -#: templates/web/default/index.html:87 +#: templates/web/default/index.html:85 msgid "Recently reported problems" msgstr "" @@ -1242,11 +1238,11 @@ msgstr "" msgid "Report a problem" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:262 +#: perllib/FixMyStreet/App/Controller/Rss.pm:252 msgid "Report on %s" msgstr "" -#: templates/web/default/index.html:11 +#: templates/web/default/index.html:15 msgid "Report, view, or discuss local problems" msgstr "" @@ -1302,7 +1298,7 @@ msgstr "" msgid "Save changes" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:599 templates/web/default/admin/search_reports.html:1 +#: perllib/FixMyStreet/App/Controller/Admin.pm:597 templates/web/default/admin/search_reports.html:1 msgid "Search Reports" msgstr "" @@ -1314,7 +1310,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:378 +#: perllib/FixMyStreet/DB/Result/Problem.pm:390 msgid "Sent to %s %s later" msgstr "" @@ -1407,11 +1403,11 @@ msgstr "" msgid "Subscribe" msgstr "" -#: templates/web/default/alert/list.html:127 +#: templates/web/default/alert/list.html:124 msgid "Subscribe me to an email alert" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:597 templates/web/default/admin/index.html:1 +#: perllib/FixMyStreet/App/Controller/Admin.pm:595 templates/web/default/admin/index.html:1 msgid "Summary" msgstr "" @@ -1419,7 +1415,7 @@ msgstr "" msgid "Summary reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:601 templates/web/default/admin/questionnaire.html:1 +#: perllib/FixMyStreet/App/Controller/Admin.pm:599 templates/web/default/admin/questionnaire.html:1 msgid "Survey Results" msgstr "" @@ -1471,7 +1467,7 @@ msgstr "" msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:738 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:737 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" @@ -1487,11 +1483,11 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:498 +#: perllib/FixMyStreet/App/Controller/Admin.pm:496 msgid "That problem will now be resent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:75 perllib/FixMyStreet/App/Controller/Rss.pm:41 +#: perllib/FixMyStreet/App/Controller/Report.pm:75 msgid "That report has been removed from FixMyStreet." msgstr "" @@ -1570,15 +1566,11 @@ msgstr "" msgid "The passwords do not match" msgstr "" -#: templates/web/default/errors/page_error_410_gone.html:10 templates/web/default/errors/page_error_410_gone.html:12 -msgid "The requested URL '%s' is no longer available" -msgstr "" - #: templates/web/default/errors/page_error_404_not_found.html:10 templates/web/default/errors/page_error_404_not_found.html:12 msgid "The requested URL '%s' was not found on this server" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:479 perllib/FixMyStreet/App/Controller/Admin.pm:649 perllib/FixMyStreet/App/Controller/Admin.pm:688 perllib/FixMyStreet/App/Controller/Admin.pm:773 +#: perllib/FixMyStreet/App/Controller/Admin.pm:477 perllib/FixMyStreet/App/Controller/Admin.pm:647 perllib/FixMyStreet/App/Controller/Admin.pm:686 perllib/FixMyStreet/App/Controller/Admin.pm:771 msgid "The requested URL was not found on this server." msgstr "" @@ -1602,11 +1594,11 @@ msgstr "" msgid "There were problems with your update. Please see below." msgstr "" -#: bin/send-reports:175 +#: bin/send-reports:178 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "" -#: bin/send-reports:178 +#: bin/send-reports:181 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 "" @@ -1626,19 +1618,19 @@ msgstr "" msgid "This is a summary of all reports on this site; select a particular council to see the reports sent there." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:815 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:117 templates/web/default/report/display.html:111 +#: perllib/FixMyStreet/Cobrand/Default.pm:840 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:117 templates/web/default/report/display.html:111 msgid "This problem has been fixed" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:811 +#: perllib/FixMyStreet/Cobrand/Default.pm:836 msgid "This problem is old and of unknown status." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:80 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:78 msgid "This report is currently marked as fixed." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:81 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:79 msgid "This report is currently marked as open." msgstr "" @@ -1646,7 +1638,7 @@ msgstr "" msgid "This web page also contains a photo of the problem, provided by the user." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:600 templates/web/default/admin/timeline.html:1 +#: perllib/FixMyStreet/App/Controller/Admin.pm:598 templates/web/default/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -1676,11 +1668,11 @@ msgstr "" msgid "Unconfirmed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:166 +#: perllib/FixMyStreet/App/Controller/Rss.pm:156 msgid "Unknown alert type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:70 perllib/FixMyStreet/App/Controller/Report/Update.pm:24 perllib/FixMyStreet/App/Controller/Rss.pm:37 +#: perllib/FixMyStreet/App/Controller/Report.pm:70 perllib/FixMyStreet/App/Controller/Report/Update.pm:24 msgid "Unknown problem ID" msgstr "" @@ -1712,7 +1704,7 @@ msgstr "" msgid "Update:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:572 perllib/FixMyStreet/App/Controller/Admin.pm:735 +#: perllib/FixMyStreet/App/Controller/Admin.pm:570 perllib/FixMyStreet/App/Controller/Admin.pm:733 msgid "Updated!" msgstr "" @@ -1728,7 +1720,7 @@ msgstr "" msgid "Updates to this problem, FixMyStreet" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:286 perllib/FixMyStreet/App/Controller/Admin.pm:316 +#: perllib/FixMyStreet/App/Controller/Admin.pm:284 perllib/FixMyStreet/App/Controller/Admin.pm:314 msgid "Values updated" msgstr "" @@ -1756,7 +1748,7 @@ msgstr "" msgid "We found more than one match for that location. We show up to ten matches, please try a different search if yours is not here." msgstr "" -#: perllib/FixMyStreet/App/Controller/Around.pm:235 +#: perllib/FixMyStreet/App/Controller/Around.pm:229 msgid "We had a problem with the supplied co-ordinates - outside the UK?" msgstr "" @@ -1764,11 +1756,11 @@ msgstr "" msgid "We may contact you periodically to ask if anything has changed with the property you reported." msgstr "" -#: bin/send-reports:185 +#: bin/send-reports:188 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:62 +#: templates/web/default/index.html:60 msgid "We send it to the council on your behalf" msgstr "" @@ -1792,7 +1784,7 @@ msgstr "" msgid "When sent" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:464 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:465 msgid "Whole block of empty flats" msgstr "" @@ -1836,7 +1828,7 @@ msgstr "" msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>." msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:42 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:45 msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n" msgstr "" @@ -1884,7 +1876,7 @@ msgstr "" msgid "Your Reports" msgstr "" -#: templates/web/default/alert/list.html:123 +#: templates/web/default/alert/list.html:120 msgid "Your email:" msgstr "" @@ -1916,11 +1908,11 @@ msgstr "" msgid "marked as fixed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:107 templates/web/default/admin/questionnaire.html:15 templates/web/default/admin/questionnaire.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:106 templates/web/default/admin/questionnaire.html:15 templates/web/default/admin/questionnaire.html:16 msgid "n/a" msgstr "" -#: templates/web/default/alert/list.html:119 +#: templates/web/default/alert/list.html:116 msgid "or" msgstr "" @@ -1940,7 +1932,7 @@ msgstr "" msgid "the map was not used so pin location may be inaccurate" msgstr "" -#: bin/send-reports:166 +#: bin/send-reports:169 msgid "this type of local problem" msgstr "" diff --git a/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po b/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po index e483e0c9b..7395ef230 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: 2011-06-09 18:49+0100\n" +"POT-Creation-Date: 2011-06-14 17:28+0100\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" @@ -19,7 +19,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: bin/send-reports:173 +#: bin/send-reports:176 perllib/FixMyStreet/DB/Result/Problem.pm:377 msgid " and " msgstr "" @@ -111,8 +111,8 @@ msgstr "wythnos" msgid "%s - Summary reports" msgstr "%s - Adroddiadau cryno" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 -#: perllib/FixMyStreet/Cobrand/Default.pm:752 +#: perllib/FixMyStreet/Cobrand/Default.pm:763 +#: perllib/FixMyStreet/Cobrand/Default.pm:777 msgid "%s ward, %s" msgstr "" @@ -124,8 +124,8 @@ msgstr "Rhoddodd %s wybod yn ddi-enw am %s" msgid "%s, reported by %s at %s" msgstr "Adroddwyd am %s gan %s am %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:769 -#: perllib/FixMyStreet/Cobrand/Default.pm:783 +#: perllib/FixMyStreet/Cobrand/Default.pm:794 +#: perllib/FixMyStreet/Cobrand/Default.pm:808 #, fuzzy msgid "%s, within %s ward" msgstr "Eiddo gwag yn ward %s" @@ -155,7 +155,7 @@ msgstr "(fel arall, gellir addasu'r porthiant RSS yn bersonol, o fewn" msgid "(returned to use)" msgstr "(wedi'i adfer i'w ddefnyddio)" -#: templates/web/default/index.html:4 templates/web/default/index.html:8 +#: templates/web/default/index.html:12 templates/web/default/index.html:8 msgid " " msgstr " " @@ -179,18 +179,18 @@ msgstr "Ni roddwyd gwybod i'r cyngor am hyn" 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/App/Controller/Admin.pm:261 +#: perllib/FixMyStreet/App/Controller/Admin.pm:259 msgid "*unknown*" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:475 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:501 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:476 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:504 #: perllib/FixMyStreet/DB/Result/Problem.pm:204 #, fuzzy msgid "-- Pick a category --" msgstr "-- Dewiswch fath o eiddo --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:461 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:462 #: perllib/FixMyStreet/DB/Result/Problem.pm:210 msgid "-- Pick a property type --" msgstr "-- Dewiswch fath o eiddo --" @@ -464,15 +464,15 @@ msgstr "" msgid "Category" msgstr "Categori:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:478 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:502 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:479 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:505 #: templates/web/default/admin/council_contacts.html:56 #: templates/web/default/admin/council_edit.html:23 #: templates/web/default/admin/report_edit.html:26 msgid "Category:" msgstr "Categori:" -#: bin/send-reports:170 +#: bin/send-reports:173 #, fuzzy msgid "Category: %s" msgstr "Categori:" @@ -561,7 +561,7 @@ msgstr "Cysylltu â'r tîm" msgid "Council" msgstr "cyngor" -#: perllib/FixMyStreet/App/Controller/Admin.pm:598 +#: perllib/FixMyStreet/App/Controller/Admin.pm:596 #: templates/web/default/admin/council_list.html:1 #, fuzzy msgid "Council contacts" @@ -672,15 +672,15 @@ msgstr "" msgid "Email:" msgstr "E-bost:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:463 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:464 msgid "Empty flat or maisonette" msgstr "Fflat neu fflat deulawr gwag" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:462 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:463 msgid "Empty house or bungalow" msgstr "Tŷ neu fyngalo gwag" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:465 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:466 msgid "Empty office or other commercial" msgstr "Swyddfa wag neu fan masnachol gwag arall" @@ -688,26 +688,26 @@ msgstr "Swyddfa wag neu fan masnachol gwag arall" msgid "Empty property details form" msgstr "Ffurflen manylion eiddo gwag" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:466 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:467 msgid "Empty pub or bar" msgstr "Tafarn neu far gwag" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:467 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:468 msgid "Empty public building - school, hospital, etc." msgstr "Adeilad cyhoeddus gwag - ysgol, ysbyty, ac ati." #: templates/web/default/around/around_index.html:10 #: templates/web/default/around/around_index.html:13 -#: templates/web/default/index.html:40 templates/web/default/index.html:43 +#: templates/web/default/index.html:38 templates/web/default/index.html:41 msgid "Enter a nearby GB postcode, or street name and area" msgstr "Cofnodwch god post Prydeinig, neu enw stryd ac ardal gerllaw" -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:20 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:24 #, fuzzy msgid "Enter a nearby postcode, or street name and area" msgstr "Cofnodwch god post Prydeinig, neu enw stryd ac ardal gerllaw:" -#: templates/web/default/index.html:61 +#: templates/web/default/index.html:59 msgid "Enter details of the empty property" msgstr "Rhowch fanylion yr eiddo gwag" @@ -768,7 +768,7 @@ msgstr "" "bob eiddo gwag\n" "o fewn pellter penodol o leoliad penodol." -#: templates/web/default/alert/list.html:101 +#: templates/web/default/alert/list.html:100 msgid "" "reportemptyhomes.com sends different categories of empty property\n" "to the appropriate council, so empty properties within the boundary of a " @@ -819,18 +819,18 @@ msgstr "Cwestiynau Cyffredin" msgid "Further information about our work on empty homes." msgstr "" -#: templates/web/default/index.html:22 +#: templates/web/default/index.html:26 #, fuzzy msgid "Get reportemptyhomes.com on your iPhone" msgstr "Cael yr Asiantaeth Tai Gwag ar eich iPhone" -#: templates/web/default/alert/list.html:115 +#: templates/web/default/alert/list.html:112 msgid "Give me an RSS feed" msgstr "Rhowch borthiant RSS i mi" #: templates/web/default/alert/index.html:24 #: templates/web/default/around/around_index.html:17 -#: templates/web/default/index.html:49 +#: templates/web/default/index.html:47 msgid "Go" msgstr "Ewch" @@ -888,15 +888,15 @@ msgstr "Cuddio hen adroddiadau " msgid "History" msgstr "" -#: templates/web/default/index.html:56 +#: templates/web/default/index.html:54 msgid "How to report an empty property" msgstr "Sut i roi gwybod am eiddo gwag" -#: perllib/FixMyStreet/App/Controller/Admin.pm:516 +#: perllib/FixMyStreet/App/Controller/Admin.pm:514 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:93 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 msgid "I'm afraid we couldn't locate your empty property in the database.\n" msgstr "" "Yn anffodus ni fu modd i ni ddod o hyd i'ch eiddo gwag yn y gronfa ddata.\n" @@ -1035,7 +1035,7 @@ msgstr "Porthiannau RSS a hysbysiadau e-bost lleol" msgid "Get local reports" msgstr "Gweld adroddiadau lleol" -#: templates/web/default/index.html:60 +#: templates/web/default/index.html:58 msgid "Locate the empty property on a map of the area" msgstr "Chwiliwch am leoliad yr eiddo gwag ar fap o'r ardal" @@ -1109,7 +1109,7 @@ msgstr "Mordwyo " msgid "Nearly Done! Now check your email..." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:291 +#: perllib/FixMyStreet/App/Controller/Admin.pm:289 msgid "New category contact added" msgstr "" @@ -1184,7 +1184,7 @@ msgstr "Adroddiadau newydd i gyngor {{COUNCIL}} ar reportemptyhomes.com" msgid "New reports within {{NAME}}'s boundary on reportemptyhomes.com" msgstr "Adroddiadau newydd o fewn ffin {{NAME}} ar reportemptyhomes.com" -#: templates/web/default/index.html:23 +#: templates/web/default/index.html:27 msgid "New!" msgstr "Newydd!" @@ -1290,7 +1290,7 @@ msgstr "Adroddiadau hŷn o eiddo gwag" msgid "Open" msgstr "" -#: templates/web/default/alert/list.html:88 +#: templates/web/default/alert/list.html:87 msgid "Or empty properties reported to:" msgstr "Neu eiddo gwag y rhoddwyd gwybod amdanynt i:" @@ -1302,10 +1302,10 @@ msgstr "" "Neu, gallwch danysgrifio am hysbysiad yn ôl pa ward neu gyngor yr ydych yn " "byw ynddo:" -#: bin/send-reports:165 bin/send-reports:174 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:492 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:501 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:856 +#: bin/send-reports:168 bin/send-reports:177 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:495 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:504 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:855 #: perllib/FixMyStreet/DB/Result/Problem.pm:316 #: perllib/FixMyStreet/DB/Result/Problem.pm:326 #: perllib/FixMyStreet/DB/Result/Problem.pm:336 @@ -1313,11 +1313,6 @@ msgstr "" msgid "Other" msgstr "Arall" -#: templates/web/default/errors/page_error_410_gone.html:1 -#: templates/web/default/errors/page_error_410_gone.html:3 -msgid "Page Gone" -msgstr "" - #: templates/web/default/errors/page_error_404_not_found.html:1 #: templates/web/default/errors/page_error_404_not_found.html:3 msgid "Page Not Found" @@ -1347,7 +1342,7 @@ msgstr "Ffotograff:" msgid "Photos of recent nearby reports" msgstr "Ffotograffau o adroddiadau cyfagos diweddar" -#: templates/web/default/index.html:78 +#: templates/web/default/index.html:76 msgid "Photos of recent reports" msgstr "Ffotograffau o adroddiadau diweddar" @@ -1371,9 +1366,9 @@ 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:640 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:660 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:676 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:639 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:659 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:675 #: perllib/FixMyStreet/DB/Result/Problem.pm:206 msgid "Please choose a category" msgstr "Dewiswch gategori" @@ -1499,7 +1494,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:239 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:242 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Nodwch a fyddech chi'n hoffi derbyn holiadur arall" @@ -1520,16 +1515,16 @@ msgstr "" msgid "Please note:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:242 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245 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:249 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:252 msgid "Please provide some text as well as a photo" msgstr "Rhowch rywfaint o destun yn ogystal â ffotograff" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:119 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:235 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:122 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:238 msgid "" "Please say whether you've ever reported an empty property to your council " "before" @@ -1545,7 +1540,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:231 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:234 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" @@ -1554,7 +1549,7 @@ 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/Report/New.pm:729 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:728 msgid "Please upload a JPEG image only" msgstr "Dim ond llun JPEG y dylech lwytho i fyny." @@ -1601,7 +1596,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:745 +#: perllib/FixMyStreet/App/Controller/Admin.pm:743 #, fuzzy msgid "Empty property marked as open." msgstr "Ffurflen manylion eiddo gwag" @@ -1623,13 +1618,13 @@ msgstr "" msgid "Empty properties within %.1fkm of this location" msgstr "Eiddo gwag o fewn %skm o'r lleoliad hwn" -#: perllib/FixMyStreet/Cobrand/Default.pm:694 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:161 -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:123 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:127 msgid "Empty properties within %s" msgstr "Eiddo gwag yn %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:703 +#: perllib/FixMyStreet/Cobrand/Default.pm:728 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:169 msgid "Empty properties within %s ward" msgstr "Eiddo gwag yn ward %s" @@ -1649,7 +1644,7 @@ msgstr "" "Eiddo y cafwyd adroddiadau diweddar ar reportemptyhomes.com eu bod wedi cael " "eu hadfer i'w defnyddio" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:469 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:470 msgid "Property type:" msgstr "Math o eiddo:" @@ -1673,7 +1668,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:185 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:188 msgid "Questionnaire filled in by empty property reporter" msgstr "Llenwyd yr holiadur gan yr unigolyn a roddodd wybod am yr eiddo gwag" @@ -1685,29 +1680,29 @@ msgstr "Llenwyd yr holiadur gan yr unigolyn a roddodd wybod am yr eiddo gwag" msgid "RSS feed" msgstr "Porthiant RSS" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 -#: perllib/FixMyStreet/Cobrand/Default.pm:746 +#: perllib/FixMyStreet/Cobrand/Default.pm:757 +#: perllib/FixMyStreet/Cobrand/Default.pm:771 #, fuzzy msgid "RSS feed for %s" msgstr "Porthiant RSS %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:739 -#: perllib/FixMyStreet/Cobrand/Default.pm:753 +#: perllib/FixMyStreet/Cobrand/Default.pm:764 +#: perllib/FixMyStreet/Cobrand/Default.pm:778 #, fuzzy msgid "RSS feed for %s ward, %s" msgstr "Porthiant RSS %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:762 -#: perllib/FixMyStreet/Cobrand/Default.pm:776 -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:147 -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:157 -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:165 +#: perllib/FixMyStreet/Cobrand/Default.pm:787 +#: perllib/FixMyStreet/Cobrand/Default.pm:801 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:143 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:151 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:161 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:169 msgid "RSS feed of %s" msgstr "Porthiant RSS %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:768 -#: perllib/FixMyStreet/Cobrand/Default.pm:782 +#: perllib/FixMyStreet/Cobrand/Default.pm:793 +#: perllib/FixMyStreet/Cobrand/Default.pm:807 #, fuzzy msgid "RSS feed of %s, within %s ward" msgstr "Porthiant RSS %s" @@ -1720,14 +1715,14 @@ 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:695 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:162 -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:122 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:126 #, fuzzy msgid "RSS feed of empty properties within %s" msgstr "Porthiant RSS o eiddo gwag yn yr %s hwn" -#: perllib/FixMyStreet/Cobrand/Default.pm:702 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:168 #, fuzzy msgid "RSS feed of empty properties within %s ward" @@ -1762,7 +1757,7 @@ msgstr "Eiddo gwag lleol diweddar, reportemptyhomes.com" msgid "Recently returned to use" msgstr "Wedi'u hadfer i'w defnyddio'n ddiweddar" -#: templates/web/default/index.html:87 +#: templates/web/default/index.html:85 msgid "Recently reported empty properties" msgstr "Eiddo gwag yr adroddwyd amdanynt yn ddiweddar" @@ -1788,12 +1783,12 @@ msgstr "Adrodd am Eiddo Gwag" msgid "Report a property" msgstr "Rhoi gwybod am eiddo" -#: perllib/FixMyStreet/App/Controller/Rss.pm:262 +#: perllib/FixMyStreet/App/Controller/Rss.pm:252 #, fuzzy msgid "Report on %s" msgstr "Adroddiadau" -#: templates/web/default/index.html:11 +#: templates/web/default/index.html:15 msgid "Report and view empty properties" msgstr "Adrodd am eiddo gwag a gweld y rhain" @@ -1856,7 +1851,7 @@ msgstr "Cuddio hen adroddiadau " msgid "Save changes" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:599 +#: perllib/FixMyStreet/App/Controller/Admin.pm:597 #: templates/web/default/admin/search_reports.html:1 #, fuzzy msgid "Search Reports" @@ -1876,7 +1871,7 @@ msgstr "" "porthiant RSS,\n" "neu rhowch eich cyfeiriad e-bost i danysgrifio am hysbysiad e-bost." -#: perllib/FixMyStreet/DB/Result/Problem.pm:378 +#: perllib/FixMyStreet/DB/Result/Problem.pm:390 msgid "Sent to %s %s later" msgstr "Anfonwyd at %s %s yn ddiweddarach" @@ -2009,11 +2004,11 @@ msgstr "Anfon yr holiadur" msgid "Subscribe" msgstr "Tanysgrifio" -#: templates/web/default/alert/list.html:127 +#: templates/web/default/alert/list.html:124 msgid "Subscribe me to an email alert" msgstr "Dymunaf danysgrifio i rybuddion drwy e-bost" -#: perllib/FixMyStreet/App/Controller/Admin.pm:597 +#: perllib/FixMyStreet/App/Controller/Admin.pm:595 #: templates/web/default/admin/index.html:1 #, fuzzy msgid "Summary" @@ -2025,7 +2020,7 @@ msgstr "Adroddiadau cryno" msgid "Summary reports" msgstr "Adroddiadau cryno" -#: perllib/FixMyStreet/App/Controller/Admin.pm:601 +#: perllib/FixMyStreet/App/Controller/Admin.pm:599 #: templates/web/default/admin/questionnaire.html:1 msgid "Survey Results" msgstr "" @@ -2124,7 +2119,7 @@ msgstr "" "i ni'ch holi chi, a ydych erioed wedi rhoi gwybod i'r cyngor am eiddo gwag " "cyn hyn?" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:738 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:737 msgid "" "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" @@ -2149,13 +2144,12 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "Ni chafodd y cod post hwnnw ei gydnabod, sori." -#: perllib/FixMyStreet/App/Controller/Admin.pm:498 +#: perllib/FixMyStreet/App/Controller/Admin.pm:496 #, 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/Rss.pm:41 msgid "That report has been removed from reportemptyhomes.com." msgstr "Mae'r adroddiad hwnnw wedi cael ei dynnu oddi ar reportemptyhomes.com" @@ -2291,20 +2285,15 @@ msgstr "" msgid "The passwords do not match" msgstr "" -#: templates/web/default/errors/page_error_410_gone.html:10 -#: templates/web/default/errors/page_error_410_gone.html:12 -msgid "The requested URL '%s' is no longer available" -msgstr "" - #: templates/web/default/errors/page_error_404_not_found.html:10 #: templates/web/default/errors/page_error_404_not_found.html:12 msgid "The requested URL '%s' was not found on this server" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:479 -#: perllib/FixMyStreet/App/Controller/Admin.pm:649 -#: perllib/FixMyStreet/App/Controller/Admin.pm:688 -#: perllib/FixMyStreet/App/Controller/Admin.pm:773 +#: perllib/FixMyStreet/App/Controller/Admin.pm:477 +#: perllib/FixMyStreet/App/Controller/Admin.pm:647 +#: perllib/FixMyStreet/App/Controller/Admin.pm:686 +#: perllib/FixMyStreet/App/Controller/Admin.pm:771 msgid "The requested URL was not found on this server." msgstr "" @@ -2336,7 +2325,7 @@ msgstr "Cafwyd anhawsterau gyda'ch adroddiad. Gweler isod." msgid "There were problems with your update. Please see below." msgstr "Cafwyd anhawsterau gyda'ch diweddariad. Gweler isod" -#: bin/send-reports:175 +#: bin/send-reports:178 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 " @@ -2344,7 +2333,7 @@ msgid "" "empty property this is so we can add it to our system." msgstr "" -#: bin/send-reports:178 +#: bin/send-reports:181 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 " @@ -2376,22 +2365,22 @@ msgstr "" "Dyma grynodeb o'r holl adroddiadau ar y safle hwn; dewiswch gyngor penodol i " "weld yr adroddiadau a anfonwyd ato." -#: perllib/FixMyStreet/Cobrand/Default.pm:815 +#: perllib/FixMyStreet/Cobrand/Default.pm:840 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:117 #: templates/web/default/report/display.html:111 msgid "This empty property has been returned to use" msgstr "Mae'r eiddo gwag hwn wedi cael ei adfer i'w ddefnyddio" -#: perllib/FixMyStreet/Cobrand/Default.pm:811 +#: perllib/FixMyStreet/Cobrand/Default.pm:836 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:80 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:78 #, 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:81 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:79 msgid "This report is currently marked as open." msgstr "" @@ -2403,7 +2392,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:600 +#: perllib/FixMyStreet/App/Controller/Admin.pm:598 #: templates/web/default/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -2444,14 +2433,13 @@ msgstr "" msgid "Unconfirmed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:166 +#: perllib/FixMyStreet/App/Controller/Rss.pm:156 #, fuzzy msgid "Unknown alert type" msgstr "ID eiddo gwag anhysbys" #: perllib/FixMyStreet/App/Controller/Report.pm:70 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:24 -#: perllib/FixMyStreet/App/Controller/Rss.pm:37 msgid "Unknown empty property ID" msgstr "ID eiddo gwag anhysbys" @@ -2486,8 +2474,8 @@ msgstr "Diweddariadau" msgid "Update:" msgstr "Diweddariad:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:572 -#: perllib/FixMyStreet/App/Controller/Admin.pm:735 +#: perllib/FixMyStreet/App/Controller/Admin.pm:570 +#: perllib/FixMyStreet/App/Controller/Admin.pm:733 #, fuzzy msgid "Updated!" msgstr "Diweddariadau" @@ -2506,8 +2494,8 @@ 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:286 -#: perllib/FixMyStreet/App/Controller/Admin.pm:316 +#: perllib/FixMyStreet/App/Controller/Admin.pm:284 +#: perllib/FixMyStreet/App/Controller/Admin.pm:314 #, fuzzy msgid "Values updated" msgstr "Anfonwch ddiweddariadau ataf i drwy'r e-bost" @@ -2549,7 +2537,7 @@ msgstr "" "hyd at ddeg cyfatebiaeth, rhowch gynnig ar chwiliad gwahanol os nad yw'ch " "lleoliad chi yno." -#: perllib/FixMyStreet/App/Controller/Around.pm:235 +#: perllib/FixMyStreet/App/Controller/Around.pm:229 msgid "" "We had an empty property with the supplied co-ordinates - outside the UK?" msgstr "" @@ -2561,14 +2549,14 @@ msgid "" "property you reported." msgstr "" -#: bin/send-reports:185 +#: bin/send-reports:188 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:62 +#: templates/web/default/index.html:60 msgid "" "The details will be sent directly to the right person in the local council " "for them to take action" @@ -2611,7 +2599,7 @@ msgstr "" msgid "When sent" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:464 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:465 msgid "Whole block of empty flats" msgstr "Bloc cyfan o fflatiau gwag" @@ -2688,7 +2676,7 @@ msgid "" "properties for %s and emailing it to us at <a href='mailto:%s'>%s</a>." msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:42 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:45 msgid "" "You have already answered this questionnaire. If you have a question, please " "<a href='%s'>get in touch</a>, or <a href='%s'>view your empty property</" @@ -2761,7 +2749,7 @@ msgstr "" msgid "Your Reports" msgstr "Adroddiadau" -#: templates/web/default/alert/list.html:123 +#: templates/web/default/alert/list.html:120 msgid "Your email:" msgstr "Eich cyfeiriad e-bost:" @@ -2794,13 +2782,13 @@ msgstr "llai na munud" msgid "marked as returned to use" msgstr "cofnodwyd bod hyn wedi'i adfer i'w ddefnyddio" -#: perllib/FixMyStreet/App/Controller/Admin.pm:107 +#: perllib/FixMyStreet/App/Controller/Admin.pm:106 #: templates/web/default/admin/questionnaire.html:15 #: templates/web/default/admin/questionnaire.html:16 msgid "n/a" msgstr "" -#: templates/web/default/alert/list.html:119 +#: templates/web/default/alert/list.html:116 msgid "or" msgstr "neu" @@ -2821,7 +2809,7 @@ 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" -#: bin/send-reports:166 +#: bin/send-reports:169 #, fuzzy msgid "this type of local empty property" msgstr "Anfonwch fanylion eiddo gwag lleol newydd ataf i drwy'r e-bost" diff --git a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po index bdc00168b..622cbbf2b 100644 --- a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: FixMyStreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2011-06-09 18:49+0100\n" +"POT-Creation-Date: 2011-06-14 17:28+0100\n" "PO-Revision-Date: 2011-04-07 09:00MET\n" "Last-Translator: Petter Reinholdtsen <pere@hungry.com>\n" "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n" @@ -19,7 +19,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: KBabel 1.11.4\n" -#: bin/send-reports:173 +#: bin/send-reports:176 perllib/FixMyStreet/DB/Result/Problem.pm:377 msgid " and " msgstr " og " @@ -101,8 +101,8 @@ msgstr "%d uker" msgid "%s - Summary reports" msgstr "%s - oppsummeringsrapporter" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 -#: perllib/FixMyStreet/Cobrand/Default.pm:752 +#: perllib/FixMyStreet/Cobrand/Default.pm:763 +#: perllib/FixMyStreet/Cobrand/Default.pm:777 msgid "%s ward, %s" msgstr "" @@ -114,8 +114,8 @@ msgstr "%s, rapportert anonymt %s" msgid "%s, reported by %s at %s" msgstr "%s, rapportert av %s %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:769 -#: perllib/FixMyStreet/Cobrand/Default.pm:783 +#: perllib/FixMyStreet/Cobrand/Default.pm:794 +#: perllib/FixMyStreet/Cobrand/Default.pm:808 #, fuzzy msgid "%s, within %s ward" msgstr "Problemer innenfor %s avdeling/etat" @@ -146,7 +146,7 @@ msgstr "(alternativt kan RSS-strømmen tilpasses, innenfor" msgid "(fixed)" msgstr "(løst)" -#: templates/web/default/index.html:4 templates/web/default/index.html:8 +#: templates/web/default/index.html:12 templates/web/default/index.html:8 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(som tagging, søppel, hull i veien, eller manglende gatelys)" @@ -168,17 +168,17 @@ msgstr "(sent til begge)" msgid "(we never show your email address or phone number)" msgstr "(vi viser aldri din epostadresse eller telefonnummer)" -#: perllib/FixMyStreet/App/Controller/Admin.pm:261 +#: perllib/FixMyStreet/App/Controller/Admin.pm:259 msgid "*unknown*" msgstr "*ukjent*" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:475 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:501 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:476 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:504 #: perllib/FixMyStreet/DB/Result/Problem.pm:204 msgid "-- Pick a category --" msgstr "-- velg en kategori --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:461 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:462 #: perllib/FixMyStreet/DB/Result/Problem.pm:210 msgid "-- Pick a property type --" msgstr "-- velg en eiendomsstype --" @@ -415,15 +415,15 @@ msgstr "Kan vi vise ditt navn offentlig?" msgid "Category" msgstr "Kategori" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:478 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:502 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:479 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:505 #: templates/web/default/admin/council_contacts.html:56 #: templates/web/default/admin/council_edit.html:23 #: templates/web/default/admin/report_edit.html:26 msgid "Category:" msgstr "Kategori:" -#: bin/send-reports:170 +#: bin/send-reports:173 msgid "Category: %s" msgstr "Kategori: %s" @@ -507,7 +507,7 @@ msgstr "Kontakt prosjektgruppen" msgid "Council" msgstr "Administrasjon" -#: perllib/FixMyStreet/App/Controller/Admin.pm:598 +#: perllib/FixMyStreet/App/Controller/Admin.pm:596 #: templates/web/default/admin/council_list.html:1 msgid "Council contacts" msgstr "Administrasjonskontakter" @@ -612,15 +612,15 @@ msgstr "" msgid "Email:" msgstr "Epost:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:463 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:464 msgid "Empty flat or maisonette" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:462 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:463 msgid "Empty house or bungalow" msgstr "Tomt hus eller bungalow" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:465 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:466 msgid "Empty office or other commercial" msgstr "Tomt kontor eller forretningsbygg" @@ -628,25 +628,25 @@ msgstr "Tomt kontor eller forretningsbygg" msgid "Empty property details form" msgstr "Tom eiendom detaljskjema" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:466 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:467 msgid "Empty pub or bar" msgstr "Tom pub eller bar" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:467 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:468 msgid "Empty public building - school, hospital, etc." msgstr "Tom offentlig bygning - skole, sykehos, etc." #: templates/web/default/around/around_index.html:10 #: templates/web/default/around/around_index.html:13 -#: templates/web/default/index.html:40 templates/web/default/index.html:43 +#: templates/web/default/index.html:38 templates/web/default/index.html:41 msgid "Enter a nearby GB postcode, or street name and area" msgstr "Skriv inn GB-postnummer i nærheten, eller veinavn og sted" -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:20 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:24 msgid "Enter a nearby postcode, or street name and area" msgstr "Skriv inn postnummer i nærheten, eller veinavn og sted" -#: templates/web/default/index.html:61 +#: templates/web/default/index.html:59 msgid "Enter details of the problem" msgstr "Legg inn detaljer om problemet" @@ -704,7 +704,7 @@ msgstr "" "et område med problemer\n" "innen en angitt distanse fra en bestemt posisjon." -#: templates/web/default/alert/list.html:101 +#: templates/web/default/alert/list.html:100 msgid "" "FixMyStreet sends different categories of problem\n" "to the appropriate council, so problems within the boundary of a particular " @@ -748,18 +748,18 @@ msgstr "Ofte spurte spørsmål" msgid "Further information about our work on empty homes." msgstr "" -#: templates/web/default/index.html:22 +#: templates/web/default/index.html:26 #, fuzzy msgid "Get FixMyStreet on your iPhone" msgstr "Fiksgatami-administrasjon" -#: templates/web/default/alert/list.html:115 +#: templates/web/default/alert/list.html:112 msgid "Give me an RSS feed" msgstr "Gi meg en RSS-strøm" #: templates/web/default/alert/index.html:24 #: templates/web/default/around/around_index.html:17 -#: templates/web/default/index.html:49 +#: templates/web/default/index.html:47 msgid "Go" msgstr "Fortsett" @@ -814,15 +814,15 @@ msgstr "Gjem utdaterte rapporter" msgid "History" msgstr "Historie" -#: templates/web/default/index.html:56 +#: templates/web/default/index.html:54 msgid "How to report a problem" msgstr "Hvordan rapportere et problem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:516 +#: perllib/FixMyStreet/App/Controller/Admin.pm:514 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "Jeg er redd du ikke kan bekrefte ubekreftede rapporter." -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:93 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "Jeg er redd vi ikke klarte å finne ditt problem i databasen.\n" @@ -945,7 +945,7 @@ msgstr "Lokal RSS-strøm og epostvarsel" msgid "Local alerts" msgstr "Lokale varsler" -#: templates/web/default/index.html:60 +#: templates/web/default/index.html:58 msgid "Locate the problem on a map of the area" msgstr "Lokaliser problemet på kartet over området" @@ -1026,7 +1026,7 @@ msgstr "Navigasjon" msgid "Nearly Done! Now check your email..." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:291 +#: perllib/FixMyStreet/App/Controller/Admin.pm:289 msgid "New category contact added" msgstr "Ny kategorikontakt lagt til" @@ -1090,7 +1090,7 @@ msgstr "Nye rapporter til {{COUNCIL}} på reportemptyhomes.com" msgid "New reports within {{NAME}}'s boundary on reportemptyhomes.com" msgstr "Nye rapporter innenfor grensen til {{NAME}} på reportemptyhomes.com" -#: templates/web/default/index.html:23 +#: templates/web/default/index.html:27 msgid "New!" msgstr "" @@ -1194,7 +1194,7 @@ msgstr "Eldre saker" msgid "Open" msgstr "Åpen" -#: templates/web/default/alert/list.html:88 +#: templates/web/default/alert/list.html:87 msgid "Or problems reported to:" msgstr "Eller problemer meldt til:" @@ -1206,10 +1206,10 @@ msgstr "" "Eller du kan abonnere på varsel basert på bydel eller administrasjon du " "hører inn under:" -#: bin/send-reports:165 bin/send-reports:174 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:492 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:501 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:856 +#: bin/send-reports:168 bin/send-reports:177 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:495 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:504 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:855 #: perllib/FixMyStreet/DB/Result/Problem.pm:316 #: perllib/FixMyStreet/DB/Result/Problem.pm:326 #: perllib/FixMyStreet/DB/Result/Problem.pm:336 @@ -1217,11 +1217,6 @@ msgstr "" msgid "Other" msgstr "Annet" -#: templates/web/default/errors/page_error_410_gone.html:1 -#: templates/web/default/errors/page_error_410_gone.html:3 -msgid "Page Gone" -msgstr "" - #: templates/web/default/errors/page_error_404_not_found.html:1 #: templates/web/default/errors/page_error_404_not_found.html:3 msgid "Page Not Found" @@ -1251,7 +1246,7 @@ msgstr "Bilde:" msgid "Photos of recent nearby reports" msgstr "Bilder av nye saker i nærheten" -#: templates/web/default/index.html:78 +#: templates/web/default/index.html:76 msgid "Photos of recent reports" msgstr "Bilder av nylig meldte saker" @@ -1275,9 +1270,9 @@ msgstr "Skriv din epost" msgid "Please check your email address is correct" msgstr "Skriv en gyldig epostadresse" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:640 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:660 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:676 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:639 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:659 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:675 #: perllib/FixMyStreet/DB/Result/Problem.pm:206 msgid "Please choose a category" msgstr "Velg en kategori" @@ -1401,7 +1396,7 @@ msgstr "" "Vennligst fyll inn skjemaet under med detaljene om problemet,\n" "og beskriv stedet så nøyaktig som mulig i boksen for detaljer." -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:239 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:242 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Vennligst indiker om du ønsker å motta et annet spørreskjema" @@ -1426,18 +1421,18 @@ msgstr "" msgid "Please note:" msgstr "Vennligst merk deg:" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:242 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245 msgid "Please provide some explanation as to why you're reopening this report" msgstr "" "Vennligst bidra med en forklaring for hvorfor du åpner denne rapporten på " "nytt" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:252 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:119 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:235 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:122 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:238 msgid "" "Please say whether you've ever reported a problem to your council before" msgstr "" @@ -1452,7 +1447,7 @@ msgstr "Velg den feed du ønsker" msgid "Please select the type of alert you want" msgstr "Velg vilken type varsel du ønsker" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:231 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:234 msgid "Please state whether or not the problem has been fixed" msgstr "Vennligs oppgi om dette problemet er blitt fikset eller ikke" @@ -1460,7 +1455,7 @@ msgstr "Vennligs oppgi om dette problemet er blitt fikset eller ikke" msgid "Please take a look at the updates that have been left." msgstr "Vær sa snill å ta en titt på oppdateringene som har blitt igjen." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:729 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:728 msgid "Please upload a JPEG image only" msgstr "Vennligst last kun opp et JPEG-bilde" @@ -1503,7 +1498,7 @@ msgstr "Problem %s sendt til administrasjon %s" msgid "Problem breakdown by state" msgstr "Tilstandsfordeling for problemer" -#: perllib/FixMyStreet/App/Controller/Admin.pm:745 +#: perllib/FixMyStreet/App/Controller/Admin.pm:743 msgid "Problem marked as open." msgstr "Problem markert som åpent." @@ -1520,13 +1515,13 @@ msgstr "Problemer nylig rapportert fikset på FiksGataMi" msgid "Problems within %.1fkm of this location" msgstr "Saker innen %skm av dette punktet" -#: perllib/FixMyStreet/Cobrand/Default.pm:694 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:161 -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:123 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:127 msgid "Problems within %s" msgstr "Problemer innenfor %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:703 +#: perllib/FixMyStreet/Cobrand/Default.pm:728 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:169 msgid "Problems within %s ward" msgstr "Problemer innenfor %s avdeling/etat" @@ -1544,7 +1539,7 @@ msgstr "Problemer innenfor grensene av:" msgid "Properties recently reported as put back to use on reportemptyhomes.com" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:469 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:470 msgid "Property type:" msgstr "Type egenskap:" @@ -1566,7 +1561,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:185 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:188 msgid "Questionnaire filled in by problem reporter" msgstr "Spørreskjema fylt inn av feilrapportøren" @@ -1578,29 +1573,29 @@ msgstr "Spørreskjema fylt inn av feilrapportøren" msgid "RSS feed" msgstr "RSS-strøm" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 -#: perllib/FixMyStreet/Cobrand/Default.pm:746 +#: perllib/FixMyStreet/Cobrand/Default.pm:757 +#: perllib/FixMyStreet/Cobrand/Default.pm:771 #, fuzzy msgid "RSS feed for %s" msgstr "RSS-strøm fra %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:739 -#: perllib/FixMyStreet/Cobrand/Default.pm:753 +#: perllib/FixMyStreet/Cobrand/Default.pm:764 +#: perllib/FixMyStreet/Cobrand/Default.pm:778 #, fuzzy msgid "RSS feed for %s ward, %s" msgstr "RSS-strøm fra %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:762 -#: perllib/FixMyStreet/Cobrand/Default.pm:776 -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:147 -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:157 -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:165 +#: perllib/FixMyStreet/Cobrand/Default.pm:787 +#: perllib/FixMyStreet/Cobrand/Default.pm:801 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:143 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:151 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:161 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:169 msgid "RSS feed of %s" msgstr "RSS-strøm fra %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:768 -#: perllib/FixMyStreet/Cobrand/Default.pm:782 +#: perllib/FixMyStreet/Cobrand/Default.pm:793 +#: perllib/FixMyStreet/Cobrand/Default.pm:807 #, fuzzy msgid "RSS feed of %s, within %s ward" msgstr "RSS-strøm for problemer i denne %s" @@ -1613,14 +1608,14 @@ 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:695 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:162 -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:122 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:126 #, fuzzy msgid "RSS feed of problems within %s" msgstr "RSS-strøm for problemer i denne %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:702 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:168 #, fuzzy msgid "RSS feed of problems within %s ward" @@ -1653,7 +1648,7 @@ msgstr "Nylig lokalt problem, FiksGataMi." msgid "Recently fixed" msgstr "Nylig løste saker" -#: templates/web/default/index.html:87 +#: templates/web/default/index.html:85 msgid "Recently reported problems" msgstr "Nylig meldte problemer" @@ -1683,11 +1678,11 @@ msgstr "Rapporter tomme hjem" msgid "Report a problem" msgstr "Rapporter et problem" -#: perllib/FixMyStreet/App/Controller/Rss.pm:262 +#: perllib/FixMyStreet/App/Controller/Rss.pm:252 msgid "Report on %s" msgstr "Rapport på %s" -#: templates/web/default/index.html:11 +#: templates/web/default/index.html:15 msgid "Report, view, or discuss local problems" msgstr "Rapporter, finn eller diskuter lokale problemer" @@ -1749,7 +1744,7 @@ msgstr "Send rapport på nytt" msgid "Save changes" msgstr "Lagre endringer" -#: perllib/FixMyStreet/App/Controller/Admin.pm:599 +#: perllib/FixMyStreet/App/Controller/Admin.pm:597 #: templates/web/default/admin/search_reports.html:1 msgid "Search Reports" msgstr "Søk i rapporter" @@ -1767,7 +1762,7 @@ msgstr "" "Velg hvilken type varsel du ønsker og klikk på knappen for en RSS-strøm, " "eller skriv inn din epostadresse for å abonnere på et epostvarsel." -#: perllib/FixMyStreet/DB/Result/Problem.pm:378 +#: perllib/FixMyStreet/DB/Result/Problem.pm:390 msgid "Sent to %s %s later" msgstr "Sendt til %s %s senere" @@ -1878,11 +1873,11 @@ msgstr "Lever spørreskjema" msgid "Subscribe" msgstr "Abonner" -#: templates/web/default/alert/list.html:127 +#: templates/web/default/alert/list.html:124 msgid "Subscribe me to an email alert" msgstr "Jeg ønsker å abonnere på epostvarsel" -#: perllib/FixMyStreet/App/Controller/Admin.pm:597 +#: perllib/FixMyStreet/App/Controller/Admin.pm:595 #: templates/web/default/admin/index.html:1 msgid "Summary" msgstr "Oppsummering" @@ -1893,7 +1888,7 @@ msgstr "Oppsummering" msgid "Summary reports" msgstr "Oppsummeringsrapporter" -#: perllib/FixMyStreet/App/Controller/Admin.pm:601 +#: perllib/FixMyStreet/App/Controller/Admin.pm:599 #: templates/web/default/admin/questionnaire.html:1 msgid "Survey Results" msgstr "" @@ -1981,7 +1976,7 @@ 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/Report/New.pm:738 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:737 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." @@ -2002,12 +1997,11 @@ msgstr "Det stedet virker ikke å være i storbritannia. Vennligst prøv igjen." msgid "That postcode was not recognised, sorry." msgstr "Det postnummeret ble ikke gjenkjent, beklager." -#: perllib/FixMyStreet/App/Controller/Admin.pm:498 +#: perllib/FixMyStreet/App/Controller/Admin.pm:496 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/Rss.pm:41 msgid "That report has been removed from FixMyStreet." msgstr "Den rapporten har blitt fjernet fra FiksGataMi." @@ -2113,20 +2107,15 @@ msgstr "De siste rapporter innenfor grensen til {{NAME}} rapportert av brukere" msgid "The passwords do not match" msgstr "" -#: templates/web/default/errors/page_error_410_gone.html:10 -#: templates/web/default/errors/page_error_410_gone.html:12 -msgid "The requested URL '%s' is no longer available" -msgstr "" - #: templates/web/default/errors/page_error_404_not_found.html:10 #: templates/web/default/errors/page_error_404_not_found.html:12 msgid "The requested URL '%s' was not found on this server" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:479 -#: perllib/FixMyStreet/App/Controller/Admin.pm:649 -#: perllib/FixMyStreet/App/Controller/Admin.pm:688 -#: perllib/FixMyStreet/App/Controller/Admin.pm:773 +#: perllib/FixMyStreet/App/Controller/Admin.pm:477 +#: perllib/FixMyStreet/App/Controller/Admin.pm:647 +#: perllib/FixMyStreet/App/Controller/Admin.pm:686 +#: perllib/FixMyStreet/App/Controller/Admin.pm:771 msgid "The requested URL was not found on this server." msgstr "" @@ -2160,7 +2149,7 @@ msgstr "Det var problemer med din rapport. Vennligst se under." msgid "There were problems with your update. Please see below." msgstr "Det var problemer med din oppdatering. Vennligst se under." -#: bin/send-reports:175 +#: bin/send-reports:178 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 " @@ -2173,7 +2162,7 @@ msgstr "" "eller gi oss beskjed om hvilken kategori av problemer dette er så vi kan " "legge det til i vårt system." -#: bin/send-reports:178 +#: bin/send-reports:181 #, fuzzy msgid "" "This email has been sent to several councils covering the location of the " @@ -2212,21 +2201,21 @@ msgstr "" "Dette er en opplisting av alle sakene i denne tjenesten; velg en bestemt " "administrasjon for å se saker som er sendt dit." -#: perllib/FixMyStreet/Cobrand/Default.pm:815 +#: perllib/FixMyStreet/Cobrand/Default.pm:840 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:117 #: templates/web/default/report/display.html:111 msgid "This problem has been fixed" msgstr "Denne saken er løst" -#: perllib/FixMyStreet/Cobrand/Default.pm:811 +#: perllib/FixMyStreet/Cobrand/Default.pm:836 msgid "This problem is old and of unknown status." msgstr "Denne saken er gammel og med ukjent status." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:80 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:78 msgid "This report is currently marked as fixed." msgstr "Denne rapporten er for tiden markert som fikset." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:81 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:79 msgid "This report is currently marked as open." msgstr "Denne rapporten er for tiden markert som åpen." @@ -2236,7 +2225,7 @@ msgid "" msgstr "" "Denne nettsiden inneholder også et bilde av problemet, sendt inn av brukeren." -#: perllib/FixMyStreet/App/Controller/Admin.pm:600 +#: perllib/FixMyStreet/App/Controller/Admin.pm:598 #: templates/web/default/admin/timeline.html:1 msgid "Timeline" msgstr "Tidslinje" @@ -2274,14 +2263,13 @@ msgstr "Klarte ikke hente kartfliser fra filtjeneren." msgid "Unconfirmed" msgstr "Ubekreftet" -#: perllib/FixMyStreet/App/Controller/Rss.pm:166 +#: perllib/FixMyStreet/App/Controller/Rss.pm:156 #, fuzzy msgid "Unknown alert type" msgstr "Ukjent problem-Id" #: perllib/FixMyStreet/App/Controller/Report.pm:70 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:24 -#: perllib/FixMyStreet/App/Controller/Rss.pm:37 msgid "Unknown problem ID" msgstr "Ukjent problem-Id" @@ -2315,8 +2303,8 @@ msgstr "Oppdater tilstanden" msgid "Update:" msgstr "Oppdatering:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:572 -#: perllib/FixMyStreet/App/Controller/Admin.pm:735 +#: perllib/FixMyStreet/App/Controller/Admin.pm:570 +#: perllib/FixMyStreet/App/Controller/Admin.pm:733 msgid "Updated!" msgstr "Oppdatert!" @@ -2334,8 +2322,8 @@ msgstr "Oppdateringer av {{title}}" msgid "Updates to this problem, FixMyStreet" msgstr "Oppdateringer til dette problemet, FiksGataMi" -#: perllib/FixMyStreet/App/Controller/Admin.pm:286 -#: perllib/FixMyStreet/App/Controller/Admin.pm:316 +#: perllib/FixMyStreet/App/Controller/Admin.pm:284 +#: perllib/FixMyStreet/App/Controller/Admin.pm:314 msgid "Values updated" msgstr "Verdier oppdatert" @@ -2374,7 +2362,7 @@ msgstr "" "Vi fant mer en ett treff for den plassen. Vi viser opp til ti treff, så " "forsøk et annet søk hvis din plass ikke er her." -#: perllib/FixMyStreet/App/Controller/Around.pm:235 +#: perllib/FixMyStreet/App/Controller/Around.pm:229 msgid "We had a problem with the supplied co-ordinates - outside the UK?" msgstr "" @@ -2388,7 +2376,7 @@ msgstr "" "Det kan hende vi periodisk tar kontakt med deg for å spørre om noe har " "endret seg med eiedommen du rapporterte." -#: bin/send-reports:185 +#: bin/send-reports:188 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 " @@ -2398,7 +2386,7 @@ msgstr "" "tiden kontaktinformasjon for dem. Hvis du vet om en egnet kontaktadresse, ta " "kontakt med oss." -#: templates/web/default/index.html:62 +#: templates/web/default/index.html:60 msgid "We send it to the council on your behalf" msgstr "Vi sender til administrasjon på dine vegne" @@ -2439,7 +2427,7 @@ msgstr "Når redigert" msgid "When sent" msgstr "Når sendt" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:464 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:465 msgid "Whole block of empty flats" msgstr "Hel blokk med tomme leiligheter" @@ -2524,7 +2512,7 @@ msgstr "" "Du kan hjelpe oss ved å finne en kontakt-epostadresse for lokale problemer i " "%s, og sende den via epost til oss på <a href='mailto:%s'>%s</a>." -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:42 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:45 msgid "" "You have already answered this questionnaire. If you have a question, please " "<a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n" @@ -2597,7 +2585,7 @@ msgstr "Ønsker du virkelig å sende på nytt?" msgid "Your Reports" msgstr "Søk i rapporter" -#: templates/web/default/alert/list.html:123 +#: templates/web/default/alert/list.html:120 msgid "Your email:" msgstr "Din epost" @@ -2630,13 +2618,13 @@ msgstr "mindre enn et minutt" msgid "marked as fixed" msgstr "markert som fikset" -#: perllib/FixMyStreet/App/Controller/Admin.pm:107 +#: perllib/FixMyStreet/App/Controller/Admin.pm:106 #: templates/web/default/admin/questionnaire.html:15 #: templates/web/default/admin/questionnaire.html:16 msgid "n/a" msgstr "" -#: templates/web/default/alert/list.html:119 +#: templates/web/default/alert/list.html:116 msgid "or" msgstr "eller" @@ -2656,7 +2644,7 @@ msgstr "åpnet på nytt" 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" -#: bin/send-reports:166 +#: bin/send-reports:169 msgid "this type of local problem" msgstr "denne type lokalt problem" @@ -2854,4 +2842,3 @@ msgstr[1] "<big>%s</big> rapport-<br>oppdateringer" #~ msgid "(blank to go anonymous)" #~ msgstr "(blank for å være anonym)" - diff --git a/notes/catalyst-master-merge-todos.txt b/notes/catalyst-master-merge-todos.txt deleted file mode 100644 index 200fda0a5..000000000 --- a/notes/catalyst-master-merge-todos.txt +++ /dev/null @@ -1,9 +0,0 @@ -display_map needs a properly faked $q so it can choose a cobrand. Or should it be ported to use new cobrand? - -change uri_for to use cobrand->url so we don't have to - -should we ditch flickr import? (does not seem to be getting huge usage and those using it would probably report using another method: http://www.flickr.com/search/?w=all&q=fixmystreet&m=tags) - -move all FAQ over to TT2 - -check that using specific 404 and 410 pages is ok for reports diff --git a/notes/osgb36_to_wgs84_notes.txt b/notes/osgb36_to_wgs84_notes.txt deleted file mode 100644 index 3deca19de..000000000 --- a/notes/osgb36_to_wgs84_notes.txt +++ /dev/null @@ -1,77 +0,0 @@ -These notes are for the FMS migration from OSGB36 to WGS84 coordinates. - -Reference: - - easting === longitude - northing === latitude - - http://en.wikipedia.org/wiki/Ordnance_Survey_National_Grid - http://en.wikipedia.org/wiki/World_Geodetic_System - -DB: - - * dump schema from live db and confirm it matches schema.sql (you never know...) - DONE: use PledgeBank's 'nearby' logic in problem_find_nearby() SQL function - DONE: in 'alerts' table convert parameter and parameter2 if alert is 'local_problems' or 'local_problems_state' - -CODE: - - DONE: update all calls to problem_find_nearby swapping parameter order. - * find all occurences of 'easting', 'northing', $e, $n etc and migrate - - * email me link broken on http://herring/?lat=51.4545595517093;lon=-0.23100115932431 - - * Cobrand.pm - * Cobrands/Barnet/Util.pm - * Cobrands/Emptyhomes/Util.pm - * CronFns.pm - * CrossSell.pm - * EastHantsWSDL.pm - * FixMyStreet/Alert.pm - * FixMyStreet/Geocode.pm - * FixMyStreet/Map.pm - * FixMyStreet/Map/Bing.pm - * FixMyStreet/Map/BingOL.pm - * FixMyStreet/Map/Google.pm - * FixMyStreet/Map/OSM.pm - * FixMyStreet/Map/OSM/CycleMap.pm - * FixMyStreet/Map/OSM/StreetView.pm - * FixMyStreet/Map/Tilma/OL/1_10k.pm - * FixMyStreet/Map/Tilma/OL/StreetView.pm - * FixMyStreet/Map/Tilma/Original.pm - * FixMyStreet/Map/Tilma/Original/1_10k.pm - * FixMyStreet/Map/Tilma/Original/StreetView.pm - * Memcached.pm - * Page.pm - * PoChange.pm - * Problems.pm - * Standard.pm - * Utils.pm - - * web/about.cgi - * web/ajax.cgi - * web/alert.cgi - * web/confirm.cgi - * web/contact.cgi - * web/faq.cgi - * web/flickr.cgi - * web/fun.cgi - * web/import.cgi - * web/index.cgi - * web/json.cgi - * web/photo.cgi - * web/questionnaire.cgi - * web/reports.cgi - * web/rss.cgi - * web/test.cgi - * web/tms-signup.cgi - * web/upload.cgi - - DONE: all scripts checked - -UI maps: - - * Tilma js code will still need eastings and northings - * All other maps should be able to switch to latlon - - diff --git a/perllib/FixMyStreet/App/Controller/Root.pm b/perllib/FixMyStreet/App/Controller/Root.pm index 7e2acc03c..9cdf0b523 100644 --- a/perllib/FixMyStreet/App/Controller/Root.pm +++ b/perllib/FixMyStreet/App/Controller/Root.pm @@ -89,8 +89,8 @@ sub page_error_404_not_found : Private { sub page_error_410_gone : Private { my ( $self, $c, $error_msg ) = @_; - $c->stash->{template} = 'errors/page_error_410_gone.html'; - $c->stash->{error_msg} = $error_msg; + $c->stash->{template} = 'index.html'; + $c->stash->{error} = $error_msg; $c->response->status(410); } diff --git a/templates/web/default/errors/page_error_410_gone.html b/templates/web/default/errors/page_error_410_gone.html deleted file mode 100644 index c4d5035d8..000000000 --- a/templates/web/default/errors/page_error_410_gone.html +++ /dev/null @@ -1,20 +0,0 @@ -[% INCLUDE 'header.html', title => loc('Page Gone') %] - -<h1>[%loc('Page Gone') %]</h1> - -[% IF error_msg %] - <p class="error">[% error_msg | html %]</p> -[% END %] - -<p> - [% - tprintf( - loc("The requested URL '%s' is no longer available"), - c.req.uri - ) - %] -</p> - -[% # FIXME - add more helpful suggestions to this page %] - -[% INCLUDE 'footer.html' %] diff --git a/templates/web/default/index.html b/templates/web/default/index.html index 5dffb5f10..ec07e2e91 100644 --- a/templates/web/default/index.html +++ b/templates/web/default/index.html @@ -1,5 +1,9 @@ [% INCLUDE 'header.html', title => '' %] +[% IF error %] + <p class="error">[% error %]</p> +[% END %] + <p id="expl"> [% subhead @@ -31,12 +35,6 @@ # } %] - -[% IF error %] - <p class="error">[% error %]</p> -[% END %] - - [% question = c.cobrand.enter_postcode_text() |