Merge branch 'master' of /home/arun/nubati.net/git/e-DoKo

diff --git a/include/game.php b/include/game.php
index cafa02658c6e308bc86a60fd65564dff18078de2..aa2561699b15a43a74ec8b26f30b69da056b43ed 100644 (file)
--- a/include/game.php
+++ b/include/game.php
@@ -239,7 +239,7 @@ if($session)
 
     if($finalscore)
       {
-       echo "Score: \n";
+       echo _('Score').": \n";
        foreach($finalscore as $user=>$value)
          {
            $name = DB_get_name('userid',$user);
@@ -1288,7 +1288,7 @@ switch($mystatus)
     $firstcard = ''; /* first card in a trick */
 
     echo "\n<ul class=\"tricks\">\n";
-    echo "  <li class=\"nohighlight\"> Game ".DB_format_gameid($gameid).": </li>\n";
+    echo '  <li class="nohighlight"> '._('Game').' '.DB_format_gameid($gameid).": </li>\n";
 
     /* output vorbehalte */
     $mygametype =  DB_get_gametype_by_gameid($gameid);
@@ -1332,14 +1332,14 @@ switch($mystatus)
            if($trick!=$lasttrick)
              {
                /* start of an old trick? */
-               echo "  <li onclick=\"hl('$trickNR');\" class=\"old\"><a href=\"#\">Trick $trickNR</a>\n".
+               echo "  <li onclick=\"hl('$trickNR');\" class=\"old\"><a href=\"#\">"._('Trick')." $trickNR</a>\n".
                  "    <div class=\"trick\" id=\"trick".$trickNR."\">\n".
                  "      <img class=\"arrow\" src=\"pics/arrow".($pos-1).".png\" alt=\"table\" />\n";
              }
            else if($trick==$lasttrick)
              {
                /* start of a last trick? */
-               echo "  <li onclick=\"hl('$trickNR');\" class=\"current\"><a href=\"#\">Trick $trickNR</a>\n".
+               echo "  <li onclick=\"hl('$trickNR');\" class=\"current\"><a href=\"#\">"._('Trick')." $trickNR</a>\n".
                  "    <div class=\"trick\" id=\"trick".$trickNR."\">\n".
                  "      <img class=\"arrow\" src=\"pics/arrow".($pos-1).".png\" alt=\"table\" />\n";
              };
@@ -1602,7 +1602,7 @@ switch($mystatus)
            $pos = DB_get_pos_by_hash($me);
            if($sequence==1)
              {
-               echo "  <li onclick=\"hl('".($tricknr)."');\" class=\"current\"><a href=\"#\">Trick ".($tricknr)."</a>\n".
+               echo "  <li onclick=\"hl('".($tricknr)."');\" class=\"current\"><a href=\"#\">"._('Trick').' '.($tricknr)."</a>\n".
                  "    <div class=\"trick\" id=\"trick".($tricknr)."\">\n".
                  "      <img class=\"arrow\" src=\"pics/arrow".($pos-1).".png\" alt=\"table\" />\n";
              }
@@ -1913,7 +1913,7 @@ switch($mystatus)
     /* display points in case game is over */
     if($mystatus=='gameover' && DB_get_game_status_by_gameid($gameid)=='gameover' )
       {
-       echo "  <li onclick=\"hl('13');\" class=\"current\"><a href=\"#\">Score</a>\n".
+       echo "  <li onclick=\"hl('13');\" class=\"current\"><a href=\"#\">"._('Score')."</a>\n".
          "    <div class=\"trick\" id=\"trick13\">\n";
        /* add pic for re/contra
         "      <img class=\"arrow\" src=\"pics/arrow".($pos-1).".png\" alt=\"table\" />\n";*/
@@ -1970,8 +1970,8 @@ switch($mystatus)
        echo "    </div>\n  </li>\n";  /* end div trick, end li trick */
       }
 
-    echo "  <li onclick=\"hl_prev();\" class=\"old\"><a href=\"#\">prev</a></li>\n";
-    echo "  <li onclick=\"hl_next();\" class=\"old\"><a href=\"#\">next</a></li>\n";
+    echo "  <li onclick=\"hl_prev();\" class=\"old\"><a href=\"#\">"._('prev')."</a></li>\n";
+    echo "  <li onclick=\"hl_next();\" class=\"old\"><a href=\"#\">"._('next')."</a></li>\n";
     echo "</ul>\n"; /* end ul tricks*/
 
     $mycards = DB_get_hand($me);

diff --git a/locale/de/LC_MESSAGES/edoko.mo b/locale/de/LC_MESSAGES/edoko.mo
index 8e4aba7f0b8875f93f6ee02b9c1eea479c847f15..a53aa6dbde6818a0d223dada160be917aaaf0986 100644 (file)
Binary files a/locale/de/LC_MESSAGES/edoko.mo and b/locale/de/LC_MESSAGES/edoko.mo differ

diff --git a/po/de.po b/po/de.po
index a4385c87ae1f92544bee87274477b5c6f1e9957b..b2499ac5c718c84c71602ce5ac54e145a1114879 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edoko\n"
 "Report-Msgid-Bugs-To: arun@nubati.net\n"
-"POT-Creation-Date: 2010-04-17 22:55-0700\n"
-"PO-Revision-Date: 2010-04-17 23:09-0700\n"
+"POT-Creation-Date: 2010-04-17 23:20-0700\n"
+"PO-Revision-Date: 2010-04-17 23:24-0700\n"
 "Last-Translator: Arun Persaud <arun@nubati.net>\n"
 "Language-Team: English\n"
 "MIME-Version: 1.0\n"
@@ -77,6 +77,10 @@ msgstr "Ansage"
 msgid "lowtrump"
 msgstr "Trumpfarmut"
 
+#: include/game.php:242 include/game.php:1916
+msgid "Score"
+msgstr "Punkte"
+
 #: include/game.php:286
 msgid "previous game"
 msgstr "vorheriges Spiel"
@@ -153,10 +157,26 @@ msgid ""
 "wait for the others. Just wait for an email."
 msgstr ""
 
+#: include/game.php:1291
+msgid "Game"
+msgstr "Spiel"
+
+#: include/game.php:1335 include/game.php:1342 include/game.php:1605
+msgid "Trick"
+msgstr "Stich"
+
 #: include/game.php:1907
 msgid "please wait until it's your turn!"
 msgstr "Bitte warte bis Du dran bist!"
 
+#: include/game.php:1973
+msgid "prev"
+msgstr "zurueck"
+
+#: include/game.php:1974
+msgid "next"
+msgstr "vor"
+
 #: include/game.php:2026
 msgid "Your cards were"
 msgstr "Deine Karten waren"
@@ -278,7 +298,7 @@ msgstr ""
 
 #: include/output.php:140
 msgid "start game"
-msgstr ""
+msgstr "Starte Spiel"
 
 #: include/output.php:218
 msgid "Thanks for joining the game"
@@ -286,11 +306,11 @@ msgstr "Danke, dass du am Spiel teilnimmst"
 
 #: include/output.php:220
 msgid "Do you want to play solo?"
-msgstr ""
+msgstr "Willst du Solo spielen?"
 
 #: include/output.php:222
 msgid "No"
-msgstr ""
+msgstr "Nein"
 
 #: include/output.php:223
 msgid "trumpless"
@@ -337,11 +357,11 @@ msgstr "Nein"
 
 #: include/output.php:244
 msgid "Do you have poverty?"
-msgstr ""
+msgstr "Hast du Armut?"
 
 #: include/output.php:255
 msgid "Do you have too many nines?"
-msgstr ""
+msgstr "Hast du zuviele Neuner?"
 
 #: include/output.php:269
 msgid "Do you have low trump (cancel game)?"

diff --git a/po/messages.pot b/po/messages.pot
index 50f3a59c6acb584e3fb4ef0ec63fa87e586bae17..e1bb06284e2b1aa87434bf9a4261098c0a0c8525 100644 (file)
--- a/po/messages.pot
+++ b/po/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edoko\n"
 "Report-Msgid-Bugs-To: arun@nubati.net\n"
-"POT-Creation-Date: 2010-04-17 22:55-0700\n"
+"POT-Creation-Date: 2010-04-17 23:20-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -76,6 +76,10 @@ msgstr ""
 msgid "lowtrump"
 msgstr ""
 
+#: include/game.php:242 include/game.php:1916
+msgid "Score"
+msgstr ""
+
 #: include/game.php:286
 msgid "previous game"
 msgstr ""
@@ -144,10 +148,26 @@ msgid ""
 "wait for the others. Just wait for an email."
 msgstr ""
 
+#: include/game.php:1291
+msgid "Game"
+msgstr ""
+
+#: include/game.php:1335 include/game.php:1342 include/game.php:1605
+msgid "Trick"
+msgstr ""
+
 #: include/game.php:1907
 msgid "please wait until it's your turn!"
 msgstr ""
 
+#: include/game.php:1973
+msgid "prev"
+msgstr ""
+
+#: include/game.php:1974
+msgid "next"
+msgstr ""
+
 #: include/game.php:2026
 msgid "Your cards were"
 msgstr ""