Lots of changes/fixes to the new translation stuff.

diff --git a/html/po/nb_NO.po b/html/po/nb_NO.po
index d7f4de6a4577299d73f35f556527c83fdc579338..b280b014405a584aaf1f623a44b0ddff54170a01 100644 (file)
--- a/html/po/nb_NO.po
+++ b/html/po/nb_NO.po
@@ -34,7 +34,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ccbs--mainline- 0.1\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: ccbs--mainline- 0.1\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2005-45-17 14:45+0200\n"
+"POT-Creation-Date: 2005-55-17 14:55+0200\n"

 "PO-Revision-Date: 2005-07-17 01:55+0200\n"
 "Last-Translator: Steinar H. Gunderson <sgunderson@bigfoot.com>\n"
 "Language-Team: Norwegian <no@translate.freefriends.org>\n"
 "PO-Revision-Date: 2005-07-17 01:55+0200\n"
 "Last-Translator: Steinar H. Gunderson <sgunderson@bigfoot.com>\n"
 "Language-Team: Norwegian <no@translate.freefriends.org>\n"


@@ -73,14 +73,12 @@ msgstr "Maskin:"
 msgid "Scoring system:"
 msgstr "Scoresystem:"
 
 msgid "Scoring system:"
 msgstr "Scoresystem:"
 

-#, fuzzy
-msgid "<input type=\"submit\" value=\"Legg inn\" />"
-msgstr "<input type=\"submit\" value=\"Legg inn\" />"
+msgid "<input type=\"submit\" value=\"Add\" />"
+msgstr "<input type=\"submit\" value=\"Legg til\" />"

 
 msgid "The tournament has been added."
 msgstr "Turneringen er lagt til."
 
 
 msgid "The tournament has been added."
 msgstr "Turneringen er lagt til."
 

-#, fuzzy

 msgid ""
 "Sorry, there was an internal error. Please tell an\n"
 "  <a href=\"mailto:sgunderson@bigfoot.com\">administrator</a> as quickly\n"
 msgid ""
 "Sorry, there was an internal error. Please tell an\n"
 "  <a href=\"mailto:sgunderson@bigfoot.com\">administrator</a> as quickly\n"


@@ -93,7 +91,6 @@ msgstr ""
 msgid "Technical information"
 msgstr "Teknisk informasjon"
 
 msgid "Technical information"
 msgstr "Teknisk informasjon"
 

-#, fuzzy

 msgid ""
 "Welcome to the web part our score and tournament system.\n"
 "    Select whatever you are interested in information for from the menu\n"
 msgid ""
 "Welcome to the web part our score and tournament system.\n"
 "    Select whatever you are interested in information for from the menu\n"


@@ -112,7 +109,6 @@ msgstr "<a href=\"tournaments.pl\">Turneringer</a>"
 msgid "<a href=\"players.pl\">Players</a>"
 msgstr "<a href=\"players.pl\">Spillere</a>"
 
 msgid "<a href=\"players.pl\">Players</a>"
 msgstr "<a href=\"players.pl\">Spillere</a>"
 

-#, fuzzy

 msgid "<a href=\"songs.pl\">Spillere</a>"
 msgstr "<a href=\"songs.pl\">Sanger</a>"
 
 msgid "<a href=\"songs.pl\">Spillere</a>"
 msgstr "<a href=\"songs.pl\">Sanger</a>"
 


@@ -200,7 +196,6 @@ msgstr "Alle sanger"
 msgid "At the moment,"
 msgstr "For øyeblikket er"
 
 msgid "At the moment,"
 msgstr "For øyeblikket er"
 

-#, fuzzy

 msgid ""
 "songs are set as used in the song selector. If you reset the song selector,\n"
 "  it will go back to 0, and all songs can potentially be selected when you\n"
 msgid ""
 "songs are set as used in the song selector. If you reset the song selector,\n"
 "  it will go back to 0, and all songs can potentially be selected when you\n"


@@ -265,7 +260,6 @@ msgstr "Fjern"
 msgid "Set active tournament"
 msgstr "Sett aktiv turnering"
 
 msgid "Set active tournament"
 msgstr "Sett aktiv turnering"
 

