diff options
| -rw-r--r-- | locale/FixMyStreet.po | 120 | ||||
| -rw-r--r-- | locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po | 201 | ||||
| -rw-r--r-- | locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po | 202 | ||||
| -rw-r--r-- | locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po | 202 | ||||
| -rw-r--r-- | locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po | 202 | ||||
| -rw-r--r-- | templates/web/default/admin/report_edit.html | 6 | ||||
| -rw-r--r-- | templates/web/zurich/admin/report_edit-sdm.html | 6 | ||||
| -rw-r--r-- | templates/web/zurich/admin/report_edit.html | 8 |
8 files changed, 449 insertions, 498 deletions
diff --git a/locale/FixMyStreet.po b/locale/FixMyStreet.po index 349b09f2a..ca355e607 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-31 15:25+0000\n" +"POT-Creation-Date: 2013-01-31 15:59+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" @@ -325,7 +325,7 @@ msgstr "" msgid "Anonymous" msgstr "" -#: templates/web/default/admin/report_edit.html:27 templates/web/default/admin/update_edit.html:17 +#: templates/web/default/admin/report_edit.html:31 templates/web/default/admin/update_edit.html:17 msgid "Anonymous:" msgstr "" @@ -345,15 +345,15 @@ msgstr "" msgid "Area covered" msgstr "" -#: templates/web/zurich/admin/report_edit.html:97 +#: templates/web/zurich/admin/report_edit.html:99 msgid "Assign to different category:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:106 +#: templates/web/zurich/admin/report_edit.html:108 msgid "Assign to external body:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:138 templates/web/zurich/admin/report_edit.html:85 +#: templates/web/zurich/admin/report_edit.html:140 templates/web/zurich/admin/report_edit.html:87 msgid "Assign to subdivision:" msgstr "" @@ -417,7 +417,7 @@ msgstr "" msgid "Category fix rate for problems > 4 weeks old" msgstr "" -#: templates/web/default/admin/body.html:75 templates/web/default/admin/body_edit.html:23 templates/web/default/admin/report_edit.html:26 templates/web/default/report/new/fill_in_details_form.html:67 templates/web/zurich/admin/body.html:36 templates/web/zurich/admin/report_edit-sdm.html:21 templates/web/zurich/admin/report_edit.html:96 +#: templates/web/default/admin/body.html:75 templates/web/default/admin/body_edit.html:23 templates/web/default/admin/report_edit.html:30 templates/web/default/report/new/fill_in_details_form.html:67 templates/web/zurich/admin/body.html:36 templates/web/zurich/admin/report_edit-sdm.html:23 templates/web/zurich/admin/report_edit.html:98 msgid "Category:" msgstr "" @@ -433,7 +433,7 @@ msgstr "" msgid "Click map to report a problem" msgstr "" -#: templates/web/bromley/report/display.html:80 templates/web/bromley/report/display.html:82 templates/web/default/admin/report_edit.html:19 templates/web/default/admin/report_edit.html:21 templates/web/default/dashboard/index.html:138 templates/web/default/dashboard/index.html:140 templates/web/default/report/update-form.html:30 templates/web/default/report/update-form.html:32 templates/web/fixmystreet/report/banner.html:15 templates/web/fixmystreet/report/update-form.html:28 templates/web/fixmystreet/report/update-form.html:30 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:10 templates/web/zurich/admin/header.html:12 templates/web/zurich/admin/report_edit.html:73 templates/web/zurich/admin/report_edit.html:75 templates/web/zurich/report/banner.html:13 +#: templates/web/bromley/report/display.html:80 templates/web/bromley/report/display.html:82 templates/web/default/admin/report_edit.html:25 templates/web/default/dashboard/index.html:138 templates/web/default/dashboard/index.html:140 templates/web/default/report/update-form.html:30 templates/web/default/report/update-form.html:32 templates/web/fixmystreet/report/banner.html:15 templates/web/fixmystreet/report/update-form.html:28 templates/web/fixmystreet/report/update-form.html:30 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:10 templates/web/zurich/admin/header.html:12 templates/web/zurich/admin/report_edit.html:75 templates/web/zurich/admin/report_edit.html:77 templates/web/zurich/report/banner.html:13 msgid "Closed" msgstr "" @@ -453,7 +453,7 @@ msgstr "" msgid "Closest nearby problems <small>(within %skm)</small>" msgstr "" -#: templates/web/default/admin/report_edit.html:16 templates/web/zurich/admin/report_edit-sdm.html:19 templates/web/zurich/admin/report_edit.html:37 +#: templates/web/default/admin/report_edit.html:17 templates/web/zurich/admin/report_edit-sdm.html:19 templates/web/zurich/admin/report_edit.html:37 msgid "Co-ordinates:" msgstr "" @@ -461,11 +461,11 @@ msgstr "" msgid "Cobrand" msgstr "" -#: templates/web/default/admin/report_edit.html:40 templates/web/default/admin/update_edit.html:44 +#: templates/web/default/admin/report_edit.html:44 templates/web/default/admin/update_edit.html:44 msgid "Cobrand data:" msgstr "" -#: templates/web/default/admin/report_edit.html:39 templates/web/default/admin/update_edit.html:43 +#: templates/web/default/admin/report_edit.html:43 templates/web/default/admin/update_edit.html:43 msgid "Cobrand:" msgstr "" @@ -493,7 +493,7 @@ msgstr "" msgid "Confirmation" msgstr "" -#: templates/web/default/admin/body.html:37 templates/web/default/admin/body.html:85 templates/web/default/admin/body_edit.html:32 templates/web/default/admin/body_edit.html:84 templates/web/zurich/admin/report_edit-sdm.html:24 templates/web/zurich/admin/report_edit.html:41 +#: templates/web/default/admin/body.html:37 templates/web/default/admin/body.html:85 templates/web/default/admin/body_edit.html:32 templates/web/default/admin/body_edit.html:84 templates/web/zurich/admin/report_edit-sdm.html:26 templates/web/zurich/admin/report_edit.html:43 msgid "Confirmed" msgstr "" @@ -501,7 +501,7 @@ msgstr "" msgid "Confirmed reports between %s and %s" msgstr "" -#: templates/web/default/admin/problem_row.html:25 templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/problem_row.html:25 templates/web/default/admin/report_edit.html:39 msgid "Confirmed:" msgstr "" @@ -557,7 +557,7 @@ msgstr "" msgid "Created" msgstr "" -#: templates/web/default/admin/report_edit.html:34 templates/web/default/admin/update_edit.html:45 templates/web/zurich/admin/report_edit-sdm.html:26 templates/web/zurich/admin/report_edit.html:44 templates/web/zurich/admin/update_edit.html:29 +#: templates/web/default/admin/report_edit.html:38 templates/web/default/admin/update_edit.html:45 templates/web/zurich/admin/report_edit-sdm.html:28 templates/web/zurich/admin/report_edit.html:46 templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "" @@ -613,7 +613,7 @@ msgstr "" msgid "Edit body details" msgstr "" -#: templates/web/default/admin/report_edit.html:1 templates/web/zurich/admin/report_edit-sdm.html:1 templates/web/zurich/admin/report_edit.html:1 templates/web/zurich/admin/report_edit.html:4 +#: templates/web/default/admin/report_edit.html:1 templates/web/zurich/admin/report_edit-sdm.html:1 templates/web/zurich/admin/report_edit.html:4 msgid "Editing problem %d" msgstr "" @@ -649,7 +649,7 @@ msgstr "" msgid "Email me updates" msgstr "" -#: templates/web/default/admin/body.html:80 templates/web/default/admin/body_edit.html:26 templates/web/default/admin/report_edit.html:32 templates/web/default/admin/update_edit.html:27 templates/web/default/admin/user-form.html:6 templates/web/default/alert/updates.html:13 templates/web/default/report/display.html:34 templates/web/zurich/admin/body.html:41 templates/web/zurich/admin/report_edit-sdm.html:23 templates/web/zurich/admin/report_edit.html:40 +#: templates/web/default/admin/body.html:80 templates/web/default/admin/body_edit.html:26 templates/web/default/admin/report_edit.html:36 templates/web/default/admin/update_edit.html:27 templates/web/default/admin/user-form.html:6 templates/web/default/alert/updates.html:13 templates/web/default/report/display.html:34 templates/web/zurich/admin/body.html:41 templates/web/zurich/admin/report_edit-sdm.html:25 templates/web/zurich/admin/report_edit.html:42 msgid "Email:" msgstr "" @@ -737,7 +737,7 @@ msgstr "" msgid "Examples:" msgstr "" -#: templates/web/default/admin/report_edit.html:41 +#: templates/web/default/admin/report_edit.html:45 msgid "Extra data:" msgstr "" @@ -786,15 +786,15 @@ msgid "" "for the county council." msgstr "" -#: templates/web/bromley/report/display.html:80 templates/web/bromley/report/display.html:82 templates/web/default/admin/index.html:36 templates/web/default/admin/report_edit.html:19 templates/web/default/admin/report_edit.html:21 templates/web/default/dashboard/index.html:138 templates/web/default/dashboard/index.html:140 templates/web/default/report/update-form.html:30 templates/web/default/report/update-form.html:32 templates/web/fixmystreet/report/banner.html:12 templates/web/fixmystreet/report/update-form.html:28 templates/web/fixmystreet/report/update-form.html:30 +#: templates/web/bromley/report/display.html:80 templates/web/bromley/report/display.html:82 templates/web/default/admin/index.html:36 templates/web/default/admin/report_edit.html:25 templates/web/default/dashboard/index.html:138 templates/web/default/dashboard/index.html:140 templates/web/default/report/update-form.html:30 templates/web/default/report/update-form.html:32 templates/web/fixmystreet/report/banner.html:12 templates/web/fixmystreet/report/update-form.html:28 templates/web/fixmystreet/report/update-form.html:30 msgid "Fixed" msgstr "" -#: templates/web/default/admin/report_edit.html:19 templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/report_edit.html:26 msgid "Fixed - Council" msgstr "" -#: templates/web/default/admin/report_edit.html:19 templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/report_edit.html:26 msgid "Fixed - User" msgstr "" @@ -814,7 +814,7 @@ msgstr "" msgid "Flagged" msgstr "" -#: templates/web/default/admin/report_edit.html:43 templates/web/default/admin/user-form.html:14 +#: templates/web/default/admin/report_edit.html:47 templates/web/default/admin/user-form.html:14 msgid "Flagged:" msgstr "" @@ -822,7 +822,7 @@ msgstr "" msgid "Follow a ward link to view only reports within that ward." msgstr "" -#: templates/web/default/admin/report_edit.html:17 +#: templates/web/default/admin/report_edit.html:21 msgid "For council(s):" msgstr "" @@ -862,7 +862,7 @@ msgstr "" msgid "Go" msgstr "" -#: templates/web/default/admin/report_edit.html:42 +#: templates/web/default/admin/report_edit.html:46 msgid "Going to send questionnaire?" msgstr "" @@ -894,7 +894,7 @@ msgstr "" msgid "Hi %s" msgstr "" -#: templates/web/default/admin/report_edit.html:19 templates/web/default/admin/report_edit.html:22 templates/web/default/admin/update_edit.html:22 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:11 templates/web/zurich/admin/report_edit.html:64 templates/web/zurich/admin/report_edit.html:68 templates/web/zurich/admin/update_edit.html:18 +#: templates/web/default/admin/report_edit.html:26 templates/web/default/admin/update_edit.html:22 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:11 templates/web/zurich/admin/report_edit.html:70 templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" msgstr "" @@ -962,7 +962,7 @@ msgstr "" msgid "If you submit a report here it will be left on the site, but not reported to the council – please still leave your report, so that we can show to the council the activity in their area." msgstr "" -#: templates/web/default/auth/token.html:23 templates/web/default/email_sent.html:9 +#: templates/web/default/auth/token.html:25 templates/web/default/email_sent.html:9 msgid "If you use web-based email or have 'junk mail' filters, you may wish to check your bulk/spam mail folders: sometimes, our messages are marked that way." msgstr "" @@ -985,11 +985,11 @@ msgstr "" msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." msgstr "" -#: templates/web/bromley/report/display.html:80 templates/web/bromley/report/display.html:82 templates/web/default/admin/report_edit.html:19 templates/web/default/admin/report_edit.html:21 templates/web/default/dashboard/index.html:138 templates/web/default/dashboard/index.html:140 templates/web/default/report/update-form.html:30 templates/web/default/report/update-form.html:32 templates/web/fixmystreet/report/banner.html:19 templates/web/fixmystreet/report/update-form.html:28 templates/web/fixmystreet/report/update-form.html:30 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:8 templates/web/zurich/admin/report_edit.html:77 templates/web/zurich/report/banner.html:15 +#: templates/web/bromley/report/display.html:80 templates/web/bromley/report/display.html:82 templates/web/default/admin/report_edit.html:25 templates/web/default/dashboard/index.html:138 templates/web/default/dashboard/index.html:140 templates/web/default/report/update-form.html:30 templates/web/default/report/update-form.html:32 templates/web/fixmystreet/report/banner.html:19 templates/web/fixmystreet/report/update-form.html:28 templates/web/fixmystreet/report/update-form.html:30 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:8 templates/web/zurich/admin/report_edit.html:79 templates/web/zurich/report/banner.html:15 msgid "In progress" msgstr "" -#: templates/web/zurich/admin/report_edit.html:116 +#: templates/web/zurich/admin/report_edit.html:118 msgid "Include reporter personal details" msgstr "" @@ -1001,7 +1001,7 @@ msgstr "" msgid "Incorrect has_photo value \"%s\"" msgstr "" -#: templates/web/zurich/admin/report_edit-sdm.html:35 templates/web/zurich/admin/report_edit.html:59 +#: templates/web/zurich/admin/report_edit-sdm.html:37 templates/web/zurich/admin/report_edit.html:61 msgid "Internal notes:" msgstr "" @@ -1021,7 +1021,7 @@ msgstr "" msgid "Invalid start date" msgstr "" -#: templates/web/bromley/report/display.html:80 templates/web/bromley/report/display.html:81 templates/web/default/admin/report_edit.html:19 templates/web/default/admin/report_edit.html:20 templates/web/default/dashboard/index.html:138 templates/web/default/dashboard/index.html:139 templates/web/default/report/update-form.html:30 templates/web/default/report/update-form.html:31 templates/web/fixmystreet/report/update-form.html:28 templates/web/fixmystreet/report/update-form.html:29 +#: templates/web/bromley/report/display.html:80 templates/web/bromley/report/display.html:81 templates/web/default/admin/report_edit.html:24 templates/web/default/dashboard/index.html:138 templates/web/default/dashboard/index.html:139 templates/web/default/report/update-form.html:30 templates/web/default/report/update-form.html:31 templates/web/fixmystreet/report/update-form.html:28 templates/web/fixmystreet/report/update-form.html:29 msgid "Investigating" msgstr "" @@ -1041,7 +1041,7 @@ msgstr "" msgid "Last editor" msgstr "" -#: templates/web/default/admin/report_edit.html:37 +#: templates/web/default/admin/report_edit.html:41 msgid "Last update:" msgstr "" @@ -1105,7 +1105,7 @@ msgstr "" msgid "Name" msgstr "" -#: templates/web/default/admin/report_edit.html:31 templates/web/default/admin/update_edit.html:26 templates/web/default/admin/user-form.html:5 templates/web/zurich/admin/report_edit-sdm.html:22 templates/web/zurich/admin/report_edit.html:39 +#: templates/web/default/admin/report_edit.html:35 templates/web/default/admin/update_edit.html:26 templates/web/default/admin/user-form.html:5 templates/web/zurich/admin/report_edit-sdm.html:24 templates/web/zurich/admin/report_edit.html:41 msgid "Name:" msgstr "" @@ -1207,7 +1207,7 @@ msgstr "" msgid "New state" msgstr "" -#: templates/web/zurich/admin/report_edit-sdm.html:38 +#: templates/web/zurich/admin/report_edit-sdm.html:40 msgid "New update:" msgstr "" @@ -1215,7 +1215,7 @@ msgstr "" msgid "New!" msgstr "" -#: templates/web/default/admin/body.html:50 templates/web/default/admin/body.html:51 templates/web/default/admin/body.html:52 templates/web/default/admin/body_edit.html:4 templates/web/default/admin/list_updates.html:30 templates/web/default/admin/list_updates.html:31 templates/web/default/admin/list_updates.html:32 templates/web/default/admin/problem_row.html:21 templates/web/default/admin/report_edit.html:29 templates/web/default/admin/report_edit.html:42 templates/web/default/admin/update_edit.html:19 templates/web/default/questionnaire/creator_fixed.html:16 templates/web/default/questionnaire/index.html:107 templates/web/default/questionnaire/index.html:68 templates/web/fixmystreet/questionnaire/index.html:101 templates/web/fixmystreet/questionnaire/index.html:62 +#: templates/web/default/admin/body.html:50 templates/web/default/admin/body.html:51 templates/web/default/admin/body.html:52 templates/web/default/admin/body_edit.html:4 templates/web/default/admin/list_updates.html:30 templates/web/default/admin/list_updates.html:31 templates/web/default/admin/list_updates.html:32 templates/web/default/admin/problem_row.html:21 templates/web/default/admin/report_edit.html:33 templates/web/default/admin/report_edit.html:46 templates/web/default/admin/update_edit.html:19 templates/web/default/questionnaire/creator_fixed.html:16 templates/web/default/questionnaire/index.html:107 templates/web/default/questionnaire/index.html:68 templates/web/fixmystreet/questionnaire/index.html:101 templates/web/fixmystreet/questionnaire/index.html:62 msgid "No" msgstr "" @@ -1243,7 +1243,7 @@ msgstr "" msgid "No flagged users found" msgstr "" -#: templates/web/zurich/admin/report_edit-sdm.html:44 +#: templates/web/zurich/admin/report_edit-sdm.html:46 msgid "No further updates" msgstr "" @@ -1267,7 +1267,7 @@ msgstr "" msgid "Non Public" msgstr "" -#: templates/web/default/admin/report_edit.html:17 templates/web/zurich/admin/report_edit-sdm.html:25 templates/web/zurich/admin/report_edit.html:43 +#: templates/web/default/admin/report_edit.html:21 templates/web/zurich/admin/report_edit-sdm.html:27 templates/web/zurich/admin/report_edit.html:45 msgid "None" msgstr "" @@ -1351,7 +1351,7 @@ msgstr "" msgid "Older problems" msgstr "" -#: templates/web/bromley/report/display.html:80 templates/web/default/admin/report_edit.html:19 templates/web/default/admin/update_edit.html:22 templates/web/default/dashboard/index.html:138 templates/web/default/report/update-form.html:30 templates/web/fixmystreet/report/update-form.html:28 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:7 templates/web/zurich/admin/report_edit.html:64 templates/web/zurich/admin/report_edit.html:66 templates/web/zurich/admin/update_edit.html:18 templates/web/zurich/report/banner.html:11 +#: templates/web/bromley/report/display.html:80 templates/web/default/admin/report_edit.html:23 templates/web/default/admin/update_edit.html:22 templates/web/default/dashboard/index.html:138 templates/web/default/report/update-form.html:30 templates/web/fixmystreet/report/update-form.html:28 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:7 templates/web/zurich/admin/report_edit.html:68 templates/web/zurich/admin/update_edit.html:18 templates/web/zurich/report/banner.html:11 msgid "Open" msgstr "" @@ -1399,7 +1399,7 @@ msgstr "" msgid "Parent" msgstr "" -#: templates/web/default/admin/report_edit.html:19 templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/report_edit.html:26 msgid "Partial" msgstr "" @@ -1415,7 +1415,7 @@ msgstr "" msgid "Phone number (optional)" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:263 templates/web/default/admin/report_edit.html:33 templates/web/default/report/new/fill_in_details_form.html:215 templates/web/zurich/admin/report_edit-sdm.html:25 templates/web/zurich/admin/report_edit.html:43 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:263 templates/web/default/admin/report_edit.html:37 templates/web/default/report/new/fill_in_details_form.html:215 templates/web/zurich/admin/report_edit-sdm.html:27 templates/web/zurich/admin/report_edit.html:45 msgid "Phone:" msgstr "" @@ -1435,7 +1435,7 @@ msgstr "" msgid "Place pin on map" msgstr "" -#: templates/web/bromley/report/display.html:80 templates/web/bromley/report/display.html:81 templates/web/default/admin/report_edit.html:19 templates/web/default/admin/report_edit.html:20 templates/web/default/dashboard/index.html:138 templates/web/default/dashboard/index.html:139 templates/web/default/report/update-form.html:30 templates/web/default/report/update-form.html:31 templates/web/fixmystreet/report/update-form.html:28 templates/web/fixmystreet/report/update-form.html:29 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:9 templates/web/zurich/admin/index-dm.html:9 templates/web/zurich/admin/report_edit.html:64 templates/web/zurich/admin/report_edit.html:67 +#: templates/web/bromley/report/display.html:80 templates/web/bromley/report/display.html:81 templates/web/default/admin/report_edit.html:24 templates/web/default/dashboard/index.html:138 templates/web/default/dashboard/index.html:139 templates/web/default/report/update-form.html:30 templates/web/default/report/update-form.html:31 templates/web/fixmystreet/report/update-form.html:28 templates/web/fixmystreet/report/update-form.html:29 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:9 templates/web/zurich/admin/index-dm.html:9 templates/web/zurich/admin/report_edit.html:69 msgid "Planned" msgstr "" @@ -1659,7 +1659,7 @@ msgstr "" msgid "Posted by %s at %s" msgstr "" -#: templates/web/default/admin/body.html:97 templates/web/default/admin/body_edit.html:40 templates/web/default/admin/report_edit.html:44 +#: templates/web/default/admin/body.html:97 templates/web/default/admin/body_edit.html:40 templates/web/default/admin/report_edit.html:48 msgid "Private" msgstr "" @@ -1759,15 +1759,15 @@ msgstr "" msgid "Public" msgstr "" -#: templates/web/zurich/admin/report_edit.html:148 +#: templates/web/zurich/admin/report_edit.html:150 msgid "Public response:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:55 +#: templates/web/zurich/admin/report_edit.html:57 msgid "Publish photo" msgstr "" -#: templates/web/zurich/admin/report_edit.html:158 +#: templates/web/zurich/admin/report_edit.html:160 msgid "Publish the response" msgstr "" @@ -1863,7 +1863,7 @@ msgstr "" msgid "Remove flag" msgstr "" -#: templates/web/default/admin/report_edit.html:55 templates/web/default/admin/update_edit.html:51 templates/web/zurich/admin/update_edit.html:35 +#: templates/web/default/admin/report_edit.html:59 templates/web/default/admin/update_edit.html:51 templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "" @@ -1959,7 +1959,7 @@ msgstr "" msgid "Reports published" msgstr "" -#: templates/web/default/admin/report_edit.html:36 +#: templates/web/default/admin/report_edit.html:40 msgid "Resend report" msgstr "" @@ -1975,11 +1975,11 @@ 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 +#: templates/web/default/admin/report_edit.html:55 templates/web/zurich/admin/report_edit.html:53 msgid "Rotate Left" msgstr "" -#: templates/web/default/admin/report_edit.html:52 templates/web/zurich/admin/report_edit.html:52 +#: templates/web/default/admin/report_edit.html:56 templates/web/zurich/admin/report_edit.html:54 msgid "Rotate Right" msgstr "" @@ -2019,11 +2019,11 @@ msgstr "" msgid "Sent to %s %s later" msgstr "" -#: templates/web/default/admin/report_edit.html:36 +#: templates/web/default/admin/report_edit.html:40 msgid "Sent:" msgstr "" -#: templates/web/default/admin/report_edit.html:38 +#: templates/web/default/admin/report_edit.html:42 msgid "Service:" msgstr "" @@ -2128,7 +2128,7 @@ msgstr "" msgid "State" msgstr "" -#: templates/web/default/admin/report_edit.html:18 templates/web/default/admin/update_edit.html:21 templates/web/default/report/update-form.html:28 templates/web/zurich/admin/report_edit-sdm.html:33 templates/web/zurich/admin/report_edit.html:62 templates/web/zurich/admin/update_edit.html:17 +#: templates/web/default/admin/report_edit.html:22 templates/web/default/admin/update_edit.html:21 templates/web/default/report/update-form.html:28 templates/web/zurich/admin/report_edit-sdm.html:35 templates/web/zurich/admin/report_edit.html:64 templates/web/zurich/admin/update_edit.html:17 msgid "State:" msgstr "" @@ -2160,7 +2160,7 @@ msgstr "" msgid "Submit" msgstr "" -#: templates/web/default/admin/report_edit.html:58 templates/web/default/admin/update_edit.html:54 templates/web/default/admin/user-form.html:17 templates/web/zurich/admin/report_edit-sdm.html:43 templates/web/zurich/admin/report_edit.html:160 templates/web/zurich/admin/update_edit.html:38 +#: templates/web/default/admin/report_edit.html:62 templates/web/default/admin/update_edit.html:54 templates/web/default/admin/user-form.html:17 templates/web/zurich/admin/report_edit-sdm.html:45 templates/web/zurich/admin/report_edit.html:162 templates/web/zurich/admin/update_edit.html:38 msgid "Submit changes" msgstr "" @@ -2168,7 +2168,7 @@ msgstr "" msgid "Submit questionnaire" msgstr "" -#: templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:6 templates/web/zurich/admin/index-dm.html:23 templates/web/zurich/admin/index-dm.html:6 templates/web/zurich/admin/index-sdm.html:21 templates/web/zurich/admin/report_edit.html:64 templates/web/zurich/admin/report_edit.html:65 templates/web/zurich/admin/reports.html:15 templates/web/zurich/report/banner.html:9 +#: templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:6 templates/web/zurich/admin/index-dm.html:23 templates/web/zurich/admin/index-dm.html:6 templates/web/zurich/admin/index-sdm.html:21 templates/web/zurich/admin/report_edit.html:67 templates/web/zurich/admin/reports.html:15 templates/web/zurich/report/banner.html:9 msgid "Submitted" msgstr "" @@ -2299,7 +2299,7 @@ msgstr "" msgid "The Open311 v2 attribute agency_responsible is used to list the administrations that received the problem report, which is not quite the way the attribute is defined in the Open311 v2 specification." msgstr "" -#: templates/web/default/auth/token.html:21 templates/web/default/email_sent.html:6 +#: templates/web/default/auth/token.html:22 templates/web/default/email_sent.html:6 msgid "The confirmation email <strong>may</strong> take a few minutes to arrive — <em>please</em> be patient." msgstr "" @@ -2527,7 +2527,7 @@ msgstr "" msgid "Try again" msgstr "" -#: templates/web/default/admin/report_edit.html:19 templates/web/default/admin/report_edit.html:22 templates/web/default/admin/update_edit.html:22 templates/web/zurich/admin/update_edit.html:18 +#: templates/web/default/admin/report_edit.html:26 templates/web/default/admin/update_edit.html:22 templates/web/zurich/admin/update_edit.html:18 msgid "Unconfirmed" msgstr "" @@ -2735,7 +2735,7 @@ msgstr "" msgid "Year" msgstr "" -#: templates/web/default/admin/body.html:50 templates/web/default/admin/body.html:51 templates/web/default/admin/body.html:52 templates/web/default/admin/body_edit.html:5 templates/web/default/admin/list_updates.html:30 templates/web/default/admin/list_updates.html:31 templates/web/default/admin/list_updates.html:32 templates/web/default/admin/problem_row.html:21 templates/web/default/admin/report_edit.html:28 templates/web/default/admin/report_edit.html:42 templates/web/default/admin/update_edit.html:18 templates/web/default/admin/users.html:26 templates/web/default/questionnaire/creator_fixed.html:14 templates/web/default/questionnaire/index.html:105 templates/web/default/questionnaire/index.html:66 templates/web/fixmystreet/questionnaire/index.html:60 templates/web/fixmystreet/questionnaire/index.html:99 +#: templates/web/default/admin/body.html:50 templates/web/default/admin/body.html:51 templates/web/default/admin/body.html:52 templates/web/default/admin/body_edit.html:5 templates/web/default/admin/list_updates.html:30 templates/web/default/admin/list_updates.html:31 templates/web/default/admin/list_updates.html:32 templates/web/default/admin/problem_row.html:21 templates/web/default/admin/report_edit.html:32 templates/web/default/admin/report_edit.html:46 templates/web/default/admin/update_edit.html:18 templates/web/default/admin/users.html:26 templates/web/default/questionnaire/creator_fixed.html:14 templates/web/default/questionnaire/index.html:105 templates/web/default/questionnaire/index.html:66 templates/web/fixmystreet/questionnaire/index.html:60 templates/web/fixmystreet/questionnaire/index.html:99 msgid "Yes" msgstr "" @@ -2823,7 +2823,7 @@ msgstr "" msgid "You must now click the link in the email we've just sent you." msgstr "" -#: templates/web/default/admin/report_edit.html:36 +#: templates/web/default/admin/report_edit.html:40 msgid "You really want to resend?" msgstr "" @@ -2907,7 +2907,7 @@ msgstr "" msgid "council ref: %s" msgstr "" -#: templates/web/default/admin/report_edit.html:16 templates/web/zurich/admin/report_edit-sdm.html:19 templates/web/zurich/admin/report_edit.html:37 +#: templates/web/default/admin/report_edit.html:19 templates/web/zurich/admin/report_edit-sdm.html:21 templates/web/zurich/admin/report_edit.html:39 msgid "didn't use map" msgstr "" @@ -2943,11 +2943,11 @@ msgstr "" msgid "or locate me automatically" msgstr "" -#: templates/web/default/admin/report_edit.html:16 templates/web/zurich/admin/report_edit-sdm.html:16 templates/web/zurich/admin/report_edit-sdm.html:19 templates/web/zurich/admin/report_edit.html:24 templates/web/zurich/admin/report_edit.html:32 templates/web/zurich/admin/report_edit.html:37 -msgid "originally entered" +#: templates/web/default/admin/report_edit.html:18 templates/web/zurich/admin/report_edit-sdm.html:16 templates/web/zurich/admin/report_edit-sdm.html:20 templates/web/zurich/admin/report_edit.html:24 templates/web/zurich/admin/report_edit.html:32 templates/web/zurich/admin/report_edit.html:38 +msgid "originally entered: “%s”" msgstr "" -#: templates/web/default/admin/report_edit.html:17 +#: templates/web/default/admin/report_edit.html:21 msgid "other areas:" msgstr "" @@ -2975,7 +2975,7 @@ msgstr "" msgid "today" msgstr "" -#: templates/web/default/admin/report_edit.html:16 templates/web/zurich/admin/report_edit-sdm.html:19 templates/web/zurich/admin/report_edit.html:37 +#: templates/web/default/admin/report_edit.html:19 templates/web/zurich/admin/report_edit-sdm.html:21 templates/web/zurich/admin/report_edit.html:39 msgid "used map" msgstr "" diff --git a/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po b/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po index 9bc5de983..11e07f708 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-31 15:25+0000\n" +"POT-Creation-Date: 2013-01-31 15:59+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" @@ -549,7 +549,7 @@ msgstr "" msgid "Anonymous" msgstr "Di-enw" -#: templates/web/default/admin/report_edit.html:27 +#: templates/web/default/admin/report_edit.html:31 #: templates/web/default/admin/update_edit.html:17 #, fuzzy msgid "Anonymous:" @@ -577,16 +577,16 @@ msgstr "Ni roddwyd gwybod i'r cyngor am hyn" msgid "Area covered" msgstr "" -#: templates/web/zurich/admin/report_edit.html:97 +#: templates/web/zurich/admin/report_edit.html:99 msgid "Assign to different category:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:106 +#: templates/web/zurich/admin/report_edit.html:108 msgid "Assign to external body:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:138 -#: templates/web/zurich/admin/report_edit.html:85 +#: templates/web/zurich/admin/report_edit.html:140 +#: templates/web/zurich/admin/report_edit.html:87 msgid "Assign to subdivision:" msgstr "" @@ -684,11 +684,11 @@ msgstr "" #: templates/web/default/admin/body.html:75 #: templates/web/default/admin/body_edit.html:23 -#: templates/web/default/admin/report_edit.html:26 +#: templates/web/default/admin/report_edit.html:30 #: templates/web/default/report/new/fill_in_details_form.html:67 #: templates/web/zurich/admin/body.html:36 -#: templates/web/zurich/admin/report_edit-sdm.html:21 -#: templates/web/zurich/admin/report_edit.html:96 +#: templates/web/zurich/admin/report_edit-sdm.html:23 +#: templates/web/zurich/admin/report_edit.html:98 msgid "Category:" msgstr "Categori:" @@ -711,8 +711,7 @@ msgstr "Sut i roi gwybod am eiddo gwag" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:82 -#: templates/web/default/admin/report_edit.html:19 -#: templates/web/default/admin/report_edit.html:21 +#: templates/web/default/admin/report_edit.html:25 #: templates/web/default/dashboard/index.html:138 #: templates/web/default/dashboard/index.html:140 #: templates/web/default/report/update-form.html:30 @@ -723,8 +722,8 @@ msgstr "Sut i roi gwybod am eiddo gwag" #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:12 -#: templates/web/zurich/admin/report_edit.html:73 #: templates/web/zurich/admin/report_edit.html:75 +#: templates/web/zurich/admin/report_edit.html:77 #: templates/web/zurich/report/banner.html:13 msgid "Closed" msgstr "" @@ -748,7 +747,7 @@ msgstr "" msgid "Closest nearby empty properties <small>(within %skm)</small>" msgstr "Yr eiddo gwag cyfagos agosaf <small>(within %skm)</small>" -#: templates/web/default/admin/report_edit.html:16 +#: templates/web/default/admin/report_edit.html:17 #: templates/web/zurich/admin/report_edit-sdm.html:19 #: templates/web/zurich/admin/report_edit.html:37 msgid "Co-ordinates:" @@ -760,12 +759,12 @@ msgstr "" msgid "Cobrand" msgstr "" -#: templates/web/default/admin/report_edit.html:40 +#: templates/web/default/admin/report_edit.html:44 #: templates/web/default/admin/update_edit.html:44 msgid "Cobrand data:" msgstr "" -#: templates/web/default/admin/report_edit.html:39 +#: templates/web/default/admin/report_edit.html:43 #: templates/web/default/admin/update_edit.html:43 msgid "Cobrand:" msgstr "" @@ -814,8 +813,8 @@ msgstr "Cadarnhau" #: templates/web/default/admin/body.html:85 #: templates/web/default/admin/body_edit.html:32 #: templates/web/default/admin/body_edit.html:84 -#: templates/web/zurich/admin/report_edit-sdm.html:24 -#: templates/web/zurich/admin/report_edit.html:41 +#: templates/web/zurich/admin/report_edit-sdm.html:26 +#: templates/web/zurich/admin/report_edit.html:43 #, fuzzy msgid "Confirmed" msgstr "Cadarnhau" @@ -826,7 +825,7 @@ msgid "Confirmed reports between %s and %s" msgstr "Adroddwyd am %s gan %s am %s" #: templates/web/default/admin/problem_row.html:25 -#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:39 #, fuzzy msgid "Confirmed:" msgstr "Cadarnhau" @@ -907,10 +906,10 @@ msgstr "Categori:" msgid "Created" msgstr "" -#: templates/web/default/admin/report_edit.html:34 +#: templates/web/default/admin/report_edit.html:38 #: templates/web/default/admin/update_edit.html:45 -#: templates/web/zurich/admin/report_edit-sdm.html:26 -#: templates/web/zurich/admin/report_edit.html:44 +#: templates/web/zurich/admin/report_edit-sdm.html:28 +#: templates/web/zurich/admin/report_edit.html:46 #: templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "" @@ -993,7 +992,6 @@ msgstr "" #: templates/web/default/admin/report_edit.html:1 #: templates/web/zurich/admin/report_edit-sdm.html:1 -#: templates/web/zurich/admin/report_edit.html:1 #: templates/web/zurich/admin/report_edit.html:4 #, fuzzy msgid "Editing empty property %d" @@ -1049,14 +1047,14 @@ msgstr "Anfonwch ddiweddariadau ataf i drwy'r e-bost" #: templates/web/default/admin/body.html:80 #: templates/web/default/admin/body_edit.html:26 -#: templates/web/default/admin/report_edit.html:32 +#: templates/web/default/admin/report_edit.html:36 #: templates/web/default/admin/update_edit.html:27 #: templates/web/default/admin/user-form.html:6 #: templates/web/default/alert/updates.html:13 #: templates/web/default/report/display.html:34 #: templates/web/zurich/admin/body.html:41 -#: templates/web/zurich/admin/report_edit-sdm.html:23 -#: templates/web/zurich/admin/report_edit.html:40 +#: templates/web/zurich/admin/report_edit-sdm.html:25 +#: templates/web/zurich/admin/report_edit.html:42 msgid "Email:" msgstr "E-bost:" @@ -1170,7 +1168,7 @@ msgstr "" msgid "Examples:" msgstr "" -#: templates/web/default/admin/report_edit.html:41 +#: templates/web/default/admin/report_edit.html:45 msgid "Extra data:" msgstr "" @@ -1258,8 +1256,7 @@ msgstr "" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:82 #: templates/web/default/admin/index.html:36 -#: templates/web/default/admin/report_edit.html:19 -#: templates/web/default/admin/report_edit.html:21 +#: templates/web/default/admin/report_edit.html:25 #: templates/web/default/dashboard/index.html:138 #: templates/web/default/dashboard/index.html:140 #: templates/web/default/report/update-form.html:30 @@ -1270,14 +1267,12 @@ msgstr "" msgid "Fixed" msgstr "" -#: templates/web/default/admin/report_edit.html:19 -#: templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/report_edit.html:26 #, fuzzy msgid "Fixed - Council" msgstr "cyngor" -#: templates/web/default/admin/report_edit.html:19 -#: templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/report_edit.html:26 #, fuzzy msgid "Fixed - User" msgstr "Cuddio hen adroddiadau " @@ -1300,7 +1295,7 @@ msgstr "" msgid "Flagged" msgstr "" -#: templates/web/default/admin/report_edit.html:43 +#: templates/web/default/admin/report_edit.html:47 #: templates/web/default/admin/user-form.html:14 msgid "Flagged:" msgstr "" @@ -1311,7 +1306,7 @@ msgstr "" msgid "Follow a ward link to view only reports within that ward." msgstr "" -#: templates/web/default/admin/report_edit.html:17 +#: templates/web/default/admin/report_edit.html:21 #, fuzzy msgid "For council(s):" msgstr "cyngor" @@ -1373,7 +1368,7 @@ msgstr "Rhowch borthiant RSS i mi" msgid "Go" msgstr "Ewch" -#: templates/web/default/admin/report_edit.html:42 +#: templates/web/default/admin/report_edit.html:46 #, fuzzy msgid "Going to send questionnaire?" msgstr "Anfon yr holiadur" @@ -1429,13 +1424,11 @@ msgstr "" msgid "Hi %s" msgstr "" -#: templates/web/default/admin/report_edit.html:19 -#: templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/report_edit.html:26 #: templates/web/default/admin/update_edit.html:22 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:11 -#: templates/web/zurich/admin/report_edit.html:64 -#: templates/web/zurich/admin/report_edit.html:68 +#: templates/web/zurich/admin/report_edit.html:70 #: templates/web/zurich/admin/update_edit.html:18 #, fuzzy msgid "Hidden" @@ -1539,7 +1532,7 @@ msgstr "" "fel y gallwn\n" "ddangos i'r cyngor y gweithgarwch yn ei ardal." -#: templates/web/default/auth/token.html:23 +#: templates/web/default/auth/token.html:25 #: templates/web/default/email_sent.html:9 msgid "" "If you use web-based email or have 'junk mail' filters, you may wish to " @@ -1579,8 +1572,7 @@ msgstr "" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:82 -#: templates/web/default/admin/report_edit.html:19 -#: templates/web/default/admin/report_edit.html:21 +#: templates/web/default/admin/report_edit.html:25 #: templates/web/default/dashboard/index.html:138 #: templates/web/default/dashboard/index.html:140 #: templates/web/default/report/update-form.html:30 @@ -1590,12 +1582,12 @@ msgstr "" #: templates/web/fixmystreet/report/update-form.html:30 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:8 -#: templates/web/zurich/admin/report_edit.html:77 +#: templates/web/zurich/admin/report_edit.html:79 #: templates/web/zurich/report/banner.html:15 msgid "In progress" msgstr "" -#: templates/web/zurich/admin/report_edit.html:116 +#: templates/web/zurich/admin/report_edit.html:118 #, fuzzy msgid "Include reporter personal details" msgstr "Cofnodwch fanylion" @@ -1609,8 +1601,8 @@ msgstr "Cynnwys hen adroddiadau" msgid "Incorrect has_photo value \"%s\"" msgstr "" -#: templates/web/zurich/admin/report_edit-sdm.html:35 -#: templates/web/zurich/admin/report_edit.html:59 +#: templates/web/zurich/admin/report_edit-sdm.html:37 +#: templates/web/zurich/admin/report_edit.html:61 msgid "Internal notes:" msgstr "" @@ -1633,8 +1625,7 @@ msgstr "" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:81 -#: templates/web/default/admin/report_edit.html:19 -#: templates/web/default/admin/report_edit.html:20 +#: templates/web/default/admin/report_edit.html:24 #: templates/web/default/dashboard/index.html:138 #: templates/web/default/dashboard/index.html:139 #: templates/web/default/report/update-form.html:30 @@ -1692,7 +1683,7 @@ msgstr "Anfonwch ddiweddariadau ataf i drwy'r e-bost" msgid "Last editor" msgstr "" -#: templates/web/default/admin/report_edit.html:37 +#: templates/web/default/admin/report_edit.html:41 #, fuzzy msgid "Last update:" msgstr "Anfonwch ddiweddariadau ataf i drwy'r e-bost" @@ -1808,11 +1799,11 @@ msgstr "Mwy o eiddo gwag cyfagos" msgid "Name" msgstr "Enw" -#: templates/web/default/admin/report_edit.html:31 +#: templates/web/default/admin/report_edit.html:35 #: templates/web/default/admin/update_edit.html:26 #: templates/web/default/admin/user-form.html:5 -#: templates/web/zurich/admin/report_edit-sdm.html:22 -#: templates/web/zurich/admin/report_edit.html:39 +#: templates/web/zurich/admin/report_edit-sdm.html:24 +#: templates/web/zurich/admin/report_edit.html:41 msgid "Name:" msgstr "Enw:" @@ -1944,7 +1935,7 @@ msgstr "Adroddiadau newydd o fewn ffin {{NAME}} ar reportemptyhomes.com" msgid "New state" msgstr "" -#: templates/web/zurich/admin/report_edit-sdm.html:38 +#: templates/web/zurich/admin/report_edit-sdm.html:40 #, fuzzy msgid "New update:" msgstr "Anfonwch ddiweddariadau ataf i drwy'r e-bost" @@ -1963,8 +1954,8 @@ msgstr "Newydd!" #: templates/web/default/admin/list_updates.html:31 #: templates/web/default/admin/list_updates.html:32 #: templates/web/default/admin/problem_row.html:21 -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:42 +#: templates/web/default/admin/report_edit.html:33 +#: templates/web/default/admin/report_edit.html:46 #: templates/web/default/admin/update_edit.html:19 #: templates/web/default/questionnaire/creator_fixed.html:16 #: templates/web/default/questionnaire/index.html:107 @@ -2000,7 +1991,7 @@ msgstr "Ni ddaethpwyd o hyd i unrhyw eiddo gwag." msgid "No flagged users found" msgstr "" -#: templates/web/zurich/admin/report_edit-sdm.html:44 +#: templates/web/zurich/admin/report_edit-sdm.html:46 #, fuzzy msgid "No further updates" msgstr "Adroddiadau" @@ -2027,9 +2018,9 @@ msgstr "" msgid "Non Public" msgstr "" -#: templates/web/default/admin/report_edit.html:17 -#: templates/web/zurich/admin/report_edit-sdm.html:25 -#: templates/web/zurich/admin/report_edit.html:43 +#: templates/web/default/admin/report_edit.html:21 +#: templates/web/zurich/admin/report_edit-sdm.html:27 +#: templates/web/zurich/admin/report_edit.html:45 #, fuzzy msgid "None" msgstr "Nac ydw" @@ -2142,15 +2133,14 @@ msgid "Older empty property reports" msgstr "Adroddiadau hŷn o eiddo gwag" #: templates/web/bromley/report/display.html:80 -#: templates/web/default/admin/report_edit.html:19 +#: templates/web/default/admin/report_edit.html:23 #: templates/web/default/admin/update_edit.html:22 #: templates/web/default/dashboard/index.html:138 #: templates/web/default/report/update-form.html:30 #: templates/web/fixmystreet/report/update-form.html:28 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 -#: templates/web/zurich/admin/report_edit.html:64 -#: templates/web/zurich/admin/report_edit.html:66 +#: templates/web/zurich/admin/report_edit.html:68 #: templates/web/zurich/admin/update_edit.html:18 #: templates/web/zurich/report/banner.html:11 msgid "Open" @@ -2221,8 +2211,7 @@ msgstr "" msgid "Parent" msgstr "" -#: templates/web/default/admin/report_edit.html:19 -#: templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/report_edit.html:26 msgid "Partial" msgstr "" @@ -2249,10 +2238,10 @@ msgid "Phone number (optional)" msgstr "(dewisol)" #: perllib/FixMyStreet/DB/ResultSet/Problem.pm:263 -#: templates/web/default/admin/report_edit.html:33 +#: templates/web/default/admin/report_edit.html:37 #: templates/web/default/report/new/fill_in_details_form.html:215 -#: templates/web/zurich/admin/report_edit-sdm.html:25 -#: templates/web/zurich/admin/report_edit.html:43 +#: templates/web/zurich/admin/report_edit-sdm.html:27 +#: templates/web/zurich/admin/report_edit.html:45 msgid "Phone:" msgstr "Rhif ffôn:" @@ -2282,8 +2271,7 @@ msgstr "" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:81 -#: templates/web/default/admin/report_edit.html:19 -#: templates/web/default/admin/report_edit.html:20 +#: templates/web/default/admin/report_edit.html:24 #: templates/web/default/dashboard/index.html:138 #: templates/web/default/dashboard/index.html:139 #: templates/web/default/report/update-form.html:30 @@ -2293,8 +2281,7 @@ msgstr "" #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 -#: templates/web/zurich/admin/report_edit.html:64 -#: templates/web/zurich/admin/report_edit.html:67 +#: templates/web/zurich/admin/report_edit.html:69 msgid "Planned" msgstr "" @@ -2647,7 +2634,7 @@ msgstr "Cofnodwyd gan %s am %s" #: templates/web/default/admin/body.html:97 #: templates/web/default/admin/body_edit.html:40 -#: templates/web/default/admin/report_edit.html:44 +#: templates/web/default/admin/report_edit.html:48 msgid "Private" msgstr "" @@ -2786,15 +2773,15 @@ msgstr "" msgid "Public" msgstr "" -#: templates/web/zurich/admin/report_edit.html:148 +#: templates/web/zurich/admin/report_edit.html:150 msgid "Public response:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:55 +#: templates/web/zurich/admin/report_edit.html:57 msgid "Publish photo" msgstr "" -#: templates/web/zurich/admin/report_edit.html:158 +#: templates/web/zurich/admin/report_edit.html:160 msgid "Publish the response" msgstr "" @@ -2944,7 +2931,7 @@ msgstr "" msgid "Remove flag" msgstr "" -#: templates/web/default/admin/report_edit.html:55 +#: templates/web/default/admin/report_edit.html:59 #: templates/web/default/admin/update_edit.html:51 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" @@ -3077,7 +3064,7 @@ msgstr "Adroddiadau ar ac yng nghyffiniau'r map" msgid "Reports published" msgstr "Adroddiadau" -#: templates/web/default/admin/report_edit.html:36 +#: templates/web/default/admin/report_edit.html:40 #, fuzzy msgid "Resend report" msgstr "Cuddio hen adroddiadau " @@ -3096,13 +3083,13 @@ 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 +#: templates/web/default/admin/report_edit.html:55 +#: templates/web/zurich/admin/report_edit.html:53 msgid "Rotate Left" msgstr "" -#: templates/web/default/admin/report_edit.html:52 -#: templates/web/zurich/admin/report_edit.html:52 +#: templates/web/default/admin/report_edit.html:56 +#: templates/web/zurich/admin/report_edit.html:54 msgid "Rotate Right" msgstr "" @@ -3158,12 +3145,12 @@ msgstr "" msgid "Sent to %s %s later" msgstr "Anfonwyd at %s %s yn ddiweddarach" -#: templates/web/default/admin/report_edit.html:36 +#: templates/web/default/admin/report_edit.html:40 #, fuzzy msgid "Sent:" msgstr "Pwnc:" -#: templates/web/default/admin/report_edit.html:38 +#: templates/web/default/admin/report_edit.html:42 msgid "Service:" msgstr "" @@ -3338,11 +3325,11 @@ msgstr "" msgid "State" msgstr "Diweddariad:" -#: templates/web/default/admin/report_edit.html:18 +#: templates/web/default/admin/report_edit.html:22 #: templates/web/default/admin/update_edit.html:21 #: templates/web/default/report/update-form.html:28 -#: templates/web/zurich/admin/report_edit-sdm.html:33 -#: templates/web/zurich/admin/report_edit.html:62 +#: templates/web/zurich/admin/report_edit-sdm.html:35 +#: templates/web/zurich/admin/report_edit.html:64 #: templates/web/zurich/admin/update_edit.html:17 #, fuzzy msgid "State:" @@ -3398,11 +3385,11 @@ msgstr "Pwnc:" msgid "Submit" msgstr "Anfon" -#: templates/web/default/admin/report_edit.html:58 +#: templates/web/default/admin/report_edit.html:62 #: templates/web/default/admin/update_edit.html:54 #: templates/web/default/admin/user-form.html:17 -#: templates/web/zurich/admin/report_edit-sdm.html:43 -#: templates/web/zurich/admin/report_edit.html:160 +#: templates/web/zurich/admin/report_edit-sdm.html:45 +#: templates/web/zurich/admin/report_edit.html:162 #: templates/web/zurich/admin/update_edit.html:38 #, fuzzy msgid "Submit changes" @@ -3418,8 +3405,7 @@ msgstr "Anfon yr holiadur" #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-dm.html:6 #: templates/web/zurich/admin/index-sdm.html:21 -#: templates/web/zurich/admin/report_edit.html:64 -#: templates/web/zurich/admin/report_edit.html:65 +#: templates/web/zurich/admin/report_edit.html:67 #: templates/web/zurich/admin/reports.html:15 #: templates/web/zurich/report/banner.html:9 #, fuzzy @@ -3665,7 +3651,7 @@ msgid "" "the way the attribute is defined in the Open311 v2 specification." msgstr "" -#: templates/web/default/auth/token.html:21 +#: templates/web/default/auth/token.html:22 #: templates/web/default/email_sent.html:6 msgid "" "The confirmation email <strong>may</strong> take a few minutes to arrive " @@ -4025,8 +4011,7 @@ msgstr "" msgid "Try again" msgstr "" -#: templates/web/default/admin/report_edit.html:19 -#: templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/report_edit.html:26 #: templates/web/default/admin/update_edit.html:22 #: templates/web/zurich/admin/update_edit.html:18 msgid "Unconfirmed" @@ -4364,8 +4349,8 @@ msgstr "" #: templates/web/default/admin/list_updates.html:31 #: templates/web/default/admin/list_updates.html:32 #: templates/web/default/admin/problem_row.html:21 -#: templates/web/default/admin/report_edit.html:28 -#: templates/web/default/admin/report_edit.html:42 +#: templates/web/default/admin/report_edit.html:32 +#: templates/web/default/admin/report_edit.html:46 #: templates/web/default/admin/update_edit.html:18 #: templates/web/default/admin/users.html:26 #: templates/web/default/questionnaire/creator_fixed.html:14 @@ -4526,7 +4511,7 @@ msgstr "Rydych wedi cadarnhau'ch hysbysiad yn llwyddiannus." msgid "You must now click the link in the email we've just sent you." msgstr "" -#: templates/web/default/admin/report_edit.html:36 +#: templates/web/default/admin/report_edit.html:40 msgid "You really want to resend?" msgstr "" @@ -4670,9 +4655,9 @@ msgstr "cyngor" msgid "council ref: %s" msgstr "" -#: templates/web/default/admin/report_edit.html:16 -#: templates/web/zurich/admin/report_edit-sdm.html:19 -#: templates/web/zurich/admin/report_edit.html:37 +#: templates/web/default/admin/report_edit.html:19 +#: templates/web/zurich/admin/report_edit-sdm.html:21 +#: templates/web/zurich/admin/report_edit.html:39 msgid "didn't use map" msgstr "" @@ -4714,16 +4699,16 @@ msgstr "neu" msgid "or locate me automatically" msgstr "" -#: templates/web/default/admin/report_edit.html:16 +#: templates/web/default/admin/report_edit.html:18 #: templates/web/zurich/admin/report_edit-sdm.html:16 -#: templates/web/zurich/admin/report_edit-sdm.html:19 +#: templates/web/zurich/admin/report_edit-sdm.html:20 #: templates/web/zurich/admin/report_edit.html:24 #: templates/web/zurich/admin/report_edit.html:32 -#: templates/web/zurich/admin/report_edit.html:37 -msgid "originally entered" +#: templates/web/zurich/admin/report_edit.html:38 +msgid "originally entered: “%s”" msgstr "" -#: templates/web/default/admin/report_edit.html:17 +#: templates/web/default/admin/report_edit.html:21 msgid "other areas:" msgstr "" @@ -4763,9 +4748,9 @@ msgstr "Anfonwch fanylion eiddo gwag lleol newydd ataf i drwy'r e-bost" msgid "today" msgstr "heddiw" -#: templates/web/default/admin/report_edit.html:16 -#: templates/web/zurich/admin/report_edit-sdm.html:19 -#: templates/web/zurich/admin/report_edit.html:37 +#: templates/web/default/admin/report_edit.html:19 +#: templates/web/zurich/admin/report_edit-sdm.html:21 +#: templates/web/zurich/admin/report_edit.html:39 msgid "used map" msgstr "" diff --git a/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po index 6c3fa6462..be5764a11 100644 --- a/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2013-01-31 15:25+0000\n" +"POT-Creation-Date: 2013-01-31 15:59+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" @@ -434,7 +434,7 @@ msgstr "" msgid "Anonymous" msgstr "Anonym" -#: templates/web/default/admin/report_edit.html:27 +#: templates/web/default/admin/report_edit.html:31 #: templates/web/default/admin/update_edit.html:17 msgid "Anonymous:" msgstr "Anonym:" @@ -460,16 +460,16 @@ msgstr "" msgid "Area covered" msgstr "" -#: templates/web/zurich/admin/report_edit.html:97 +#: templates/web/zurich/admin/report_edit.html:99 msgid "Assign to different category:" msgstr "Einer anderen Kategorie (DA) zuweisen:" -#: templates/web/zurich/admin/report_edit.html:106 +#: templates/web/zurich/admin/report_edit.html:108 msgid "Assign to external body:" msgstr "Einer externen Stelle zuweisen:" -#: templates/web/zurich/admin/report_edit.html:138 -#: templates/web/zurich/admin/report_edit.html:85 +#: templates/web/zurich/admin/report_edit.html:140 +#: templates/web/zurich/admin/report_edit.html:87 msgid "Assign to subdivision:" msgstr "An Fachbereich zuweisen:" @@ -564,11 +564,11 @@ msgstr "" #: templates/web/default/admin/body.html:75 #: templates/web/default/admin/body_edit.html:23 -#: templates/web/default/admin/report_edit.html:26 +#: templates/web/default/admin/report_edit.html:30 #: templates/web/default/report/new/fill_in_details_form.html:67 #: templates/web/zurich/admin/body.html:36 -#: templates/web/zurich/admin/report_edit-sdm.html:21 -#: templates/web/zurich/admin/report_edit.html:96 +#: templates/web/zurich/admin/report_edit-sdm.html:23 +#: templates/web/zurich/admin/report_edit.html:98 msgid "Category:" msgstr "Kategorie:" @@ -589,8 +589,7 @@ msgstr "Mangel lokalisieren" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:82 -#: templates/web/default/admin/report_edit.html:19 -#: templates/web/default/admin/report_edit.html:21 +#: templates/web/default/admin/report_edit.html:25 #: templates/web/default/dashboard/index.html:138 #: templates/web/default/dashboard/index.html:140 #: templates/web/default/report/update-form.html:30 @@ -601,8 +600,8 @@ msgstr "Mangel lokalisieren" #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:12 -#: templates/web/zurich/admin/report_edit.html:73 #: templates/web/zurich/admin/report_edit.html:75 +#: templates/web/zurich/admin/report_edit.html:77 #: templates/web/zurich/report/banner.html:13 msgid "Closed" msgstr "Erledigt" @@ -624,7 +623,7 @@ msgstr "Erledigt:" msgid "Closest nearby problems <small>(within %skm)</small>" msgstr "" -#: templates/web/default/admin/report_edit.html:16 +#: templates/web/default/admin/report_edit.html:17 #: templates/web/zurich/admin/report_edit-sdm.html:19 #: templates/web/zurich/admin/report_edit.html:37 msgid "Co-ordinates:" @@ -636,12 +635,12 @@ msgstr "Koordinaten:" msgid "Cobrand" msgstr "" -#: templates/web/default/admin/report_edit.html:40 +#: templates/web/default/admin/report_edit.html:44 #: templates/web/default/admin/update_edit.html:44 msgid "Cobrand data:" msgstr "" -#: templates/web/default/admin/report_edit.html:39 +#: templates/web/default/admin/report_edit.html:43 #: templates/web/default/admin/update_edit.html:43 msgid "Cobrand:" msgstr "" @@ -687,8 +686,8 @@ msgstr "Bestätigung" #: templates/web/default/admin/body.html:85 #: templates/web/default/admin/body_edit.html:32 #: templates/web/default/admin/body_edit.html:84 -#: templates/web/zurich/admin/report_edit-sdm.html:24 -#: templates/web/zurich/admin/report_edit.html:41 +#: templates/web/zurich/admin/report_edit-sdm.html:26 +#: templates/web/zurich/admin/report_edit.html:43 msgid "Confirmed" msgstr "Bestätigt" @@ -697,7 +696,7 @@ msgid "Confirmed reports between %s and %s" msgstr "" #: templates/web/default/admin/problem_row.html:25 -#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:39 msgid "Confirmed:" msgstr "Bestätigt:" @@ -771,10 +770,10 @@ msgstr "" msgid "Created" msgstr "Erstellt" -#: templates/web/default/admin/report_edit.html:34 +#: templates/web/default/admin/report_edit.html:38 #: templates/web/default/admin/update_edit.html:45 -#: templates/web/zurich/admin/report_edit-sdm.html:26 -#: templates/web/zurich/admin/report_edit.html:44 +#: templates/web/zurich/admin/report_edit-sdm.html:28 +#: templates/web/zurich/admin/report_edit.html:46 #: templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "Erstellt:" @@ -854,7 +853,6 @@ msgstr "" #: templates/web/default/admin/report_edit.html:1 #: templates/web/zurich/admin/report_edit-sdm.html:1 -#: templates/web/zurich/admin/report_edit.html:1 #: templates/web/zurich/admin/report_edit.html:4 msgid "Editing problem %d" msgstr "Meldung %d bearbeiten" @@ -906,14 +904,14 @@ msgstr "Schicken sie mir Aktualisierungen" #: templates/web/default/admin/body.html:80 #: templates/web/default/admin/body_edit.html:26 -#: templates/web/default/admin/report_edit.html:32 +#: templates/web/default/admin/report_edit.html:36 #: templates/web/default/admin/update_edit.html:27 #: templates/web/default/admin/user-form.html:6 #: templates/web/default/alert/updates.html:13 #: templates/web/default/report/display.html:34 #: templates/web/zurich/admin/body.html:41 -#: templates/web/zurich/admin/report_edit-sdm.html:23 -#: templates/web/zurich/admin/report_edit.html:40 +#: templates/web/zurich/admin/report_edit-sdm.html:25 +#: templates/web/zurich/admin/report_edit.html:42 msgid "Email:" msgstr "E-mail:" @@ -1019,7 +1017,7 @@ msgstr "Beispieladresse" msgid "Examples:" msgstr "Beispiele:" -#: templates/web/default/admin/report_edit.html:41 +#: templates/web/default/admin/report_edit.html:45 msgid "Extra data:" msgstr "" @@ -1086,8 +1084,7 @@ msgstr "" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:82 #: templates/web/default/admin/index.html:36 -#: templates/web/default/admin/report_edit.html:19 -#: templates/web/default/admin/report_edit.html:21 +#: templates/web/default/admin/report_edit.html:25 #: templates/web/default/dashboard/index.html:138 #: templates/web/default/dashboard/index.html:140 #: templates/web/default/report/update-form.html:30 @@ -1098,13 +1095,11 @@ msgstr "" msgid "Fixed" msgstr "Gelöst" -#: templates/web/default/admin/report_edit.html:19 -#: templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/report_edit.html:26 msgid "Fixed - Council" msgstr "" -#: templates/web/default/admin/report_edit.html:19 -#: templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/report_edit.html:26 msgid "Fixed - User" msgstr "" @@ -1125,7 +1120,7 @@ msgstr "" msgid "Flagged" msgstr "" -#: templates/web/default/admin/report_edit.html:43 +#: templates/web/default/admin/report_edit.html:47 #: templates/web/default/admin/user-form.html:14 msgid "Flagged:" msgstr "" @@ -1136,7 +1131,7 @@ msgstr "" msgid "Follow a ward link to view only reports within that ward." msgstr "" -#: templates/web/default/admin/report_edit.html:17 +#: templates/web/default/admin/report_edit.html:21 msgid "For council(s):" msgstr "" @@ -1193,7 +1188,7 @@ msgstr "" msgid "Go" msgstr "Los" -#: templates/web/default/admin/report_edit.html:42 +#: templates/web/default/admin/report_edit.html:46 msgid "Going to send questionnaire?" msgstr "" @@ -1245,13 +1240,11 @@ msgstr "" msgid "Hi %s" msgstr "Hallo %s" -#: templates/web/default/admin/report_edit.html:19 -#: templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/report_edit.html:26 #: templates/web/default/admin/update_edit.html:22 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:11 -#: templates/web/zurich/admin/report_edit.html:64 -#: templates/web/zurich/admin/report_edit.html:68 +#: templates/web/zurich/admin/report_edit.html:70 #: templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" msgstr "Unsichtbar" @@ -1340,7 +1333,7 @@ msgid "" "the council the activity in their area." msgstr "" -#: templates/web/default/auth/token.html:23 +#: templates/web/default/auth/token.html:25 #: templates/web/default/email_sent.html:9 msgid "" "If you use web-based email or have 'junk mail' filters, you may wish to " @@ -1376,8 +1369,7 @@ msgstr "" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:82 -#: templates/web/default/admin/report_edit.html:19 -#: templates/web/default/admin/report_edit.html:21 +#: templates/web/default/admin/report_edit.html:25 #: templates/web/default/dashboard/index.html:138 #: templates/web/default/dashboard/index.html:140 #: templates/web/default/report/update-form.html:30 @@ -1387,12 +1379,12 @@ msgstr "" #: templates/web/fixmystreet/report/update-form.html:30 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:8 -#: templates/web/zurich/admin/report_edit.html:77 +#: templates/web/zurich/admin/report_edit.html:79 #: templates/web/zurich/report/banner.html:15 msgid "In progress" msgstr "In Bearbeitung" -#: templates/web/zurich/admin/report_edit.html:116 +#: templates/web/zurich/admin/report_edit.html:118 #, fuzzy msgid "Include reporter personal details" msgstr "Bitte geben Sie einiges Details an" @@ -1405,8 +1397,8 @@ msgstr "" msgid "Incorrect has_photo value \"%s\"" msgstr "" -#: templates/web/zurich/admin/report_edit-sdm.html:35 -#: templates/web/zurich/admin/report_edit.html:59 +#: templates/web/zurich/admin/report_edit-sdm.html:37 +#: templates/web/zurich/admin/report_edit.html:61 msgid "Internal notes:" msgstr "Interne Notizen" @@ -1428,8 +1420,7 @@ msgstr "Ung&ultiges Startdatum" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:81 -#: templates/web/default/admin/report_edit.html:19 -#: templates/web/default/admin/report_edit.html:20 +#: templates/web/default/admin/report_edit.html:24 #: templates/web/default/dashboard/index.html:138 #: templates/web/default/dashboard/index.html:139 #: templates/web/default/report/update-form.html:30 @@ -1474,7 +1465,7 @@ msgstr "Letzte Bearbeitung" msgid "Last editor" msgstr "Letzter Bearbeiter" -#: templates/web/default/admin/report_edit.html:37 +#: templates/web/default/admin/report_edit.html:41 msgid "Last update:" msgstr "Letzte Bearbeitung" @@ -1585,11 +1576,11 @@ msgstr "Meldungen in der Nähe" msgid "Name" msgstr "Name" -#: templates/web/default/admin/report_edit.html:31 +#: templates/web/default/admin/report_edit.html:35 #: templates/web/default/admin/update_edit.html:26 #: templates/web/default/admin/user-form.html:5 -#: templates/web/zurich/admin/report_edit-sdm.html:22 -#: templates/web/zurich/admin/report_edit.html:39 +#: templates/web/zurich/admin/report_edit-sdm.html:24 +#: templates/web/zurich/admin/report_edit.html:41 msgid "Name:" msgstr "Name:" @@ -1706,7 +1697,7 @@ msgstr "" msgid "New state" msgstr "Neuer Status" -#: templates/web/zurich/admin/report_edit-sdm.html:38 +#: templates/web/zurich/admin/report_edit-sdm.html:40 msgid "New update:" msgstr "Neue Antwort" @@ -1724,8 +1715,8 @@ msgstr "Neu!" #: templates/web/default/admin/list_updates.html:31 #: templates/web/default/admin/list_updates.html:32 #: templates/web/default/admin/problem_row.html:21 -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:42 +#: templates/web/default/admin/report_edit.html:33 +#: templates/web/default/admin/report_edit.html:46 #: templates/web/default/admin/update_edit.html:19 #: templates/web/default/questionnaire/creator_fixed.html:16 #: templates/web/default/questionnaire/index.html:107 @@ -1759,7 +1750,7 @@ msgstr "" msgid "No flagged users found" msgstr "" -#: templates/web/zurich/admin/report_edit-sdm.html:44 +#: templates/web/zurich/admin/report_edit-sdm.html:46 msgid "No further updates" msgstr "Bearbeitung abschliessen" @@ -1785,9 +1776,9 @@ msgstr "" msgid "Non Public" msgstr "" -#: templates/web/default/admin/report_edit.html:17 -#: templates/web/zurich/admin/report_edit-sdm.html:25 -#: templates/web/zurich/admin/report_edit.html:43 +#: templates/web/default/admin/report_edit.html:21 +#: templates/web/zurich/admin/report_edit-sdm.html:27 +#: templates/web/zurich/admin/report_edit.html:45 msgid "None" msgstr "Keine" @@ -1889,15 +1880,14 @@ msgid "Older problems" msgstr "" #: templates/web/bromley/report/display.html:80 -#: templates/web/default/admin/report_edit.html:19 +#: templates/web/default/admin/report_edit.html:23 #: templates/web/default/admin/update_edit.html:22 #: templates/web/default/dashboard/index.html:138 #: templates/web/default/report/update-form.html:30 #: templates/web/fixmystreet/report/update-form.html:28 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 -#: templates/web/zurich/admin/report_edit.html:64 -#: templates/web/zurich/admin/report_edit.html:66 +#: templates/web/zurich/admin/report_edit.html:68 #: templates/web/zurich/admin/update_edit.html:18 #: templates/web/zurich/report/banner.html:11 msgid "Open" @@ -1963,8 +1953,7 @@ msgstr "" msgid "Parent" msgstr "" -#: templates/web/default/admin/report_edit.html:19 -#: templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/report_edit.html:26 msgid "Partial" msgstr "" @@ -1989,10 +1978,10 @@ msgid "Phone number (optional)" msgstr "Telefonnummer (optional)" #: perllib/FixMyStreet/DB/ResultSet/Problem.pm:263 -#: templates/web/default/admin/report_edit.html:33 +#: templates/web/default/admin/report_edit.html:37 #: templates/web/default/report/new/fill_in_details_form.html:215 -#: templates/web/zurich/admin/report_edit-sdm.html:25 -#: templates/web/zurich/admin/report_edit.html:43 +#: templates/web/zurich/admin/report_edit-sdm.html:27 +#: templates/web/zurich/admin/report_edit.html:45 msgid "Phone:" msgstr "Telefonnummer:" @@ -2021,8 +2010,7 @@ msgstr "Pin auf der Karte absetzen" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:81 -#: templates/web/default/admin/report_edit.html:19 -#: templates/web/default/admin/report_edit.html:20 +#: templates/web/default/admin/report_edit.html:24 #: templates/web/default/dashboard/index.html:138 #: templates/web/default/dashboard/index.html:139 #: templates/web/default/report/update-form.html:30 @@ -2032,8 +2020,7 @@ msgstr "Pin auf der Karte absetzen" #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 -#: templates/web/zurich/admin/report_edit.html:64 -#: templates/web/zurich/admin/report_edit.html:67 +#: templates/web/zurich/admin/report_edit.html:69 msgid "Planned" msgstr "Rückmeldung ausstehend" @@ -2363,7 +2350,7 @@ msgstr "" #: templates/web/default/admin/body.html:97 #: templates/web/default/admin/body_edit.html:40 -#: templates/web/default/admin/report_edit.html:44 +#: templates/web/default/admin/report_edit.html:48 msgid "Private" msgstr "" @@ -2486,15 +2473,15 @@ msgstr "" msgid "Public" msgstr "" -#: templates/web/zurich/admin/report_edit.html:148 +#: templates/web/zurich/admin/report_edit.html:150 msgid "Public response:" msgstr "Offizielle Antwort" -#: templates/web/zurich/admin/report_edit.html:55 +#: templates/web/zurich/admin/report_edit.html:57 msgid "Publish photo" msgstr "Foto veröffentlichen" -#: templates/web/zurich/admin/report_edit.html:158 +#: templates/web/zurich/admin/report_edit.html:160 msgid "Publish the response" msgstr "Antwort veröffentlichen" @@ -2639,7 +2626,7 @@ msgstr "" msgid "Remove flag" msgstr "" -#: templates/web/default/admin/report_edit.html:55 +#: templates/web/default/admin/report_edit.html:59 #: templates/web/default/admin/update_edit.html:51 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" @@ -2767,7 +2754,7 @@ msgstr "" msgid "Reports published" msgstr "Missbrauch melden" -#: templates/web/default/admin/report_edit.html:36 +#: templates/web/default/admin/report_edit.html:40 msgid "Resend report" msgstr "" @@ -2785,13 +2772,13 @@ 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 +#: templates/web/default/admin/report_edit.html:55 +#: templates/web/zurich/admin/report_edit.html:53 msgid "Rotate Left" msgstr "" -#: templates/web/default/admin/report_edit.html:52 -#: templates/web/zurich/admin/report_edit.html:52 +#: templates/web/default/admin/report_edit.html:56 +#: templates/web/zurich/admin/report_edit.html:54 msgid "Rotate Right" msgstr "" @@ -2840,11 +2827,11 @@ msgstr "" msgid "Sent to %s %s later" msgstr "" -#: templates/web/default/admin/report_edit.html:36 +#: templates/web/default/admin/report_edit.html:40 msgid "Sent:" msgstr "Gesendet:" -#: templates/web/default/admin/report_edit.html:38 +#: templates/web/default/admin/report_edit.html:42 msgid "Service:" msgstr "" @@ -2996,11 +2983,11 @@ msgstr "" msgid "State" msgstr "Status" -#: templates/web/default/admin/report_edit.html:18 +#: templates/web/default/admin/report_edit.html:22 #: templates/web/default/admin/update_edit.html:21 #: templates/web/default/report/update-form.html:28 -#: templates/web/zurich/admin/report_edit-sdm.html:33 -#: templates/web/zurich/admin/report_edit.html:62 +#: templates/web/zurich/admin/report_edit-sdm.html:35 +#: templates/web/zurich/admin/report_edit.html:64 #: templates/web/zurich/admin/update_edit.html:17 msgid "State:" msgstr "Status:" @@ -3051,11 +3038,11 @@ msgstr "Titel:" msgid "Submit" msgstr "Abschicken" -#: templates/web/default/admin/report_edit.html:58 +#: templates/web/default/admin/report_edit.html:62 #: templates/web/default/admin/update_edit.html:54 #: templates/web/default/admin/user-form.html:17 -#: templates/web/zurich/admin/report_edit-sdm.html:43 -#: templates/web/zurich/admin/report_edit.html:160 +#: templates/web/zurich/admin/report_edit-sdm.html:45 +#: templates/web/zurich/admin/report_edit.html:162 #: templates/web/zurich/admin/update_edit.html:38 msgid "Submit changes" msgstr "Änderungen speichern" @@ -3070,8 +3057,7 @@ msgstr "" #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-dm.html:6 #: templates/web/zurich/admin/index-sdm.html:21 -#: templates/web/zurich/admin/report_edit.html:64 -#: templates/web/zurich/admin/report_edit.html:65 +#: templates/web/zurich/admin/report_edit.html:67 #: templates/web/zurich/admin/reports.html:15 #: templates/web/zurich/report/banner.html:9 msgid "Submitted" @@ -3262,7 +3248,7 @@ msgid "" "the attribute is defined in the Open311 v2 specification." msgstr "" -#: templates/web/default/auth/token.html:21 +#: templates/web/default/auth/token.html:22 #: templates/web/default/email_sent.html:6 msgid "" "The confirmation email <strong>may</strong> take a few minutes to arrive " @@ -3572,8 +3558,7 @@ msgstr "Total" msgid "Try again" msgstr "Erneut versuchen" -#: templates/web/default/admin/report_edit.html:19 -#: templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/report_edit.html:26 #: templates/web/default/admin/update_edit.html:22 #: templates/web/zurich/admin/update_edit.html:18 msgid "Unconfirmed" @@ -3884,8 +3869,8 @@ msgstr "Jahr" #: templates/web/default/admin/list_updates.html:31 #: templates/web/default/admin/list_updates.html:32 #: templates/web/default/admin/problem_row.html:21 -#: templates/web/default/admin/report_edit.html:28 -#: templates/web/default/admin/report_edit.html:42 +#: templates/web/default/admin/report_edit.html:32 +#: templates/web/default/admin/report_edit.html:46 #: templates/web/default/admin/update_edit.html:18 #: templates/web/default/admin/users.html:26 #: templates/web/default/questionnaire/creator_fixed.html:14 @@ -4032,7 +4017,7 @@ msgstr "" "Sie können Ihre Meldung bestätigen, indem Sie auf den Link im E-" "Mail klicken." -#: templates/web/default/admin/report_edit.html:36 +#: templates/web/default/admin/report_edit.html:40 msgid "You really want to resend?" msgstr "" @@ -4167,9 +4152,9 @@ msgstr "" msgid "council ref: %s" msgstr "" -#: templates/web/default/admin/report_edit.html:16 -#: templates/web/zurich/admin/report_edit-sdm.html:19 -#: templates/web/zurich/admin/report_edit.html:37 +#: templates/web/default/admin/report_edit.html:19 +#: templates/web/zurich/admin/report_edit-sdm.html:21 +#: templates/web/zurich/admin/report_edit.html:39 msgid "didn't use map" msgstr "hat Karte nicht verwendet" @@ -4211,16 +4196,17 @@ msgstr "oder" msgid "or locate me automatically" msgstr "oder automatisch lokalisieren" -#: templates/web/default/admin/report_edit.html:16 +#: templates/web/default/admin/report_edit.html:18 #: templates/web/zurich/admin/report_edit-sdm.html:16 -#: templates/web/zurich/admin/report_edit-sdm.html:19 +#: templates/web/zurich/admin/report_edit-sdm.html:20 #: templates/web/zurich/admin/report_edit.html:24 #: templates/web/zurich/admin/report_edit.html:32 -#: templates/web/zurich/admin/report_edit.html:37 -msgid "originally entered" +#: templates/web/zurich/admin/report_edit.html:38 +#, fuzzy +msgid "originally entered: “%s”" msgstr "ursprünglich eingegeben" -#: templates/web/default/admin/report_edit.html:17 +#: templates/web/default/admin/report_edit.html:21 msgid "other areas:" msgstr "" @@ -4260,9 +4246,9 @@ msgstr "" msgid "today" msgstr "heute" -#: templates/web/default/admin/report_edit.html:16 -#: templates/web/zurich/admin/report_edit-sdm.html:19 -#: templates/web/zurich/admin/report_edit.html:37 +#: templates/web/default/admin/report_edit.html:19 +#: templates/web/zurich/admin/report_edit-sdm.html:21 +#: templates/web/zurich/admin/report_edit.html:39 msgid "used map" msgstr "Karte verwendet" diff --git a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po index 7b5e9ae35..863ce67ca 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-31 15:25+0000\n" +"POT-Creation-Date: 2013-01-31 15:59+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" @@ -479,7 +479,7 @@ msgstr "En oppdatering markerte dette problemet som fikset." msgid "Anonymous" msgstr "Anonym" -#: templates/web/default/admin/report_edit.html:27 +#: templates/web/default/admin/report_edit.html:31 #: templates/web/default/admin/update_edit.html:17 msgid "Anonymous:" msgstr "Anonym:" @@ -507,16 +507,16 @@ msgstr "Der du fra den lokale administrasjonen?" msgid "Area covered" msgstr "" -#: templates/web/zurich/admin/report_edit.html:97 +#: templates/web/zurich/admin/report_edit.html:99 msgid "Assign to different category:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:106 +#: templates/web/zurich/admin/report_edit.html:108 msgid "Assign to external body:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:138 -#: templates/web/zurich/admin/report_edit.html:85 +#: templates/web/zurich/admin/report_edit.html:140 +#: templates/web/zurich/admin/report_edit.html:87 msgid "Assign to subdivision:" msgstr "" @@ -617,11 +617,11 @@ msgstr "Løsningsrate fordelt på kategori for problemer > 4 uker gamle" #: templates/web/default/admin/body.html:75 #: templates/web/default/admin/body_edit.html:23 -#: templates/web/default/admin/report_edit.html:26 +#: templates/web/default/admin/report_edit.html:30 #: templates/web/default/report/new/fill_in_details_form.html:67 #: templates/web/zurich/admin/body.html:36 -#: templates/web/zurich/admin/report_edit-sdm.html:21 -#: templates/web/zurich/admin/report_edit.html:96 +#: templates/web/zurich/admin/report_edit-sdm.html:23 +#: templates/web/zurich/admin/report_edit.html:98 msgid "Category:" msgstr "Kategori:" @@ -642,8 +642,7 @@ msgstr "Klikk i kartet for å rapportere et problem" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:82 -#: templates/web/default/admin/report_edit.html:19 -#: templates/web/default/admin/report_edit.html:21 +#: templates/web/default/admin/report_edit.html:25 #: templates/web/default/dashboard/index.html:138 #: templates/web/default/dashboard/index.html:140 #: templates/web/default/report/update-form.html:30 @@ -654,8 +653,8 @@ msgstr "Klikk i kartet for å rapportere et problem" #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:12 -#: templates/web/zurich/admin/report_edit.html:73 #: templates/web/zurich/admin/report_edit.html:75 +#: templates/web/zurich/admin/report_edit.html:77 #: templates/web/zurich/report/banner.html:13 msgid "Closed" msgstr "Lukket" @@ -677,7 +676,7 @@ msgstr "Lukket:" msgid "Closest nearby problems <small>(within %skm)</small>" msgstr "De nærmeste problemene <small>(innenfor %skm)</small>" -#: templates/web/default/admin/report_edit.html:16 +#: templates/web/default/admin/report_edit.html:17 #: templates/web/zurich/admin/report_edit-sdm.html:19 #: templates/web/zurich/admin/report_edit.html:37 msgid "Co-ordinates:" @@ -689,12 +688,12 @@ msgstr "Koordinater:" msgid "Cobrand" msgstr "Merkevaresamarbeid" -#: templates/web/default/admin/report_edit.html:40 +#: templates/web/default/admin/report_edit.html:44 #: templates/web/default/admin/update_edit.html:44 msgid "Cobrand data:" msgstr "Merkevaresamarbeidsdata:" -#: templates/web/default/admin/report_edit.html:39 +#: templates/web/default/admin/report_edit.html:43 #: templates/web/default/admin/update_edit.html:43 msgid "Cobrand:" msgstr "Merkevaresamarbeid:" @@ -741,8 +740,8 @@ msgstr "Bekreftelse" #: templates/web/default/admin/body.html:85 #: templates/web/default/admin/body_edit.html:32 #: templates/web/default/admin/body_edit.html:84 -#: templates/web/zurich/admin/report_edit-sdm.html:24 -#: templates/web/zurich/admin/report_edit.html:41 +#: templates/web/zurich/admin/report_edit-sdm.html:26 +#: templates/web/zurich/admin/report_edit.html:43 msgid "Confirmed" msgstr "Bekreftet" @@ -752,7 +751,7 @@ msgid "Confirmed reports between %s and %s" msgstr "%srapporter mellom %s og %s" #: templates/web/default/admin/problem_row.html:25 -#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:39 msgid "Confirmed:" msgstr "Bekreftet:" @@ -826,10 +825,10 @@ msgstr "Lag kategori" msgid "Created" msgstr "Opprettet" -#: templates/web/default/admin/report_edit.html:34 +#: templates/web/default/admin/report_edit.html:38 #: templates/web/default/admin/update_edit.html:45 -#: templates/web/zurich/admin/report_edit-sdm.html:26 -#: templates/web/zurich/admin/report_edit.html:44 +#: templates/web/zurich/admin/report_edit-sdm.html:28 +#: templates/web/zurich/admin/report_edit.html:46 #: templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "Opprettet:" @@ -910,7 +909,6 @@ msgstr "" #: templates/web/default/admin/report_edit.html:1 #: templates/web/zurich/admin/report_edit-sdm.html:1 -#: templates/web/zurich/admin/report_edit.html:1 #: templates/web/zurich/admin/report_edit.html:4 msgid "Editing problem %d" msgstr "Rediger problem %d" @@ -962,14 +960,14 @@ msgstr "Send meg oppdateringer" #: templates/web/default/admin/body.html:80 #: templates/web/default/admin/body_edit.html:26 -#: templates/web/default/admin/report_edit.html:32 +#: templates/web/default/admin/report_edit.html:36 #: templates/web/default/admin/update_edit.html:27 #: templates/web/default/admin/user-form.html:6 #: templates/web/default/alert/updates.html:13 #: templates/web/default/report/display.html:34 #: templates/web/zurich/admin/body.html:41 -#: templates/web/zurich/admin/report_edit-sdm.html:23 -#: templates/web/zurich/admin/report_edit.html:40 +#: templates/web/zurich/admin/report_edit-sdm.html:25 +#: templates/web/zurich/admin/report_edit.html:42 msgid "Email:" msgstr "E-post:" @@ -1080,7 +1078,7 @@ msgstr "Eksempel-postnummer %s" msgid "Examples:" msgstr "Eksempler:" -#: templates/web/default/admin/report_edit.html:41 +#: templates/web/default/admin/report_edit.html:45 msgid "Extra data:" msgstr "Ekstra data:" @@ -1157,8 +1155,7 @@ msgstr "" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:82 #: templates/web/default/admin/index.html:36 -#: templates/web/default/admin/report_edit.html:19 -#: templates/web/default/admin/report_edit.html:21 +#: templates/web/default/admin/report_edit.html:25 #: templates/web/default/dashboard/index.html:138 #: templates/web/default/dashboard/index.html:140 #: templates/web/default/report/update-form.html:30 @@ -1169,13 +1166,11 @@ msgstr "" msgid "Fixed" msgstr "Løst" -#: templates/web/default/admin/report_edit.html:19 -#: templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/report_edit.html:26 msgid "Fixed - Council" msgstr "Løst - Administrasjon" -#: templates/web/default/admin/report_edit.html:19 -#: templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/report_edit.html:26 msgid "Fixed - User" msgstr "Løst - Bruker" @@ -1196,7 +1191,7 @@ msgstr "Flag bruker" msgid "Flagged" msgstr "Flagget:" -#: templates/web/default/admin/report_edit.html:43 +#: templates/web/default/admin/report_edit.html:47 #: templates/web/default/admin/user-form.html:14 msgid "Flagged:" msgstr "Flagget:" @@ -1207,7 +1202,7 @@ msgstr "Flagget:" msgid "Follow a ward link to view only reports within that ward." msgstr "Følg en bydelslenke for å kun se rapporter innenfor den bydelen." -#: templates/web/default/admin/report_edit.html:17 +#: templates/web/default/admin/report_edit.html:21 msgid "For council(s):" msgstr "For administrasjon(ene):" @@ -1265,7 +1260,7 @@ msgstr "Gi meg en RSS-strøm" msgid "Go" msgstr "Fortsett" -#: templates/web/default/admin/report_edit.html:42 +#: templates/web/default/admin/report_edit.html:46 msgid "Going to send questionnaire?" msgstr "Skal det sendes spørreskjema?" @@ -1321,13 +1316,11 @@ msgstr "" msgid "Hi %s" msgstr "Hei, %s" -#: templates/web/default/admin/report_edit.html:19 -#: templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/report_edit.html:26 #: templates/web/default/admin/update_edit.html:22 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:11 -#: templates/web/zurich/admin/report_edit.html:64 -#: templates/web/zurich/admin/report_edit.html:68 +#: templates/web/zurich/admin/report_edit.html:70 #: templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" msgstr "Skjul" @@ -1427,7 +1420,7 @@ msgstr "" "inn din rapport, slik at vi kan vise administrasjonen aktiviteten i deres " "område." -#: templates/web/default/auth/token.html:23 +#: templates/web/default/auth/token.html:25 #: templates/web/default/email_sent.html:9 msgid "" "If you use web-based email or have 'junk mail' filters, you may wish to " @@ -1471,8 +1464,7 @@ msgstr "" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:82 -#: templates/web/default/admin/report_edit.html:19 -#: templates/web/default/admin/report_edit.html:21 +#: templates/web/default/admin/report_edit.html:25 #: templates/web/default/dashboard/index.html:138 #: templates/web/default/dashboard/index.html:140 #: templates/web/default/report/update-form.html:30 @@ -1482,12 +1474,12 @@ msgstr "" #: templates/web/fixmystreet/report/update-form.html:30 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:8 -#: templates/web/zurich/admin/report_edit.html:77 +#: templates/web/zurich/admin/report_edit.html:79 #: templates/web/zurich/report/banner.html:15 msgid "In progress" msgstr "Under arbeid" -#: templates/web/zurich/admin/report_edit.html:116 +#: templates/web/zurich/admin/report_edit.html:118 #, fuzzy msgid "Include reporter personal details" msgstr "Legg inn opplysninger om problemet" @@ -1500,8 +1492,8 @@ msgstr "Inkluder ubekreftede problemer" msgid "Incorrect has_photo value \"%s\"" msgstr "Feil has_photo-verdi \"%s\"" -#: templates/web/zurich/admin/report_edit-sdm.html:35 -#: templates/web/zurich/admin/report_edit.html:59 +#: templates/web/zurich/admin/report_edit-sdm.html:37 +#: templates/web/zurich/admin/report_edit.html:61 msgid "Internal notes:" msgstr "" @@ -1523,8 +1515,7 @@ msgstr "Ugyldig startdato" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:81 -#: templates/web/default/admin/report_edit.html:19 -#: templates/web/default/admin/report_edit.html:20 +#: templates/web/default/admin/report_edit.html:24 #: templates/web/default/dashboard/index.html:138 #: templates/web/default/dashboard/index.html:139 #: templates/web/default/report/update-form.html:30 @@ -1569,7 +1560,7 @@ msgstr "Etternavn" msgid "Last editor" msgstr "Sist redigert av" -#: templates/web/default/admin/report_edit.html:37 +#: templates/web/default/admin/report_edit.html:41 msgid "Last update:" msgstr "Siste oppdatering:" @@ -1683,11 +1674,11 @@ msgstr "Flere problemer i nærheten" msgid "Name" msgstr "Navn" -#: templates/web/default/admin/report_edit.html:31 +#: templates/web/default/admin/report_edit.html:35 #: templates/web/default/admin/update_edit.html:26 #: templates/web/default/admin/user-form.html:5 -#: templates/web/zurich/admin/report_edit-sdm.html:22 -#: templates/web/zurich/admin/report_edit.html:39 +#: templates/web/zurich/admin/report_edit-sdm.html:24 +#: templates/web/zurich/admin/report_edit.html:41 msgid "Name:" msgstr "Navn:" @@ -1815,7 +1806,7 @@ msgstr "Nye rapporter innenfor grensen til {{NAME}} på reportemptyhomes.com" msgid "New state" msgstr "Ny tilstand" -#: templates/web/zurich/admin/report_edit-sdm.html:38 +#: templates/web/zurich/admin/report_edit-sdm.html:40 #, fuzzy msgid "New update:" msgstr "Få oppdateringer" @@ -1834,8 +1825,8 @@ msgstr "Ny!" #: templates/web/default/admin/list_updates.html:31 #: templates/web/default/admin/list_updates.html:32 #: templates/web/default/admin/problem_row.html:21 -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:42 +#: templates/web/default/admin/report_edit.html:33 +#: templates/web/default/admin/report_edit.html:46 #: templates/web/default/admin/update_edit.html:19 #: templates/web/default/questionnaire/creator_fixed.html:16 #: templates/web/default/questionnaire/index.html:107 @@ -1869,7 +1860,7 @@ msgstr "Ingen flaggede problemer ble funnet" msgid "No flagged users found" msgstr "Ingen flaggede brukere ble funnet" -#: templates/web/zurich/admin/report_edit-sdm.html:44 +#: templates/web/zurich/admin/report_edit-sdm.html:46 #, fuzzy msgid "No further updates" msgstr "Dine oppdateringer" @@ -1896,9 +1887,9 @@ msgstr "" msgid "Non Public" msgstr "" -#: templates/web/default/admin/report_edit.html:17 -#: templates/web/zurich/admin/report_edit-sdm.html:25 -#: templates/web/zurich/admin/report_edit.html:43 +#: templates/web/default/admin/report_edit.html:21 +#: templates/web/zurich/admin/report_edit-sdm.html:27 +#: templates/web/zurich/admin/report_edit.html:45 msgid "None" msgstr "Ingen" @@ -2004,15 +1995,14 @@ msgid "Older problems" msgstr "Eldre problemer" #: templates/web/bromley/report/display.html:80 -#: templates/web/default/admin/report_edit.html:19 +#: templates/web/default/admin/report_edit.html:23 #: templates/web/default/admin/update_edit.html:22 #: templates/web/default/dashboard/index.html:138 #: templates/web/default/report/update-form.html:30 #: templates/web/fixmystreet/report/update-form.html:28 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 -#: templates/web/zurich/admin/report_edit.html:64 -#: templates/web/zurich/admin/report_edit.html:66 +#: templates/web/zurich/admin/report_edit.html:68 #: templates/web/zurich/admin/update_edit.html:18 #: templates/web/zurich/report/banner.html:11 msgid "Open" @@ -2082,8 +2072,7 @@ msgstr "Fant ikke siden" msgid "Parent" msgstr "" -#: templates/web/default/admin/report_edit.html:19 -#: templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/report_edit.html:26 msgid "Partial" msgstr "Delvis" @@ -2108,10 +2097,10 @@ msgid "Phone number (optional)" msgstr "Telefonnummer (valgfritt)" #: perllib/FixMyStreet/DB/ResultSet/Problem.pm:263 -#: templates/web/default/admin/report_edit.html:33 +#: templates/web/default/admin/report_edit.html:37 #: templates/web/default/report/new/fill_in_details_form.html:215 -#: templates/web/zurich/admin/report_edit-sdm.html:25 -#: templates/web/zurich/admin/report_edit.html:43 +#: templates/web/zurich/admin/report_edit-sdm.html:27 +#: templates/web/zurich/admin/report_edit.html:45 msgid "Phone:" msgstr "Telefon:" @@ -2140,8 +2129,7 @@ msgstr "" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:81 -#: templates/web/default/admin/report_edit.html:19 -#: templates/web/default/admin/report_edit.html:20 +#: templates/web/default/admin/report_edit.html:24 #: templates/web/default/dashboard/index.html:138 #: templates/web/default/dashboard/index.html:139 #: templates/web/default/report/update-form.html:30 @@ -2151,8 +2139,7 @@ msgstr "" #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 -#: templates/web/zurich/admin/report_edit.html:64 -#: templates/web/zurich/admin/report_edit.html:67 +#: templates/web/zurich/admin/report_edit.html:69 msgid "Planned" msgstr "Planlagt" @@ -2514,7 +2501,7 @@ msgstr "Sendt inn av %s %s" #: templates/web/default/admin/body.html:97 #: templates/web/default/admin/body_edit.html:40 -#: templates/web/default/admin/report_edit.html:44 +#: templates/web/default/admin/report_edit.html:48 msgid "Private" msgstr "" @@ -2644,15 +2631,15 @@ msgstr "" msgid "Public" msgstr "" -#: templates/web/zurich/admin/report_edit.html:148 +#: templates/web/zurich/admin/report_edit.html:150 msgid "Public response:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:55 +#: templates/web/zurich/admin/report_edit.html:57 msgid "Publish photo" msgstr "" -#: templates/web/zurich/admin/report_edit.html:158 +#: templates/web/zurich/admin/report_edit.html:160 msgid "Publish the response" msgstr "" @@ -2796,7 +2783,7 @@ msgstr "" msgid "Remove flag" msgstr "Fjern flagg" -#: templates/web/default/admin/report_edit.html:55 +#: templates/web/default/admin/report_edit.html:59 #: templates/web/default/admin/update_edit.html:51 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" @@ -2926,7 +2913,7 @@ msgstr "Problemer i og rundt kartet" msgid "Reports published" msgstr "Rapporter misbruk" -#: templates/web/default/admin/report_edit.html:36 +#: templates/web/default/admin/report_edit.html:40 msgid "Resend report" msgstr "Send rapport på nytt" @@ -2946,13 +2933,13 @@ 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 +#: templates/web/default/admin/report_edit.html:55 +#: templates/web/zurich/admin/report_edit.html:53 msgid "Rotate Left" msgstr "" -#: templates/web/default/admin/report_edit.html:52 -#: templates/web/zurich/admin/report_edit.html:52 +#: templates/web/default/admin/report_edit.html:56 +#: templates/web/zurich/admin/report_edit.html:54 msgid "Rotate Right" msgstr "" @@ -3004,11 +2991,11 @@ msgstr "" msgid "Sent to %s %s later" msgstr "Sendt til %s %s senere" -#: templates/web/default/admin/report_edit.html:36 +#: templates/web/default/admin/report_edit.html:40 msgid "Sent:" msgstr "Sendt:" -#: templates/web/default/admin/report_edit.html:38 +#: templates/web/default/admin/report_edit.html:42 msgid "Service:" msgstr "Tjeneste:" @@ -3164,11 +3151,11 @@ msgstr "Startmåned:" msgid "State" msgstr "Tilstand" -#: templates/web/default/admin/report_edit.html:18 +#: templates/web/default/admin/report_edit.html:22 #: templates/web/default/admin/update_edit.html:21 #: templates/web/default/report/update-form.html:28 -#: templates/web/zurich/admin/report_edit-sdm.html:33 -#: templates/web/zurich/admin/report_edit.html:62 +#: templates/web/zurich/admin/report_edit-sdm.html:35 +#: templates/web/zurich/admin/report_edit.html:64 #: templates/web/zurich/admin/update_edit.html:17 msgid "State:" msgstr "Tilstand:" @@ -3220,11 +3207,11 @@ msgstr "Emne:" msgid "Submit" msgstr "Send inn" -#: templates/web/default/admin/report_edit.html:58 +#: templates/web/default/admin/report_edit.html:62 #: templates/web/default/admin/update_edit.html:54 #: templates/web/default/admin/user-form.html:17 -#: templates/web/zurich/admin/report_edit-sdm.html:43 -#: templates/web/zurich/admin/report_edit.html:160 +#: templates/web/zurich/admin/report_edit-sdm.html:45 +#: templates/web/zurich/admin/report_edit.html:162 #: templates/web/zurich/admin/update_edit.html:38 msgid "Submit changes" msgstr "Send inn endringer" @@ -3239,8 +3226,7 @@ msgstr "Send inn spørreskjema" #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-dm.html:6 #: templates/web/zurich/admin/index-sdm.html:21 -#: templates/web/zurich/admin/report_edit.html:64 -#: templates/web/zurich/admin/report_edit.html:65 +#: templates/web/zurich/admin/report_edit.html:67 #: templates/web/zurich/admin/reports.html:15 #: templates/web/zurich/report/banner.html:9 #, fuzzy @@ -3454,7 +3440,7 @@ msgstr "" "administrasjonene som mottok problemrapporten, noe som ikke helt stemmer med " "hvordan atributten er definert i Open311 v2-spesifikasjonen." -#: templates/web/default/auth/token.html:21 +#: templates/web/default/auth/token.html:22 #: templates/web/default/email_sent.html:6 msgid "" "The confirmation email <strong>may</strong> take a few minutes to arrive " @@ -3813,8 +3799,7 @@ msgstr "Totalt" msgid "Try again" msgstr "" -#: templates/web/default/admin/report_edit.html:19 -#: templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/report_edit.html:26 #: templates/web/default/admin/update_edit.html:22 #: templates/web/zurich/admin/update_edit.html:18 msgid "Unconfirmed" @@ -4149,8 +4134,8 @@ msgstr "År" #: templates/web/default/admin/list_updates.html:31 #: templates/web/default/admin/list_updates.html:32 #: templates/web/default/admin/problem_row.html:21 -#: templates/web/default/admin/report_edit.html:28 -#: templates/web/default/admin/report_edit.html:42 +#: templates/web/default/admin/report_edit.html:32 +#: templates/web/default/admin/report_edit.html:46 #: templates/web/default/admin/update_edit.html:18 #: templates/web/default/admin/users.html:26 #: templates/web/default/questionnaire/creator_fixed.html:14 @@ -4318,7 +4303,7 @@ msgstr "" "Du må nå åpne lenken i e-posten vi akkurat sendte deg — dersom du ikke " "gjør det, %s" -#: templates/web/default/admin/report_edit.html:36 +#: templates/web/default/admin/report_edit.html:40 msgid "You really want to resend?" msgstr "Ønsker du virkelig å sende på nytt?" @@ -4454,9 +4439,9 @@ msgstr "administrasjon" msgid "council ref: %s" msgstr "%s ref: %s" -#: templates/web/default/admin/report_edit.html:16 -#: templates/web/zurich/admin/report_edit-sdm.html:19 -#: templates/web/zurich/admin/report_edit.html:37 +#: templates/web/default/admin/report_edit.html:19 +#: templates/web/zurich/admin/report_edit-sdm.html:21 +#: templates/web/zurich/admin/report_edit.html:39 msgid "didn't use map" msgstr "brukte ikke kart" @@ -4498,16 +4483,17 @@ msgstr "eller" msgid "or locate me automatically" msgstr "" -#: templates/web/default/admin/report_edit.html:16 +#: templates/web/default/admin/report_edit.html:18 #: templates/web/zurich/admin/report_edit-sdm.html:16 -#: templates/web/zurich/admin/report_edit-sdm.html:19 +#: templates/web/zurich/admin/report_edit-sdm.html:20 #: templates/web/zurich/admin/report_edit.html:24 #: templates/web/zurich/admin/report_edit.html:32 -#: templates/web/zurich/admin/report_edit.html:37 -msgid "originally entered" +#: templates/web/zurich/admin/report_edit.html:38 +#, fuzzy +msgid "originally entered: “%s”" msgstr "søkte etter" -#: templates/web/default/admin/report_edit.html:17 +#: templates/web/default/admin/report_edit.html:21 msgid "other areas:" msgstr "andre områder:" @@ -4545,9 +4531,9 @@ msgstr "denne type lokalt problem" msgid "today" msgstr "idag" -#: templates/web/default/admin/report_edit.html:16 -#: templates/web/zurich/admin/report_edit-sdm.html:19 -#: templates/web/zurich/admin/report_edit.html:37 +#: templates/web/default/admin/report_edit.html:19 +#: templates/web/zurich/admin/report_edit-sdm.html:21 +#: templates/web/zurich/admin/report_edit.html:39 msgid "used map" msgstr "brukte kart" diff --git a/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po index be42114c0..a180daeb3 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-31 15:25+0000\n" +"POT-Creation-Date: 2013-01-31 15:59+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" @@ -485,7 +485,7 @@ msgstr "Ei oppdatering markerte dette problemet som løyst." msgid "Anonymous" msgstr "Anonym" -#: templates/web/default/admin/report_edit.html:27 +#: templates/web/default/admin/report_edit.html:31 #: templates/web/default/admin/update_edit.html:17 msgid "Anonymous:" msgstr "Anonym:" @@ -513,16 +513,16 @@ msgstr "den lokale administrasjonen" msgid "Area covered" msgstr "" -#: templates/web/zurich/admin/report_edit.html:97 +#: templates/web/zurich/admin/report_edit.html:99 msgid "Assign to different category:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:106 +#: templates/web/zurich/admin/report_edit.html:108 msgid "Assign to external body:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:138 -#: templates/web/zurich/admin/report_edit.html:85 +#: templates/web/zurich/admin/report_edit.html:140 +#: templates/web/zurich/admin/report_edit.html:87 msgid "Assign to subdivision:" msgstr "" @@ -624,11 +624,11 @@ msgstr "Løysingsrate fordelt på kategori for problem > 4 veker gamle" #: templates/web/default/admin/body.html:75 #: templates/web/default/admin/body_edit.html:23 -#: templates/web/default/admin/report_edit.html:26 +#: templates/web/default/admin/report_edit.html:30 #: templates/web/default/report/new/fill_in_details_form.html:67 #: templates/web/zurich/admin/body.html:36 -#: templates/web/zurich/admin/report_edit-sdm.html:21 -#: templates/web/zurich/admin/report_edit.html:96 +#: templates/web/zurich/admin/report_edit-sdm.html:23 +#: templates/web/zurich/admin/report_edit.html:98 msgid "Category:" msgstr "Kategori:" @@ -650,8 +650,7 @@ msgstr "Korleis rapportera eit problem" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:82 -#: templates/web/default/admin/report_edit.html:19 -#: templates/web/default/admin/report_edit.html:21 +#: templates/web/default/admin/report_edit.html:25 #: templates/web/default/dashboard/index.html:138 #: templates/web/default/dashboard/index.html:140 #: templates/web/default/report/update-form.html:30 @@ -662,8 +661,8 @@ msgstr "Korleis rapportera eit problem" #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:12 -#: templates/web/zurich/admin/report_edit.html:73 #: templates/web/zurich/admin/report_edit.html:75 +#: templates/web/zurich/admin/report_edit.html:77 #: templates/web/zurich/report/banner.html:13 msgid "Closed" msgstr "Lukka" @@ -686,7 +685,7 @@ msgstr "Lukka:" msgid "Closest nearby problems <small>(within %skm)</small>" msgstr "Dei næraste problema <small>(innanfor %skm)</small>" -#: templates/web/default/admin/report_edit.html:16 +#: templates/web/default/admin/report_edit.html:17 #: templates/web/zurich/admin/report_edit-sdm.html:19 #: templates/web/zurich/admin/report_edit.html:37 msgid "Co-ordinates:" @@ -698,12 +697,12 @@ msgstr "Koordinatar:" msgid "Cobrand" msgstr "Merkevaresamarbeid" -#: templates/web/default/admin/report_edit.html:40 +#: templates/web/default/admin/report_edit.html:44 #: templates/web/default/admin/update_edit.html:44 msgid "Cobrand data:" msgstr "Data om merkevaresamarbeid:" -#: templates/web/default/admin/report_edit.html:39 +#: templates/web/default/admin/report_edit.html:43 #: templates/web/default/admin/update_edit.html:43 msgid "Cobrand:" msgstr "Merkevaresamarbeid:" @@ -750,8 +749,8 @@ msgstr "Stadfesting" #: templates/web/default/admin/body.html:85 #: templates/web/default/admin/body_edit.html:32 #: templates/web/default/admin/body_edit.html:84 -#: templates/web/zurich/admin/report_edit-sdm.html:24 -#: templates/web/zurich/admin/report_edit.html:41 +#: templates/web/zurich/admin/report_edit-sdm.html:26 +#: templates/web/zurich/admin/report_edit.html:43 msgid "Confirmed" msgstr "Stadfesta" @@ -761,7 +760,7 @@ msgid "Confirmed reports between %s and %s" msgstr "%srapportar mellom %s og %s" #: templates/web/default/admin/problem_row.html:25 -#: templates/web/default/admin/report_edit.html:35 +#: templates/web/default/admin/report_edit.html:39 msgid "Confirmed:" msgstr "Stadfesta:" @@ -835,10 +834,10 @@ msgstr "Lag kategori" msgid "Created" msgstr "Oppretta" -#: templates/web/default/admin/report_edit.html:34 +#: templates/web/default/admin/report_edit.html:38 #: templates/web/default/admin/update_edit.html:45 -#: templates/web/zurich/admin/report_edit-sdm.html:26 -#: templates/web/zurich/admin/report_edit.html:44 +#: templates/web/zurich/admin/report_edit-sdm.html:28 +#: templates/web/zurich/admin/report_edit.html:46 #: templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "Oppretta:" @@ -920,7 +919,6 @@ msgstr "" #: templates/web/default/admin/report_edit.html:1 #: templates/web/zurich/admin/report_edit-sdm.html:1 -#: templates/web/zurich/admin/report_edit.html:1 #: templates/web/zurich/admin/report_edit.html:4 msgid "Editing problem %d" msgstr "Rediger problem %d" @@ -972,14 +970,14 @@ msgstr "Send meg oppdateringar" #: templates/web/default/admin/body.html:80 #: templates/web/default/admin/body_edit.html:26 -#: templates/web/default/admin/report_edit.html:32 +#: templates/web/default/admin/report_edit.html:36 #: templates/web/default/admin/update_edit.html:27 #: templates/web/default/admin/user-form.html:6 #: templates/web/default/alert/updates.html:13 #: templates/web/default/report/display.html:34 #: templates/web/zurich/admin/body.html:41 -#: templates/web/zurich/admin/report_edit-sdm.html:23 -#: templates/web/zurich/admin/report_edit.html:40 +#: templates/web/zurich/admin/report_edit-sdm.html:25 +#: templates/web/zurich/admin/report_edit.html:42 msgid "Email:" msgstr "E-post:" @@ -1091,7 +1089,7 @@ msgstr "Postnummerdøme %s" msgid "Examples:" msgstr "Døme:" -#: templates/web/default/admin/report_edit.html:41 +#: templates/web/default/admin/report_edit.html:45 #, fuzzy msgid "Extra data:" msgstr "Data om merkevaresamarbeid:" @@ -1171,8 +1169,7 @@ msgstr "" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:82 #: templates/web/default/admin/index.html:36 -#: templates/web/default/admin/report_edit.html:19 -#: templates/web/default/admin/report_edit.html:21 +#: templates/web/default/admin/report_edit.html:25 #: templates/web/default/dashboard/index.html:138 #: templates/web/default/dashboard/index.html:140 #: templates/web/default/report/update-form.html:30 @@ -1183,13 +1180,11 @@ msgstr "" msgid "Fixed" msgstr "Løyst" -#: templates/web/default/admin/report_edit.html:19 -#: templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/report_edit.html:26 msgid "Fixed - Council" msgstr "Løyst – Administrasjon" -#: templates/web/default/admin/report_edit.html:19 -#: templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/report_edit.html:26 msgid "Fixed - User" msgstr "Løyst – Brukar" @@ -1210,7 +1205,7 @@ msgstr "Flagg brukar" msgid "Flagged" msgstr "Flagga:" -#: templates/web/default/admin/report_edit.html:43 +#: templates/web/default/admin/report_edit.html:47 #: templates/web/default/admin/user-form.html:14 msgid "Flagged:" msgstr "Flagga:" @@ -1221,7 +1216,7 @@ msgstr "Flagga:" msgid "Follow a ward link to view only reports within that ward." msgstr "Følg ei bydellenkje for å berre sjå rapportar innanfor den bydelen." -#: templates/web/default/admin/report_edit.html:17 +#: templates/web/default/admin/report_edit.html:21 msgid "For council(s):" msgstr "For administrasjon(ane):" @@ -1282,7 +1277,7 @@ msgstr "Gje meg ein RSS-straum" msgid "Go" msgstr "Hald fram" -#: templates/web/default/admin/report_edit.html:42 +#: templates/web/default/admin/report_edit.html:46 msgid "Going to send questionnaire?" msgstr "Skal spørjeskjemaet sendast?" @@ -1337,13 +1332,11 @@ msgstr "Her er dei ulike typane lokale problemvarsel for «%s»." msgid "Hi %s" msgstr "" -#: templates/web/default/admin/report_edit.html:19 -#: templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/report_edit.html:26 #: templates/web/default/admin/update_edit.html:22 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:11 -#: templates/web/zurich/admin/report_edit.html:64 -#: templates/web/zurich/admin/report_edit.html:68 +#: templates/web/zurich/admin/report_edit.html:70 #: templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" msgstr "Skjult" @@ -1443,7 +1436,7 @@ msgstr "" "sender inn rapporten din, slik at vi kan visa administrasjonen aktiviteten i " "området ditt." -#: templates/web/default/auth/token.html:23 +#: templates/web/default/auth/token.html:25 #: templates/web/default/email_sent.html:9 msgid "" "If you use web-based email or have 'junk mail' filters, you may wish to " @@ -1487,8 +1480,7 @@ msgstr "" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:82 -#: templates/web/default/admin/report_edit.html:19 -#: templates/web/default/admin/report_edit.html:21 +#: templates/web/default/admin/report_edit.html:25 #: templates/web/default/dashboard/index.html:138 #: templates/web/default/dashboard/index.html:140 #: templates/web/default/report/update-form.html:30 @@ -1498,13 +1490,13 @@ msgstr "" #: templates/web/fixmystreet/report/update-form.html:30 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:8 -#: templates/web/zurich/admin/report_edit.html:77 +#: templates/web/zurich/admin/report_edit.html:79 #: templates/web/zurich/report/banner.html:15 #, fuzzy msgid "In progress" msgstr "Under arbeid" -#: templates/web/zurich/admin/report_edit.html:116 +#: templates/web/zurich/admin/report_edit.html:118 #, fuzzy msgid "Include reporter personal details" msgstr "Ver venleg og legg inn opplysningar om problemet" @@ -1517,8 +1509,8 @@ msgstr "Inkluder ikkje-stadfesta problem" msgid "Incorrect has_photo value \"%s\"" msgstr "Feil has_photo-verdi «%s»" -#: templates/web/zurich/admin/report_edit-sdm.html:35 -#: templates/web/zurich/admin/report_edit.html:59 +#: templates/web/zurich/admin/report_edit-sdm.html:37 +#: templates/web/zurich/admin/report_edit.html:61 msgid "Internal notes:" msgstr "" @@ -1540,8 +1532,7 @@ msgstr "Ugyldig startdato" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:81 -#: templates/web/default/admin/report_edit.html:19 -#: templates/web/default/admin/report_edit.html:20 +#: templates/web/default/admin/report_edit.html:24 #: templates/web/default/dashboard/index.html:138 #: templates/web/default/dashboard/index.html:139 #: templates/web/default/report/update-form.html:30 @@ -1587,7 +1578,7 @@ msgstr "Siste oppdatering:" msgid "Last editor" msgstr "Sist redigert av" -#: templates/web/default/admin/report_edit.html:37 +#: templates/web/default/admin/report_edit.html:41 msgid "Last update:" msgstr "Siste oppdatering:" @@ -1702,11 +1693,11 @@ msgstr "Fleire problem i nærleiken" msgid "Name" msgstr "Namn" -#: templates/web/default/admin/report_edit.html:31 +#: templates/web/default/admin/report_edit.html:35 #: templates/web/default/admin/update_edit.html:26 #: templates/web/default/admin/user-form.html:5 -#: templates/web/zurich/admin/report_edit-sdm.html:22 -#: templates/web/zurich/admin/report_edit.html:39 +#: templates/web/zurich/admin/report_edit-sdm.html:24 +#: templates/web/zurich/admin/report_edit.html:41 msgid "Name:" msgstr "Namn:" @@ -1835,7 +1826,7 @@ msgstr "Nye rapportar innanfor grensa til {{NAME}} på reportemptyhomes.com" msgid "New state" msgstr "Ny tilstand" -#: templates/web/zurich/admin/report_edit-sdm.html:38 +#: templates/web/zurich/admin/report_edit-sdm.html:40 #, fuzzy msgid "New update:" msgstr "Siste oppdatering:" @@ -1854,8 +1845,8 @@ msgstr "Ny!" #: templates/web/default/admin/list_updates.html:31 #: templates/web/default/admin/list_updates.html:32 #: templates/web/default/admin/problem_row.html:21 -#: templates/web/default/admin/report_edit.html:29 -#: templates/web/default/admin/report_edit.html:42 +#: templates/web/default/admin/report_edit.html:33 +#: templates/web/default/admin/report_edit.html:46 #: templates/web/default/admin/update_edit.html:19 #: templates/web/default/questionnaire/creator_fixed.html:16 #: templates/web/default/questionnaire/index.html:107 @@ -1889,7 +1880,7 @@ msgstr "Fann ingen flagga problem" msgid "No flagged users found" msgstr "Fann ingen flagga brukarar" -#: templates/web/zurich/admin/report_edit-sdm.html:44 +#: templates/web/zurich/admin/report_edit-sdm.html:46 #, fuzzy msgid "No further updates" msgstr "Oppdateringane dine" @@ -1916,9 +1907,9 @@ msgstr "" msgid "Non Public" msgstr "" -#: templates/web/default/admin/report_edit.html:17 -#: templates/web/zurich/admin/report_edit-sdm.html:25 -#: templates/web/zurich/admin/report_edit.html:43 +#: templates/web/default/admin/report_edit.html:21 +#: templates/web/zurich/admin/report_edit-sdm.html:27 +#: templates/web/zurich/admin/report_edit.html:45 msgid "None" msgstr "Ingen" @@ -2028,15 +2019,14 @@ msgid "Older problems" msgstr "Eldre problem" #: templates/web/bromley/report/display.html:80 -#: templates/web/default/admin/report_edit.html:19 +#: templates/web/default/admin/report_edit.html:23 #: templates/web/default/admin/update_edit.html:22 #: templates/web/default/dashboard/index.html:138 #: templates/web/default/report/update-form.html:30 #: templates/web/fixmystreet/report/update-form.html:28 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 -#: templates/web/zurich/admin/report_edit.html:64 -#: templates/web/zurich/admin/report_edit.html:66 +#: templates/web/zurich/admin/report_edit.html:68 #: templates/web/zurich/admin/update_edit.html:18 #: templates/web/zurich/report/banner.html:11 msgid "Open" @@ -2106,8 +2096,7 @@ msgstr "Fann ikkje sida" msgid "Parent" msgstr "" -#: templates/web/default/admin/report_edit.html:19 -#: templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/report_edit.html:26 msgid "Partial" msgstr "Delvis" @@ -2134,10 +2123,10 @@ msgid "Phone number (optional)" msgstr "(valfritt)" #: perllib/FixMyStreet/DB/ResultSet/Problem.pm:263 -#: templates/web/default/admin/report_edit.html:33 +#: templates/web/default/admin/report_edit.html:37 #: templates/web/default/report/new/fill_in_details_form.html:215 -#: templates/web/zurich/admin/report_edit-sdm.html:25 -#: templates/web/zurich/admin/report_edit.html:43 +#: templates/web/zurich/admin/report_edit-sdm.html:27 +#: templates/web/zurich/admin/report_edit.html:45 msgid "Phone:" msgstr "Telefon:" @@ -2167,8 +2156,7 @@ msgstr "" #: templates/web/bromley/report/display.html:80 #: templates/web/bromley/report/display.html:81 -#: templates/web/default/admin/report_edit.html:19 -#: templates/web/default/admin/report_edit.html:20 +#: templates/web/default/admin/report_edit.html:24 #: templates/web/default/dashboard/index.html:138 #: templates/web/default/dashboard/index.html:139 #: templates/web/default/report/update-form.html:30 @@ -2178,8 +2166,7 @@ msgstr "" #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:9 #: templates/web/zurich/admin/index-dm.html:9 -#: templates/web/zurich/admin/report_edit.html:64 -#: templates/web/zurich/admin/report_edit.html:67 +#: templates/web/zurich/admin/report_edit.html:69 msgid "Planned" msgstr "Planlagt" @@ -2542,7 +2529,7 @@ msgstr "Sendt inn av %s %s" #: templates/web/default/admin/body.html:97 #: templates/web/default/admin/body_edit.html:40 -#: templates/web/default/admin/report_edit.html:44 +#: templates/web/default/admin/report_edit.html:48 msgid "Private" msgstr "" @@ -2675,15 +2662,15 @@ msgstr "" msgid "Public" msgstr "" -#: templates/web/zurich/admin/report_edit.html:148 +#: templates/web/zurich/admin/report_edit.html:150 msgid "Public response:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:55 +#: templates/web/zurich/admin/report_edit.html:57 msgid "Publish photo" msgstr "" -#: templates/web/zurich/admin/report_edit.html:158 +#: templates/web/zurich/admin/report_edit.html:160 msgid "Publish the response" msgstr "" @@ -2828,7 +2815,7 @@ msgstr "" msgid "Remove flag" msgstr "Fjern flagg" -#: templates/web/default/admin/report_edit.html:55 +#: templates/web/default/admin/report_edit.html:59 #: templates/web/default/admin/update_edit.html:51 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" @@ -2960,7 +2947,7 @@ msgstr "Problem i og rundt kartet" msgid "Reports published" msgstr "Rapporter eit problem" -#: templates/web/default/admin/report_edit.html:36 +#: templates/web/default/admin/report_edit.html:40 msgid "Resend report" msgstr "Send rapport på nytt" @@ -2980,13 +2967,13 @@ 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 +#: templates/web/default/admin/report_edit.html:55 +#: templates/web/zurich/admin/report_edit.html:53 msgid "Rotate Left" msgstr "" -#: templates/web/default/admin/report_edit.html:52 -#: templates/web/zurich/admin/report_edit.html:52 +#: templates/web/default/admin/report_edit.html:56 +#: templates/web/zurich/admin/report_edit.html:54 msgid "Rotate Right" msgstr "" @@ -3038,11 +3025,11 @@ msgstr "" msgid "Sent to %s %s later" msgstr "Sendt til %s %s seinare" -#: templates/web/default/admin/report_edit.html:36 +#: templates/web/default/admin/report_edit.html:40 msgid "Sent:" msgstr "Sendt:" -#: templates/web/default/admin/report_edit.html:38 +#: templates/web/default/admin/report_edit.html:42 msgid "Service:" msgstr "Teneste:" @@ -3199,11 +3186,11 @@ msgstr "Startmånad:" msgid "State" msgstr "Tilstand" -#: templates/web/default/admin/report_edit.html:18 +#: templates/web/default/admin/report_edit.html:22 #: templates/web/default/admin/update_edit.html:21 #: templates/web/default/report/update-form.html:28 -#: templates/web/zurich/admin/report_edit-sdm.html:33 -#: templates/web/zurich/admin/report_edit.html:62 +#: templates/web/zurich/admin/report_edit-sdm.html:35 +#: templates/web/zurich/admin/report_edit.html:64 #: templates/web/zurich/admin/update_edit.html:17 msgid "State:" msgstr "Tilstand:" @@ -3257,11 +3244,11 @@ msgstr "Emne:" msgid "Submit" msgstr "Send inn" -#: templates/web/default/admin/report_edit.html:58 +#: templates/web/default/admin/report_edit.html:62 #: templates/web/default/admin/update_edit.html:54 #: templates/web/default/admin/user-form.html:17 -#: templates/web/zurich/admin/report_edit-sdm.html:43 -#: templates/web/zurich/admin/report_edit.html:160 +#: templates/web/zurich/admin/report_edit-sdm.html:45 +#: templates/web/zurich/admin/report_edit.html:162 #: templates/web/zurich/admin/update_edit.html:38 msgid "Submit changes" msgstr "Send inn endringar" @@ -3276,8 +3263,7 @@ msgstr "Send inn spørjeskjema" #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-dm.html:6 #: templates/web/zurich/admin/index-sdm.html:21 -#: templates/web/zurich/admin/report_edit.html:64 -#: templates/web/zurich/admin/report_edit.html:65 +#: templates/web/zurich/admin/report_edit.html:67 #: templates/web/zurich/admin/reports.html:15 #: templates/web/zurich/report/banner.html:9 #, fuzzy @@ -3496,7 +3482,7 @@ msgstr "" "administrasjonane som mottok problemrapporten, noko som ikkje heilt passar " "med korleis attributten er definert i Open311 v2-spesifikasjonen." -#: templates/web/default/auth/token.html:21 +#: templates/web/default/auth/token.html:22 #: templates/web/default/email_sent.html:6 msgid "" "The confirmation email <strong>may</strong> take a few minutes to arrive " @@ -3865,8 +3851,7 @@ msgstr "Totalt" msgid "Try again" msgstr "" -#: templates/web/default/admin/report_edit.html:19 -#: templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/report_edit.html:26 #: templates/web/default/admin/update_edit.html:22 #: templates/web/zurich/admin/update_edit.html:18 msgid "Unconfirmed" @@ -4207,8 +4192,8 @@ msgstr "År" #: templates/web/default/admin/list_updates.html:31 #: templates/web/default/admin/list_updates.html:32 #: templates/web/default/admin/problem_row.html:21 -#: templates/web/default/admin/report_edit.html:28 -#: templates/web/default/admin/report_edit.html:42 +#: templates/web/default/admin/report_edit.html:32 +#: templates/web/default/admin/report_edit.html:46 #: templates/web/default/admin/update_edit.html:18 #: templates/web/default/admin/users.html:26 #: templates/web/default/questionnaire/creator_fixed.html:14 @@ -4377,7 +4362,7 @@ msgstr "" "Du må no opna lenkja i e-posten vi akkurat sende deg — dersom du ikkje " "gjer det, %s" -#: templates/web/default/admin/report_edit.html:36 +#: templates/web/default/admin/report_edit.html:40 msgid "You really want to resend?" msgstr "Ynskjer du verkeleg å senda på nytt?" @@ -4520,9 +4505,9 @@ msgstr "administrasjon" msgid "council ref: %s" msgstr "" -#: templates/web/default/admin/report_edit.html:16 -#: templates/web/zurich/admin/report_edit-sdm.html:19 -#: templates/web/zurich/admin/report_edit.html:37 +#: templates/web/default/admin/report_edit.html:19 +#: templates/web/zurich/admin/report_edit-sdm.html:21 +#: templates/web/zurich/admin/report_edit.html:39 msgid "didn't use map" msgstr "brukte ikkje kart" @@ -4564,16 +4549,17 @@ msgstr "eller" msgid "or locate me automatically" msgstr "" -#: templates/web/default/admin/report_edit.html:16 +#: templates/web/default/admin/report_edit.html:18 #: templates/web/zurich/admin/report_edit-sdm.html:16 -#: templates/web/zurich/admin/report_edit-sdm.html:19 +#: templates/web/zurich/admin/report_edit-sdm.html:20 #: templates/web/zurich/admin/report_edit.html:24 #: templates/web/zurich/admin/report_edit.html:32 -#: templates/web/zurich/admin/report_edit.html:37 -msgid "originally entered" +#: templates/web/zurich/admin/report_edit.html:38 +#, fuzzy +msgid "originally entered: “%s”" msgstr "søkte etter" -#: templates/web/default/admin/report_edit.html:17 +#: templates/web/default/admin/report_edit.html:21 msgid "other areas:" msgstr "andre område:" @@ -4612,9 +4598,9 @@ msgstr "denne typen lokalt problem" msgid "today" msgstr "i dag" -#: templates/web/default/admin/report_edit.html:16 -#: templates/web/zurich/admin/report_edit-sdm.html:19 -#: templates/web/zurich/admin/report_edit.html:37 +#: templates/web/default/admin/report_edit.html:19 +#: templates/web/zurich/admin/report_edit-sdm.html:21 +#: templates/web/zurich/admin/report_edit.html:39 msgid "used map" msgstr "brukte kart" diff --git a/templates/web/default/admin/report_edit.html b/templates/web/default/admin/report_edit.html index eaa1e404c..8eb12b50d 100644 --- a/templates/web/default/admin/report_edit.html +++ b/templates/web/default/admin/report_edit.html @@ -13,7 +13,11 @@ <li><label for='title'>[% loc('Subject:') %]</label> <input size=60 type='text' id='title' name='title' value='[% problem.title | html %]'></li> <li><label for='detail'>[% loc('Details:') %]</label> <textarea name='detail' id='detail' cols=60 rows=10>[% problem.detail | html %]</textarea></li> -<li>[% loc('Co-ordinates:') %] [% problem.latitude %], [% problem.longitude %] ( [% loc('originally entered') %] [% problem.postcode | html %] , [% IF problem.used_map %][% loc('used map') %][% ELSE %][% loc("didn't use map") %][% END %])</li> + +<li>[% loc('Co-ordinates:') %] [% problem.latitude %], [% problem.longitude %] +( [% tprintf( loc('originally entered: “%s”'), problem.postcode | html ) %], +[% IF problem.used_map %][% loc('used map') %][% ELSE %][% loc("didn't use map") %][% END %])</li> + <li>[% loc('For council(s):') %] [% IF problem.bodies_str %][% problem.bodies_str %][% ELSE %]<em>[% loc('None' ) %]</em>[% END %] ([% loc('other areas:') %] [% problem.areas | remove('^,') | remove( ',$' ) %])</li> <li><label class="inline" for="state">[% loc('State:') %]</label> <select name="state" id="state"> [% FOREACH state IN [ ['confirmed', loc('Open')], ['investigating', diff --git a/templates/web/zurich/admin/report_edit-sdm.html b/templates/web/zurich/admin/report_edit-sdm.html index 89acfe238..0a0e4ed58 100644 --- a/templates/web/zurich/admin/report_edit-sdm.html +++ b/templates/web/zurich/admin/report_edit-sdm.html @@ -13,10 +13,12 @@ <li><a href="[% c.uri_for_email( '/report', problem.id ) %]">[% loc('View report on site' )%]</a></li> <li>[% loc('Details:') %] [% problem.detail | html %] [% IF problem.extra.original_detail %] -<br>[% loc('originally entered') %]: “[% problem.extra.original_detail | html %]” +<br>[% tprintf( loc('originally entered: “%s”'), problem.extra.original_detail | html ) %] [% END %] </li> -<li>[% loc('Co-ordinates:') %] [% problem.local_coords.join(',') %] ([% problem.latitude %],[% problem.longitude %]) ([% loc('originally entered') %] ‘[% problem.postcode | html %]’, [% IF problem.used_map %][% loc('used map') %][% ELSE %][% loc("didn't use map") %][% END %])</li> +<li>[% loc('Co-ordinates:') %] [% problem.local_coords.join(',') %] ([% problem.latitude %],[% problem.longitude %]) +([% tprintf( loc('originally entered: “%s”'), problem.postcode | html ) %], +[% IF problem.used_map %][% loc('used map') %][% ELSE %][% loc("didn't use map") %][% END %])</li> <li>[% loc('Category:') %] [% problem.category | html %] </li> <li>[% loc('Name:') %] [% problem.name | html %] diff --git a/templates/web/zurich/admin/report_edit.html b/templates/web/zurich/admin/report_edit.html index aabd9d7c9..9c612065f 100644 --- a/templates/web/zurich/admin/report_edit.html +++ b/templates/web/zurich/admin/report_edit.html @@ -21,7 +21,7 @@ [% IF problem.state == 'fixed - council' OR problem.state == 'closed' %] <li>[% loc('Details:') %] [% problem.detail | html %] [% IF problem.extra.original_detail %] - <br>[% loc('originally entered') %]: “[% problem.extra.original_detail | html %]” + <br>[% tprintf( loc('originally entered: “%s”'), problem.extra.original_detail | html ) %] [% END %] </li> [% ELSE %] @@ -29,12 +29,14 @@ <li><label for='detail'>[% loc('Details:') %]</label> <textarea name='detail' id='detail' cols=60 rows=5>[% problem.detail | html %]</textarea> [% IF problem.extra.original_detail %] - [% loc('originally entered') %]: “[% problem.extra.original_detail | html %]” + [% tprintf( loc('originally entered: “%s”'), problem.extra.original_detail | html ) %] [% END %] </li> [% END %] -<li>[% loc('Co-ordinates:') %] [% problem.local_coords.join(',') %] ([% problem.latitude %],[% problem.longitude %]) ([% loc('originally entered') %] ‘[% problem.postcode | html %]’, [% IF problem.used_map %][% loc('used map') %][% ELSE %][% loc("didn't use map") %][% END %])</li> +<li>[% loc('Co-ordinates:') %] [% problem.local_coords.join(',') %] ([% problem.latitude %],[% problem.longitude %]) +([% tprintf( loc('originally entered: “%s”'), problem.postcode | html ) %], +[% IF problem.used_map %][% loc('used map') %][% ELSE %][% loc("didn't use map") %][% END %])</li> <li>[% loc('Name:') %] [% problem.name | html %] <input type='hidden' name='name' id='name' value='[% problem.name | html %]'></li> <li>[% loc('Email:') %] [% problem.user.email | html %] <input type='hidden' id='email' name='email' value='[% problem.user.email | html %]'> |