No need for all pins yet (does nothing <6 months), hide pins using OL JS if present; permalink.

8 files changed, 298 insertions, 224 deletions

diff --git a/locale/FixMyStreet.po b/locale/FixMyStreet.po
index f1d14a6c0..396fdd076 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-02-23 13:09+0000\n"
+"POT-Creation-Date: 2011-02-24 13:57+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"
@@ -279,7 +279,7 @@ msgstr ""
 msgid "reopened"
 msgstr ""
 
-#: perllib/Page.pm:640 web/index.cgi:1071
+#: perllib/Page.pm:640 web/index.cgi:1076
 msgid "Offensive? Unsuitable? Tell us"
 msgstr ""
 
@@ -292,7 +292,7 @@ msgid ""
 "Sorry, that appears to be a Crown dependency postcode, which we don't cover."
 msgstr ""
 
-#: perllib/Page.pm:675 perllib/FixMyStreet/Geocode.pm:134
+#: perllib/Page.pm:675 perllib/FixMyStreet/Geocode.pm:137
 msgid ""
 "We do not cover Northern Ireland, I'm afraid, as our licence doesn't include "
 "any maps for the region."
@@ -310,7 +310,7 @@ msgstr ""
 msgid "This report is currently marked as open."
 msgstr ""
 
-#: perllib/FixMyStreet/Alert.pm:311
+#: perllib/FixMyStreet/Alert.pm:308
 #, perl-format
 msgid "Report on %s"
 msgstr ""
@@ -324,21 +324,21 @@ msgstr ""
 msgid "That location does not appear to be in Britain; please try again."
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode.pm:114
-msgid "Sorry, we could not parse that location. Please try again."
+#: perllib/FixMyStreet/Geocode.pm:97 perllib/FixMyStreet/Geocode.pm:132
+msgid "Sorry, we could not find that location."
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode.pm:116 perllib/FixMyStreet/Geocode.pm:131
-msgid "Sorry, we could not find that location."
+#: perllib/FixMyStreet/Geocode.pm:130
+msgid "Sorry, we could not parse that location. Please try again."
 msgstr ""
 
-#: perllib/FixMyStreet/Geocode.pm:147
+#: perllib/FixMyStreet/Geocode.pm:150
 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/Geocode.pm:162
+#: perllib/FixMyStreet/Geocode.pm:165
 msgid "More than one match"
 msgstr ""
 
@@ -355,9 +355,9 @@ msgstr ""
 #: perllib/FixMyStreet/Map/OSM.pm:41
 #: perllib/FixMyStreet/Map/OSM/CycleMap.pm:38
 msgid ""
-"Map &copy; <a href=\"http://www.openstreetmap.org/\">OpenStreetMap</a> and "
-"contributors, <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">CC-"
-"BY-SA</a>"
+"Map &copy; <a id=\"osm_link\" href=\"http://www.openstreetmap.org/"
+"\">OpenStreetMap</a> and contributors, <a href=\"http://creativecommons.org/"
+"licenses/by-sa/2.0/\">CC-BY-SA</a>"
 msgstr ""
 
 #: perllib/FixMyStreet/Map/BingOL.pm:39
@@ -545,8 +545,8 @@ msgstr ""
 msgid "RSS feed of nearby problems"
 msgstr ""
 
-#: web/alert.cgi:308 web/alert.cgi:367 web/index.cgi:970 web/index.cgi:1082
-#: web/reports.cgi:255
+#: web/alert.cgi:308 web/alert.cgi:367 web/index.cgi:975 web/index.cgi:1087
+#: web/reports.cgi:254
 msgid "RSS feed"
 msgstr ""
 
@@ -616,12 +616,12 @@ msgstr ""
 msgid "Receive email when updates are left on this problem."
 msgstr ""
 
-#: web/alert.cgi:461 web/alert.cgi:488 web/index.cgi:736 web/index.cgi:1076
+#: web/alert.cgi:461 web/alert.cgi:488 web/index.cgi:736 web/index.cgi:1081
 #: web-admin/index.cgi:630 web-admin/index.cgi:750
 msgid "Email:"
 msgstr ""
 
-#: web/alert.cgi:462 web/alert.cgi:489 web/index.cgi:1077
+#: web/alert.cgi:462 web/alert.cgi:489 web/index.cgi:1082
 msgid "Subscribe"
 msgstr ""
 
@@ -737,13 +737,13 @@ msgid ""
 "reported a problem to a council before?"
 msgstr ""
 
-#: web/confirm.cgi:190 web/questionnaire.cgi:234 web/questionnaire.cgi:322
+#: web/confirm.cgi:190 web/questionnaire.cgi:234 web/questionnaire.cgi:323
 #: web-admin/index.cgi:340 web-admin/index.cgi:341 web-admin/index.cgi:503
 #: web-admin/index.cgi:590 web-admin/index.cgi:608
 msgid "Yes"
 msgstr ""
 
-#: web/confirm.cgi:191 web/questionnaire.cgi:235 web/questionnaire.cgi:323
+#: web/confirm.cgi:191 web/questionnaire.cgi:235 web/questionnaire.cgi:324
 #: web-admin/index.cgi:340 web-admin/index.cgi:341 web-admin/index.cgi:503
 #: web-admin/index.cgi:590 web-admin/index.cgi:608
 msgid "No"
@@ -847,7 +847,7 @@ msgstr ""
 msgid "Message:"
 msgstr ""
 
-#: web/contact.cgi:238 web/index.cgi:1092
+#: web/contact.cgi:238 web/index.cgi:1097
 msgid "Post"
 msgstr ""
 
@@ -1170,11 +1170,11 @@ msgstr ""
 msgid "Details:"
 msgstr ""
 
-#: web/index.cgi:734 web/index.cgi:1108
+#: web/index.cgi:734 web/index.cgi:1113 web/questionnaire.cgi:308
 msgid "Photo:"
 msgstr ""
 
-#: web/index.cgi:735 web/index.cgi:1089 web-admin/index.cgi:629
+#: web/index.cgi:735 web/index.cgi:1094 web-admin/index.cgi:629
 #: web-admin/index.cgi:749
 msgid "Name:"
 msgstr ""
@@ -1183,7 +1183,7 @@ msgstr ""
 msgid "Phone:"
 msgstr ""
 
-#: web/index.cgi:738 web/index.cgi:1096
+#: web/index.cgi:738 web/index.cgi:1101
 msgid "(optional)"
 msgstr ""
 
@@ -1270,100 +1270,100 @@ msgstr ""
 msgid "Hide pins"
 msgstr ""
 
-#: web/index.cgi:969
+#: web/index.cgi:974
 msgid "Email me new local problems"
 msgstr ""
 
-#: web/index.cgi:971
+#: web/index.cgi:976
 msgid "RSS feed of recent local problems"
 msgstr ""
 
-#: web/index.cgi:974
+#: web/index.cgi:979
 msgid "Problems in this area"
 msgstr ""
 
-#: web/index.cgi:975
+#: web/index.cgi:980
 msgid "Reports on and around the map"
 msgstr ""
 
-#: web/index.cgi:976
+#: web/index.cgi:981
 #, perl-format
 msgid "Closest nearby problems <small>(within&nbsp;%skm)</small>"
 msgstr ""
 
-#: web/index.cgi:980
+#: web/index.cgi:985
 msgid ""
 "To report a problem, simply\n"
 "        <strong>click on the map</strong> at the correct location."
 msgstr ""
 