-#, fuzzy

 msgid ""
 "This function sets what tournament is active (that is, what the big screen\n"
 "  is to show information from)."
 msgid ""
 "This function sets what tournament is active (that is, what the big screen\n"
 "  is to show information from)."


@@ -274,9 +268,8 @@ msgstr ""
 "storskjermen\n"
 "    skal vise informasjon fra."
 
 "storskjermen\n"
 "    skal vise informasjon fra."
 

-#, fuzzy

 msgid "Select"
 msgid "Select"

-msgstr "Selvvalgt"
+msgstr "Velg"

 
 msgid "Short title"
 msgstr "Kort tittel"
 
 msgid "Short title"
 msgstr "Kort tittel"


@@ -290,36 +283,39 @@ msgstr ""
 "\t    <input type=\"submit\" value=\"Oppdater\" />\n"
 "\t  "
 
 "\t    <input type=\"submit\" value=\"Oppdater\" />\n"
 "\t  "
 

-#, fuzzy
-msgid "Generelle fakta"
-msgstr "Generelle fakta"
-

 msgid "Start new round"
 msgstr "Start ny runde"
 
 msgid "Start new round"
 msgstr "Start ny runde"
 

-msgid "For øyeblikket har det vært avholdt"
-msgstr ""
+msgid "At the moment, there's been"
+msgstr "For øyeblikket har man spilt"

 
 msgid ""
 
 msgid ""

+"full rounds,\n"
+"      which means that you could start round"
+msgstr ""

 "fulle runder,\n"
 "      hvilket vil si at du kan begynne runde"
 "fulle runder,\n"
 "      hvilket vil si at du kan begynne runde"

-msgstr ""

 
 msgid ""
 
 msgid ""

+"if you'd like. Note that you can't start a new round before the\n"
+"      previous one has been completely done."
+msgstr ""

 "om du skulle ønske det. Vær oppmerksom på at du ikke kan begynne en ny "
 "runde\n"
 "      før den forrige er gjort helt ferdig."
 "om du skulle ønske det. Vær oppmerksom på at du ikke kan begynne en ny "
 "runde\n"
 "      før den forrige er gjort helt ferdig."

-msgstr ""

 
 

-#, fuzzy
-msgid "Det er"
-msgstr "Dato"
+msgid "There are"
+msgstr "Det er"

 
 msgid ""
 
 msgid ""

+"players going\n"
+"      onto the next round, and these will be spread evenly out over how "
+"many\n"
+"      groups you select."
+msgstr ""

 "mennesker som vil gå videre til\n"
 "      neste runde, og disse vil bli spredd jevnt utover så mange grupper som "
 "du velger."
 "mennesker som vil gå videre til\n"
 "      neste runde, og disse vil bli spredd jevnt utover så mange grupper som "
 "du velger."

-msgstr ""

 
 msgid "Number of groups"
 msgstr "Antall grupper"
 
 msgid "Number of groups"
 msgstr "Antall grupper"


@@ -345,15 +341,12 @@ msgstr "Antall selvvalgte sanger"
 msgid "<input name=\"numchosen\" />"
 msgstr "<input name=\"numchosen\" />"
 
 msgid "<input name=\"numchosen\" />"
 msgstr "<input name=\"numchosen\" />"
 

-#, fuzzy

 msgid "Start next round"
 msgstr "Start ny runde"
 
 msgid "Start next round"
 msgstr "Start ny runde"
 

-#, fuzzy

 msgid "End tournament"
 msgstr "Avslutt turnering"
 
 msgid "End tournament"
 msgstr "Avslutt turnering"
 

-#, fuzzy

 msgid ""
 "As there's only one group left and that group is done, you can end the\n"
 "    tournament if you'd like to. Note that when you've ended the "
 msgid ""
 "As there's only one group left and that group is done, you can end the\n"
 "    tournament if you'd like to. Note that when you've ended the "


@@ -371,29 +364,26 @@ msgstr ""
 "turneringen er permanent\n"
 "      avsluttet)."
 
 "turneringen er permanent\n"
 "      avsluttet)."
 

