Lots of translation updates.

diff --git a/html/po/en_DK.po b/html/po/en_DK.po
index cab03637c98f7c94f47e4277376f3907cfe29ce5..2dd2487e12bba720f484c3465f2ee8b50d8cb931 100644 (file)
--- a/html/po/en_DK.po
+++ b/html/po/en_DK.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-52-17 12:52+0200\n"
+"POT-Creation-Date: 2005-39-17 13:39+0200\n"

 "PO-Revision-Date: 2005-07-17 01:55+0200\n"
 "Last-Translator: Steinar H. Gunderson <sgunderson@bigfoot.com>\n"
 "Language-Team: English <en@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: English <en@translate.freefriends.org>\n"


@@ -94,7 +94,8 @@ msgstr "Technical information"
 msgid ""
 "Velkommen. Alt er under konstant utvikling foreløpig, og kan derfor\n"
 "    være knotete, buggy eller bare manglende. Such is life :-)"
 msgid ""
 "Velkommen. Alt er under konstant utvikling foreløpig, og kan derfor\n"
 "    være knotete, buggy eller bare manglende. Such is life :-)"

-msgstr "Welcome to the web part our score and tournament system.\n"
+msgstr ""
+"Welcome to the web part our score and tournament system.\n"

 "   Select whatever you are interested in information for from the menu\n"
 "   below."
 
 "   Select whatever you are interested in information for from the menu\n"
 "   below."
 


@@ -123,7 +124,7 @@ msgid "Storskjerm"
 msgstr "Bigscreen"
 
 msgid "<a href=\"set-active-tournament.pl\">Sett aktiv turnering</a>"
 msgstr "Bigscreen"
 
 msgid "<a href=\"set-active-tournament.pl\">Sett aktiv turnering</a>"

-msgstr "<a href=\"set-active-tournament.pl\">Sett aktiv turnering</a>"
+msgstr "<a href=\"set-active-tournament.pl\">Set active tournament</a>"

 
 msgid "Nick"
 msgstr "Nick"
 
 msgid "Nick"
 msgstr "Nick"


@@ -185,8 +186,21 @@ msgstr "Occasion"
 msgid "Alle sanger"
 msgstr "All songs"
 
 msgid "Alle sanger"
 msgstr "All songs"
 

+msgid "For øyeblikket er"
+msgstr "At the moment, "
+
+msgid ""
+"sanger satt som\n"
+"    brukt i sangvelgeren. Nullstiller du sangvelgeren, går den tilbake\n"
+"    til 0 og alle sanger kan potensielt trekkes ut når du lager en ny\n"
+"    gruppe."
+msgstr ""
+"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"
+"create a new group."
+

 msgid "<input type=\"submit\" value=\"Nullstill sangvelger\" />"
 msgid "<input type=\"submit\" value=\"Nullstill sangvelger\" />"

-msgstr "<input type=\"submit\" value=\"Nullstill sangvelger\" />"
+msgstr "<input type=\"submit\" value=\"Reset song selector\" />"

 
 msgid "Påmelding"
 msgstr "Registration"
 
 msgid "Påmelding"
 msgstr "Registration"


@@ -305,7 +319,8 @@ msgid ""
 "      avsluttet)."
 msgstr ""
 "As there's only one group left and that group is done, you can end the\n"
 "      avsluttet)."
 msgstr ""
 "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 tournament, the\n"
+"tournament if you'd like to. Note that when you've ended the tournament, "
+"the\n"

 "ranking lists will be generated and the CC points will be handed out, and\n"
 "there's no way back (that is, the tournament is permanently ended)."
 
 "ranking lists will be generated and the CC points will be handed out, and\n"
 "there's no way back (that is, the tournament is permanently ended)."
 


@@ -348,9 +363,15 @@ msgstr "Double"
 msgid "Artist"
 msgstr "Artist"
 
 msgid "Artist"
 msgstr "Artist"
 

+msgid "Fotratinger"
+msgstr "Foot ratings"
+

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

+msgid "av"
+msgstr "by"
+

 msgid "Beste scores"
 msgstr "Best scores"
 
 msgid "Beste scores"
 msgstr "Best scores"
 

diff --git a/html/po/templates.pot b/html/po/templates.pot
index a171994e3bcb3a4fcb039f7008bb6930981d3ea8..ee6f5a7a0aab6c486200f60b2e34ca94f5cdb93c 100644 (file)
--- a/html/po/templates.pot
+++ b/html/po/templates.pot
@@ -34,7 +34,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-52-17 12:52+0200\n"
+"POT-Creation-Date: 2005-39-17 13:39+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"