-#: web/index.cgi:982
+#: web/index.cgi:987
 #, perl-format
 msgid ""
 "<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this\n"
 "        step</a>.</small>"
 msgstr ""
 
-#: web/index.cgi:987
+#: web/index.cgi:992
 msgid "Recent local problems, FixMyStreet"
 msgstr ""
 
-#: web/index.cgi:1000
+#: web/index.cgi:1005
 msgid "There were problems with your update. Please see below."
 msgstr ""
 
-#: web/index.cgi:1021 web/index.cgi:1023
+#: web/index.cgi:1026 web/index.cgi:1028
 msgid "Unknown problem ID"
 msgstr ""
 
-#: web/index.cgi:1024
+#: web/index.cgi:1029
 msgid "That report has been removed from FixMyStreet."
 msgstr ""
 
-#: web/index.cgi:1044
+#: web/index.cgi:1049
 msgid "This problem is old and of unknown status."
 msgstr ""
 
-#: web/index.cgi:1047 web/index.cgi:1088
+#: web/index.cgi:1052 web/index.cgi:1093
 msgid "This problem has been fixed"
 msgstr ""
 
-#: web/index.cgi:1072
+#: web/index.cgi:1077
 msgid "More problems nearby"
 msgstr ""
 
-#: web/index.cgi:1075
+#: web/index.cgi:1080
 msgid "Email me updates"
 msgstr ""
 
-#: web/index.cgi:1078
+#: web/index.cgi:1083
 msgid "Receive email when updates are left on this problem"
 msgstr ""
 
-#: web/index.cgi:1083
+#: web/index.cgi:1088
 msgid "RSS feed of updates to this problem"
 msgstr ""
 
-#: web/index.cgi:1084
+#: web/index.cgi:1089
 msgid "Provide an update"
 msgstr ""
 
-#: web/index.cgi:1090
+#: web/index.cgi:1095
 msgid "Update:"
 msgstr ""
 
-#: web/index.cgi:1091
+#: web/index.cgi:1096
 msgid "Alert me to future updates"
 msgstr ""
 
-#: web/index.cgi:1099
+#: web/index.cgi:1104
 msgid ""
 "Please note that updates are not sent to the council. If you leave your name "
 "it will be public. Your information will only be used in accordance with our "
 "<a href=\"/faq#privacy\">privacy policy</a>"
 msgstr ""
 
-#: web/index.cgi:1119
+#: web/index.cgi:1124
 msgid "Updates to this problem, FixMyStreet"
 msgstr ""
 
@@ -1520,112 +1520,112 @@ msgid ""
 "your experience of getting the problem fixed?"
 msgstr ""
 
-#: web/questionnaire.cgi:321
+#: web/questionnaire.cgi:322
 msgid ""
 "Would you like to receive another questionnaire in 4 weeks, reminding you to "
 "check the status?"
 msgstr ""
 
-#: web/reports.cgi:193 web/reports.cgi:240
+#: web/reports.cgi:192 web/reports.cgi:239
 msgid "Summary reports"
 msgstr ""
 
-#: web/reports.cgi:195
+#: web/reports.cgi:194
 msgid ""
 "This is a summary of all reports on this site; select a particular council "
 "to see the reports sent there."
 msgstr ""
 
-#: web/reports.cgi:196
+#: web/reports.cgi:195
 msgid "Greyed-out lines are councils that no longer exist."
 msgstr ""
 
-#: web/reports.cgi:200 web-admin/index.cgi:477 web-admin/index.cgi:656
+#: web/reports.cgi:199 web-admin/index.cgi:477 web-admin/index.cgi:656
 msgid "Name"
 msgstr ""
 
-#: web/reports.cgi:200 web/reports.cgi:276
+#: web/reports.cgi:199 web/reports.cgi:275
 msgid "New problems"
 msgstr ""
 
-#: web/reports.cgi:200 web/reports.cgi:284
+#: web/reports.cgi:199 web/reports.cgi:283
 msgid "Older problems"
 msgstr ""
 
-#: web/reports.cgi:202
+#: web/reports.cgi:201
 msgid "Old problems,<br>state unknown"
 msgstr ""
 
-#: web/reports.cgi:204 web/reports.cgi:291
+#: web/reports.cgi:203 web/reports.cgi:290
 msgid "Recently fixed"
 msgstr ""
 
-#: web/reports.cgi:204
+#: web/reports.cgi:203
 msgid "Older fixed"
 msgstr ""
 
-#: web/reports.cgi:246
+#: web/reports.cgi:245
 msgid "council"
 msgstr ""
 
-#: web/reports.cgi:256
+#: web/reports.cgi:255
 #, perl-format
 msgid "RSS feed of problems in this %s"
 msgstr ""
 
-#: web/reports.cgi:260
+#: web/reports.cgi:259
 #, perl-format
 msgid "This is a summary of all reports for one %s."
 msgstr ""
 
-#: web/reports.cgi:261
+#: web/reports.cgi:260
 #, perl-format
 msgid "This is a summary of all reports for this %s."
 msgstr ""
 
-#: web/reports.cgi:265
+#: web/reports.cgi:264
 #, perl-format
 msgid "You can <a href=\"%s\">see less detail</a>."
 msgstr ""
 
-#: web/reports.cgi:267
+#: web/reports.cgi:266
 #, perl-format
 msgid "You can <a href=\"%s\">see more details</a>."
 msgstr ""
 
-#: web/reports.cgi:269
+#: web/reports.cgi:268
 #, perl-format
 msgid ""
 "You can <a href=\"%s\">see less detail</a> or go back and <a href=\"/reports"
 "\">show all councils</a>."
 msgstr ""
 
-#: web/reports.cgi:271
+#: web/reports.cgi:270
 #, perl-format
 msgid ""
 "You can <a href=\"%s\">see more details</a> or go back and <a href=\"/reports"
 "\">show all councils</a>."
 msgstr ""
 
-#: web/reports.cgi:286
+#: web/reports.cgi:285
 msgid "Old problems, state unknown"
 msgstr ""
 
-#: web/reports.cgi:292
+#: web/reports.cgi:291
 msgid "Old fixed"
 msgstr ""
 
-#: web/reports.cgi:295
+#: web/reports.cgi:294
 #, perl-format
 msgid "%s - Summary reports"
 msgstr ""
 
-#: web/reports.cgi:295
+#: web/reports.cgi:294
 #, perl-format
 msgid "Problems within %s, FixMyStreet"
 msgstr ""
 
-#: web/reports.cgi:335
+#: web/reports.cgi:334
 msgid "(not sent to council)"
 msgstr ""
 
diff --git a/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po b/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po
index bc32354de..78351aa70 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-02-23 13:09+0000\n"
+"POT-Creation-Date: 2011-02-24 13:57+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"
@@ -311,7 +311,7 @@ msgstr "cofnodwyd bod hyn wedi'i adfer i'w ddefnyddio"
 msgid "reopened"
 msgstr "wedi'i ailagor"
 
-#: perllib/Page.pm:640 web/index.cgi:1071
+#: perllib/Page.pm:640 web/index.cgi:1076
 msgid "Offensive? Unsuitable? Tell us"
 msgstr "Sarhaus? Anaddas? Rhowch wybod i ni"
 
@@ -324,7 +324,7 @@ msgid ""
 "Sorry, that appears to be a Crown dependency postcode, which we don't cover."
 msgstr ""
 
