aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Somerville <matthew@fury.ukcod.org.uk>2011-02-26 21:30:06 +0000
committerMatthew Somerville <matthew@fury.ukcod.org.uk>2011-02-26 21:30:06 +0000
commitc59db19be536d54e13b5c27f29a46fd46a4f6297 (patch)
tree295b3328f39696484501c7602b6ff57a0a4df0e1
parent53603571faac4fa9112e6f9f947a8e89436bc38a (diff)
.po update, Go->Submit on one button.
-rw-r--r--locale/FixMyStreet.po12
-rw-r--r--locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po12
-rw-r--r--locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po40
-rw-r--r--templates/website/cobrands/fiksgatami/faq-nb2
-rwxr-xr-xweb/confirm.cgi2
5 files changed, 36 insertions, 32 deletions
diff --git a/locale/FixMyStreet.po b/locale/FixMyStreet.po
index 3ace31cff..c510ee6b9 100644
--- a/locale/FixMyStreet.po
+++ b/locale/FixMyStreet.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 1.0\n"
"Report-Msgid-Bugs-To: matthew@mysociety.org\n"
-"POT-Creation-Date: 2011-02-26 20:53+0000\n"
+"POT-Creation-Date: 2011-02-26 21:29+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"
@@ -597,7 +597,7 @@ msgid ""
"postcode or street name and area:"
msgstr ""
-#: web/alert.cgi:389 web/confirm.cgi:192 web/index.cgi:166
+#: web/alert.cgi:389 web/index.cgi:166
msgid "Go"
msgstr ""
@@ -750,6 +750,10 @@ msgstr ""
msgid "No"
msgstr ""
+#: web/confirm.cgi:192 web/index.cgi:790
+msgid "Submit"
+msgstr ""
+
#: web/confirm.cgi:237
#, perl-format
msgid ""
@@ -1243,10 +1247,6 @@ msgid ""
"their privacy policies."
msgstr ""
-#: web/index.cgi:790
-msgid "Submit"
-msgstr ""
-
#: web/index.cgi:885
msgid "Hide stale reports"
msgstr ""
diff --git a/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po b/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po
index 0e8a707af..9e01baaad 100644
--- a/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po
+++ b/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 1.0\n"
"Report-Msgid-Bugs-To: matthew@mysociety.org\n"
-"POT-Creation-Date: 2011-02-26 20:53+0000\n"
+"POT-Creation-Date: 2011-02-26 21:29+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"
@@ -702,7 +702,7 @@ msgstr ""
"ward chi,\n"
"cofnodwch eich cod post Prydeinig neu enw stryd ac ardal:"
-#: web/alert.cgi:389 web/confirm.cgi:192 web/index.cgi:166
+#: web/alert.cgi:389 web/index.cgi:166
msgid "Go"
msgstr "Ewch"
@@ -890,6 +890,10 @@ msgstr "Ydw"
msgid "No"
msgstr "Nac ydw"
+#: web/confirm.cgi:192 web/index.cgi:790
+msgid "Submit"
+msgstr "Anfon"
+
#: web/confirm.cgi:237
#, perl-format
msgid ""
@@ -1451,10 +1455,6 @@ msgid ""
"in accordance with their privacy policies."
msgstr ""
-#: web/index.cgi:790
-msgid "Submit"
-msgstr "Anfon"
-
#: web/index.cgi:885
msgid "Hide stale reports"
msgstr "Cuddio hen adroddiadau "
diff --git a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po
index e12ebf185..144f2d6ee 100644
--- a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: FixMyStreet\n"
"Report-Msgid-Bugs-To: matthew@mysociety.org\n"
-"POT-Creation-Date: 2011-02-26 20:53+0000\n"
-"PO-Revision-Date: 2011-02-24 23:09MET\n"
+"POT-Creation-Date: 2011-02-26 21:29+0000\n"
+"PO-Revision-Date: 2011-02-26 22:01MET\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"
@@ -658,9 +658,9 @@ msgid ""
msgstr ""
"Du finner lokale saker ved å søke på ditt postnummer, veinavn eller sted:"
-#: web/alert.cgi:389 web/confirm.cgi:192 web/index.cgi:166
+#: web/alert.cgi:389 web/index.cgi:166
msgid "Go"
-msgstr "Søk"
+msgstr "Fortsett"
#: web/alert.cgi:415
msgid "Some photos of recent reports"
@@ -701,7 +701,7 @@ msgstr "Vi kan ikke bekrefte dette varselet??"
#: web/alert.cgi:544
msgid "You have successfully confirmed your alert."
-msgstr "Du har nå bekreftet ditt varsel"
+msgstr "Du har nå lykkes med å bekrefte ditt varsel."
#: web/alert.cgi:551
msgid "You have successfully deleted your alert."
@@ -807,8 +807,8 @@ msgid ""
"Thanks, glad to hear it's been fixed! Could we just ask if you have ever "
"reported a problem to a council before?"
msgstr ""
-"Takk, glad for å høre at det er fikset! Kan vi få spørre deg om du har "
-"rapportert et problem til en administrasjon tidligere?"
+"Takk, glad for å høre at problemet er fikset! Vi vil gjerne spørre deg om "
+"du har rapportert et problem til en administrasjon tidligere?"
#: web/confirm.cgi:190 web/questionnaire.cgi:234 web/questionnaire.cgi:323
#: web-admin/index.cgi:340 web-admin/index.cgi:341 web-admin/index.cgi:503
@@ -822,14 +822,18 @@ msgstr "Ja"
msgid "No"
msgstr "Nei"
+#: web/confirm.cgi:192 web/index.cgi:790
+msgid "Submit"
+msgstr "Send inn"
+
#: web/confirm.cgi:237
#, perl-format
msgid ""
"Thank you &mdash; you can <a href=\"%s\">view your updated problem</a> on "
"the site."
msgstr ""
-"Tusen takk &mdash; du kan <a href=\"%s\">ditt oppdaterte problem</a> på "
-"tjenesten."
+"Tusen takk &mdash; du kan <a href=\"%s\">se på ditt oppdaterte problem</a> "
+"her hos oss."
#: web/contact.cgi:22
msgid "Contact Us"
@@ -871,6 +875,10 @@ msgid ""
"individual empty\n"
"homes; use the box accessed from <a href=\"/\">the front page</a>."
msgstr ""
+"Vi vil gjerne høre hva du tenker om dette nettstedet. Det er bare å fylle "
+"inn skjemaet. Vær så snill å ikke kontakte oss om individuelle tomme hjem. "
+"For det bør du i stedet bruke boksen tilgjengelig fra <a href=\"/"
+"\">forsiden</a>."
#: web/contact.cgi:141
msgid ""
@@ -1126,7 +1134,7 @@ msgstr ""
#: web/index.cgi:570 web-admin/index.cgi:628
msgid "Category:"
-msgstr "Kategori"
+msgstr "Kategori:"
#: web/index.cgi:576
msgid "Empty house or bungalow"
@@ -1388,10 +1396,6 @@ msgid ""
"their privacy policies."
msgstr ""
-#: web/index.cgi:790
-msgid "Submit"
-msgstr "Send inn"
-
#: web/index.cgi:885
msgid "Hide stale reports"
msgstr "Gjem utdaterte rapporter"
@@ -2079,7 +2083,7 @@ msgstr "Tilstandsfordeling for oppdateringer"
#: web-admin/index.cgi:186
msgid "Diligency prize league table"
-msgstr ""
+msgstr "Hvem har endret kontaktlista"
#: web-admin/index.cgi:190
#, fuzzy, perl-format
@@ -2181,7 +2185,7 @@ msgstr "Bekreftet"
#: web-admin/index.cgi:353
msgid "Update statuses"
-msgstr "Oppdater statuser"
+msgstr "Oppdater tilstanden"
#: web-admin/index.cgi:358
msgid "Add new category"
@@ -2201,7 +2205,7 @@ msgstr "Merk: "
#: web-admin/index.cgi:380
msgid "Create category"
-msgstr "Lat categori"
+msgstr "Lag kategori"
#: web-admin/index.cgi:432
msgid "Save changes"
@@ -2350,7 +2354,7 @@ msgstr "Koordinater:"
#: web-admin/index.cgi:624
msgid "originally entered"
-msgstr ""
+msgstr "søkte etter"
#: web-admin/index.cgi:625
msgid "For council(s):"
diff --git a/templates/website/cobrands/fiksgatami/faq-nb b/templates/website/cobrands/fiksgatami/faq-nb
index b6ecfa02a..0a3e78b0c 100644
--- a/templates/website/cobrands/fiksgatami/faq-nb
+++ b/templates/website/cobrands/fiksgatami/faq-nb
@@ -12,7 +12,7 @@
<dd>FiksGataMi er primært for rapportering av ting som
er <strong>ødelagt, skadet, dumpet eller trenger å bli reparert,
- rengjøring eller rydding</strong>. Dette kan for eksempel være:
+ rengjort eller ryddet</strong>. Dette kan for eksempel være:
<ul>
<li>Forlatte kjøretøy</li>
diff --git a/web/confirm.cgi b/web/confirm.cgi
index 925b64ed2..7de002e24 100755
--- a/web/confirm.cgi
+++ b/web/confirm.cgi
@@ -189,7 +189,7 @@ sub ask_questionnaire {
my $qn_thanks = _("Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?");
my $yes = _('Yes');
my $no = _('No');
- my $go = _('Go');
+ my $go = _('Submit');
my $form_action = Cobrand::url($cobrand, "/confirm", $q);
my $form_extra_elements = Cobrand::form_elements($cobrand, 'questionnaire', $q);
my $out = <<EOF;