@@ -173,6 +173,16 @@ msgstr ""
 msgid "Alle sanger"
 msgstr ""
 
 msgid "Alle sanger"
 msgstr ""
 

+msgid "For øyeblikket er"
+msgstr ""
+
+msgid ""
+"sanger satt som\n"
+"    brukt i sangvelgeren. Nullstiller du sangvelgeren, går den tilbake\n"
+"    til 0 og alle sanger kan potensielt trekkes ut når du lager en ny\n"
+"    gruppe."
+msgstr ""
+

 msgid "<input type=\"submit\" value=\"Nullstill sangvelger\" />"
 msgstr ""
 
 msgid "<input type=\"submit\" value=\"Nullstill sangvelger\" />"
 msgstr ""
 


@@ -321,9 +331,15 @@ msgstr ""
 msgid "Artist"
 msgstr ""
 
 msgid "Artist"
 msgstr ""
 

+msgid "Fotratinger"
+msgstr ""
+

 msgid "Standardavvik"
 msgstr ""
 
 msgid "Standardavvik"
 msgstr ""
 

+msgid "av"
+msgstr ""
+

 msgid "Beste scores"
 msgstr ""
 
 msgid "Beste scores"
 msgstr ""
 

diff --git a/html/templates/randomsongs.tmpl b/html/templates/randomsongs.tmpl
index f8ff24f3542c529cfacd774bb614257d7f47c654..c21004ec440b9cdc0df94257c880d9c11fba186c 100755 (executable)
--- a/html/templates/randomsongs.tmpl
+++ b/html/templates/randomsongs.tmpl
@@ -1,9 +1,9 @@
 [%# vim:set filetype=html: %]
 <div>
 [%# vim:set filetype=html: %]
 <div>

-  <p>For øyeblikket er <strong>[% num_used %]</strong> sanger satt som
+  <p><_>For øyeblikket er</_> <strong>[% num_used %]</strong> <_>sanger satt som

     brukt i sangvelgeren. Nullstiller du sangvelgeren, går den tilbake
     til 0 og alle sanger kan potensielt trekkes ut når du lager en ny
     brukt i sangvelgeren. Nullstiller du sangvelgeren, går den tilbake
     til 0 og alle sanger kan potensielt trekkes ut når du lager en ny

-    gruppe.</p>
+    gruppe.</_></p>

 
   <form action="do-reset-randomsongs.pl" method="post">
     <p><input type="submit" value="Nullstill sangvelger" /></p>
 
   <form action="do-reset-randomsongs.pl" method="post">
     <p><input type="submit" value="Nullstill sangvelger" /></p>

diff --git a/html/templates/songs.tmpl b/html/templates/songs.tmpl
index 77840925ea304614c85c373aac29d368b0b63e50..b43bf0f5323aa5c7c1285b2c02e4ead4d78c7105 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 %]"><_>Fotratinger</_></a></p>

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


@@ -33,7 +33,7 @@
 [% IF s.high_score == '' %]
         <td></td>
 [% ELSE %]
 [% IF s.high_score == '' %]
         <td></td>
 [% ELSE %]

-        <td>[% s.high_score %] av <a href="song.pl?id=[% s.high_score_player %]">[% s.high_score_nick %]</a></td>
+        <td>[% s.high_score %] <_>av</_> <a href="song.pl?id=[% s.high_score_player %]">[% s.high_score_nick %]</a></td>

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

diff --git a/intl/make-all-pot.sh b/intl/make-all-pot.sh
index 1d513bfb585ffea6eb3712e1e99fadb0dace9106..707ac76ef03ff122e2d23d6b37e2e077aa824b04 100755 (executable)
--- a/intl/make-all-pot.sh
+++ b/intl/make-all-pot.sh
@@ -9,7 +9,7 @@ for FILE in templates/*.tmpl; do
 done
 
 msgcat templates/*.pot > po/templates.pot
 done
 
 msgcat templates/*.pot > po/templates.pot

-rm -f templates/*.pot
+# rm -f templates/*.pot

 
 for FILE in po/*.po; do
        msgmerge -U $FILE po/templates.pot
 
 for FILE in po/*.po; do
        msgmerge -U $FILE po/templates.pot