-#: perllib/Page.pm:675 perllib/FixMyStreet/Geocode.pm:134
+#: perllib/Page.pm:675 perllib/FixMyStreet/Geocode.pm:137
 msgid ""
 "We do not cover Northern Ireland, I'm afraid, as our licence doesn't include "
 "any maps for the region."
@@ -345,7 +345,7 @@ msgstr "Mae'r eiddo gwag hwn wedi cael ei adfer i'w ddefnyddio"
 msgid "This report is currently marked as open."
 msgstr ""
 
-#: perllib/FixMyStreet/Alert.pm:311
+#: perllib/FixMyStreet/Alert.pm:308
 #, fuzzy, perl-format
 msgid "Report on %s"
 msgstr "Adroddiadau"
@@ -363,16 +363,16 @@ msgstr ""
 "Nid yw'n ymddangos bod y lleoliad hwnnw ym Mhrydain; rhowch gynnig arall "
 "arni."
 
-#: perllib/FixMyStreet/Geocode.pm:114
+#: perllib/FixMyStreet/Geocode.pm:97 perllib/FixMyStreet/Geocode.pm:132
+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.pm:130
 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."
 
-#: perllib/FixMyStreet/Geocode.pm:116 perllib/FixMyStreet/Geocode.pm:131
-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.pm:147
+#: perllib/FixMyStreet/Geocode.pm:150
 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."
@@ -381,7 +381,7 @@ msgstr ""
 "hyd at ddeg cyfatebiaeth, rhowch gynnig ar chwiliad gwahanol os nad yw'ch "
 "lleoliad chi yno."
 
-#: perllib/FixMyStreet/Geocode.pm:162
+#: perllib/FixMyStreet/Geocode.pm:165
 msgid "More than one match"
 msgstr ""
 
@@ -398,9 +398,9 @@ msgstr ""
 #: perllib/FixMyStreet/Map/OSM.pm:41
 #: perllib/FixMyStreet/Map/OSM/CycleMap.pm:38
 msgid ""
-"Map &copy; <a href=\"http://www.openstreetmap.org/\">OpenStreetMap</a> and "
-"contributors, <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">CC-"
-"BY-SA</a>"
+"Map &copy; <a id=\"osm_link\" href=\"http://www.openstreetmap.org/"
+"\">OpenStreetMap</a> and contributors, <a href=\"http://creativecommons.org/"
+"licenses/by-sa/2.0/\">CC-BY-SA</a>"
 msgstr ""
 
 #: perllib/FixMyStreet/Map/BingOL.pm:39
@@ -639,8 +639,8 @@ msgstr "(pellter rhagosodedig sy'n cynnwys tua 200,000 o bobl)"
 msgid "RSS feed of nearby empty properties"
 msgstr "Porthiant RSS o eiddo gwag sydd gerllaw"
 
-#: web/alert.cgi:308 web/alert.cgi:367 web/index.cgi:970 web/index.cgi:1082
-#: web/reports.cgi:255
+#: web/alert.cgi:308 web/alert.cgi:367 web/index.cgi:975 web/index.cgi:1087
+#: web/reports.cgi:254
 msgid "RSS feed"
 msgstr "Porthiant RSS"
 
@@ -723,12 +723,12 @@ msgstr ""
 "Derbyn neges e-bost pan fydd diweddariadau'n cael eu rhoi am yr eiddo gwag "
 "hwn."
 
-#: web/alert.cgi:461 web/alert.cgi:488 web/index.cgi:736 web/index.cgi:1076
+#: web/alert.cgi:461 web/alert.cgi:488 web/index.cgi:736 web/index.cgi:1081
 #: web-admin/index.cgi:630 web-admin/index.cgi:750
 msgid "Email:"
 msgstr "E-bost:"
 
-#: web/alert.cgi:462 web/alert.cgi:489 web/index.cgi:1077
+#: web/alert.cgi:462 web/alert.cgi:489 web/index.cgi:1082
 msgid "Subscribe"
 msgstr "Tanysgrifio"
 
@@ -877,13 +877,13 @@ msgstr ""
 "i ni'ch holi chi, a ydych erioed wedi rhoi gwybod i'r cyngor am eiddo gwag "
 "cyn hyn?"
 
-#: web/confirm.cgi:190 web/questionnaire.cgi:234 web/questionnaire.cgi:322
+#: web/confirm.cgi:190 web/questionnaire.cgi:234 web/questionnaire.cgi:323
 #: web-admin/index.cgi:340 web-admin/index.cgi:341 web-admin/index.cgi:503
 #: web-admin/index.cgi:590 web-admin/index.cgi:608
 msgid "Yes"
 msgstr "Ydw"
 
-#: web/confirm.cgi:191 web/questionnaire.cgi:235 web/questionnaire.cgi:323
+#: web/confirm.cgi:191 web/questionnaire.cgi:235 web/questionnaire.cgi:324
 #: web-admin/index.cgi:340 web-admin/index.cgi:341 web-admin/index.cgi:503
 #: web-admin/index.cgi:590 web-admin/index.cgi:608
 msgid "No"
@@ -1004,7 +1004,7 @@ msgstr "Pwnc:"
 msgid "Message:"
 msgstr "Neges:"
 
-#: web/contact.cgi:238 web/index.cgi:1092
+#: web/contact.cgi:238 web/index.cgi:1097
 msgid "Post"
 msgstr "Postio"
 
@@ -1378,11 +1378,11 @@ msgstr "Ffurflen manylion eiddo gwag"
 msgid "Details:"
 msgstr "Manylion:"
 
-#: web/index.cgi:734 web/index.cgi:1108
+#: web/index.cgi:734 web/index.cgi:1113 web/questionnaire.cgi:308
 msgid "Photo:"
 msgstr "Ffotograff:"
 
-#: web/index.cgi:735 web/index.cgi:1089 web-admin/index.cgi:629
+#: web/index.cgi:735 web/index.cgi:1094 web-admin/index.cgi:629
 #: web-admin/index.cgi:749
 msgid "Name:"
 msgstr "Enw:"
@@ -1391,7 +1391,7 @@ msgstr "Enw:"
 msgid "Phone:"
 msgstr "Rhif ffôn:"
 
-#: web/index.cgi:738 web/index.cgi:1096
+#: web/index.cgi:738 web/index.cgi:1101
 msgid "(optional)"
 msgstr "(dewisol)"
 
@@ -1478,28 +1478,28 @@ msgstr "Dangos pinnau"
 msgid "Hide pins"
 msgstr "Cuddio pinnau"
 
-#: web/index.cgi:969
+#: web/index.cgi:974
 msgid "Email me new local empty properties"
 msgstr "Anfonwch fanylion eiddo gwag lleol newydd ataf i drwy'r e-bost"
 
-#: web/index.cgi:971
+#: web/index.cgi:976
 msgid "RSS feed of recent local empty properties"
 msgstr "Porthiant RSS o eiddo gwag lleol diweddar"
 
-#: web/index.cgi:974
+#: web/index.cgi:979
 msgid "Empty properties in this area"
 msgstr "Eiddo gwag yn yr ardal hon"
 
-#: web/index.cgi:975
+#: web/index.cgi:980
 msgid "Reports on and around the map"
 msgstr "Adroddiadau ar ac yng nghyffiniau'r map"
 
-#: web/index.cgi:976
+#: web/index.cgi:981
 #, perl-format
 msgid "Closest nearby empty properties <small>(within&nbsp;%skm)</small>"
 msgstr "Yr eiddo gwag cyfagos agosaf <small>(within&nbsp;%skm)</small>"
 