-#, fuzzy

 msgid "End the tournament"
 msgstr "Avslutt turnering"
 
 msgid "Ranking list"
 msgstr "Rankingliste"
 
 msgid "End the tournament"
 msgstr "Avslutt turnering"
 
 msgid "Ranking list"
 msgstr "Rankingliste"
 

-msgid "plass"
-msgstr ""
+msgid "place"
+msgstr "plass"

 
 

-msgid "med"
-msgstr ""
+msgid "with"
+msgstr "med"

 
 

-#, fuzzy
-msgid "poeng"
-msgstr "Sang"
+msgid "points"
+msgstr "poeng"

 
 

-#, fuzzy

 msgid "Number of machines:"
 msgid "Number of machines:"

-msgstr "Antall tilfeldige sanger"
+msgstr "Antall maskiner:"

 
 msgid "Number of simultaneous players on each machine:"
 
 msgid "Number of simultaneous players on each machine:"

-msgstr ""
+msgstr "Antall som spiller samtidig på hver maskin:"

 
 msgid "Gruppe"
 msgstr ""
 
 msgid "Gruppe"
 msgstr ""


@@ -422,8 +412,7 @@ msgstr "E"
 msgid "C"
 msgstr "C"
 
 msgid "C"
 msgstr "C"
 

-#, fuzzy
-msgid "<input type=\"submit\" value=\"Oppdater\" />"
+msgid "<input type=\"submit\" value=\"Update\" />"

 msgstr "<input type=\"submit\" value=\"Oppdater\" />"
 
 msgid "Single"
 msgstr "<input type=\"submit\" value=\"Oppdater\" />"
 
 msgid "Single"


@@ -432,15 +421,10 @@ msgstr "Single"
 msgid "Double"
 msgstr "Double"
 
 msgid "Double"
 msgstr "Double"
 

-#, fuzzy
-msgid "Sang"
-msgstr "Sang"
-

 msgid "Artist"
 msgstr "Artist"
 
 msgid "Artist"
 msgstr "Artist"
 

-#, fuzzy
-msgid "Fotratinger"
+msgid "Foot ratings"

 msgstr "Fotratinger"
 
 msgid "Std.dev."
 msgstr "Fotratinger"
 
 msgid "Std.dev."


@@ -460,18 +444,3 @@ msgstr "Beklager, det oppsto et problem ved behandlingen av forespørselen din:"
 
 msgid "Please go back and try again."
 msgstr "Vennligst gå tilbake og prøv igjen."
 
 msgid "Please go back and try again."
 msgstr "Vennligst gå tilbake og prøv igjen."

-
-#~ msgid "Season"
-#~ msgstr "Sesong"
-
-#~ msgid "Place"
-#~ msgstr "Sted"
-
-#~ msgid "Machine"
-#~ msgstr "Maskin"
-
-#~ msgid "Scoring system"
-#~ msgstr "Scoresystem"
-
-#~ msgid "by"
-#~ msgstr "av"

diff --git a/html/po/templates.pot b/html/po/templates.pot
index 36aa6096aac8a630d5a2d5229dcf8ac03747502e..d5d1116f33997644849e1a6e7cd5044f3581d38f 100644 (file)
--- a/html/po/templates.pot
+++ b/html/po/templates.pot
@@ -36,7 +36,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ccbs\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: ccbs\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2005-45-17 14:45+0200\n"
+"POT-Creation-Date: 2005-55-17 14:55+0200\n"

 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"


@@ -71,7 +71,7 @@ msgstr ""
 msgid "Scoring system:"
 msgstr ""
 
 msgid "Scoring system:"
 msgstr ""
 

-msgid "<input type=\"submit\" value=\"Legg inn\" />"
+msgid "<input type=\"submit\" value=\"Add\" />"

 msgstr ""
 
 msgid "The tournament has been added."
 msgstr ""
 
 msgid "The tournament has been added."


@@ -257,33 +257,30 @@ msgid ""
 "\t  "
 msgstr ""
 
 "\t  "
 msgstr ""
 

-msgid "Generelle fakta"
-msgstr ""
-

 msgid "Start new round"
 msgstr ""
 
 msgid "Start new round"
 msgstr ""
 

