diff options
| -rw-r--r-- | locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po | 20 | ||||
| -rwxr-xr-x | web/index.cgi | 17 |
2 files changed, 20 insertions, 17 deletions
diff --git a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po index fa0761753..087fd53a5 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 @@ msgstr "" "Project-Id-Version: FixMyStreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" "POT-Creation-Date: 2011-02-17 14:20+0000\n" -"PO-Revision-Date: 2011-02-17 14:56MET\n" +"PO-Revision-Date: 2011-02-18 08:32MET\n" "Last-Translator: Petter Reinholdtsen <pere@hungry.com>\n" "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n" "MIME-Version: 1.0\n" @@ -118,9 +118,9 @@ msgid "" "\"logoie\"></span></a>" msgstr "" "<div id=\"logo\" align=\"center\"><a href=\"http://www.nuug.no/\">NUUG</a> " -"and<br><a href=\"http://www.mysociety.org/\"><img width=\"133\" " -"height=\"26\" border=0 src=\"/i/mysociety-dark.png\" alt=\"mySociety\"><span " -"id=\"logoie\"></span></a></div>" +"and<br><a href=\"http://www.mysociety.org/\"><img width=\"133\" height=\"26" +"\" border=0 src=\"/i/mysociety-dark.png\" alt=\"mySociety\"><span id=\"logoie" +"\"></span></a></div>" #: perllib/Page.pm:381 msgid "Error" @@ -132,7 +132,7 @@ msgstr "ditt problem vil ikke bli publisert" #: perllib/Page.pm:444 msgid "we'll hang on to your problem report while you're checking your email." -msgstr "vi holder på din problemrapport mens du sjekker din epost." +msgstr "vi holder på rapporten din mens du sjekker epost." #: perllib/Page.pm:446 msgid "your update will not be posted" @@ -165,10 +165,10 @@ msgid "" msgstr "" "<h1>Nesten ferdig! Nå må du sjekke din epost...</h1>\n" "<p>Bekreftelseseposten <strong>kan</strong> bruke noen minutter på å nå frem " -"— <em>vær så snill</em> å være tolmodig.</p>\n" -"<p>Hvi du bruker webbasert epost eller ar søppelepost-filter, så ønsker du " +"— <em>vær så snill</em> å være tålmodig.</p>\n" +"<p>Hvis du bruker webbasert epost eller ar søppelepost-filter, så ønsker du " "kanskje a sjekke din bulk/spam-mappe. Noen ganger blir epost fra oss markert " -"som det.</p>\n" +"slik.</p>\n" "<p>Du må nå klikke på lenken i eposten vi nettopp har sendt deg —\n" "hvis du ikke gjør det, %s.</p>\n" "<p>(Ingen grunn til bekymring — %s)</p>\n" @@ -278,7 +278,7 @@ msgstr "kartet ble ikke brukt, så nåleposisjon kan være unøyaktig" #: perllib/Page.pm:567 #, perl-format msgid "Sent to %s %s later" -msgstr "Send til %s %s senere" +msgstr "Sendt til %s %s senere" #: perllib/Page.pm:571 msgid "Not reported to council" @@ -1180,7 +1180,7 @@ msgstr "" #: web/index.cgi:660 web/index.cgi:662 msgid " or " -msgstr "eller" +msgstr " eller " #: web/index.cgi:661 msgid "All the information you provide here will be sent to" diff --git a/web/index.cgi b/web/index.cgi index 12808fb02..fd1bd2512 100755 --- a/web/index.cgi +++ b/web/index.cgi @@ -658,13 +658,13 @@ name if you give us permission.'), $council_list); } my $n = @missing; my $list = join(_(' or '), map { $all_councils->{$_}->{name} } @missing); - $vars{text_help} = '<p>' . _('All the information you provide here will be sent to') . '<strong>' + $vars{text_help} = '<p>' . _('All the information you provide here will be sent to') . ' <strong>' . join('</strong>' . _(' or ') . '<strong>', map { $all_councils->{$_}->{name} } @councils) . '</strong>. '; $vars{text_help} .= _('The subject and details of the problem will be public, plus your name if you give us permission.'); - $vars{text_help} .= mySociety::Locale::nget( - _('We do <strong>not</strong> yet have details for the other council that covers this location.'), - _('We do <strong>not</strong> yet have details for the other councils that cover this location.'), + $vars{text_help} .= ' ' . mySociety::Locale::nget( + 'We do <strong>not</strong> yet have details for the other council that covers this location.', + 'We do <strong>not</strong> yet have details for the other councils that cover this location.', $n ); $vars{text_help} .= ' ' . sprintf(_("You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>."), $list, $e, $e); @@ -677,14 +677,17 @@ name if you give us permission.'), $council_list); if ($q->{site} ne 'emptyhomes') { $vars{text_help} = '<p>'; $vars{text_help} .= mySociety::Locale::nget( - _('We do not yet have details for the council that covers this location.'), - _('We do not yet have details for the councils that cover this location.'), + 'We do not yet have details for the council that covers this location.', + 'We do not yet have details for the councils that cover this location.', $n ); $vars{text_help} .= _("If you submit a problem here the subject and details of the problem will be public, but the problem will <strong>not</strong> be reported to the council."); $vars{text_help} .= sprintf(_("You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>."), $list, $e, $e); } else { - $vars{text_help} = _("<p>We do not yet have details for the council that covers this location. 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."); + $vars{text_help} = '<p>' + . _('We do not yet have details for the council that covers this location.') + . ' ' + . _("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."); } $vars{text_help} .= '<input type="hidden" name="council" value="-1">'; } |