-#: web/index.cgi:980
+#: web/index.cgi:985
 msgid ""
 "To report an empty property, simply\n"
 "        <strong>click on the map</strong> at the correct location."
@@ -1507,7 +1507,7 @@ msgstr ""
 "Er mwyn rhoi gwybod am eiddo gwag\n"
 "        <strong>cliciwch ar y map</strong> wrth y lleoliad cywir."
 
-#: web/index.cgi:982
+#: web/index.cgi:987
 #, perl-format
 msgid ""
 "<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this\n"
@@ -1516,68 +1516,68 @@ msgstr ""
 "<small>Os na allwch weld y map, <a href='%s' rel='nofollow'>ewch heibio\n"
 "        i'r cam hwn</a>.</small>"
 
-#: web/index.cgi:987
+#: web/index.cgi:992
 msgid "Recent local empty properties, reportemptyhomes.com"
 msgstr "Eiddo gwag lleol diweddar, reportemptyhomes.com"
 
-#: web/index.cgi:1000
+#: web/index.cgi:1005
 msgid "There were problems with your update. Please see below."
 msgstr "Cafwyd anhawsterau gyda'ch diweddariad. Gweler isod"
 
-#: web/index.cgi:1021 web/index.cgi:1023
+#: web/index.cgi:1026 web/index.cgi:1028
 msgid "Unknown empty property ID"
 msgstr "ID eiddo gwag anhysbys"
 
-#: web/index.cgi:1024
+#: web/index.cgi:1029
 msgid "That report has been removed from reportemptyhomes.com."
 msgstr "Mae'r adroddiad hwnnw wedi cael ei dynnu oddi ar reportemptyhomes.com"
 
-#: web/index.cgi:1044
+#: web/index.cgi:1049
 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."
 
-#: web/index.cgi:1047 web/index.cgi:1088
+#: web/index.cgi:1052 web/index.cgi:1093
 msgid "This empty property has been returned to use"
 msgstr "Mae'r eiddo gwag hwn wedi cael ei adfer i'w ddefnyddio"
 
-#: web/index.cgi:1072
+#: web/index.cgi:1077
 msgid "More empty properties nearby"
 msgstr "Mwy o eiddo gwag cyfagos"
 
-#: web/index.cgi:1075
+#: web/index.cgi:1080
 msgid "Email me updates"
 msgstr "Anfonwch ddiweddariadau ataf i drwy'r e-bost"
 
-#: web/index.cgi:1078
+#: web/index.cgi:1083
 msgid "Receive email when updates are left on this empty property"
 msgstr ""
 "Hoffwn dderbyn neges e-bost pan gaiff diweddariadau eu rhoi am yr eiddo gwag "
 "hwn"
 
-#: web/index.cgi:1083
+#: web/index.cgi:1088
 msgid "RSS feed of updates to this empty property"
 msgstr "Porthiant RSS o ddiweddariadau i'r eiddo gwag hwn"
 
-#: web/index.cgi:1084
+#: web/index.cgi:1089
 msgid "Provide an update"
 msgstr "Rhowch ddiweddariad"
 
-#: web/index.cgi:1090
+#: web/index.cgi:1095
 msgid "Update:"
 msgstr "Diweddariad:"
 
-#: web/index.cgi:1091
+#: web/index.cgi:1096
 msgid "Alert me to future updates"
 msgstr "Rhowch wybod i mi am ddiweddariadau yn y dyfodol"
 
-#: web/index.cgi:1099
+#: web/index.cgi:1104
 msgid ""
 "Please note that updates are not sent to the council. If you leave your name "
 "it will be public. Your information will only be used in accordance with our "
 "<a href=\"/faq#privacy\">privacy policy</a>"
 msgstr ""
 
-#: web/index.cgi:1119
+#: web/index.cgi:1124
 msgid "Updates to this empty property, reportemptyhomes.com"
 msgstr "Diweddariadau i'r eiddo gwag hwn, reportemptyhomes.com"
 
@@ -1798,17 +1798,17 @@ msgstr ""
 "profiad\n"
 "o gael yr eiddo gwag yn ôl mewn defnydd?"
 
-#: web/questionnaire.cgi:321
+#: web/questionnaire.cgi:322
 msgid ""
 "Would you like to receive another questionnaire in 4 weeks, reminding you to "
 "check the status?"
 msgstr ""
 
-#: web/reports.cgi:193 web/reports.cgi:240
+#: web/reports.cgi:192 web/reports.cgi:239
 msgid "Summary reports"
 msgstr "Adroddiadau cryno"
 
-#: web/reports.cgi:195
+#: web/reports.cgi:194
 msgid ""
 "This is a summary of all reports on this site; select a particular council "
 "to see the reports sent there."
@@ -1816,64 +1816,64 @@ msgstr ""
 "Dyma grynodeb o'r holl adroddiadau ar y safle hwn; dewiswch gyngor penodol i "
 "weld yr adroddiadau a anfonwyd ato."
 
-#: web/reports.cgi:196
+#: web/reports.cgi:195
 msgid "Greyed-out lines are councils that no longer exist."
 msgstr "Mae'r llinellau mewn llwyd yn gynghorau nad ydynt yn bodoli mwyach."
 
-#: web/reports.cgi:200 web-admin/index.cgi:477 web-admin/index.cgi:656
+#: web/reports.cgi:199 web-admin/index.cgi:477 web-admin/index.cgi:656
 msgid "Name"
 msgstr "Enw"
 
-#: web/reports.cgi:200 web/reports.cgi:276
+#: web/reports.cgi:199 web/reports.cgi:275
 msgid "New empty property reports"
 msgstr "Adroddiadau newydd am eiddo gwag"
 
-#: web/reports.cgi:200 web/reports.cgi:284
+#: web/reports.cgi:199 web/reports.cgi:283
 msgid "Older empty property reports"
 msgstr "Adroddiadau hŷn o eiddo gwag"
 
-#: web/reports.cgi:202
+#: web/reports.cgi:201
 msgid "Old empty properties,<br>state unknown"
 msgstr "Hen eiddo gwag,<br>cyflwr anhysbys"
 
-#: web/reports.cgi:204 web/reports.cgi:291
+#: web/reports.cgi:203 web/reports.cgi:290
 msgid "Recently returned to use"
 msgstr "Wedi'u hadfer i'w defnyddio'n ddiweddar"
 
-#: web/reports.cgi:204
+#: web/reports.cgi:203
 msgid "Older returned to use"
 msgstr "Wedi'u hadfer i'w defnyddio ers amser"
 
-#: web/reports.cgi:246
+#: web/reports.cgi:245
 msgid "council"
 msgstr "cyngor"
 
-#: web/reports.cgi:256
+#: web/reports.cgi:255
 #, perl-format
 msgid "RSS feed of empty properties in this %s"
 msgstr "Porthiant RSS o eiddo gwag yn yr %s hwn"
 
-#: web/reports.cgi:260
+#: web/reports.cgi:259
 #, perl-format
 msgid "This is a summary of all reports for one %s."
 msgstr "Dyma grynodeb o'r holl adroddiadau ar gyfer y %s."
 
-#: web/reports.cgi:261
+#: web/reports.cgi:260
 #, perl-format
 msgid "This is a summary of all reports for this %s."
 msgstr ""
 
-#: web/reports.cgi:265
+#: web/reports.cgi:264
 #, perl-format
 msgid "You can <a href=\"%s\">see less detail</a>."
 msgstr "Gallwch <a href=\"%s\">weld llai o fanylion</a>."
 
