diff options
| -rw-r--r-- | locale/FixMyStreet.po | 154 | ||||
| -rw-r--r-- | locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po | 182 | ||||
| -rw-r--r-- | locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po | 184 | ||||
| -rw-r--r-- | locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po | 183 | ||||
| -rw-r--r-- | locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po | 183 | ||||
| -rw-r--r-- | templates/web/default/admin/report_edit.html | 4 | ||||
| -rw-r--r-- | templates/web/default/auth/sign_out.html | 3 | ||||
| -rw-r--r-- | templates/web/fixmybarangay/auth/sign_out.html | 8 | ||||
| -rw-r--r-- | templates/web/fixmystreet/report/_item.html | 3 | ||||
| -rw-r--r-- | templates/web/zurich/admin/index-sdm.html | 6 | ||||
| -rw-r--r-- | templates/web/zurich/admin/report_edit.html | 6 | ||||
| -rw-r--r-- | templates/web/zurich/auth/sign_out.html | 3 | ||||
| -rw-r--r-- | templates/web/zurich/report/_item.html | 3 |
13 files changed, 553 insertions, 369 deletions
diff --git a/locale/FixMyStreet.po b/locale/FixMyStreet.po index b51f8c5db..349b09f2a 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: 2013-01-24 18:27+0000\n" +"POT-Creation-Date: 2013-01-31 15:25+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <team@fixmystreet.com>\n" @@ -17,7 +17,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 perllib/FixMyStreet/DB/ResultSet/Problem.pm:339 +#: perllib/FixMyStreet/DB/Result/Problem.pm:579 perllib/FixMyStreet/DB/ResultSet/Problem.pm:339 msgid " and " msgstr "" @@ -37,7 +37,7 @@ msgstr "" msgid "%d confirmed alerts, %d unconfirmed" msgstr "" -#: templates/web/default/admin/index.html:19 +#: templates/web/default/admin/index.html:19 templates/web/zurich/admin/index.html:6 msgid "%d council contacts – %d confirmed, %d unconfirmed" msgstr "" @@ -61,7 +61,7 @@ msgstr "" msgid "%s - Summary reports" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:621 +#: perllib/FixMyStreet/DB/Result/Problem.pm:627 msgid "%s ref: %s" msgstr "" @@ -69,11 +69,11 @@ msgstr "" msgid "%s ward, %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:506 +#: perllib/FixMyStreet/DB/Result/Problem.pm:512 msgid "%s, reported anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:508 +#: perllib/FixMyStreet/DB/Result/Problem.pm:514 msgid "%s, reported by %s at %s" msgstr "" @@ -81,15 +81,15 @@ msgstr "" msgid "%s, within %s ward" msgstr "" -#: templates/web/default/email_sent.html:28 +#: templates/web/default/email_sent.html:29 msgid "(Don't worry — we'll hang on to your alert while you're checking your email.)" msgstr "" -#: templates/web/default/email_sent.html:24 +#: templates/web/default/email_sent.html:25 msgid "(Don't worry — we'll hang on to your problem report while you're checking your email.)" msgstr "" -#: templates/web/default/email_sent.html:26 +#: templates/web/default/email_sent.html:27 msgid "(Don't worry — we'll hang on to your update while you're checking your email.)" msgstr "" @@ -105,11 +105,11 @@ msgstr "" msgid "(alternatively the RSS feed can be customised, within" msgstr "" -#: templates/web/default/around/around_map_list_items.html:12 templates/web/default/around/on_map_list_items.html:9 templates/web/fixmystreet/report/_item.html:23 templates/web/zurich/report/_item.html:27 +#: templates/web/default/around/around_map_list_items.html:12 templates/web/default/around/on_map_list_items.html:9 templates/web/fixmystreet/report/_item.html:20 templates/web/zurich/report/_item.html:19 msgid "(closed)" msgstr "" -#: templates/web/default/around/around_map_list_items.html:10 templates/web/default/around/on_map_list_items.html:7 templates/web/fixmystreet/report/_item.html:21 templates/web/zurich/report/_item.html:25 +#: templates/web/default/around/around_map_list_items.html:10 templates/web/default/around/on_map_list_items.html:7 templates/web/fixmystreet/report/_item.html:18 templates/web/zurich/report/_item.html:17 msgid "(fixed)" msgstr "" @@ -117,7 +117,7 @@ msgstr "" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "" -#: templates/web/default/reports/_list-entry.html:4 templates/web/fixmystreet/report/_item.html:17 templates/web/zurich/report/_item.html:21 +#: templates/web/default/reports/_list-entry.html:4 templates/web/fixmystreet/report/_item.html:14 msgid "(not sent to council)" msgstr "" @@ -125,7 +125,7 @@ msgstr "" msgid "(optional)" msgstr "" -#: templates/web/default/reports/_list-entry.html:2 templates/web/fixmystreet/report/_item.html:16 templates/web/zurich/report/_item.html:20 +#: templates/web/default/reports/_list-entry.html:2 templates/web/fixmystreet/report/_item.html:13 msgid "(sent to both)" msgstr "" @@ -217,7 +217,7 @@ msgstr "" msgid "<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this step</a>.</small>" msgstr "" -#: templates/web/default/admin/index.html:14 +#: templates/web/default/admin/index.html:14 templates/web/zurich/admin/index.html:4 msgid "<strong>%d</strong> live problems" msgstr "" @@ -285,7 +285,7 @@ msgstr "" msgid "Alert me to future updates" msgstr "" -#: templates/web/default/reports/index.html:3 templates/web/fixmybarangay/reports/index.html:3 +#: templates/web/default/reports/index.html:3 templates/web/fixmybarangay/reports/index.html:3 templates/web/zurich/reports/index.html:12 msgid "All Reports" msgstr "" @@ -385,7 +385,7 @@ msgstr "" msgid "Be sure to choose the right category, because we use that to determine to whom the report is sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1084 perllib/FixMyStreet/Cobrand/Zurich.pm:127 templates/web/default/admin/bodies.html:1 templates/web/zurich/header.html:63 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1086 perllib/FixMyStreet/Cobrand/Zurich.pm:140 templates/web/default/admin/bodies.html:1 templates/web/zurich/header.html:63 msgid "Bodies" msgstr "" @@ -437,7 +437,7 @@ msgstr "" msgid "Closed" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:714 +#: perllib/FixMyStreet/DB/Result/Problem.pm:720 msgid "Closed by council" msgstr "" @@ -521,7 +521,7 @@ msgstr "" msgid "Contact the team" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1217 perllib/FixMyStreet/App/Controller/Admin.pm:1245 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1219 perllib/FixMyStreet/App/Controller/Admin.pm:1247 msgid "Could not find user" msgstr "" @@ -633,11 +633,11 @@ msgstr "" msgid "Email" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1193 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1195 msgid "Email added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1190 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 msgid "Email already in abuse list" msgstr "" @@ -693,7 +693,7 @@ msgstr "" msgid "Endpoint" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:12 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:25 msgid "Enter a Zürich street name" msgstr "" @@ -810,7 +810,7 @@ msgstr "" msgid "Flag user" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 templates/web/default/admin/users.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 templates/web/default/admin/users.html:16 msgid "Flagged" msgstr "" @@ -866,7 +866,7 @@ msgstr "" msgid "Going to send questionnaire?" msgstr "" -#: templates/web/default/admin/index.html:24 +#: templates/web/default/admin/index.html:24 templates/web/zurich/admin/index.html:11 msgid "Graph of problem creation by status over time" msgstr "" @@ -942,15 +942,15 @@ msgstr "" msgid "ID" msgstr "" -#: templates/web/default/email_sent.html:18 +#: templates/web/default/email_sent.html:19 msgid "If you do not, your alert will not be activated." msgstr "" -#: templates/web/default/email_sent.html:14 +#: templates/web/default/email_sent.html:15 msgid "If you do not, your problem will not be posted." msgstr "" -#: templates/web/default/email_sent.html:16 +#: templates/web/default/email_sent.html:17 msgid "If you do not, your update will not be posted." msgstr "" @@ -989,6 +989,10 @@ msgstr "" msgid "In progress" msgstr "" +#: templates/web/zurich/admin/report_edit.html:116 +msgid "Include reporter personal details" +msgstr "" + #: templates/web/default/admin/stats.html:76 msgid "Include unconfirmed reports" msgstr "" @@ -1005,7 +1009,7 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1004 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1006 msgid "Invalid end date" msgstr "" @@ -1013,7 +1017,7 @@ msgstr "" msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:994 +#: perllib/FixMyStreet/App/Controller/Admin.pm:996 msgid "Invalid start date" msgstr "" @@ -1175,6 +1179,10 @@ msgstr "" msgid "New problems within {{NAME}}'s boundary on FixMyStreet" msgstr "" +#: templates/web/zurich/admin/index-sdm.html:4 +msgid "New reports" +msgstr "" + #: db/alert_types_eha.pl:23 msgid "New reports for {{COUNCIL}} within {{WARD}} ward on reportemptyhomes.com" msgstr "" @@ -1371,7 +1379,7 @@ msgstr "" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1023 perllib/FixMyStreet/App/Controller/Report/New.pm:663 perllib/FixMyStreet/App/Controller/Report/New.pm:664 perllib/FixMyStreet/DB/Result/Problem.pm:515 perllib/FixMyStreet/DB/Result/Problem.pm:525 perllib/FixMyStreet/DB/Result/Problem.pm:535 perllib/FixMyStreet/DB/Result/Problem.pm:547 perllib/FixMyStreet/DB/ResultSet/Problem.pm:331 perllib/FixMyStreet/DB/ResultSet/Problem.pm:340 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1023 perllib/FixMyStreet/App/Controller/Report/New.pm:663 perllib/FixMyStreet/App/Controller/Report/New.pm:664 perllib/FixMyStreet/DB/Result/Problem.pm:521 perllib/FixMyStreet/DB/Result/Problem.pm:531 perllib/FixMyStreet/DB/Result/Problem.pm:541 perllib/FixMyStreet/DB/Result/Problem.pm:553 perllib/FixMyStreet/DB/ResultSet/Problem.pm:331 perllib/FixMyStreet/DB/ResultSet/Problem.pm:340 msgid "Other" msgstr "" @@ -1526,6 +1534,10 @@ msgstr "" msgid "Please enter your title" msgstr "" +#: templates/web/default/auth/sign_out.html:5 templates/web/zurich/auth/sign_out.html:5 +msgid "Please feel free to <a href=\"%s\">sign in again</a>, or go back to the <a href=\"/\">front page</a>." +msgstr "" + #: templates/web/emptyhomes/report/new/fill_in_details_text.html:1 msgid "" "Please fill in details of the empty property below, saying what type of\n" @@ -1667,7 +1679,7 @@ msgstr "" msgid "Problem %s sent to council %s" msgstr "" -#: templates/web/default/admin/index.html:28 +#: templates/web/default/admin/index.html:28 templates/web/zurich/admin/index.html:15 msgid "Problem breakdown by state" msgstr "" @@ -1871,7 +1883,7 @@ msgstr "" msgid "Report empty properties" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:286 +#: perllib/FixMyStreet/App/Controller/Rss.pm:295 msgid "Report on %s" msgstr "" @@ -1887,7 +1899,7 @@ msgstr "" msgid "Reported %s, to %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:530 templates/web/default/contact/index.html:45 templates/web/fixmystreet/contact/index.html:46 +#: perllib/FixMyStreet/DB/Result/Problem.pm:536 templates/web/default/contact/index.html:45 templates/web/fixmystreet/contact/index.html:46 msgid "Reported anonymously at %s" msgstr "" @@ -1895,23 +1907,23 @@ msgstr "" msgid "Reported before" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:522 +#: perllib/FixMyStreet/DB/Result/Problem.pm:528 msgid "Reported by %s anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:553 templates/web/default/contact/index.html:47 templates/web/fixmystreet/contact/index.html:48 +#: perllib/FixMyStreet/DB/Result/Problem.pm:559 templates/web/default/contact/index.html:47 templates/web/fixmystreet/contact/index.html:48 msgid "Reported by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:544 +#: perllib/FixMyStreet/DB/Result/Problem.pm:550 msgid "Reported by %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:518 +#: perllib/FixMyStreet/DB/Result/Problem.pm:524 msgid "Reported by %s in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:538 +#: perllib/FixMyStreet/DB/Result/Problem.pm:544 msgid "Reported by %s in the %s category by %s at %s" msgstr "" @@ -1919,11 +1931,11 @@ msgstr "" msgid "Reported in the %s category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:526 +#: perllib/FixMyStreet/DB/Result/Problem.pm:532 msgid "Reported in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:548 +#: perllib/FixMyStreet/DB/Result/Problem.pm:554 msgid "Reported in the %s category by %s at %s" msgstr "" @@ -1931,14 +1943,22 @@ msgstr "" msgid "Reporting a problem" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1085 perllib/FixMyStreet/Cobrand/Zurich.pm:120 templates/web/zurich/header.html:59 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 perllib/FixMyStreet/Cobrand/Zurich.pm:133 templates/web/zurich/header.html:59 msgid "Reports" msgstr "" +#: templates/web/zurich/admin/index-sdm.html:7 +msgid "Reports awaiting approval" +msgstr "" + #: templates/web/default/around/tabbed_lists.html:3 msgid "Reports on and around the map" msgstr "" +#: templates/web/zurich/admin/index-sdm.html:10 +msgid "Reports published" +msgstr "" + #: templates/web/default/admin/report_edit.html:36 msgid "Resend report" msgstr "" @@ -1955,6 +1975,14 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" +#: templates/web/default/admin/report_edit.html:51 templates/web/zurich/admin/report_edit.html:51 +msgid "Rotate Left" +msgstr "" + +#: templates/web/default/admin/report_edit.html:52 templates/web/zurich/admin/report_edit.html:52 +msgid "Rotate Right" +msgstr "" + #: templates/web/default/admin/body_edit.html:76 msgid "Save changes" msgstr "" @@ -1987,7 +2015,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:634 +#: perllib/FixMyStreet/DB/Result/Problem.pm:640 msgid "Sent to %s %s later" msgstr "" @@ -2044,7 +2072,7 @@ msgstr "" msgid "Sign in or create an account" msgstr "" -#: templates/web/bromley/auth/sign_out.html:1 templates/web/default/auth/sign_out.html:1 templates/web/default/header.html:30 templates/web/emptyhomes/header.html:41 templates/web/fiksgatami/header.html:22 templates/web/fiksgatami/nn/header.html:22 templates/web/fixmybarangay/auth/sign_out.html:1 templates/web/lichfielddc/header.html:177 templates/web/reading/header.html:33 templates/web/zurich/auth/sign_out.html:1 +#: templates/web/bromley/auth/sign_out.html:1 templates/web/default/auth/sign_out.html:1 templates/web/default/header.html:30 templates/web/emptyhomes/header.html:41 templates/web/fiksgatami/header.html:22 templates/web/fiksgatami/nn/header.html:22 templates/web/lichfielddc/header.html:177 templates/web/reading/header.html:33 templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" msgstr "" @@ -2104,7 +2132,7 @@ msgstr "" msgid "State:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1090 templates/web/default/admin/stats.html:1 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1092 templates/web/default/admin/stats.html:1 msgid "Stats" msgstr "" @@ -2156,15 +2184,15 @@ msgstr "" msgid "Subscribe to an alert based upon what baranagay you’re in:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1083 perllib/FixMyStreet/Cobrand/Zurich.pm:119 templates/web/default/admin/index.html:1 templates/web/zurich/admin/index-dm.html:1 templates/web/zurich/admin/index-sdm.html:1 templates/web/zurich/header.html:56 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1085 perllib/FixMyStreet/Cobrand/Zurich.pm:132 templates/web/default/admin/index.html:1 templates/web/zurich/admin/index-dm.html:1 templates/web/zurich/admin/index-sdm.html:1 templates/web/zurich/admin/index.html:1 templates/web/zurich/header.html:56 msgid "Summary" msgstr "" -#: templates/web/default/reports/index.html:1 templates/web/emptyhomes/reports/index.html:1 templates/web/fiksgatami/nn/reports/index.html:1 templates/web/fiksgatami/reports/index.html:1 templates/web/fixmybarangay/reports/index.html:1 +#: templates/web/default/reports/index.html:1 templates/web/emptyhomes/reports/index.html:1 templates/web/fiksgatami/nn/reports/index.html:1 templates/web/fiksgatami/reports/index.html:1 templates/web/fixmybarangay/reports/index.html:1 templates/web/zurich/reports/index.html:0 templates/web/zurich/reports/index.html:4 msgid "Summary reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 msgid "Survey" msgstr "" @@ -2287,7 +2315,7 @@ msgstr "" msgid "The details of your problem are available on the right hand side of this page." msgstr "" -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 perllib/FixMyStreet/App/Controller/Reports.pm:51 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 perllib/FixMyStreet/App/Controller/Reports.pm:67 msgid "The error was: %s" msgstr "" @@ -2363,7 +2391,7 @@ msgstr "" msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" -#: perllib/FixMyStreet/App/Controller/Reports.pm:48 +#: perllib/FixMyStreet/App/Controller/Reports.pm:64 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "" @@ -2467,7 +2495,7 @@ msgstr "" msgid "This web page also contains a photo of the problem, provided by the user." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1086 templates/web/default/admin/timeline.html:1 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1088 templates/web/default/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -2571,7 +2599,7 @@ msgstr "" msgid "Updated" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:733 perllib/FixMyStreet/App/Controller/Admin.pm:867 perllib/FixMyStreet/App/Controller/Admin.pm:918 perllib/FixMyStreet/App/Controller/Admin.pm:955 perllib/FixMyStreet/Cobrand/Zurich.pm:309 perllib/FixMyStreet/Cobrand/Zurich.pm:364 +#: perllib/FixMyStreet/App/Controller/Admin.pm:733 perllib/FixMyStreet/App/Controller/Admin.pm:867 perllib/FixMyStreet/App/Controller/Admin.pm:918 perllib/FixMyStreet/App/Controller/Admin.pm:957 perllib/FixMyStreet/Cobrand/Zurich.pm:322 perllib/FixMyStreet/Cobrand/Zurich.pm:377 msgid "Updated!" msgstr "" @@ -2587,15 +2615,15 @@ msgstr "" msgid "Updates to this problem, FixMyStreet" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1249 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1251 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1221 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1223 msgid "User flagged" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1088 perllib/FixMyStreet/Cobrand/Zurich.pm:134 templates/web/default/admin/flagged.html:30 templates/web/zurich/header.html:68 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1090 perllib/FixMyStreet/Cobrand/Zurich.pm:147 templates/web/default/admin/flagged.html:30 templates/web/zurich/header.html:68 msgid "Users" msgstr "" @@ -2755,7 +2783,7 @@ msgstr "" msgid "You have already attached a photo to this update, attaching another one will replace it." msgstr "" -#: templates/web/default/auth/sign_out.html:3 templates/web/fixmybarangay/auth/sign_out.html:3 templates/web/zurich/auth/sign_out.html:3 +#: templates/web/default/auth/sign_out.html:3 templates/web/zurich/auth/sign_out.html:3 msgid "You have been signed out" msgstr "" @@ -2791,7 +2819,7 @@ msgstr "" msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "" -#: templates/web/default/email_sent.html:12 +#: templates/web/default/email_sent.html:13 msgid "You must now click the link in the email we've just sent you." msgstr "" @@ -2875,7 +2903,7 @@ msgstr "" msgid "council" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:619 +#: perllib/FixMyStreet/DB/Result/Problem.pm:625 msgid "council ref: %s" msgstr "" @@ -2887,11 +2915,11 @@ msgstr "" msgid "e.g. ‘%s’ or ‘%s’" msgstr "" -#: templates/web/default/admin/index.html:15 +#: templates/web/default/admin/index.html:15 templates/web/zurich/admin/index.html:5 msgid "from %d different users" msgstr "" -#: perllib/Utils.pm:267 +#: perllib/Utils.pm:268 msgid "less than a minute" msgstr "" @@ -2943,7 +2971,7 @@ msgstr "" msgid "this type of local problem" msgstr "" -#: perllib/Utils.pm:241 +#: perllib/Utils.pm:240 msgid "today" msgstr "" @@ -2970,14 +2998,14 @@ msgid_plural "<big>%s</big> reports recently" msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:286 +#: perllib/Utils.pm:287 #, perl-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:288 +#: perllib/Utils.pm:289 #, perl-format msgid "%d minute" msgid_plural "%d minutes" @@ -2998,7 +3026,7 @@ msgid_plural "We do not yet have details for the councils that cover this locati msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:282 +#: perllib/Utils.pm:283 #, perl-format msgid "%d week" msgid_plural "%d weeks" @@ -3026,7 +3054,7 @@ msgid_plural "We do <strong>not</strong> yet have details for the other councils msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:284 +#: perllib/Utils.pm:285 #, perl-format msgid "%d day" msgid_plural "%d days" diff --git a/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po b/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po index 5da3f6b77..9bc5de983 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: 2013-01-24 18:27+0000\n" +"POT-Creation-Date: 2013-01-31 15:25+0000\n" "PO-Revision-Date: 2009-07-10 14:20-0000\n" "Last-Translator: Mark Smith <Mark.Smith@trosol.co.uk>\n" "Language-Team: mySociety\n" @@ -20,7 +20,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:579 #: perllib/FixMyStreet/DB/ResultSet/Problem.pm:339 msgid " and " msgstr "" @@ -53,6 +53,7 @@ msgid "%d confirmed alerts, %d unconfirmed" msgstr "" #: templates/web/default/admin/index.html:19 +#: templates/web/zurich/admin/index.html:6 msgid "%d council contacts – %d confirmed, %d unconfirmed" msgstr "" @@ -80,7 +81,7 @@ msgstr "" msgid "%s - Summary reports" msgstr "%s - Adroddiadau cryno" -#: perllib/FixMyStreet/DB/Result/Problem.pm:621 +#: perllib/FixMyStreet/DB/Result/Problem.pm:627 msgid "%s ref: %s" msgstr "" @@ -88,11 +89,11 @@ msgstr "" msgid "%s ward, %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:506 +#: perllib/FixMyStreet/DB/Result/Problem.pm:512 msgid "%s, reported anonymously at %s" msgstr "Rhoddodd %s wybod yn ddi-enw am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:508 +#: perllib/FixMyStreet/DB/Result/Problem.pm:514 msgid "%s, reported by %s at %s" msgstr "Adroddwyd am %s gan %s am %s" @@ -101,14 +102,14 @@ msgstr "Adroddwyd am %s gan %s am %s" msgid "%s, within %s ward" msgstr "Eiddo gwag yn ward %s" -#: templates/web/default/email_sent.html:28 +#: templates/web/default/email_sent.html:29 #, fuzzy msgid "" "(Don't worry — we'll hang on to your alert while you're checking your " "email.)" msgstr "byddwn yn dal gafael ar eich hysbysiad wrth i chi wirio eich e-bost." -#: templates/web/default/email_sent.html:24 +#: templates/web/default/email_sent.html:25 #, fuzzy msgid "" "(Don't worry — we'll hang on to your empty property report while " @@ -117,7 +118,7 @@ msgstr "" "byddwn yn dal gafael ar eich hysbysiad am eiddo gwag wrth i chi wirio eich e-" "bost." -#: templates/web/default/email_sent.html:26 +#: templates/web/default/email_sent.html:27 #, fuzzy msgid "" "(Don't worry — we'll hang on to your update while you're checking your " @@ -141,15 +142,15 @@ msgstr "(fel arall, gellir addasu'r porthiant RSS yn bersonol, o fewn" #: templates/web/default/around/around_map_list_items.html:12 #: templates/web/default/around/on_map_list_items.html:9 -#: templates/web/fixmystreet/report/_item.html:23 -#: templates/web/zurich/report/_item.html:27 +#: templates/web/fixmystreet/report/_item.html:20 +#: templates/web/zurich/report/_item.html:19 msgid "(closed)" msgstr "" #: templates/web/default/around/around_map_list_items.html:10 #: templates/web/default/around/on_map_list_items.html:7 -#: templates/web/fixmystreet/report/_item.html:21 -#: templates/web/zurich/report/_item.html:25 +#: templates/web/fixmystreet/report/_item.html:18 +#: templates/web/zurich/report/_item.html:17 msgid "(returned to use)" msgstr "(wedi'i adfer i'w ddefnyddio)" @@ -159,8 +160,7 @@ msgid " " msgstr " " #: templates/web/default/reports/_list-entry.html:4 -#: templates/web/fixmystreet/report/_item.html:17 -#: templates/web/zurich/report/_item.html:21 +#: templates/web/fixmystreet/report/_item.html:14 #, fuzzy msgid "(not sent to council)" msgstr "Ni roddwyd gwybod i'r cyngor am hyn" @@ -171,8 +171,7 @@ msgid "(optional)" msgstr "(dewisol)" #: templates/web/default/reports/_list-entry.html:2 -#: templates/web/fixmystreet/report/_item.html:16 -#: templates/web/zurich/report/_item.html:20 +#: templates/web/fixmystreet/report/_item.html:13 #, fuzzy msgid "(sent to both)" msgstr "Ni roddwyd gwybod i'r cyngor am hyn" @@ -367,6 +366,7 @@ msgstr "" " i'r cam hwn</a>.</small>" #: templates/web/default/admin/index.html:14 +#: templates/web/zurich/admin/index.html:4 #, fuzzy msgid "<strong>%d</strong> live empty properties" msgstr "Adrodd am eiddo gwag a gweld y rhain" @@ -458,6 +458,7 @@ msgstr "Rhowch wybod i mi am ddiweddariadau yn y dyfodol" #: templates/web/default/reports/index.html:3 #: templates/web/fixmybarangay/reports/index.html:3 +#: templates/web/zurich/reports/index.html:12 #, fuzzy msgid "All Reports" msgstr "Adroddiadau" @@ -624,8 +625,8 @@ msgid "" "whom the report is sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1084 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:127 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1086 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:140 #: templates/web/default/admin/bodies.html:1 #: templates/web/zurich/header.html:63 msgid "Bodies" @@ -728,7 +729,7 @@ msgstr "Sut i roi gwybod am eiddo gwag" msgid "Closed" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:714 +#: perllib/FixMyStreet/DB/Result/Problem.pm:720 #, fuzzy msgid "Closed by council" msgstr "Ni roddwyd gwybod i'r cyngor am hyn" @@ -856,8 +857,8 @@ msgstr "Cysylltwch â Ni" msgid "Contact the team" msgstr "Cysylltu â'r tîm" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1217 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1245 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1219 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1247 msgid "Could not find user" msgstr "" @@ -1030,11 +1031,11 @@ msgstr "" msgid "Email" msgstr "E-bost:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1193 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1195 msgid "Email added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1190 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 msgid "Email already in abuse list" msgstr "" @@ -1101,7 +1102,7 @@ msgstr "" msgid "Endpoint" msgstr "Cadarnhau" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:12 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:25 #, fuzzy msgid "Enter a Zürich street name" msgstr "Cofnodwch god post Prydeinig, neu enw stryd ac ardal gerllaw:" @@ -1294,7 +1295,7 @@ msgstr "" msgid "Flag user" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 #: templates/web/default/admin/users.html:16 msgid "Flagged" msgstr "" @@ -1378,6 +1379,7 @@ msgid "Going to send questionnaire?" msgstr "Anfon yr holiadur" #: templates/web/default/admin/index.html:24 +#: templates/web/zurich/admin/index.html:11 msgid "Graph of empty property creation by status over time" msgstr "" @@ -1500,17 +1502,17 @@ msgstr "" msgid "ID" msgstr "" -#: templates/web/default/email_sent.html:18 +#: templates/web/default/email_sent.html:19 #, fuzzy msgid "If you do not, your alert will not be activated." msgstr "ni fydd eich hysbysiad yn cael ei weithredu" -#: templates/web/default/email_sent.html:14 +#: templates/web/default/email_sent.html:15 #, fuzzy msgid "If you do not, your empty property will not be posted." msgstr "ni fydd eich eiddo gwag yn cael ei bostio" -#: templates/web/default/email_sent.html:16 +#: templates/web/default/email_sent.html:17 #, fuzzy msgid "If you do not, your update will not be posted." msgstr "ni fydd eich diweddariad yn cael ei bostio" @@ -1593,6 +1595,11 @@ msgstr "" msgid "In progress" msgstr "" +#: templates/web/zurich/admin/report_edit.html:116 +#, fuzzy +msgid "Include reporter personal details" +msgstr "Cofnodwch fanylion" + #: templates/web/default/admin/stats.html:76 #, fuzzy msgid "Include unconfirmed reports" @@ -1611,7 +1618,7 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1004 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1006 #, fuzzy msgid "Invalid end date" msgstr "Rhowch ddiweddariad" @@ -1620,7 +1627,7 @@ msgstr "Rhowch ddiweddariad" msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:994 +#: perllib/FixMyStreet/App/Controller/Admin.pm:996 msgid "Invalid start date" msgstr "" @@ -1904,6 +1911,11 @@ msgid "" "New empty property reports within {{NAME}}'s boundary on reportemptyhomes.com" msgstr "Adroddiadau newydd o fewn ffin {{NAME}} ar reportemptyhomes.com" +#: templates/web/zurich/admin/index-sdm.html:4 +#, fuzzy +msgid "New reports" +msgstr "Cuddio hen adroddiadau " + #: db/alert_types_eha.pl:23 msgid "" "New reports for {{COUNCIL}} within {{WARD}} ward on reportemptyhomes.com" @@ -2179,10 +2191,10 @@ msgstr "" #: perllib/FixMyStreet/App/Controller/Report/New.pm:1023 #: perllib/FixMyStreet/App/Controller/Report/New.pm:663 #: perllib/FixMyStreet/App/Controller/Report/New.pm:664 -#: perllib/FixMyStreet/DB/Result/Problem.pm:515 -#: perllib/FixMyStreet/DB/Result/Problem.pm:525 -#: perllib/FixMyStreet/DB/Result/Problem.pm:535 -#: perllib/FixMyStreet/DB/Result/Problem.pm:547 +#: perllib/FixMyStreet/DB/Result/Problem.pm:521 +#: perllib/FixMyStreet/DB/Result/Problem.pm:531 +#: perllib/FixMyStreet/DB/Result/Problem.pm:541 +#: perllib/FixMyStreet/DB/Result/Problem.pm:553 #: perllib/FixMyStreet/DB/ResultSet/Problem.pm:331 #: perllib/FixMyStreet/DB/ResultSet/Problem.pm:340 msgid "Other" @@ -2441,6 +2453,13 @@ msgstr "Cofnodwch eich enw" msgid "Please enter your title" msgstr "Cofnodwch eich cyfeiriad e-bost" +#: templates/web/default/auth/sign_out.html:5 +#: templates/web/zurich/auth/sign_out.html:5 +msgid "" +"Please feel free to <a href=\"%s\">sign in again</a>, or go back to the <a " +"href=\"/\">front page</a>." +msgstr "" + #: templates/web/emptyhomes/report/new/fill_in_details_text.html:1 #, fuzzy msgid "" @@ -2652,6 +2671,7 @@ msgid "Empty property %s sent to council %s" msgstr "Eiddo gwag yn %s" #: templates/web/default/admin/index.html:28 +#: templates/web/zurich/admin/index.html:15 #, fuzzy msgid "Empty property breakdown by state" msgstr "ni fydd eich eiddo gwag yn cael ei bostio" @@ -2956,7 +2976,7 @@ msgstr "Adroddiadau" msgid "Report empty properties" msgstr "Adrodd am eiddo gwag a gweld y rhain" -#: perllib/FixMyStreet/App/Controller/Rss.pm:286 +#: perllib/FixMyStreet/App/Controller/Rss.pm:295 #, fuzzy msgid "Report on %s" msgstr "Adroddiadau" @@ -2978,7 +2998,7 @@ msgstr "Adroddiadau" msgid "Reported %s, to %s" msgstr "Adroddwyd gan %s am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:530 +#: perllib/FixMyStreet/DB/Result/Problem.pm:536 #: templates/web/default/contact/index.html:45 #: templates/web/fixmystreet/contact/index.html:46 msgid "Reported anonymously at %s" @@ -2990,25 +3010,25 @@ msgstr "Adroddwyd yn ddi-enw am %s" msgid "Reported before" msgstr "Wedi adrodd o'r blaen" -#: perllib/FixMyStreet/DB/Result/Problem.pm:522 +#: perllib/FixMyStreet/DB/Result/Problem.pm:528 msgid "Reported by %s anonymously at %s" msgstr "Adroddwyd gan %s yn ddi-enw am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:553 +#: perllib/FixMyStreet/DB/Result/Problem.pm:559 #: templates/web/default/contact/index.html:47 #: templates/web/fixmystreet/contact/index.html:48 msgid "Reported by %s at %s" msgstr "Adroddwyd gan %s am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:544 +#: perllib/FixMyStreet/DB/Result/Problem.pm:550 msgid "Reported by %s by %s at %s" msgstr "Adroddwyd gan %s trwy %s am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:518 +#: perllib/FixMyStreet/DB/Result/Problem.pm:524 msgid "Reported by %s in the %s category anonymously at %s" msgstr "Adroddwyd am hyn gan %s yn y categori %s yn ddi-enw, am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:538 +#: perllib/FixMyStreet/DB/Result/Problem.pm:544 msgid "Reported by %s in the %s category by %s at %s" msgstr "Adroddwyd gan %s yn y categori %s trwy %s am %s" @@ -3017,11 +3037,11 @@ msgstr "Adroddwyd gan %s yn y categori %s trwy %s am %s" msgid "Reported in the %s category" msgstr "Adroddwyd yn y categori %s gan %s am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:526 +#: perllib/FixMyStreet/DB/Result/Problem.pm:532 msgid "Reported in the %s category anonymously at %s" msgstr "Adroddiwyd yn y categori %s yn ddi-enw am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:548 +#: perllib/FixMyStreet/DB/Result/Problem.pm:554 msgid "Reported in the %s category by %s at %s" msgstr "Adroddwyd yn y categori %s gan %s am %s" @@ -3038,16 +3058,25 @@ msgstr "Adroddwyd yn y categori %s gan %s am %s" msgid "Reporting an empty property" msgstr "Adrodd am eiddo gwag" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1085 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:120 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:133 #: templates/web/zurich/header.html:59 msgid "Reports" msgstr "Adroddiadau" +#: templates/web/zurich/admin/index-sdm.html:7 +msgid "Reports awaiting approval" +msgstr "" + #: templates/web/default/around/tabbed_lists.html:3 msgid "Reports on and around the map" msgstr "Adroddiadau ar ac yng nghyffiniau'r map" +#: templates/web/zurich/admin/index-sdm.html:10 +#, fuzzy +msgid "Reports published" +msgstr "Adroddiadau" + #: templates/web/default/admin/report_edit.html:36 #, fuzzy msgid "Resend report" @@ -3067,6 +3096,16 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" +#: templates/web/default/admin/report_edit.html:51 +#: templates/web/zurich/admin/report_edit.html:51 +msgid "Rotate Left" +msgstr "" + +#: templates/web/default/admin/report_edit.html:52 +#: templates/web/zurich/admin/report_edit.html:52 +msgid "Rotate Right" +msgstr "" + #: templates/web/default/admin/body_edit.html:76 msgid "Save changes" msgstr "" @@ -3115,7 +3154,7 @@ msgstr "" "porthiant RSS,\n" "neu rhowch eich cyfeiriad e-bost i danysgrifio am hysbysiad e-bost." -#: perllib/FixMyStreet/DB/Result/Problem.pm:634 +#: perllib/FixMyStreet/DB/Result/Problem.pm:640 msgid "Sent to %s %s later" msgstr "Anfonwyd at %s %s yn ddiweddarach" @@ -3217,7 +3256,6 @@ msgstr "" #: templates/web/emptyhomes/header.html:41 #: templates/web/fiksgatami/header.html:22 #: templates/web/fiksgatami/nn/header.html:22 -#: templates/web/fixmybarangay/auth/sign_out.html:1 #: templates/web/lichfielddc/header.html:177 #: templates/web/reading/header.html:33 #: templates/web/zurich/auth/sign_out.html:1 @@ -3310,7 +3348,7 @@ msgstr "Diweddariad:" msgid "State:" msgstr "Diweddariad:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1090 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1092 #: templates/web/default/admin/stats.html:1 #, fuzzy msgid "Stats" @@ -3409,12 +3447,12 @@ msgstr "" "Neu, gallwch danysgrifio am hysbysiad yn ôl pa ward neu gyngor yr ydych yn " "byw ynddo:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1083 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:119 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1085 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:132 #: templates/web/default/admin/index.html:1 #: templates/web/zurich/admin/index-dm.html:1 #: templates/web/zurich/admin/index-sdm.html:1 -#: templates/web/zurich/header.html:56 +#: templates/web/zurich/admin/index.html:1 templates/web/zurich/header.html:56 #, fuzzy msgid "Summary" msgstr "Adroddiadau cryno" @@ -3424,10 +3462,12 @@ msgstr "Adroddiadau cryno" #: templates/web/fiksgatami/nn/reports/index.html:1 #: templates/web/fiksgatami/reports/index.html:1 #: templates/web/fixmybarangay/reports/index.html:1 +#: templates/web/zurich/reports/index.html:0 +#: templates/web/zurich/reports/index.html:4 msgid "Summary reports" msgstr "Adroddiadau cryno" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 msgid "Survey" msgstr "" @@ -3654,7 +3694,7 @@ msgid "" msgstr "Mae manylion eich eiddo gwag ar gael ar ochr dde'r dudalen hon." #: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 -#: perllib/FixMyStreet/App/Controller/Reports.pm:51 +#: perllib/FixMyStreet/App/Controller/Reports.pm:67 #, fuzzy msgid "The error was: %s" msgstr "Testun y gwall oedd:" @@ -3776,7 +3816,7 @@ msgstr "" "Ni allai'r defnyddiwr leoli'r eiddo gwag ar fap, ond i weld yr ardal o " "gwmpas y lleoliad a gofnodwyd ganddynt " -#: perllib/FixMyStreet/App/Controller/Reports.pm:48 +#: perllib/FixMyStreet/App/Controller/Reports.pm:64 msgid "" "There was an empty property showing the All Reports page. Please try again " "later." @@ -3932,7 +3972,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:1086 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1088 #: templates/web/default/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -4085,9 +4125,9 @@ msgstr "Diweddariadau" #: perllib/FixMyStreet/App/Controller/Admin.pm:733 #: perllib/FixMyStreet/App/Controller/Admin.pm:867 #: perllib/FixMyStreet/App/Controller/Admin.pm:918 -#: perllib/FixMyStreet/App/Controller/Admin.pm:955 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:309 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:364 +#: perllib/FixMyStreet/App/Controller/Admin.pm:957 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:322 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:377 #, fuzzy msgid "Updated!" msgstr "Diweddariadau" @@ -4113,16 +4153,16 @@ 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:1249 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1251 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1221 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1223 msgid "User flagged" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1088 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:134 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1090 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:147 #: templates/web/default/admin/flagged.html:30 #: templates/web/zurich/header.html:68 msgid "Users" @@ -4424,7 +4464,6 @@ msgid "" msgstr "" #: templates/web/default/auth/sign_out.html:3 -#: templates/web/fixmybarangay/auth/sign_out.html:3 #: templates/web/zurich/auth/sign_out.html:3 msgid "You have been signed out" msgstr "" @@ -4483,7 +4522,7 @@ msgid "" "accurate:" msgstr "Rydych wedi cadarnhau'ch hysbysiad yn llwyddiannus." -#: templates/web/default/email_sent.html:12 +#: templates/web/default/email_sent.html:13 msgid "You must now click the link in the email we've just sent you." msgstr "" @@ -4627,7 +4666,7 @@ msgstr "" msgid "council" msgstr "cyngor" -#: perllib/FixMyStreet/DB/Result/Problem.pm:619 +#: perllib/FixMyStreet/DB/Result/Problem.pm:625 msgid "council ref: %s" msgstr "" @@ -4643,10 +4682,11 @@ msgid "e.g. ‘%s’ or ‘%s’" msgstr "" #: templates/web/default/admin/index.html:15 +#: templates/web/zurich/admin/index.html:5 msgid "from %d different users" msgstr "" -#: perllib/Utils.pm:267 +#: perllib/Utils.pm:268 msgid "less than a minute" msgstr "llai na munud" @@ -4719,7 +4759,7 @@ msgstr "" msgid "this type of local empty property" msgstr "Anfonwch fanylion eiddo gwag lleol newydd ataf i drwy'r e-bost" -#: perllib/Utils.pm:241 +#: perllib/Utils.pm:240 msgid "today" msgstr "heddiw" @@ -4752,14 +4792,14 @@ msgid_plural "<big>%s</big> reports recently" msgstr[0] "<big>%s</big> adroddiad yn ddiweddar" msgstr[1] "<big>%s</big> o adroddiadau yn ddiweddar" -#: perllib/Utils.pm:286 +#: perllib/Utils.pm:287 #, fuzzy, perl-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "awr" msgstr[1] "awr" -#: perllib/Utils.pm:288 +#: perllib/Utils.pm:289 #, fuzzy, perl-format msgid "%d minute" msgid_plural "%d minutes" @@ -4781,7 +4821,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:282 +#: perllib/Utils.pm:283 #, fuzzy, perl-format msgid "%d week" msgid_plural "%d weeks" @@ -4813,7 +4853,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:284 +#: perllib/Utils.pm:285 #, fuzzy, perl-format msgid "%d day" msgid_plural "%d days" diff --git a/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po index cba7768ad..6c3fa6462 100644 --- a/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -6,16 +6,17 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2013-01-24 18:27+0000\n" +"POT-Creation-Date: 2013-01-31 15:25+0000\n" "PO-Revision-Date: 2013-01-28 14:00+0100\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <team@fixmystreet.com>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:579 #: perllib/FixMyStreet/DB/ResultSet/Problem.pm:339 msgid " and " msgstr "und" @@ -46,6 +47,7 @@ msgid "%d confirmed alerts, %d unconfirmed" msgstr "" #: templates/web/default/admin/index.html:19 +#: templates/web/zurich/admin/index.html:6 msgid "%d council contacts – %d confirmed, %d unconfirmed" msgstr "" @@ -72,7 +74,7 @@ msgstr "" msgid "%s - Summary reports" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:621 +#: perllib/FixMyStreet/DB/Result/Problem.pm:627 msgid "%s ref: %s" msgstr "" @@ -80,11 +82,11 @@ msgstr "" msgid "%s ward, %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:506 +#: perllib/FixMyStreet/DB/Result/Problem.pm:512 msgid "%s, reported anonymously at %s" msgstr "%s, gemeldet um %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:508 +#: perllib/FixMyStreet/DB/Result/Problem.pm:514 msgid "%s, reported by %s at %s" msgstr "" @@ -92,19 +94,19 @@ msgstr "" msgid "%s, within %s ward" msgstr "" -#: templates/web/default/email_sent.html:28 +#: templates/web/default/email_sent.html:29 msgid "" "(Don't worry — we'll hang on to your alert while you're checking your " "email.)" msgstr "" -#: templates/web/default/email_sent.html:24 +#: templates/web/default/email_sent.html:25 msgid "" "(Don't worry — we'll hang on to your problem report while you're " "checking your email.)" msgstr "" -#: templates/web/default/email_sent.html:26 +#: templates/web/default/email_sent.html:27 msgid "" "(Don't worry — we'll hang on to your update while you're checking your " "email.)" @@ -127,15 +129,15 @@ msgstr "" #: templates/web/default/around/around_map_list_items.html:12 #: templates/web/default/around/on_map_list_items.html:9 -#: templates/web/fixmystreet/report/_item.html:23 -#: templates/web/zurich/report/_item.html:27 +#: templates/web/fixmystreet/report/_item.html:20 +#: templates/web/zurich/report/_item.html:19 msgid "(closed)" msgstr "(erledigt)" #: templates/web/default/around/around_map_list_items.html:10 #: templates/web/default/around/on_map_list_items.html:7 -#: templates/web/fixmystreet/report/_item.html:21 -#: templates/web/zurich/report/_item.html:25 +#: templates/web/fixmystreet/report/_item.html:18 +#: templates/web/zurich/report/_item.html:17 msgid "(fixed)" msgstr "(gelöst)" @@ -145,8 +147,7 @@ msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(z.B. illegale Deponien, Strassenschäden, Graffitis usw.)" #: templates/web/default/reports/_list-entry.html:4 -#: templates/web/fixmystreet/report/_item.html:17 -#: templates/web/zurich/report/_item.html:21 +#: templates/web/fixmystreet/report/_item.html:14 msgid "(not sent to council)" msgstr "" @@ -156,8 +157,7 @@ msgid "(optional)" msgstr "(optional)" #: templates/web/default/reports/_list-entry.html:2 -#: templates/web/fixmystreet/report/_item.html:16 -#: templates/web/zurich/report/_item.html:20 +#: templates/web/fixmystreet/report/_item.html:13 msgid "(sent to both)" msgstr "" @@ -278,6 +278,7 @@ msgstr "" "small>" #: templates/web/default/admin/index.html:14 +#: templates/web/zurich/admin/index.html:4 msgid "<strong>%d</strong> live problems" msgstr "" @@ -362,6 +363,7 @@ msgstr "" #: templates/web/default/reports/index.html:3 #: templates/web/fixmybarangay/reports/index.html:3 +#: templates/web/zurich/reports/index.html:12 msgid "All Reports" msgstr "Alle Meldungen" @@ -505,8 +507,8 @@ msgid "" "whom the report is sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1084 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:127 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1086 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:140 #: templates/web/default/admin/bodies.html:1 #: templates/web/zurich/header.html:63 msgid "Bodies" @@ -605,7 +607,7 @@ msgstr "Mangel lokalisieren" msgid "Closed" msgstr "Erledigt" -#: perllib/FixMyStreet/DB/Result/Problem.pm:714 +#: perllib/FixMyStreet/DB/Result/Problem.pm:720 msgid "Closed by council" msgstr "" @@ -724,8 +726,8 @@ msgstr "" msgid "Contact the team" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1217 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1245 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1219 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1247 msgid "Could not find user" msgstr "" @@ -886,11 +888,11 @@ msgstr "" msgid "Email" msgstr "E-Mail" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1193 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1195 msgid "Email added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1190 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 msgid "Email already in abuse list" msgstr "" @@ -955,7 +957,7 @@ msgstr "" msgid "Endpoint" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:12 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:25 msgid "Enter a Zürich street name" msgstr "Ungefähre Adresse des Mangels" @@ -1118,7 +1120,7 @@ msgstr "" msgid "Flag user" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 #: templates/web/default/admin/users.html:16 msgid "Flagged" msgstr "" @@ -1196,6 +1198,7 @@ msgid "Going to send questionnaire?" msgstr "" #: templates/web/default/admin/index.html:24 +#: templates/web/zurich/admin/index.html:11 msgid "Graph of problem creation by status over time" msgstr "" @@ -1311,15 +1314,15 @@ msgstr "" msgid "ID" msgstr "ID" -#: templates/web/default/email_sent.html:18 +#: templates/web/default/email_sent.html:19 msgid "If you do not, your alert will not be activated." msgstr "" -#: templates/web/default/email_sent.html:14 +#: templates/web/default/email_sent.html:15 msgid "If you do not, your problem will not be posted." msgstr "" -#: templates/web/default/email_sent.html:16 +#: templates/web/default/email_sent.html:17 msgid "If you do not, your update will not be posted." msgstr "" @@ -1389,6 +1392,11 @@ msgstr "" msgid "In progress" msgstr "In Bearbeitung" +#: templates/web/zurich/admin/report_edit.html:116 +#, fuzzy +msgid "Include reporter personal details" +msgstr "Bitte geben Sie einiges Details an" + #: templates/web/default/admin/stats.html:76 msgid "Include unconfirmed reports" msgstr "" @@ -1406,7 +1414,7 @@ msgstr "Interne Notizen" msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1004 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1006 msgid "Invalid end date" msgstr "Ung&ultiges Enddatum" @@ -1414,7 +1422,7 @@ msgstr "Ung&ultiges Enddatum" msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:994 +#: perllib/FixMyStreet/App/Controller/Admin.pm:996 msgid "Invalid start date" msgstr "Ung&ultiges Startdatum" @@ -1668,6 +1676,11 @@ msgstr "" msgid "New problems within {{NAME}}'s boundary on FixMyStreet" msgstr "" +#: templates/web/zurich/admin/index-sdm.html:4 +#, fuzzy +msgid "New reports" +msgstr "Alle Meldungen" + #: db/alert_types_eha.pl:23 msgid "" "New reports for {{COUNCIL}} within {{WARD}} ward on reportemptyhomes.com" @@ -1921,10 +1934,10 @@ msgstr "" #: perllib/FixMyStreet/App/Controller/Report/New.pm:1023 #: perllib/FixMyStreet/App/Controller/Report/New.pm:663 #: perllib/FixMyStreet/App/Controller/Report/New.pm:664 -#: perllib/FixMyStreet/DB/Result/Problem.pm:515 -#: perllib/FixMyStreet/DB/Result/Problem.pm:525 -#: perllib/FixMyStreet/DB/Result/Problem.pm:535 -#: perllib/FixMyStreet/DB/Result/Problem.pm:547 +#: perllib/FixMyStreet/DB/Result/Problem.pm:521 +#: perllib/FixMyStreet/DB/Result/Problem.pm:531 +#: perllib/FixMyStreet/DB/Result/Problem.pm:541 +#: perllib/FixMyStreet/DB/Result/Problem.pm:553 #: perllib/FixMyStreet/DB/ResultSet/Problem.pm:331 #: perllib/FixMyStreet/DB/ResultSet/Problem.pm:340 msgid "Other" @@ -2161,6 +2174,13 @@ msgstr "Bitte geben Sie Ihren Namen an" msgid "Please enter your title" msgstr "Bitte geben Sie Iher E-Mail-Adresse an" +#: templates/web/default/auth/sign_out.html:5 +#: templates/web/zurich/auth/sign_out.html:5 +msgid "" +"Please feel free to <a href=\"%s\">sign in again</a>, or go back to the <a " +"href=\"/\">front page</a>." +msgstr "" + #: templates/web/emptyhomes/report/new/fill_in_details_text.html:1 msgid "" "Please fill in details of the empty property below, saying what type of\n" @@ -2364,6 +2384,7 @@ msgid "Problem %s sent to council %s" msgstr "" #: templates/web/default/admin/index.html:28 +#: templates/web/zurich/admin/index.html:15 msgid "Problem breakdown by state" msgstr "Meldungen nach Status sortiert" @@ -2648,7 +2669,7 @@ msgstr "Missbrauch melden" msgid "Report empty properties" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:286 +#: perllib/FixMyStreet/App/Controller/Rss.pm:295 msgid "Report on %s" msgstr "" @@ -2667,7 +2688,7 @@ msgstr "" msgid "Reported %s, to %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:530 +#: perllib/FixMyStreet/DB/Result/Problem.pm:536 #: templates/web/default/contact/index.html:45 #: templates/web/fixmystreet/contact/index.html:46 msgid "Reported anonymously at %s" @@ -2679,25 +2700,25 @@ msgstr "Anonym gemeldet um" msgid "Reported before" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:522 +#: perllib/FixMyStreet/DB/Result/Problem.pm:528 msgid "Reported by %s anonymously at %s" msgstr "Anonym gemeldet von %s um %s " -#: perllib/FixMyStreet/DB/Result/Problem.pm:553 +#: perllib/FixMyStreet/DB/Result/Problem.pm:559 #: templates/web/default/contact/index.html:47 #: templates/web/fixmystreet/contact/index.html:48 msgid "Reported by %s at %s" msgstr "Gemeldet von %s um %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:544 +#: perllib/FixMyStreet/DB/Result/Problem.pm:550 msgid "Reported by %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:518 +#: perllib/FixMyStreet/DB/Result/Problem.pm:524 msgid "Reported by %s in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:538 +#: perllib/FixMyStreet/DB/Result/Problem.pm:544 msgid "Reported by %s in the %s category by %s at %s" msgstr "" @@ -2705,11 +2726,11 @@ msgstr "" msgid "Reported in the %s category" msgstr "In der Kategorie %s gemeldet" -#: perllib/FixMyStreet/DB/Result/Problem.pm:526 +#: perllib/FixMyStreet/DB/Result/Problem.pm:532 msgid "Reported in the %s category anonymously at %s" msgstr "In der Kategorie %s um %s gemeldet" -#: perllib/FixMyStreet/DB/Result/Problem.pm:548 +#: perllib/FixMyStreet/DB/Result/Problem.pm:554 msgid "Reported in the %s category by %s at %s" msgstr "Gemeldet in der Kategorie %s" @@ -2726,16 +2747,26 @@ msgstr "Gemeldet in der Kategorie %s" msgid "Reporting a problem" msgstr "Ihre Meldung" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1085 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:120 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:133 #: templates/web/zurich/header.html:59 msgid "Reports" msgstr "Meldungen" +#: templates/web/zurich/admin/index-sdm.html:7 +#, fuzzy +msgid "Reports awaiting approval" +msgstr "Ihre Meldung" + #: templates/web/default/around/tabbed_lists.html:3 msgid "Reports on and around the map" msgstr "" +#: templates/web/zurich/admin/index-sdm.html:10 +#, fuzzy +msgid "Reports published" +msgstr "Missbrauch melden" + #: templates/web/default/admin/report_edit.html:36 msgid "Resend report" msgstr "" @@ -2754,6 +2785,16 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" +#: templates/web/default/admin/report_edit.html:51 +#: templates/web/zurich/admin/report_edit.html:51 +msgid "Rotate Left" +msgstr "" + +#: templates/web/default/admin/report_edit.html:52 +#: templates/web/zurich/admin/report_edit.html:52 +msgid "Rotate Right" +msgstr "" + #: templates/web/default/admin/body_edit.html:76 msgid "Save changes" msgstr "Änderungen speichern" @@ -2795,7 +2836,7 @@ msgid "" "or enter your email address to subscribe to an email alert." msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:634 +#: perllib/FixMyStreet/DB/Result/Problem.pm:640 msgid "Sent to %s %s later" msgstr "" @@ -2877,7 +2918,6 @@ msgstr "" #: templates/web/emptyhomes/header.html:41 #: templates/web/fiksgatami/header.html:22 #: templates/web/fiksgatami/nn/header.html:22 -#: templates/web/fixmybarangay/auth/sign_out.html:1 #: templates/web/lichfielddc/header.html:177 #: templates/web/reading/header.html:33 #: templates/web/zurich/auth/sign_out.html:1 @@ -2965,7 +3005,7 @@ msgstr "Status" msgid "State:" msgstr "Status:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1090 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1092 #: templates/web/default/admin/stats.html:1 msgid "Stats" msgstr "" @@ -3055,12 +3095,12 @@ msgstr "" msgid "Subscribe to an alert based upon what baranagay you’re in:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1083 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:119 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1085 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:132 #: templates/web/default/admin/index.html:1 #: templates/web/zurich/admin/index-dm.html:1 #: templates/web/zurich/admin/index-sdm.html:1 -#: templates/web/zurich/header.html:56 +#: templates/web/zurich/admin/index.html:1 templates/web/zurich/header.html:56 msgid "Summary" msgstr "Zusammenfassung" @@ -3069,10 +3109,12 @@ msgstr "Zusammenfassung" #: templates/web/fiksgatami/nn/reports/index.html:1 #: templates/web/fiksgatami/reports/index.html:1 #: templates/web/fixmybarangay/reports/index.html:1 +#: templates/web/zurich/reports/index.html:0 +#: templates/web/zurich/reports/index.html:4 msgid "Summary reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 msgid "Survey" msgstr "" @@ -3250,7 +3292,7 @@ msgid "" msgstr "" #: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 -#: perllib/FixMyStreet/App/Controller/Reports.pm:51 +#: perllib/FixMyStreet/App/Controller/Reports.pm:67 msgid "The error was: %s" msgstr "" @@ -3347,7 +3389,7 @@ msgid "" "the location they entered" msgstr "" -#: perllib/FixMyStreet/App/Controller/Reports.pm:48 +#: perllib/FixMyStreet/App/Controller/Reports.pm:64 msgid "" "There was a problem showing the All Reports page. Please try again later." msgstr "" @@ -3487,7 +3529,7 @@ msgid "" "This web page also contains a photo of the problem, provided by the user." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1086 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1088 #: templates/web/default/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -3616,9 +3658,9 @@ msgstr "Aktualisiert" #: perllib/FixMyStreet/App/Controller/Admin.pm:733 #: perllib/FixMyStreet/App/Controller/Admin.pm:867 #: perllib/FixMyStreet/App/Controller/Admin.pm:918 -#: perllib/FixMyStreet/App/Controller/Admin.pm:955 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:309 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:364 +#: perllib/FixMyStreet/App/Controller/Admin.pm:957 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:322 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:377 msgid "Updated!" msgstr "Aktualisiert!" @@ -3643,16 +3685,16 @@ msgstr "" msgid "Updates to this problem, FixMyStreet" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1249 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1251 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1221 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1223 msgid "User flagged" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1088 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:134 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1090 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:147 #: templates/web/default/admin/flagged.html:30 #: templates/web/zurich/header.html:68 msgid "Users" @@ -3933,7 +3975,6 @@ msgid "" msgstr "" #: templates/web/default/auth/sign_out.html:3 -#: templates/web/fixmybarangay/auth/sign_out.html:3 #: templates/web/zurich/auth/sign_out.html:3 msgid "You have been signed out" msgstr "Sie haben sich abgemeldet" @@ -3985,7 +4026,7 @@ msgid "" "accurate:" msgstr "" -#: templates/web/default/email_sent.html:12 +#: templates/web/default/email_sent.html:13 msgid "You must now click the link in the email we've just sent you." msgstr "" "Sie können Ihre Meldung bestätigen, indem Sie auf den Link im E-" @@ -4122,7 +4163,7 @@ msgstr "" msgid "council" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:619 +#: perllib/FixMyStreet/DB/Result/Problem.pm:625 msgid "council ref: %s" msgstr "" @@ -4138,10 +4179,11 @@ msgid "e.g. ‘%s’ or ‘%s’" msgstr "z.B. ‘%s’ oder ‘%s’" #: templates/web/default/admin/index.html:15 +#: templates/web/zurich/admin/index.html:5 msgid "from %d different users" msgstr "" -#: perllib/Utils.pm:267 +#: perllib/Utils.pm:268 msgid "less than a minute" msgstr "weniger als einer Minute" @@ -4214,7 +4256,7 @@ msgstr "" msgid "this type of local problem" msgstr "" -#: perllib/Utils.pm:241 +#: perllib/Utils.pm:240 msgid "today" msgstr "heute" @@ -4246,14 +4288,14 @@ msgid_plural "<big>%s</big> reports recently" msgstr[0] "<big>%s</big> Meldung in letzter Zeit" msgstr[1] "<big>%s</big> Meldungen in letzter Zeit" -#: perllib/Utils.pm:286 +#: perllib/Utils.pm:287 #, perl-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d Stunde" msgstr[1] "%d Stunden" -#: perllib/Utils.pm:288 +#: perllib/Utils.pm:289 #, perl-format msgid "%d minute" msgid_plural "%d minutes" @@ -4274,7 +4316,7 @@ msgid_plural "" "We do not yet have details for the councils that cover this location." msgstr[0] "" -#: perllib/Utils.pm:282 +#: perllib/Utils.pm:283 #, perl-format msgid "%d week" msgid_plural "%d weeks" @@ -4306,7 +4348,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:284 +#: perllib/Utils.pm:285 #, perl-format msgid "%d day" msgid_plural "%d days" diff --git a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po index 6f92189ec..7b5e9ae35 100644 --- a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: FixMyStreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2013-01-24 18:27+0000\n" +"POT-Creation-Date: 2013-01-31 15:25+0000\n" "PO-Revision-Date: 2012-09-14 00:22+0100\n" "Last-Translator: Anders Einar Hilden <hildenae@gmail.com>\n" "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n" @@ -22,7 +22,7 @@ msgstr "" "X-Generator: KBabel 1.11.4\n" "X-Poedit-Basepath: ../../../\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:579 #: perllib/FixMyStreet/DB/ResultSet/Problem.pm:339 msgid " and " msgstr " og " @@ -53,6 +53,7 @@ msgid "%d confirmed alerts, %d unconfirmed" msgstr "%d bekreftede varsler, %d ubekreftede" #: templates/web/default/admin/index.html:19 +#: templates/web/zurich/admin/index.html:6 msgid "%d council contacts – %d confirmed, %d unconfirmed" msgstr "%d administrasjonskontakter – %d bekreftet, %d ubekreftet" @@ -79,7 +80,7 @@ msgstr "" msgid "%s - Summary reports" msgstr "%s - oppsummeringsrapporter" -#: perllib/FixMyStreet/DB/Result/Problem.pm:621 +#: perllib/FixMyStreet/DB/Result/Problem.pm:627 msgid "%s ref: %s" msgstr "%s ref: %s" @@ -87,11 +88,11 @@ msgstr "%s ref: %s" msgid "%s ward, %s" msgstr "%s bydel, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:506 +#: perllib/FixMyStreet/DB/Result/Problem.pm:512 msgid "%s, reported anonymously at %s" msgstr "%s, rapportert anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:508 +#: perllib/FixMyStreet/DB/Result/Problem.pm:514 msgid "%s, reported by %s at %s" msgstr "%s, rapportert av %s %s" @@ -99,21 +100,21 @@ msgstr "%s, rapportert av %s %s" msgid "%s, within %s ward" msgstr "%s, innefor bydel %s" -#: templates/web/default/email_sent.html:28 +#: templates/web/default/email_sent.html:29 #, fuzzy msgid "" "(Don't worry — we'll hang on to your alert while you're checking your " "email.)" msgstr "vi tar vare på ditt varsel mens du sjekker din e-post." -#: templates/web/default/email_sent.html:24 +#: templates/web/default/email_sent.html:25 #, fuzzy msgid "" "(Don't worry — we'll hang on to your problem report while you're " "checking your email.)" msgstr "vi tar vare på rapporten din mens du sjekker e-post." -#: templates/web/default/email_sent.html:26 +#: templates/web/default/email_sent.html:27 #, fuzzy msgid "" "(Don't worry — we'll hang on to your update while you're checking your " @@ -137,15 +138,15 @@ msgstr "(alternativt kan RSS-strømmen tilpasses, innenfor" #: templates/web/default/around/around_map_list_items.html:12 #: templates/web/default/around/on_map_list_items.html:9 -#: templates/web/fixmystreet/report/_item.html:23 -#: templates/web/zurich/report/_item.html:27 +#: templates/web/fixmystreet/report/_item.html:20 +#: templates/web/zurich/report/_item.html:19 msgid "(closed)" msgstr "(lukket)" #: templates/web/default/around/around_map_list_items.html:10 #: templates/web/default/around/on_map_list_items.html:7 -#: templates/web/fixmystreet/report/_item.html:21 -#: templates/web/zurich/report/_item.html:25 +#: templates/web/fixmystreet/report/_item.html:18 +#: templates/web/zurich/report/_item.html:17 msgid "(fixed)" msgstr "(løst)" @@ -155,8 +156,7 @@ msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(som tagging, søppel, hull i veien, eller ødelagte gatelys)" #: templates/web/default/reports/_list-entry.html:4 -#: templates/web/fixmystreet/report/_item.html:17 -#: templates/web/zurich/report/_item.html:21 +#: templates/web/fixmystreet/report/_item.html:14 msgid "(not sent to council)" msgstr "(ikke rapportert til administrasjonen)" @@ -167,8 +167,7 @@ msgstr "(valgfritt)" # Denne teksten er lite forklarende #: templates/web/default/reports/_list-entry.html:2 -#: templates/web/fixmystreet/report/_item.html:16 -#: templates/web/zurich/report/_item.html:20 +#: templates/web/fixmystreet/report/_item.html:13 msgid "(sent to both)" msgstr "(sendt til begge)" @@ -314,6 +313,7 @@ msgstr "" "dette steget</a>.</small>" #: templates/web/default/admin/index.html:14 +#: templates/web/zurich/admin/index.html:4 msgid "<strong>%d</strong> live problems" msgstr "<strong>%d</strong> aktive problemer" @@ -398,6 +398,7 @@ msgstr "Send meg varsel ved fremtidige oppdateringer" #: templates/web/default/reports/index.html:3 #: templates/web/fixmybarangay/reports/index.html:3 +#: templates/web/zurich/reports/index.html:12 msgid "All Reports" msgstr "Alle rapporter" @@ -557,8 +558,8 @@ msgid "" "whom the report is sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1084 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:127 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1086 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:140 #: templates/web/default/admin/bodies.html:1 #: templates/web/zurich/header.html:63 msgid "Bodies" @@ -659,7 +660,7 @@ msgstr "Klikk i kartet for å rapportere et problem" msgid "Closed" msgstr "Lukket" -#: perllib/FixMyStreet/DB/Result/Problem.pm:714 +#: perllib/FixMyStreet/DB/Result/Problem.pm:720 msgid "Closed by council" msgstr "(ikke rapportert til administrasjonen)" @@ -780,8 +781,8 @@ msgstr "Kontakt oss" msgid "Contact the team" msgstr "Kontakt prosjektgruppen" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1217 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1245 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1219 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1247 msgid "Could not find user" msgstr "Kunne ikke finne bruker" @@ -943,11 +944,11 @@ msgstr "Oppdatert av" msgid "Email" msgstr "E-post" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1193 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1195 msgid "Email added to abuse list" msgstr "Epost lagt til misbruksliste" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1190 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 msgid "Email already in abuse list" msgstr "Epost allerede i misbrukslisten" @@ -1014,7 +1015,7 @@ msgid "Endpoint" msgstr "Sett opp Open311" # Kan "Oppgi" være bedre? -#: perllib/FixMyStreet/Cobrand/Zurich.pm:12 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:25 #, fuzzy msgid "Enter a Zürich street name" msgstr "Skriv inn et veinavn og sted" @@ -1190,7 +1191,7 @@ msgstr "Løst:" msgid "Flag user" msgstr "Flag bruker" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 #: templates/web/default/admin/users.html:16 msgid "Flagged" msgstr "Flagget:" @@ -1269,6 +1270,7 @@ msgid "Going to send questionnaire?" msgstr "Skal det sendes spørreskjema?" #: templates/web/default/admin/index.html:24 +#: templates/web/zurich/admin/index.html:11 msgid "Graph of problem creation by status over time" msgstr "Graf over problemoppretting fordelt på status over tid" @@ -1389,17 +1391,17 @@ msgstr "" msgid "ID" msgstr "ID" -#: templates/web/default/email_sent.html:18 +#: templates/web/default/email_sent.html:19 #, fuzzy msgid "If you do not, your alert will not be activated." msgstr "ditt varsel vil ikke bli aktivert" -#: templates/web/default/email_sent.html:14 +#: templates/web/default/email_sent.html:15 #, fuzzy msgid "If you do not, your problem will not be posted." msgstr "vil ditt problem ikke bli publisert" -#: templates/web/default/email_sent.html:16 +#: templates/web/default/email_sent.html:17 #, fuzzy msgid "If you do not, your update will not be posted." msgstr "din oppdatering vil ikke bli publisert" @@ -1485,6 +1487,11 @@ msgstr "" msgid "In progress" msgstr "Under arbeid" +#: templates/web/zurich/admin/report_edit.html:116 +#, fuzzy +msgid "Include reporter personal details" +msgstr "Legg inn opplysninger om problemet" + #: templates/web/default/admin/stats.html:76 msgid "Include unconfirmed reports" msgstr "Inkluder ubekreftede problemer" @@ -1502,7 +1509,7 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "Ugyldig agency_responsible-verdi %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1004 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1006 msgid "Invalid end date" msgstr "Ugyldig slutt-dato" @@ -1510,7 +1517,7 @@ msgstr "Ugyldig slutt-dato" msgid "Invalid format %s specified." msgstr "Ugyldig format %s oppgitt." -#: perllib/FixMyStreet/App/Controller/Admin.pm:994 +#: perllib/FixMyStreet/App/Controller/Admin.pm:996 msgid "Invalid start date" msgstr "Ugyldig startdato" @@ -1777,6 +1784,11 @@ msgstr "Nye problemer i {{COUNCIL}} på FiksGataMi" msgid "New problems within {{NAME}}'s boundary on FixMyStreet" msgstr "Nye rapporter innenfor grensen til {{NAME}} på FiksGataMi" +#: templates/web/zurich/admin/index-sdm.html:4 +#, fuzzy +msgid "New reports" +msgstr "Åpne rapporter" + #: db/alert_types_eha.pl:23 msgid "" "New reports for {{COUNCIL}} within {{WARD}} ward on reportemptyhomes.com" @@ -2039,10 +2051,10 @@ msgstr "" #: perllib/FixMyStreet/App/Controller/Report/New.pm:1023 #: perllib/FixMyStreet/App/Controller/Report/New.pm:663 #: perllib/FixMyStreet/App/Controller/Report/New.pm:664 -#: perllib/FixMyStreet/DB/Result/Problem.pm:515 -#: perllib/FixMyStreet/DB/Result/Problem.pm:525 -#: perllib/FixMyStreet/DB/Result/Problem.pm:535 -#: perllib/FixMyStreet/DB/Result/Problem.pm:547 +#: perllib/FixMyStreet/DB/Result/Problem.pm:521 +#: perllib/FixMyStreet/DB/Result/Problem.pm:531 +#: perllib/FixMyStreet/DB/Result/Problem.pm:541 +#: perllib/FixMyStreet/DB/Result/Problem.pm:553 #: perllib/FixMyStreet/DB/ResultSet/Problem.pm:331 #: perllib/FixMyStreet/DB/ResultSet/Problem.pm:340 msgid "Other" @@ -2296,6 +2308,13 @@ msgstr "Vennligst tast inn ditt mellomnavn" msgid "Please enter your title" msgstr "Vennligst legg inn din tittel" +#: templates/web/default/auth/sign_out.html:5 +#: templates/web/zurich/auth/sign_out.html:5 +msgid "" +"Please feel free to <a href=\"%s\">sign in again</a>, or go back to the <a " +"href=\"/\">front page</a>." +msgstr "" + #: templates/web/emptyhomes/report/new/fill_in_details_text.html:1 msgid "" "Please fill in details of the empty property below, saying what type of\n" @@ -2516,6 +2535,7 @@ msgid "Problem %s sent to council %s" msgstr "Problem %s sendt til administrasjon %s" #: templates/web/default/admin/index.html:28 +#: templates/web/zurich/admin/index.html:15 msgid "Problem breakdown by state" msgstr "Tilstandsfordeling av problemer" @@ -2806,7 +2826,7 @@ msgstr "Rapporter misbruk" msgid "Report empty properties" msgstr "Rapporter tomme hjem" -#: perllib/FixMyStreet/App/Controller/Rss.pm:286 +#: perllib/FixMyStreet/App/Controller/Rss.pm:295 msgid "Report on %s" msgstr "Rapport på %s" @@ -2825,7 +2845,7 @@ msgstr "Rapportert %s" msgid "Reported %s, to %s" msgstr "Rapportert %s, til %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:530 +#: perllib/FixMyStreet/DB/Result/Problem.pm:536 #: templates/web/default/contact/index.html:45 #: templates/web/fixmystreet/contact/index.html:46 msgid "Reported anonymously at %s" @@ -2837,25 +2857,25 @@ msgstr "Rapportert anonymt %s" msgid "Reported before" msgstr "Rapportert tidligere" -#: perllib/FixMyStreet/DB/Result/Problem.pm:522 +#: perllib/FixMyStreet/DB/Result/Problem.pm:528 msgid "Reported by %s anonymously at %s" msgstr "Publisert av %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:553 +#: perllib/FixMyStreet/DB/Result/Problem.pm:559 #: templates/web/default/contact/index.html:47 #: templates/web/fixmystreet/contact/index.html:48 msgid "Reported by %s at %s" msgstr "Publisert av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:544 +#: perllib/FixMyStreet/DB/Result/Problem.pm:550 msgid "Reported by %s by %s at %s" msgstr "Rapporter av %s av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:518 +#: perllib/FixMyStreet/DB/Result/Problem.pm:524 msgid "Reported by %s in the %s category anonymously at %s" msgstr "Rapportert av %s i kategorien %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:538 +#: perllib/FixMyStreet/DB/Result/Problem.pm:544 msgid "Reported by %s in the %s category by %s at %s" msgstr "Rapportert av %s i kategorien %s av %s %s" @@ -2864,11 +2884,11 @@ msgstr "Rapportert av %s i kategorien %s av %s %s" msgid "Reported in the %s category" msgstr "Rapportert i kategorien %s av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:526 +#: perllib/FixMyStreet/DB/Result/Problem.pm:532 msgid "Reported in the %s category anonymously at %s" msgstr "Rapportert i kategorien %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:548 +#: perllib/FixMyStreet/DB/Result/Problem.pm:554 msgid "Reported in the %s category by %s at %s" msgstr "Rapportert i kategorien %s av %s %s" @@ -2885,17 +2905,27 @@ msgstr "Rapportert i kategorien %s av %s %s" msgid "Reporting a problem" msgstr "Legger til et problem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1085 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:120 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:133 #: templates/web/zurich/header.html:59 #, fuzzy msgid "Reports" msgstr "Alle rapporter" +#: templates/web/zurich/admin/index-sdm.html:7 +#, fuzzy +msgid "Reports awaiting approval" +msgstr "Legger til et problem" + #: templates/web/default/around/tabbed_lists.html:3 msgid "Reports on and around the map" msgstr "Problemer i og rundt kartet" +#: templates/web/zurich/admin/index-sdm.html:10 +#, fuzzy +msgid "Reports published" +msgstr "Rapporter misbruk" + #: templates/web/default/admin/report_edit.html:36 msgid "Resend report" msgstr "Send rapport på nytt" @@ -2916,6 +2946,16 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Veioperatør for denne navngitte veien (fra OpenStreetMap): %s" +#: templates/web/default/admin/report_edit.html:51 +#: templates/web/zurich/admin/report_edit.html:51 +msgid "Rotate Left" +msgstr "" + +#: templates/web/default/admin/report_edit.html:52 +#: templates/web/zurich/admin/report_edit.html:52 +msgid "Rotate Right" +msgstr "" + #: templates/web/default/admin/body_edit.html:76 msgid "Save changes" msgstr "Lagre endringer" @@ -2960,7 +3000,7 @@ msgstr "" "Velg hvilken type varsel du ønsker og klikk på knappen for en RSS-kilde, " "eller skriv inn din e-postadresse for å abonnere på et e-postvarsel." -#: perllib/FixMyStreet/DB/Result/Problem.pm:634 +#: perllib/FixMyStreet/DB/Result/Problem.pm:640 msgid "Sent to %s %s later" msgstr "Sendt til %s %s senere" @@ -3042,7 +3082,6 @@ msgstr "Logg inn eller opprett en konto" #: templates/web/emptyhomes/header.html:41 #: templates/web/fiksgatami/header.html:22 #: templates/web/fiksgatami/nn/header.html:22 -#: templates/web/fixmybarangay/auth/sign_out.html:1 #: templates/web/lichfielddc/header.html:177 #: templates/web/reading/header.html:33 #: templates/web/zurich/auth/sign_out.html:1 @@ -3134,7 +3173,7 @@ msgstr "Tilstand" msgid "State:" msgstr "Tilstand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1090 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1092 #: templates/web/default/admin/stats.html:1 msgid "Stats" msgstr "Statistikk" @@ -3229,12 +3268,12 @@ msgstr "" "Eller du kan abonnere på varsel basert på bydel eller administrasjon du " "hører inn under:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1083 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:119 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1085 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:132 #: templates/web/default/admin/index.html:1 #: templates/web/zurich/admin/index-dm.html:1 #: templates/web/zurich/admin/index-sdm.html:1 -#: templates/web/zurich/header.html:56 +#: templates/web/zurich/admin/index.html:1 templates/web/zurich/header.html:56 msgid "Summary" msgstr "Oppsummering" @@ -3243,10 +3282,12 @@ msgstr "Oppsummering" #: templates/web/fiksgatami/nn/reports/index.html:1 #: templates/web/fiksgatami/reports/index.html:1 #: templates/web/fixmybarangay/reports/index.html:1 +#: templates/web/zurich/reports/index.html:0 +#: templates/web/zurich/reports/index.html:4 msgid "Summary reports" msgstr "Oppsummeringsrapporter" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 #, fuzzy msgid "Survey" msgstr "Resultater fra spørreundersøkelsen" @@ -3450,7 +3491,7 @@ msgstr "" "Detaljene om ditt problem er tilgjengelig på høyre kant av denne siden." #: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 -#: perllib/FixMyStreet/App/Controller/Reports.pm:51 +#: perllib/FixMyStreet/App/Controller/Reports.pm:67 msgid "The error was: %s" msgstr "Feilen var: %s" @@ -3561,7 +3602,7 @@ msgstr "" "Brukeren kunne ikke plassere problemet på et kart, men sjekk området rundt " "stedet de skrev inn" -#: perllib/FixMyStreet/App/Controller/Reports.pm:48 +#: perllib/FixMyStreet/App/Controller/Reports.pm:64 msgid "" "There was a problem showing the All Reports page. Please try again later." msgstr "" @@ -3726,7 +3767,7 @@ msgid "" msgstr "" "Denne nettsiden inneholder også et bilde av problemet, sendt inn av brukeren." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1086 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1088 #: templates/web/default/admin/timeline.html:1 msgid "Timeline" msgstr "Tidslinje" @@ -3860,9 +3901,9 @@ msgstr "Oppdatert!" #: perllib/FixMyStreet/App/Controller/Admin.pm:733 #: perllib/FixMyStreet/App/Controller/Admin.pm:867 #: perllib/FixMyStreet/App/Controller/Admin.pm:918 -#: perllib/FixMyStreet/App/Controller/Admin.pm:955 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:309 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:364 +#: perllib/FixMyStreet/App/Controller/Admin.pm:957 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:322 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:377 msgid "Updated!" msgstr "Oppdatert!" @@ -3887,16 +3928,16 @@ msgstr "Oppdateringer av {{title}}" msgid "Updates to this problem, FixMyStreet" msgstr "Oppdateringer til dette problemet, FiksGataMi" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1249 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1251 msgid "User flag removed" msgstr "Brukerflagg fjernet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1221 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1223 msgid "User flagged" msgstr "Bruker flagget" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1088 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:134 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1090 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:147 #: templates/web/default/admin/flagged.html:30 #: templates/web/zurich/header.html:68 msgid "Users" @@ -4213,7 +4254,6 @@ msgstr "" "annet vil bytte ut dette." #: templates/web/default/auth/sign_out.html:3 -#: templates/web/fixmybarangay/auth/sign_out.html:3 #: templates/web/zurich/auth/sign_out.html:3 msgid "You have been signed out" msgstr "Du er allerede logget ut" @@ -4271,7 +4311,7 @@ msgstr "" "Du har lykkes med å logge inn. Vennligst sjekk og bekreft at dine detaljer " "er korrekte:" -#: templates/web/default/email_sent.html:12 +#: templates/web/default/email_sent.html:13 #, fuzzy msgid "You must now click the link in the email we've just sent you." msgstr "" @@ -4409,7 +4449,7 @@ msgstr "av %s" msgid "council" msgstr "administrasjon" -#: perllib/FixMyStreet/DB/Result/Problem.pm:619 +#: perllib/FixMyStreet/DB/Result/Problem.pm:625 #, fuzzy msgid "council ref: %s" msgstr "%s ref: %s" @@ -4426,10 +4466,11 @@ msgid "e.g. ‘%s’ or ‘%s’" msgstr "for eksempel «%s» eller «%s»" #: templates/web/default/admin/index.html:15 +#: templates/web/zurich/admin/index.html:5 msgid "from %d different users" msgstr "fra %d forskjellige brukere" -#: perllib/Utils.pm:267 +#: perllib/Utils.pm:268 msgid "less than a minute" msgstr "mindre enn et minutt" @@ -4500,7 +4541,7 @@ msgstr "" msgid "this type of local problem" msgstr "denne type lokalt problem" -#: perllib/Utils.pm:241 +#: perllib/Utils.pm:240 msgid "today" msgstr "idag" @@ -4532,14 +4573,14 @@ msgid_plural "<big>%s</big> reports recently" msgstr[0] "<big>%s</big> rapportert<br>nylig" msgstr[1] "<big>%s</big> rapportert<br>nylig" -#: perllib/Utils.pm:286 +#: perllib/Utils.pm:287 #, perl-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d time" msgstr[1] "%d timer" -#: perllib/Utils.pm:288 +#: perllib/Utils.pm:289 #, perl-format msgid "%d minute" msgid_plural "%d minutes" @@ -4563,7 +4604,7 @@ msgstr[0] "" msgstr[1] "" "Vi har ennå ikke detaljer for administrasjonene som dekker dette stedet." -#: perllib/Utils.pm:282 +#: perllib/Utils.pm:283 #, perl-format msgid "%d week" msgid_plural "%d weeks" @@ -4599,7 +4640,7 @@ msgstr[1] "" "Vi har ennå <strong>ikke</strong> detaljene for de andre administrasjonene " "som dekker dette stedet." -#: perllib/Utils.pm:284 +#: perllib/Utils.pm:285 #, perl-format msgid "%d day" msgid_plural "%d days" diff --git a/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po index a3e584024..be42114c0 100644 --- a/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2013-01-24 18:27+0000\n" +"POT-Creation-Date: 2013-01-31 15:25+0000\n" "PO-Revision-Date: 2011-12-08 10:56+0100\n" "Last-Translator: Anders Einar Hilden <hildenae@gmail.com>\n" "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n" @@ -21,7 +21,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:579 #: perllib/FixMyStreet/DB/ResultSet/Problem.pm:339 msgid " and " msgstr " og " @@ -52,6 +52,7 @@ msgid "%d confirmed alerts, %d unconfirmed" msgstr "%d stadfesta varsel, %d ikkje stadfesta" #: templates/web/default/admin/index.html:19 +#: templates/web/zurich/admin/index.html:6 msgid "%d council contacts – %d confirmed, %d unconfirmed" msgstr "%d administrasjonskontaktar – %d stadfesta, %d ikkje stadfesta" @@ -78,7 +79,7 @@ msgstr "" msgid "%s - Summary reports" msgstr "%s – oppsummeringsrapportar" -#: perllib/FixMyStreet/DB/Result/Problem.pm:621 +#: perllib/FixMyStreet/DB/Result/Problem.pm:627 msgid "%s ref: %s" msgstr "" @@ -86,11 +87,11 @@ msgstr "" msgid "%s ward, %s" msgstr "%s bydel, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:506 +#: perllib/FixMyStreet/DB/Result/Problem.pm:512 msgid "%s, reported anonymously at %s" msgstr "%s, rapportert anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:508 +#: perllib/FixMyStreet/DB/Result/Problem.pm:514 msgid "%s, reported by %s at %s" msgstr "%s, rapportert av %s %s" @@ -98,21 +99,21 @@ msgstr "%s, rapportert av %s %s" msgid "%s, within %s ward" msgstr "%s, innanfor bydelen %s" -#: templates/web/default/email_sent.html:28 +#: templates/web/default/email_sent.html:29 #, fuzzy msgid "" "(Don't worry — we'll hang on to your alert while you're checking your " "email.)" msgstr "vi tek vare på varselet ditt medan du sjekkar e-posten din." -#: templates/web/default/email_sent.html:24 +#: templates/web/default/email_sent.html:25 #, fuzzy msgid "" "(Don't worry — we'll hang on to your problem report while you're " "checking your email.)" msgstr "vi tek vare på rapporten din medan du sjekkar e-posten din." -#: templates/web/default/email_sent.html:26 +#: templates/web/default/email_sent.html:27 #, fuzzy msgid "" "(Don't worry — we'll hang on to your update while you're checking your " @@ -136,16 +137,16 @@ msgstr "(alternativt kan RSS-straumen tilpassast, innanfor" #: templates/web/default/around/around_map_list_items.html:12 #: templates/web/default/around/on_map_list_items.html:9 -#: templates/web/fixmystreet/report/_item.html:23 -#: templates/web/zurich/report/_item.html:27 +#: templates/web/fixmystreet/report/_item.html:20 +#: templates/web/zurich/report/_item.html:19 #, fuzzy msgid "(closed)" msgstr "Lukka" #: templates/web/default/around/around_map_list_items.html:10 #: templates/web/default/around/on_map_list_items.html:7 -#: templates/web/fixmystreet/report/_item.html:21 -#: templates/web/zurich/report/_item.html:25 +#: templates/web/fixmystreet/report/_item.html:18 +#: templates/web/zurich/report/_item.html:17 msgid "(fixed)" msgstr "(løyst)" @@ -155,8 +156,7 @@ msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(som tagging, søppel, hol i vegen, eller øydelagte gatelys)" #: templates/web/default/reports/_list-entry.html:4 -#: templates/web/fixmystreet/report/_item.html:17 -#: templates/web/zurich/report/_item.html:21 +#: templates/web/fixmystreet/report/_item.html:14 msgid "(not sent to council)" msgstr "(ikkje rapportert til administrasjonen)" @@ -166,8 +166,7 @@ msgid "(optional)" msgstr "(valfritt)" #: templates/web/default/reports/_list-entry.html:2 -#: templates/web/fixmystreet/report/_item.html:16 -#: templates/web/zurich/report/_item.html:20 +#: templates/web/fixmystreet/report/_item.html:13 msgid "(sent to both)" msgstr "(sendt til begge)" @@ -314,6 +313,7 @@ msgstr "" "dette steget</a>.</small>" #: templates/web/default/admin/index.html:14 +#: templates/web/zurich/admin/index.html:4 msgid "<strong>%d</strong> live problems" msgstr "<strong>%d</strong> aktive problem" @@ -402,6 +402,7 @@ msgstr "Send meg varsel ved framtidige oppdateringar" #: templates/web/default/reports/index.html:3 #: templates/web/fixmybarangay/reports/index.html:3 +#: templates/web/zurich/reports/index.html:12 #, fuzzy msgid "All Reports" msgstr "Alle rapportar" @@ -563,8 +564,8 @@ msgid "" "whom the report is sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1084 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:127 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1086 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:140 #: templates/web/default/admin/bodies.html:1 #: templates/web/zurich/header.html:63 msgid "Bodies" @@ -668,7 +669,7 @@ msgid "Closed" msgstr "Lukka" # skal det vera forskjellig tyding frå engelsken her? --KBU -#: perllib/FixMyStreet/DB/Result/Problem.pm:714 +#: perllib/FixMyStreet/DB/Result/Problem.pm:720 msgid "Closed by council" msgstr "(ikkje rapportert til administrasjonen)" @@ -789,8 +790,8 @@ msgstr "Kontakt oss" msgid "Contact the team" msgstr "Kontakt prosjektgruppa" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1217 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1245 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1219 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1247 msgid "Could not find user" msgstr "Kunne ikkje finna brukaren" @@ -953,11 +954,11 @@ msgstr "Oppdatert av" msgid "Email" msgstr "E-post" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1193 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1195 msgid "Email added to abuse list" msgstr "E-post lagd til misbrukliste" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1190 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 msgid "Email already in abuse list" msgstr "E-post allereie i misbruklista" @@ -1023,7 +1024,7 @@ msgstr "Sluttmånad:" msgid "Endpoint" msgstr "Sett opp Open311" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:12 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:25 #, fuzzy msgid "Enter a Zürich street name" msgstr "Skriv inn postnummer i nærleiken, eller vegnamn og stad" @@ -1204,7 +1205,7 @@ msgstr "Løyst:" msgid "Flag user" msgstr "Flagg brukar" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 #: templates/web/default/admin/users.html:16 msgid "Flagged" msgstr "Flagga:" @@ -1286,6 +1287,7 @@ msgid "Going to send questionnaire?" msgstr "Skal spørjeskjemaet sendast?" #: templates/web/default/admin/index.html:24 +#: templates/web/zurich/admin/index.html:11 msgid "Graph of problem creation by status over time" msgstr "Graf over problemoppretting fordelt på status over tid" @@ -1405,17 +1407,17 @@ msgstr "" msgid "ID" msgstr "ID" -#: templates/web/default/email_sent.html:18 +#: templates/web/default/email_sent.html:19 #, fuzzy msgid "If you do not, your alert will not be activated." msgstr "varselet ditt vil ikkje aktiverast" -#: templates/web/default/email_sent.html:14 +#: templates/web/default/email_sent.html:15 #, fuzzy msgid "If you do not, your problem will not be posted." msgstr "vil problemet ditt ikkje publiserast" -#: templates/web/default/email_sent.html:16 +#: templates/web/default/email_sent.html:17 #, fuzzy msgid "If you do not, your update will not be posted." msgstr "oppdateringa di vil ikkje publiserast" @@ -1502,6 +1504,11 @@ msgstr "" msgid "In progress" msgstr "Under arbeid" +#: templates/web/zurich/admin/report_edit.html:116 +#, fuzzy +msgid "Include reporter personal details" +msgstr "Ver venleg og legg inn opplysningar om problemet" + #: templates/web/default/admin/stats.html:76 msgid "Include unconfirmed reports" msgstr "Inkluder ikkje-stadfesta problem" @@ -1519,7 +1526,7 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "Ugyldig agency_responsible-verdi %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1004 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1006 msgid "Invalid end date" msgstr "Ugyldig slutt-dato" @@ -1527,7 +1534,7 @@ msgstr "Ugyldig slutt-dato" msgid "Invalid format %s specified." msgstr "Ugyldig format %s oppgjeve." -#: perllib/FixMyStreet/App/Controller/Admin.pm:994 +#: perllib/FixMyStreet/App/Controller/Admin.pm:996 msgid "Invalid start date" msgstr "Ugyldig startdato" @@ -1797,6 +1804,11 @@ msgstr "Nye problem i {{COUNCIL}} på FiksGataMi" msgid "New problems within {{NAME}}'s boundary on FixMyStreet" msgstr "Nye rapportar innanfor grensa til {{NAME}} på FiksGataMi" +#: templates/web/zurich/admin/index-sdm.html:4 +#, fuzzy +msgid "New reports" +msgstr "Opne rapportar" + #: db/alert_types_eha.pl:23 msgid "" "New reports for {{COUNCIL}} within {{WARD}} ward on reportemptyhomes.com" @@ -2063,10 +2075,10 @@ msgstr "" #: perllib/FixMyStreet/App/Controller/Report/New.pm:1023 #: perllib/FixMyStreet/App/Controller/Report/New.pm:663 #: perllib/FixMyStreet/App/Controller/Report/New.pm:664 -#: perllib/FixMyStreet/DB/Result/Problem.pm:515 -#: perllib/FixMyStreet/DB/Result/Problem.pm:525 -#: perllib/FixMyStreet/DB/Result/Problem.pm:535 -#: perllib/FixMyStreet/DB/Result/Problem.pm:547 +#: perllib/FixMyStreet/DB/Result/Problem.pm:521 +#: perllib/FixMyStreet/DB/Result/Problem.pm:531 +#: perllib/FixMyStreet/DB/Result/Problem.pm:541 +#: perllib/FixMyStreet/DB/Result/Problem.pm:553 #: perllib/FixMyStreet/DB/ResultSet/Problem.pm:331 #: perllib/FixMyStreet/DB/ResultSet/Problem.pm:340 msgid "Other" @@ -2324,6 +2336,13 @@ msgstr "Ver venleg og legg inn namnet ditt" msgid "Please enter your title" msgstr "Ver venleg og legg inn e-posten din" +#: templates/web/default/auth/sign_out.html:5 +#: templates/web/zurich/auth/sign_out.html:5 +msgid "" +"Please feel free to <a href=\"%s\">sign in again</a>, or go back to the <a " +"href=\"/\">front page</a>." +msgstr "" + #: templates/web/emptyhomes/report/new/fill_in_details_text.html:1 msgid "" "Please fill in details of the empty property below, saying what type of\n" @@ -2544,6 +2563,7 @@ msgid "Problem %s sent to council %s" msgstr "Problem %s sendt til administrasjon %s" #: templates/web/default/admin/index.html:28 +#: templates/web/zurich/admin/index.html:15 msgid "Problem breakdown by state" msgstr "Tilstandsfordeling av problem" @@ -2840,7 +2860,7 @@ msgstr "Rapporter eit problem" msgid "Report empty properties" msgstr "Rapporter tomme heimar" -#: perllib/FixMyStreet/App/Controller/Rss.pm:286 +#: perllib/FixMyStreet/App/Controller/Rss.pm:295 msgid "Report on %s" msgstr "Rapport på %s" @@ -2859,7 +2879,7 @@ msgstr "Rapportert %s" msgid "Reported %s, to %s" msgstr "Rapportert %s, til %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:530 +#: perllib/FixMyStreet/DB/Result/Problem.pm:536 #: templates/web/default/contact/index.html:45 #: templates/web/fixmystreet/contact/index.html:46 msgid "Reported anonymously at %s" @@ -2871,25 +2891,25 @@ msgstr "Rapportert anonymt %s" msgid "Reported before" msgstr "Rapportert tidlegare" -#: perllib/FixMyStreet/DB/Result/Problem.pm:522 +#: perllib/FixMyStreet/DB/Result/Problem.pm:528 msgid "Reported by %s anonymously at %s" msgstr "Publisert av %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:553 +#: perllib/FixMyStreet/DB/Result/Problem.pm:559 #: templates/web/default/contact/index.html:47 #: templates/web/fixmystreet/contact/index.html:48 msgid "Reported by %s at %s" msgstr "Publisert av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:544 +#: perllib/FixMyStreet/DB/Result/Problem.pm:550 msgid "Reported by %s by %s at %s" msgstr "Rapportert av %s av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:518 +#: perllib/FixMyStreet/DB/Result/Problem.pm:524 msgid "Reported by %s in the %s category anonymously at %s" msgstr "Rapportert av %s i kategorien %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:538 +#: perllib/FixMyStreet/DB/Result/Problem.pm:544 msgid "Reported by %s in the %s category by %s at %s" msgstr "Rapportert av %s i kategorien %s av %s %s" @@ -2898,11 +2918,11 @@ msgstr "Rapportert av %s i kategorien %s av %s %s" msgid "Reported in the %s category" msgstr "Rapportert i kategorien %s av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:526 +#: perllib/FixMyStreet/DB/Result/Problem.pm:532 msgid "Reported in the %s category anonymously at %s" msgstr "Rapportert i kategorien %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:548 +#: perllib/FixMyStreet/DB/Result/Problem.pm:554 msgid "Reported in the %s category by %s at %s" msgstr "Rapportert i kategorien %s av %s %s" @@ -2919,17 +2939,27 @@ msgstr "Rapportert i kategorien %s av %s %s" msgid "Reporting a problem" msgstr "Legger til eit problem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1085 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:120 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:133 #: templates/web/zurich/header.html:59 #, fuzzy msgid "Reports" msgstr "Alle rapportar" +#: templates/web/zurich/admin/index-sdm.html:7 +#, fuzzy +msgid "Reports awaiting approval" +msgstr "Legger til eit problem" + #: templates/web/default/around/tabbed_lists.html:3 msgid "Reports on and around the map" msgstr "Problem i og rundt kartet" +#: templates/web/zurich/admin/index-sdm.html:10 +#, fuzzy +msgid "Reports published" +msgstr "Rapporter eit problem" + #: templates/web/default/admin/report_edit.html:36 msgid "Resend report" msgstr "Send rapport på nytt" @@ -2950,6 +2980,16 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Vegoperatør for denne namngjevne vegen (frå OpenStreetMap): %s" +#: templates/web/default/admin/report_edit.html:51 +#: templates/web/zurich/admin/report_edit.html:51 +msgid "Rotate Left" +msgstr "" + +#: templates/web/default/admin/report_edit.html:52 +#: templates/web/zurich/admin/report_edit.html:52 +msgid "Rotate Right" +msgstr "" + #: templates/web/default/admin/body_edit.html:76 msgid "Save changes" msgstr "Lagra endringar" @@ -2994,7 +3034,7 @@ msgstr "" "Vel kva for ein type varsel du ynskjer og klikk på knappen for ei RSS-" "kjelde, eller skriv inn e-postadressa di for å abonnera på eit e-postvarsel." -#: perllib/FixMyStreet/DB/Result/Problem.pm:634 +#: perllib/FixMyStreet/DB/Result/Problem.pm:640 msgid "Sent to %s %s later" msgstr "Sendt til %s %s seinare" @@ -3076,7 +3116,6 @@ msgstr "Logg inn eller opprett ein konto" #: templates/web/emptyhomes/header.html:41 #: templates/web/fiksgatami/header.html:22 #: templates/web/fiksgatami/nn/header.html:22 -#: templates/web/fixmybarangay/auth/sign_out.html:1 #: templates/web/lichfielddc/header.html:177 #: templates/web/reading/header.html:33 #: templates/web/zurich/auth/sign_out.html:1 @@ -3169,7 +3208,7 @@ msgstr "Tilstand" msgid "State:" msgstr "Tilstand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1090 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1092 #: templates/web/default/admin/stats.html:1 msgid "Stats" msgstr "Statistikk" @@ -3266,12 +3305,12 @@ msgstr "" "Eller du kan abonnera på varsel basert på bydel eller administrasjon du " "høyrer til under:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1083 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:119 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1085 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:132 #: templates/web/default/admin/index.html:1 #: templates/web/zurich/admin/index-dm.html:1 #: templates/web/zurich/admin/index-sdm.html:1 -#: templates/web/zurich/header.html:56 +#: templates/web/zurich/admin/index.html:1 templates/web/zurich/header.html:56 msgid "Summary" msgstr "Oppsummering" @@ -3280,10 +3319,12 @@ msgstr "Oppsummering" #: templates/web/fiksgatami/nn/reports/index.html:1 #: templates/web/fiksgatami/reports/index.html:1 #: templates/web/fixmybarangay/reports/index.html:1 +#: templates/web/zurich/reports/index.html:0 +#: templates/web/zurich/reports/index.html:4 msgid "Summary reports" msgstr "Oppsummeringsrapportar" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 #, fuzzy msgid "Survey" msgstr "Resultat frå spørjeundersøkinga" @@ -3492,7 +3533,7 @@ msgstr "" "Detaljane om problemet ditt er tilgjengelege på høgre kant av denne sida." #: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 -#: perllib/FixMyStreet/App/Controller/Reports.pm:51 +#: perllib/FixMyStreet/App/Controller/Reports.pm:67 msgid "The error was: %s" msgstr "Feilen var: %s" @@ -3604,7 +3645,7 @@ msgstr "" "Brukaren kunne ikkje plassera problemet på eit kart, men sjekk områdde rundt " "staden dei skreiv inn" -#: perllib/FixMyStreet/App/Controller/Reports.pm:48 +#: perllib/FixMyStreet/App/Controller/Reports.pm:64 msgid "" "There was a problem showing the All Reports page. Please try again later." msgstr "" @@ -3774,7 +3815,7 @@ msgid "" msgstr "" "Denne nettsida inneheld òg eit bilete av problemet, sendt inn av brukaren." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1086 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1088 #: templates/web/default/admin/timeline.html:1 msgid "Timeline" msgstr "Tidslinje" @@ -3914,9 +3955,9 @@ msgstr "Oppdatert!" #: perllib/FixMyStreet/App/Controller/Admin.pm:733 #: perllib/FixMyStreet/App/Controller/Admin.pm:867 #: perllib/FixMyStreet/App/Controller/Admin.pm:918 -#: perllib/FixMyStreet/App/Controller/Admin.pm:955 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:309 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:364 +#: perllib/FixMyStreet/App/Controller/Admin.pm:957 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:322 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:377 msgid "Updated!" msgstr "Oppdatert!" @@ -3941,16 +3982,16 @@ msgstr "Oppdateringar av {{title}}" msgid "Updates to this problem, FixMyStreet" msgstr "Oppdateringar til dette problemet, FiksGataMi" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1249 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1251 msgid "User flag removed" msgstr "Brukarflagg fjerna" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1221 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1223 msgid "User flagged" msgstr "Brukar flagga" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1088 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:134 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1090 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:147 #: templates/web/default/admin/flagged.html:30 #: templates/web/zurich/header.html:68 msgid "Users" @@ -4272,7 +4313,6 @@ msgstr "" "anna vil byta ut dette." #: templates/web/default/auth/sign_out.html:3 -#: templates/web/fixmybarangay/auth/sign_out.html:3 #: templates/web/zurich/auth/sign_out.html:3 msgid "You have been signed out" msgstr "Du er allereie logga ut" @@ -4330,7 +4370,7 @@ msgstr "" "Du har no logga inn. Ver venleg og sjekk og stadfest at detaljane dine er " "korrekte:" -#: templates/web/default/email_sent.html:12 +#: templates/web/default/email_sent.html:13 #, fuzzy msgid "You must now click the link in the email we've just sent you." msgstr "" @@ -4476,7 +4516,7 @@ msgstr "av %s" msgid "council" msgstr "administrasjon" -#: perllib/FixMyStreet/DB/Result/Problem.pm:619 +#: perllib/FixMyStreet/DB/Result/Problem.pm:625 msgid "council ref: %s" msgstr "" @@ -4492,10 +4532,11 @@ msgid "e.g. ‘%s’ or ‘%s’" msgstr "" #: templates/web/default/admin/index.html:15 +#: templates/web/zurich/admin/index.html:5 msgid "from %d different users" msgstr "frå %d ulike brukarar" -#: perllib/Utils.pm:267 +#: perllib/Utils.pm:268 msgid "less than a minute" msgstr "mindre enn eitt minutt" @@ -4567,7 +4608,7 @@ msgstr "" msgid "this type of local problem" msgstr "denne typen lokalt problem" -#: perllib/Utils.pm:241 +#: perllib/Utils.pm:240 msgid "today" msgstr "i dag" @@ -4599,14 +4640,14 @@ msgid_plural "<big>%s</big> reports recently" msgstr[0] "<big>%s</big> rapport nyleg" msgstr[1] "<big>%s</big> rapportar nyleg" -#: perllib/Utils.pm:286 +#: perllib/Utils.pm:287 #, perl-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d time" msgstr[1] "%d timar" -#: perllib/Utils.pm:288 +#: perllib/Utils.pm:289 #, perl-format msgid "%d minute" msgid_plural "%d minutes" @@ -4630,7 +4671,7 @@ msgstr[0] "" msgstr[1] "" "Vi har enno ikkje detaljar for administrasjonane som dekkjer denne staden." -#: perllib/Utils.pm:282 +#: perllib/Utils.pm:283 #, perl-format msgid "%d week" msgid_plural "%d weeks" @@ -4666,7 +4707,7 @@ msgstr[1] "" "Vi har enno <strong>ikkje</strong> detaljane for dei andre administrasjonane " "som dekkjer denne staden." -#: perllib/Utils.pm:284 +#: perllib/Utils.pm:285 #, perl-format msgid "%d day" msgid_plural "%d days" diff --git a/templates/web/default/admin/report_edit.html b/templates/web/default/admin/report_edit.html index 6fc0e797b..eaa1e404c 100644 --- a/templates/web/default/admin/report_edit.html +++ b/templates/web/default/admin/report_edit.html @@ -48,8 +48,8 @@ <li><img alt="" height="[% photo.height %]" width="[% photo.width %]" src="[% c.cobrand.base_url %][% photo.url %]"> <br> [% IF rotated %]Photo may be cached for a while.<br>[% END %] -<input type="submit" name="rotate_photo" value="Rotate Left" /> -<input type="submit" name="rotate_photo" value="Rotate Right" /> +<input type="submit" name="rotate_photo" value="[% loc('Rotate Left') %]"> +<input type="submit" name="rotate_photo" value="[% loc('Rotate Right') %]"> <br> <input type="checkbox" id="remove_photo" name="remove_photo" value="1"> <label class="inline" for="remove_photo">[% loc("Remove photo (can't be undone!)") %]</label></li> diff --git a/templates/web/default/auth/sign_out.html b/templates/web/default/auth/sign_out.html index 23d39aa2d..571e13f9f 100644 --- a/templates/web/default/auth/sign_out.html +++ b/templates/web/default/auth/sign_out.html @@ -2,7 +2,6 @@ <h1>[% loc('You have been signed out') %]</h1> -<p>Please feel free to <a href="[% c.uri_for('/auth') %]">sign in again</a>, or -go back to the <a href="/">FixMyStreet front page</a>.</p> +<p>[% tprintf( loc('Please feel free to <a href="%s">sign in again</a>, or go back to the <a href="/">front page</a>.'), c.uri_for('/auth') ) %]</p> [% INCLUDE 'footer.html' %] diff --git a/templates/web/fixmybarangay/auth/sign_out.html b/templates/web/fixmybarangay/auth/sign_out.html deleted file mode 100644 index 11888089a..000000000 --- a/templates/web/fixmybarangay/auth/sign_out.html +++ /dev/null @@ -1,8 +0,0 @@ -[% INCLUDE 'header.html', title = loc('Sign out'), bodyclass = 'fullwidthpage' %] - -<h1>[% loc('You have been signed out') %]</h1> - -<p>Please feel free to <a href="[% c.uri_for('/auth') %]">sign in again</a>, or -go back to the <a href="/">FixMyBarangay front page</a>.</p> - -[% INCLUDE 'footer.html' %] diff --git a/templates/web/fixmystreet/report/_item.html b/templates/web/fixmystreet/report/_item.html index d8ab9ccb5..508b02614 100644 --- a/templates/web/fixmystreet/report/_item.html +++ b/templates/web/fixmystreet/report/_item.html @@ -6,7 +6,8 @@ <h4>[% problem.title | html %]</h4> <small>[% prettify_dt( problem.confirmed_local, 1 ) %] [%- IF dist %], [% dist %]km[% END %] - [%- IF include_lastupdate AND problem.confirmed != problem.lastupdate AND problem.whensent != problem.lastupdate %], last updated [% prettify_dt( problem.lastupdate_local, 1 ) %] + [%- IF include_lastupdate AND problem.confirmed != problem.lastupdate AND problem.whensent != problem.lastupdate %], + [% tprintf('last updated %s', prettify_dt( problem.lastupdate_local, 1 ) ) %] [%- END %] [% IF include_lastupdate %] [% IF problem.bodies_str_ids.size > 1 %] [% loc('(sent to both)') %] diff --git a/templates/web/zurich/admin/index-sdm.html b/templates/web/zurich/admin/index-sdm.html index cc6dc33a6..4e4009c16 100644 --- a/templates/web/zurich/admin/index-sdm.html +++ b/templates/web/zurich/admin/index-sdm.html @@ -1,13 +1,13 @@ [% PROCESS 'admin/header.html' title=loc('Summary') -%] [% PROCESS 'admin/report_blocks.html' %] -<h2>New reports</h2> +<h2>[% loc('New reports') %]</h2> [% INCLUDE list, problems = reports_new.all %] -<h2>Reports awaiting approval</h2> +<h2>[% loc('Reports awaiting approval') %]</h2> [% INCLUDE list, problems = reports_unpublished.all, no_edit = 1 %] -<h2>Reports published</h2> +<h2>[% loc('Reports published') %]</h2> [% INCLUDE list, problems = reports_published.all, no_edit = 1 %] [% INCLUDE 'admin/footer.html' %] diff --git a/templates/web/zurich/admin/report_edit.html b/templates/web/zurich/admin/report_edit.html index 122045550..aabd9d7c9 100644 --- a/templates/web/zurich/admin/report_edit.html +++ b/templates/web/zurich/admin/report_edit.html @@ -48,8 +48,8 @@ <li><img alt="" src="[% c.cobrand.base_url %][% photo.url %]"> <br> [% IF rotated %]Photo may be cached for a while.<br>[% END %] -<input type="submit" name="rotate_photo" value="Rotate Left" /> -<input type="submit" name="rotate_photo" value="Rotate Right" /> +<input type="submit" name="rotate_photo" value="[% loc('Rotate Left') %]"> +<input type="submit" name="rotate_photo" value="[% loc('Rotate Right') %]"> <br> <input type="checkbox" id="publish_photo" name="publish_photo" value="1"[% ' checked' IF problem.extra.publish_photo %]> <label class="inline" for="publish_photo">[% loc("Publish photo") %]</label></li> @@ -113,7 +113,7 @@ </select> <br> <input type="checkbox" name="third_personal" id="third_personal" value="1"[% ' checked' IF problem.extra.third_personal %]> - <label for="third_personal" class="inline">Include reporter personal details</label> + <label for="third_personal" class="inline">[% loc('Include reporter personal details') %]</label> </ul> diff --git a/templates/web/zurich/auth/sign_out.html b/templates/web/zurich/auth/sign_out.html index fa2f6fd69..644118f63 100644 --- a/templates/web/zurich/auth/sign_out.html +++ b/templates/web/zurich/auth/sign_out.html @@ -2,7 +2,6 @@ <h1>[% loc('You have been signed out') %]</h1> -<p>Please feel free to <a href="[% c.uri_for('/admin') %]">sign in again</a>, or -go back to the <a href="/">front page</a>.</p> +<p>[% tprintf( loc('Please feel free to <a href="%s">sign in again</a>, or go back to the <a href="/">front page</a>.'), c.uri_for('/admin') ) %]</p> [% INCLUDE 'footer.html' %] diff --git a/templates/web/zurich/report/_item.html b/templates/web/zurich/report/_item.html index cf70bdcbb..41164cdd1 100644 --- a/templates/web/zurich/report/_item.html +++ b/templates/web/zurich/report/_item.html @@ -10,7 +10,8 @@ [% END %] <small>[% prettify_dt( problem.created_local, 'zurich' ) %] [%- IF dist %], [% dist %]km[% END %] - [%- IF include_lastupdate AND problem.created != problem.lastupdate AND problem.whensent != problem.lastupdate %], last updated [% prettify_dt( problem.lastupdate_local, 'zurich' ) %] + [%- IF include_lastupdate AND problem.created != problem.lastupdate AND problem.whensent != problem.lastupdate %], + [% tprintf('last updated %s', prettify_dt( problem.lastupdate_local, 'zurich' ) ) %] [%- END %] [% IF NOT no_fixed AND problem.is_fixed %] [% loc('(fixed)') %] |