-msgid "For øyeblikket har det vært avholdt"
+msgid "At the moment, there's been"

 msgstr ""
 
 msgid ""
 msgstr ""
 
 msgid ""

-"fulle runder,\n"
-"      hvilket vil si at du kan begynne runde"
+"full rounds,\n"
+"      which means that you could start round"

 msgstr ""
 
 msgid ""
 msgstr ""
 
 msgid ""

-"om du skulle ønske det. Vær oppmerksom på at du ikke kan begynne en ny "
-"runde\n"
-"      før den forrige er gjort helt ferdig."
+"if you'd like. Note that you can't start a new round before the\n"
+"      previous one has been completely done."

 msgstr ""
 
 msgstr ""
 

-msgid "Det er"
+msgid "There are"

 msgstr ""
 
 msgid ""
 msgstr ""
 
 msgid ""

-"mennesker som vil gå videre til\n"
-"      neste runde, og disse vil bli spredd jevnt utover så mange grupper som "
-"du velger."
+"players going\n"
+"      onto the next round, and these will be spread evenly out over how "
+"many\n"
+"      groups you select."

 msgstr ""
 
 msgid "Number of groups"
 msgstr ""
 
 msgid "Number of groups"


@@ -332,13 +329,13 @@ msgstr ""
 msgid "Ranking list"
 msgstr ""
 
 msgid "Ranking list"
 msgstr ""
 

-msgid "plass"
+msgid "place"

 msgstr ""
 
 msgstr ""
 

-msgid "med"
+msgid "with"

 msgstr ""
 
 msgstr ""
 

-msgid "poeng"
+msgid "points"

 msgstr ""
 
 msgid "Number of machines:"
 msgstr ""
 
 msgid "Number of machines:"


@@ -374,7 +371,7 @@ msgstr ""
 msgid "C"
 msgstr ""
 
 msgid "C"
 msgstr ""
 

-msgid "<input type=\"submit\" value=\"Oppdater\" />"
+msgid "<input type=\"submit\" value=\"Update\" />"

 msgstr ""
 
 msgid "Single"
 msgstr ""
 
 msgid "Single"


@@ -383,13 +380,10 @@ msgstr ""
 msgid "Double"
 msgstr ""
 
 msgid "Double"
 msgstr ""
 

-msgid "Sang"
-msgstr ""
-

 msgid "Artist"
 msgstr ""
 
 msgid "Artist"
 msgstr ""
 

-msgid "Fotratinger"
+msgid "Foot ratings"

 msgstr ""
 
 msgid "Std.dev."
 msgstr ""
 
 msgid "Std.dev."

diff --git a/html/templates/add-tournament.tmpl b/html/templates/add-tournament.tmpl
index bf6db09f4c9163d9605ad615acd4316b1bffa220..cf32b68736033aeb4d9c14f30a72970fdd78102a 100644 (file)
--- a/html/templates/add-tournament.tmpl
+++ b/html/templates/add-tournament.tmpl
@@ -55,7 +55,7 @@
       </td>
     </tr>
     <tr>
       </td>
     </tr>
     <tr>

-      <td colspan="2"><input type="submit" value="Legg inn" /></td>
+      <td colspan="2"><input type="submit" value="Add" /></td>

     </tr>
   </table>
 </form>
     </tr>
   </table>
 </form>