-#: web/reports.cgi:267
+#: web/reports.cgi:266
 #, perl-format
 msgid "You can <a href=\"%s\">see more details</a>."
 msgstr "Gallwch <a href=\"%s\">weld mwy o fanylion</a>."
 
-#: web/reports.cgi:269
+#: web/reports.cgi:268
 #, perl-format
 msgid ""
 "You can <a href=\"%s\">see less detail</a> or go back and <a href=\"/reports"
@@ -1882,7 +1882,7 @@ msgstr ""
 "Gallwch <a href=\"%s\">weld llai o fanylion</a> neu fynd yn ôl a <a href=\"/"
 "reports\">dangos pob cyngor</a>."
 
-#: web/reports.cgi:271
+#: web/reports.cgi:270
 #, perl-format
 msgid ""
 "You can <a href=\"%s\">see more details</a> or go back and <a href=\"/reports"
@@ -1891,25 +1891,25 @@ msgstr ""
 "Gallwch <a href=\"%s\">weld mwy o fanylion</a> neu fynd yn ôl a <a href=\"/"
 "reports\">dangos pob cyngor</a>."
 
-#: web/reports.cgi:286
+#: web/reports.cgi:285
 msgid "Old empty properties, state unknown"
 msgstr "Eiddo gwag hen, nid yw eu cyflwr yn hysbys"
 
-#: web/reports.cgi:292
+#: web/reports.cgi:291
 msgid "Old returned to use"
 msgstr "Hen wedi'i adfer i'w ddefnyddio"
 
-#: web/reports.cgi:295
+#: web/reports.cgi:294
 #, perl-format
 msgid "%s - Summary reports"
 msgstr "%s - Adroddiadau cryno"
 
-#: web/reports.cgi:295
+#: web/reports.cgi:294
 #, perl-format
 msgid "Empty properties within %s, reportemptyhomes.com"
 msgstr "Eiddo gwag o fewn %s, reportemptyhomes.com"
 
-#: web/reports.cgi:335
+#: web/reports.cgi:334
 #, fuzzy
 msgid "(not sent to council)"
 msgstr "Ni roddwyd gwybod i'r cyngor am hyn"
diff --git a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po
index edef3eab4..243e74c99 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-02-23 13:09+0000\n"
+"POT-Creation-Date: 2011-02-24 13:57+0000\n"
 "PO-Revision-Date: 2011-02-23 22:56MET\n"
 "Last-Translator: Petter Reinholdtsen <pere@hungry.com>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -305,7 +305,7 @@ msgstr "markert som fikset"
 msgid "reopened"
 msgstr "åpnet på nytt"
 
-#: perllib/Page.pm:640 web/index.cgi:1071
+#: perllib/Page.pm:640 web/index.cgi:1076
 msgid "Offensive? Unsuitable? Tell us"
 msgstr "Støtende? Upassende?  Gi oss beskjed"
 
@@ -320,7 +320,7 @@ msgstr ""
 "Beklager det ser ut til å være et \"Crown dependency\"-postnummer, som vi "
 "ikke dekker."
 
-#: perllib/Page.pm:675 perllib/FixMyStreet/Geocode.pm:134
+#: perllib/Page.pm:675 perllib/FixMyStreet/Geocode.pm:137
 msgid ""
 "We do not cover Northern Ireland, I'm afraid, as our licence doesn't include "
 "any maps for the region."
@@ -340,7 +340,7 @@ msgstr "Denne rapporten er for tiden markert som fikset."
 msgid "This report is currently marked as open."
 msgstr "Denne rapporten er for tiden markert som åpen."
 
-#: perllib/FixMyStreet/Alert.pm:311
+#: perllib/FixMyStreet/Alert.pm:308
 #, perl-format
 msgid "Report on %s"
 msgstr "Rapport på %s"
@@ -356,15 +356,15 @@ msgstr ""
 msgid "That location does not appear to be in Britain; please try again."
 msgstr "Det stedet virker ikke å være i storbritannia. Vennligst prøv igjen."
 
-#: perllib/FixMyStreet/Geocode.pm:114
-msgid "Sorry, we could not parse that location. Please try again."
-msgstr "Beklager, vi kunne ikke tolke den posisjonen.  Vennligst prøv på nytt."
-
-#: perllib/FixMyStreet/Geocode.pm:116 perllib/FixMyStreet/Geocode.pm:131
+#: perllib/FixMyStreet/Geocode.pm:97 perllib/FixMyStreet/Geocode.pm:132
 msgid "Sorry, we could not find that location."
 msgstr "Beklager, vi kunne ikke finne det stedet."
 
-#: perllib/FixMyStreet/Geocode.pm:147
+#: perllib/FixMyStreet/Geocode.pm:130
+msgid "Sorry, we could not parse that location. Please try again."
+msgstr "Beklager, vi kunne ikke tolke den posisjonen.  Vennligst prøv på nytt."
+
+#: perllib/FixMyStreet/Geocode.pm:150
 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."
@@ -372,7 +372,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/Geocode.pm:162
+#: perllib/FixMyStreet/Geocode.pm:165
 msgid "More than one match"
 msgstr "Mer enn ett treff"
 
@@ -391,13 +391,13 @@ msgstr ""
 #: perllib/FixMyStreet/Map/OSM.pm:41
 #: perllib/FixMyStreet/Map/OSM/CycleMap.pm:38
 msgid ""
-"Map &copy; <a href=\"http://www.openstreetmap.org/\">OpenStreetMap</a> and "
-"contributors, <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">CC-"
-"BY-SA</a>"
+"Map &copy; <a id=\"osm_link\" href=\"http://www.openstreetmap.org/"
+"\">OpenStreetMap</a> and contributors, <a href=\"http://creativecommons.org/"
+"licenses/by-sa/2.0/\">CC-BY-SA</a>"
 msgstr ""
-"Kart &copy; <a href=\"http://www.openstreetmap.org/\">OpenStreetMap</a> og "
-"bidragsytere, <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">CC-"
-"BY-SA</a>"
+"Kart &copy; <a id=\"osm_link\" href=\"http://www.openstreetmap.org/"
+"\">OpenStreetMap</a> og bidragsytere, <a href=\"http://creativecommons.org/"
+"licenses/by-sa/2.0/\">CC-BY-SA</a>"
 
 #: perllib/FixMyStreet/Map/BingOL.pm:39
 msgid ""
@@ -599,8 +599,8 @@ msgstr "??"
 msgid "RSS feed of nearby problems"
 msgstr "RSS-strøm med problemer i nærheten"
 
-#: web/alert.cgi:308 web/alert.cgi:367 web/index.cgi:970 web/index.cgi:1082
-#: web/reports.cgi:255
+#: web/alert.cgi:308 web/alert.cgi:367 web/index.cgi:975 web/index.cgi:1087
+#: web/reports.cgi:254
 msgid "RSS feed"
 msgstr "RSS-strøm"
 
@@ -677,12 +677,12 @@ msgstr "Ugyldig valg av feed"
 msgid "Receive email when updates are left on this problem."
 msgstr "Motta epost når det er uppdateringer på denne saken"
 
-#: web/alert.cgi:461 web/alert.cgi:488 web/index.cgi:736 web/index.cgi:1076
+#: web/alert.cgi:461 web/alert.cgi:488 web/index.cgi:736 web/index.cgi:1081
 #: web-admin/index.cgi:630 web-admin/index.cgi:750
 msgid "Email:"
 msgstr "Epost:"
 
-#: web/alert.cgi:462 web/alert.cgi:489 web/index.cgi:1077
+#: web/alert.cgi:462 web/alert.cgi:489 web/index.cgi:1082
 msgid "Subscribe"
 msgstr "Abonner"
 
@@ -807,13 +807,13 @@ msgstr ""
 "Takk, glad for å høre at det er fikset!  Kan vi få spørre deg om du har "
 "rapportert et problem til en administrasjon tidligere?"
 
-#: web/confirm.cgi:190 web/questionnaire.cgi:234 web/questionnaire.cgi:322
+#: web/confirm.cgi:190 web/questionnaire.cgi:234 web/questionnaire.cgi:323
 #: web-admin/index.cgi:340 web-admin/index.cgi:341 web-admin/index.cgi:503
 #: web-admin/index.cgi:590 web-admin/index.cgi:608
 msgid "Yes"
 msgstr "Ja"
 
-#: web/confirm.cgi:191 web/questionnaire.cgi:235 web/questionnaire.cgi:323
+#: web/confirm.cgi:191 web/questionnaire.cgi:235 web/questionnaire.cgi:324
 #: web-admin/index.cgi:340 web-admin/index.cgi:341 web-admin/index.cgi:503
 #: web-admin/index.cgi:590 web-admin/index.cgi:608
 msgid "No"
@@ -931,7 +931,7 @@ msgstr "Tema:"
 msgid "Message:"
 msgstr "Melding:"
 
-#: web/contact.cgi:238 web/index.cgi:1092
+#: web/contact.cgi:238 web/index.cgi:1097
 msgid "Post"
 msgstr "Send inn"
 
@@ -1303,11 +1303,11 @@ msgstr "Tom eiendom detaljskjema"
 msgid "Details:"
 msgstr "Detaljer:"
 
-#: web/index.cgi:734 web/index.cgi:1108
+#: web/index.cgi:734 web/index.cgi:1113 web/questionnaire.cgi:308
 msgid "Photo:"
 msgstr "Bilde:"
 
-#: web/index.cgi:735 web/index.cgi:1089 web-admin/index.cgi:629
+#: web/index.cgi:735 web/index.cgi:1094 web-admin/index.cgi:629
 #: web-admin/index.cgi:749
 msgid "Name:"
 msgstr "Navn:"
@@ -1316,7 +1316,7 @@ msgstr "Navn:"
 msgid "Phone:"
 msgstr "Telefon:"
 
-#: web/index.cgi:738 web/index.cgi:1096
+#: web/index.cgi:738 web/index.cgi:1101
 msgid "(optional)"
 msgstr "(valgfritt)"
 
@@ -1413,28 +1413,28 @@ msgstr "Vis nåler"
 msgid "Hide pins"
 msgstr "Gjem nåler"
 
-#: web/index.cgi:969
+#: web/index.cgi:974
 msgid "Email me new local problems"
 msgstr "Send meg epost om lokale problemer"
 
-#: web/index.cgi:971
+#: web/index.cgi:976
 msgid "RSS feed of recent local problems"
 msgstr "RSS-strøm med nylige lokale problemer"
 
-#: web/index.cgi:974
+#: web/index.cgi:979
 msgid "Problems in this area"
 msgstr "Saker i dette område"
 
-#: web/index.cgi:975
+#: web/index.cgi:980
 msgid "Reports on and around the map"
 msgstr "Saker i og rundt kartet"
 
-#: web/index.cgi:976
+#: web/index.cgi:981
 #, perl-format
 msgid "Closest nearby problems <small>(within&nbsp;%skm)</small>"
 msgstr "De nærmeste sakene <small>(innenfor&nbsp;%skm)</small>"
 
-#: web/index.cgi:980
+#: web/index.cgi:985
 msgid ""
 "To report a problem, simply\n"
 "        <strong>click on the map</strong> at the correct location."
@@ -1442,7 +1442,7 @@ msgstr ""
 "For å lage en sak, \n"
 "        <strong>klikk på kartet</strong> på riktig sted."
 
-#: web/index.cgi:982
+#: web/index.cgi:987
 #, perl-format
 msgid ""
 "<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this\n"
@@ -1452,59 +1452,59 @@ msgstr ""
 "dette\n"
 "        steget</a>.</small>"
 
-#: web/index.cgi:987
+#: web/index.cgi:992
 msgid "Recent local problems, FixMyStreet"
 msgstr "Nylig lokalt problem, FiksGataMi."
 
-#: web/index.cgi:1000
+#: web/index.cgi:1005
 msgid "There were problems with your update. Please see below."
 msgstr "Det var problemer med din oppdatering. Vennligst se under."
 
-#: web/index.cgi:1021 web/index.cgi:1023
+#: web/index.cgi:1026 web/index.cgi:1028
 msgid "Unknown problem ID"
 msgstr "Ukjent problem-Id"
 
-#: web/index.cgi:1024
+#: web/index.cgi:1029
 msgid "That report has been removed from FixMyStreet."
 msgstr "Den rapporten har blitt fjernet fra FiksGataMi."
 
-#: web/index.cgi:1044
+#: web/index.cgi:1049
 msgid "This problem is old and of unknown status."
 msgstr "Denne saken er gammel og med ukjent status."
 
-#: web/index.cgi:1047 web/index.cgi:1088
+#: web/index.cgi:1052 web/index.cgi:1093
 msgid "This problem has been fixed"
 msgstr "Denne saken er løst."
 
-#: web/index.cgi:1072
+#: web/index.cgi:1077
 msgid "More problems nearby"
 msgstr "Flere saker i nærheten"
 
-#: web/index.cgi:1075
+#: web/index.cgi:1080
 msgid "Email me updates"
 msgstr "Send meg oppdateringer"
 
-#: web/index.cgi:1078
+#: web/index.cgi:1083
 msgid "Receive email when updates are left on this problem"
 msgstr "Motta epost når oppdateringer legges inn om dette problemet"
 
-#: web/index.cgi:1083
+#: web/index.cgi:1088
 msgid "RSS feed of updates to this problem"
 msgstr "RSS-strøm med oppdateringer for dette problemet"
 
-#: web/index.cgi:1084
+#: web/index.cgi:1089
 msgid "Provide an update"
 msgstr "Bidra med oppdatering"
 
-#: web/index.cgi:1090
+#: web/index.cgi:1095
 msgid "Update:"
 msgstr "Oppdatering:"
 
-#: web/index.cgi:1091
+#: web/index.cgi:1096
 msgid "Alert me to future updates"
 msgstr "Send meg varsel ved fremtidige oppdateringer"
 
-#: web/index.cgi:1099
+#: web/index.cgi:1104
 msgid ""
 "Please note that updates are not sent to the council. If you leave your name "
 "it will be public. Your information will only be used in accordance with our "
@@ -1515,7 +1515,7 @@ msgstr ""
 "informasjon vil kun bli brukt i henhold til våre <a href=\"/faq#privacy"
 "\">personvernpolicy</a>"
 
-#: web/index.cgi:1119
+#: web/index.cgi:1124
 msgid "Updates to this problem, FixMyStreet"
 msgstr "Oppdateringer til dette problemet, FiksGataMi"
 
@@ -1701,7 +1701,7 @@ msgstr ""
 "(denne blir sendt til administrasjonen). Du kan for eksempel\n"
 "dele din erfaring med hvordan din sak ble løst."
 
-#: web/questionnaire.cgi:321
+#: web/questionnaire.cgi:322
 msgid ""
 "Would you like to receive another questionnaire in 4 weeks, reminding you to "
 "check the status?"