diff --git a/html/templates/show-tournament.tmpl b/html/templates/show-tournament.tmpl
index c111fdcef2bd65a2925dc6a7c8ad61d1e3910ffb..fee1f5380fcd055566bfdf624f98758b0db8c4da 100644 (file)
--- a/html/templates/show-tournament.tmpl
+++ b/html/templates/show-tournament.tmpl
@@ -1,5 +1,5 @@
 [%# vim:set filetype=html: %]
 [%# vim:set filetype=html: %]

-  <h2>Generelle fakta</h2>
+  <h2>General facts</h2>

 
   <div>
     <ul>
 
   <div>
     <ul>


@@ -16,13 +16,14 @@
   <h2>Start new round</h2>
 
   <div>
   <h2>Start new round</h2>
 
   <div>

-    <p><_>For øyeblikket har det vært avholdt</_> <strong>[% num_rounds %]</strong> <_>fulle runder,
-      hvilket vil si at du kan begynne runde</_> <strong>[% num_rounds + 1 %]</strong>
-      <_>om du skulle ønske det. Vær oppmerksom på at du ikke kan begynne en ny runde
-      før den forrige er gjort helt ferdig.</_></p>
+    <p><_>At the moment, there's been</_> <strong>[% num_rounds %]</strong> <_>full rounds,
+      which means that you could start round</_> <strong>[% num_rounds + 1 %]</strong>
+      <_>if you'd like. Note that you can't start a new round before the
+      previous one has been completely done.</_></p>

 
 

-    <p><_>Det er</_> <strong>[% num_qualified %]</strong> <_>mennesker som vil gå videre til
-      neste runde, og disse vil bli spredd jevnt utover så mange grupper som du velger.</_></p>
+    <p><_>There are</_> <strong>[% num_qualified %]</strong> <_>players going
+      onto the next round, and these will be spread evenly out over how many
+      groups you select.</_></p>

 
     <form method="post" action="do-start-round.pl">
       <table>
 
     <form method="post" action="do-start-round.pl">
       <table>


@@ -80,9 +81,9 @@
     <ul>
 [% FOR r = rankings %]
 [% IF r.points == -1 %]
     <ul>
 [% FOR r = rankings %]
 [% IF r.points == -1 %]

-      <li>[% r.ranking %]. <_>plass</_>: <a href="player.pl?id=[% r.player %]">[% r.nick %]</a></li>
+      <li>[% r.ranking %]. <_>place</_>: <a href="player.pl?id=[% r.player %]">[% r.nick %]</a></li>

 [% ELSE %]
 [% ELSE %]

-      <li>[% r.ranking %]. <_>plass</_>: <a href="player.pl?id=[% r.player %]">[% r.nick %]</a>, <_>med</_> [% r.points %] <_>poeng</_>.</li>
+      <li>[% r.ranking %]. <_>place</_>: <a href="player.pl?id=[% r.player %]">[% r.nick %]</a>, <_>with</_> [% r.points %] <_>points</_>.</li>

 [% END %]
 [% END %]
     </ul>
 [% END %]
 [% END %]
     </ul>


@@ -249,7 +250,7 @@
      <td>[% pl.total %]</td>
         [% END %]
      <td>[% pl.rank %]</td>
      <td>[% pl.total %]</td>
         [% END %]
      <td>[% pl.rank %]</td>

-     <td><input type="submit" value="Oppdater" /></td>
+     <td><input type="submit" value="Update" /></td>

     </tr>
       [% END %]
     [% END %]
     </tr>
       [% END %]
     [% END %]

diff --git a/html/templates/songratings.tmpl b/html/templates/songratings.tmpl
index d5a6bd66a58aea97d20d3480fd0916ae5bd653c0..2df7ec737643575a8cad7f644a3afdefa90beaef 100644 (file)
--- a/html/templates/songratings.tmpl
+++ b/html/templates/songratings.tmpl
@@ -13,7 +13,7 @@
 [% END %]      
       </tr>
       <tr>
 [% END %]      
       </tr>
       <tr>

-        <th>Sang</th>
+        <th>Song</th>

         <th>Artist</th>
         <th>B</th>
         <th>S</th>
         <th>Artist</th>
         <th>B</th>
         <th>S</th>

diff --git a/html/templates/songs.tmpl b/html/templates/songs.tmpl
index 3100d477558bdfa85e3535aa9ebaba16c3df421e..c876a22f8ac40c09cd9923757fcd4891fd097805 100644 (file)
--- a/html/templates/songs.tmpl
+++ b/html/templates/songs.tmpl
@@ -13,7 +13,7 @@
   <h2>[% s.machinename %]</h2>
 
   <div>
   <h2>[% s.machinename %]</h2>
 
   <div>

-    <p><a href="songratings.pl?machine=[% s. machine %]"><_>Fotratinger</_></a></p>
+    <p><a href="songratings.pl?machine=[% s. machine %]"><_>Foot ratings</_></a></p>

   
     <table class="scores">
       <tr>
   
     <table class="scores">
       <tr>