@@ -1709,11 +1709,11 @@ msgstr ""
 "Kunne du tenke deg å motta en ny forespørsel om 4 uker, som minner deg om å "
 "sjekke status?"
 
-#: web/reports.cgi:193 web/reports.cgi:240
+#: web/reports.cgi:192 web/reports.cgi:239
 msgid "Summary reports"
 msgstr "Oppsummeringsrapporter"
 
-#: web/reports.cgi:195
+#: web/reports.cgi:194
 msgid ""
 "This is a summary of all reports on this site; select a particular council "
 "to see the reports sent there."
@@ -1721,65 +1721,65 @@ msgstr ""
 "Dette er en opplisting av alle sakene i denne tjenesten; velg en bestemt "
 "administrasjon for å se saker som er sendt dit."
 
-#: web/reports.cgi:196
+#: web/reports.cgi:195
 msgid "Greyed-out lines are councils that no longer exist."
 msgstr ""
 "Linjer med grå bakgrunn er administrasjoner som ikke lenger eksisterer."
 
-#: web/reports.cgi:200 web-admin/index.cgi:477 web-admin/index.cgi:656
+#: web/reports.cgi:199 web-admin/index.cgi:477 web-admin/index.cgi:656
 msgid "Name"
 msgstr "Navn"
 
-#: web/reports.cgi:200 web/reports.cgi:276
+#: web/reports.cgi:199 web/reports.cgi:275
 msgid "New problems"
 msgstr "Nye saker"
 
-#: web/reports.cgi:200 web/reports.cgi:284
+#: web/reports.cgi:199 web/reports.cgi:283
 msgid "Older problems"
 msgstr "Eldre saker"
 
-#: web/reports.cgi:202
+#: web/reports.cgi:201
 msgid "Old problems,<br>state unknown"
 msgstr "Eldre saker, <br>ukjent status"
 
-#: web/reports.cgi:204 web/reports.cgi:291
+#: web/reports.cgi:203 web/reports.cgi:290
 msgid "Recently fixed"
 msgstr "Nylig løste saker"
 
-#: web/reports.cgi:204
+#: web/reports.cgi:203
 msgid "Older fixed"
 msgstr "Eldre løste"
 
-#: web/reports.cgi:246
+#: web/reports.cgi:245
 msgid "council"
 msgstr "administrasjon"
 
-#: web/reports.cgi:256
+#: web/reports.cgi:255
 #, perl-format
 msgid "RSS feed of problems in this %s"
 msgstr "RSS-strøm for problemer i denne %s"
 
-#: web/reports.cgi:260
+#: web/reports.cgi:259
 #, perl-format
 msgid "This is a summary of all reports for one %s."
 msgstr "Dette er en oppsummering av alle rapporter for en %s."
 
-#: web/reports.cgi:261
+#: web/reports.cgi:260
 #, perl-format
 msgid "This is a summary of all reports for this %s."
 msgstr "Dette er en oppsummering for alle rapporter for denne %s."
 
-#: web/reports.cgi:265
+#: web/reports.cgi:264
 #, perl-format
 msgid "You can <a href=\"%s\">see less detail</a>."
 msgstr "Du kan <a href=\"%s\">se mindre detaljer</a>."
 
-#: web/reports.cgi:267
+#: web/reports.cgi:266
 #, perl-format
 msgid "You can <a href=\"%s\">see more details</a>."
 msgstr "Du kan <a href=\"%s\">se flere detaljer</a>."
 
-#: web/reports.cgi:269
+#: web/reports.cgi:268
 #, perl-format
 msgid ""
 "You can <a href=\"%s\">see less detail</a> or go back and <a href=\"/reports"
@@ -1788,7 +1788,7 @@ msgstr ""
 "Du kan <a href=\"%s\">se mindre detaljer</a> eller gå tilbake og <a href=\"/"
 "reports\">se alle administrasjonene</a>."
 
-#: web/reports.cgi:271
+#: web/reports.cgi:270
 #, perl-format
 msgid ""
 "You can <a href=\"%s\">see more details</a> or go back and <a href=\"/reports"
@@ -1797,25 +1797,25 @@ msgstr ""
 "Du kan <a href=\"%s\">se flere detaljer</a> eller gå tilbake og <a href=\"/"
 "reports\">se alle administrasjonene</a>."
 
-#: web/reports.cgi:286
+#: web/reports.cgi:285
 msgid "Old problems, state unknown"
 msgstr "Eldre saker med ukjent status"
 
-#: web/reports.cgi:292
+#: web/reports.cgi:291
 msgid "Old fixed"
 msgstr "Eldre saker som er løst"
 
-#: web/reports.cgi:295
+#: web/reports.cgi:294
 #, perl-format
 msgid "%s - Summary reports"
 msgstr "%s - oppsummeringsrapporter"
 
-#: web/reports.cgi:295
+#: web/reports.cgi:294
 #, perl-format
 msgid "Problems within %s, FixMyStreet"
 msgstr "Problemer innenfor %s, Fiksgatami"
 
-#: web/reports.cgi:335
+#: web/reports.cgi:334
 msgid "(not sent to council)"
 msgstr "(ikke rapportert til administrasjonen)"
 
@@ -3395,3 +3395,12 @@ msgid ""
 "To stop receiving emails when there are new updates on this property,\n"
 "please follow this link: <?=$values['unsubscribe_url']?>\n"
 msgstr ""
+
+#~ msgid ""
+#~ "Map &copy; <a href=\"http://www.openstreetmap.org/\">OpenStreetMap</a> "
+#~ "and contributors, <a href=\"http://creativecommons.org/licenses/by-sa/2.0/"
+#~ "\">CC-BY-SA</a>"
+#~ msgstr ""
+#~ "Kart &copy; <a href=\"http://www.openstreetmap.org/\">OpenStreetMap</a> "
+#~ "og bidragsytere, <a href=\"http://creativecommons.org/licenses/by-sa/2.0/"
+#~ "\">CC-BY-SA</a>"
diff --git a/perllib/FixMyStreet/Map/OSM.pm b/perllib/FixMyStreet/Map/OSM.pm
index 7953d16e2..79a9248e5 100644
--- a/perllib/FixMyStreet/Map/OSM.pm
+++ b/perllib/FixMyStreet/Map/OSM.pm
@@ -38,7 +38,7 @@ sub display_map {
     my $pins = join(",\n", @pins);
 
     my $out = FixMyStreet::Map::header($q, $params{type});
-    my $copyright = _('Map &copy; <a href="http://www.openstreetmap.org/">OpenStreetMap</a> and contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>');
+    my $copyright = _('Map &copy; <a id="osm_link" href="http://www.openstreetmap.org/">OpenStreetMap</a> and contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>');
     $out .= <<EOF;
 <input type="hidden" name="latitude" id="fixmystreet.latitude" value="$params{latitude}">
 <input type="hidden" name="longitude" id="fixmystreet.longitude" value="$params{longitude}">
diff --git a/perllib/FixMyStreet/Map/OSM/CycleMap.pm b/perllib/FixMyStreet/Map/OSM/CycleMap.pm
index 01c51acf4..87884d459 100644
--- a/perllib/FixMyStreet/Map/OSM/CycleMap.pm
+++ b/perllib/FixMyStreet/Map/OSM/CycleMap.pm
@@ -35,7 +35,7 @@ sub display_map {
     }
 
     my $out = FixMyStreet::Map::header($q, $params{type});
-    my $copyright = _('Map &copy; <a href="http://www.openstreetmap.org/">OpenStreetMap</a> and contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>');
+    my $copyright = _('Map &copy; <a id="osm_link" href="http://www.openstreetmap.org/">OpenStreetMap</a> and contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>');
     $out .= <<EOF;
 <script type="text/javascript">
 var fixmystreet = {
diff --git a/web/index.cgi b/web/index.cgi
index 8fab1d079..ed5b285c2 100755
--- a/web/index.cgi
+++ b/web/index.cgi
@@ -929,7 +929,12 @@ sub display_location {
         $hide_link = NewURL($q, -retain=>1, no_pins=>1);
         $hide_text = _('Hide pins');
     }
-    my $map_links = "<p id='sub_map_links'><a id='hide_pins_link' rel='nofollow' href='$hide_link'>$hide_text</a> | <a id='all_pins_link' rel='nofollow' href='$all_link'>$all_text</a></p> <input type='hidden' id='all_pins' name='all_pins' value='$input_h{all_pins}'>";
+    my $map_links = "<p id='sub_map_links'><a id='hide_pins_link' rel='nofollow' href='$hide_link'>$hide_text</a>";
+    if (mySociety::Config::get('COUNTRY') eq 'GB') {
+        $map_links .= " | <a id='all_pins_link' rel='nofollow' href='$all_link'>$all_text</a></p> <input type='hidden' id='all_pins' name='all_pins' value='$input_h{all_pins}'>";
+    } else {
+        $map_links .= "</p>";
+    }
 
     # truncate the lat,lon for nicer rss urls
     my ( $short_lat, $short_lon ) =
diff --git a/web/js.js b/web/js.js
index b2012fc84..07bede2d7 100644
--- a/web/js.js
+++ b/web/js.js
@@ -16,8 +16,12 @@ YAHOO.util.Event.onContentReady('mapForm', function() {
             this.onsubmit = function() { return false; };
         }
 
-        this.x.value = fixmystreet.x + 3;
-        this.y.value = fixmystreet.y + 3;
+        /* XXX Should be in Tilma code only */
+        if (this.x) {
+            this.x.value = fixmystreet.x + 3;
+            this.y.value = fixmystreet.y + 3;
+        }
+
         /*
         if (swfu && swfu.getStats().files_queued > 0) {
             swfu.startUpload();
diff --git a/web/js/map-OpenStreetMap.js b/web/js/map-OpenStreetMap.js
index 6e350537a..911d49d57 100644
--- a/web/js/map-OpenStreetMap.js
+++ b/web/js/map-OpenStreetMap.js
@@ -1,25 +1,33 @@
 YAHOO.util.Event.onContentReady('map', function() {
+
+    fixmystreet.ZOOM_OFFSET = 14;
+
+    var perm = new OpenLayers.Control.Permalink();
     fixmystreet.map = new OpenLayers.Map("map", {
         controls: [
             new OpenLayers.Control.ArgParser(),
             //new OpenLayers.Control.LayerSwitcher(),
             new OpenLayers.Control.Navigation(),
+            perm,
+            new OpenLayers.Control.PermalinkFMS('osm_link', 'http://www.openstreetmap.org/'),
             new OpenLayers.Control.PanZoomFMS()
         ],
         displayProjection: new OpenLayers.Projection("EPSG:4326")
     });
     var osm = new fixmystreet.map_type("", {
-        zoomOffset: 14,
+        zoomOffset: fixmystreet.ZOOM_OFFSET,
         numZoomLevels: 4
     });
     fixmystreet.map.addLayer(osm);
 
-    var centre = new OpenLayers.LonLat( fixmystreet.longitude, fixmystreet.latitude );
-    centre.transform(
-        new OpenLayers.Projection("EPSG:4326"),
-        fixmystreet.map.getProjectionObject()
-    );
-    fixmystreet.map.setCenter(centre, 2);
+    if (!fixmystreet.map.getCenter()) {
+        var centre = new OpenLayers.LonLat( fixmystreet.longitude, fixmystreet.latitude );
+        centre.transform(
+            new OpenLayers.Projection("EPSG:4326"),
+            fixmystreet.map.getProjectionObject()
+        );
+        fixmystreet.map.setCenter(centre, 2);
+    }
 
     if (document.getElementById('mapForm')) {
         var click = new OpenLayers.Control.Click();
@@ -27,7 +35,17 @@ YAHOO.util.Event.onContentReady('map', function() {
         click.activate();
     }
 
-    var markers = new OpenLayers.Layer.Markers("Markers");
+    /* To let permalink not be caught by the Click layer, answer found
+     * at http://www.mail-archive.com/users@openlayers.org/msg12958.html
+     * Not sure why you can't use eventListeners or events.register...
+     */
+    OpenLayers.Event.observe( perm.element, "click", function(e) {
+        OpenLayers.Event.stop(e);
+        location.href = OpenLayers.Event.element(e).href;
+        return false;
+    });
+
+    fixmystreet.markers = new OpenLayers.Layer.Markers("Markers");
     var cols = { 'red':'R', 'green':'G', 'blue':'B', 'purple':'P' };
     for (var i=0; i<fixmystreet.pins.length; i++) {
         var pin = fixmystreet.pins[i];
@@ -44,10 +62,28 @@ YAHOO.util.Event.onContentReady('map', function() {
         if (pin[3]) {
             marker.events.register('click', marker, function(evt) { window.location = '/report/' + pin[3]; OpenLayers.Event.stop(evt); });
         }
-        markers.addMarker(marker);
+        fixmystreet.markers.addMarker(marker);
     }
-    fixmystreet.map.addLayer(markers);
+    fixmystreet.map.addLayer(fixmystreet.markers);
+
+});
 
+YAHOO.util.Event.addListener('hide_pins_link', 'click', function(e) {
+    YAHOO.util.Event.preventDefault(e);
+    var showhide = [
+        'Show pins', 'Hide pins',
+        'Dangos pinnau', 'Cuddio pinnau',
+        "Vis nåler", "Gjem nåler"
+    ];
+    for (var i=0; i<showhide.length; i+=2) {
+        if (this.innerHTML == showhide[i]) {
+            fixmystreet.markers.setVisibility(true);
+            this.innerHTML = showhide[i+1];
+        } else if (this.innerHTML == showhide[i+1]) {
+            fixmystreet.markers.setVisibility(false);
+            this.innerHTML = showhide[i];
+        }
+    }
 });
 
 /* Overridding the buttonDown function of PanZoom so that it does
@@ -87,6 +123,26 @@ OpenLayers.Control.PanZoomFMS = OpenLayers.Class(OpenLayers.Control.PanZoom, {
     }
 });
 
+/* Overriding Permalink so that it can pass the correct zoom to OSM */
+OpenLayers.Control.PermalinkFMS = OpenLayers.Class(OpenLayers.Control.Permalink, {
+    updateLink: function() {
+        var separator = this.anchor ? '#' : '?';
+        var href = this.base;
+        if (href.indexOf(separator) != -1) {
+            href = href.substring( 0, href.indexOf(separator) );
+        }
+
+        href += separator + OpenLayers.Util.getParameterString(this.createParams(null, this.map.getZoom()+fixmystreet.ZOOM_OFFSET));
+        if (this.anchor && !this.element) {
+            window.location.href = href;
+        }
+        else {
+            this.element.href = href;
+        }
+    }
+});
+
+/* Click handler */
 OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, {                
     defaultHandlerOptions: {
         'single': true,