marked more strings for translation

diff --git a/include/functions.php b/include/functions.php
index a06f3d425ed4c1acf4ae189b446f162b052ef650..04d1bde7ec785ad779ed391322ad23d9c5b1449d 100644 (file)
--- a/include/functions.php
+++ b/include/functions.php
@@ -1103,7 +1103,7 @@ function display_user_menu($id)
       if($i==0)
        {
          echo "<div class=\"usermenu\">\n";
-         echo "It's your turn in these games:<br />\n";
+         echo _('It\'s your turn in these games').":<br />\n";
        }
 
       $i++;

diff --git a/include/game.php b/include/game.php
index db27bde601dd75d743c62d99c0674f4ea07df303..0601e4443e0a9ede1af5b60529194ce45eba5690 100644 (file)
--- a/include/game.php
+++ b/include/game.php
@@ -1904,7 +1904,7 @@ switch($mystatus)
       }
     else if(myisset('card') && !$myturn )
       {
-       echo "please wait until it's your turn! <br />\n";
+       echo _("please wait until it's your turn!")."<br />\n";
       }
 
     if($seq!=4 && $trickNR>=1 && !(myisset('card') && $myturn) )
@@ -1981,7 +1981,7 @@ switch($mystatus)
     if($myturn && !myisset('card') && $mystatus=='play' )
       {
        echo "Hello ".$myname.", it's your turn!  <br />\n";
-       echo "Your cards are: <br />\n";
+       echo _('Your cards are').": <br />\n";
 
        /* do we have to follow suite? */
        $followsuit = 0;
@@ -2013,7 +2013,7 @@ switch($mystatus)
       }
     else if($mystatus=='play' )
       {
-       echo "Your cards are: <br />\n";
+       echo _('Your cards are').": <br />\n";
        foreach($mycards as $card)
          display_card($card,$PREF['cardset']);
       }
@@ -2023,7 +2023,7 @@ switch($mystatus)
        $oldcards = mysort($oldcards,$gametype);
 
        if(isset($_SESSION['id']) && $myid==$_SESSION['id'])
-         echo "Your cards were: <br />\n";
+         echo _('Your cards were').": <br />\n";
        else
          {
            $name = DB_get_name('userid',$myid);
@@ -2109,10 +2109,10 @@ $gameend = time() - strtotime($r[0]);
 
 if($gamestatus == 'play' || $gameend < 60*60*24*7)
   {
-    echo "<br />\nA short comment:<input name=\"comment\" type=\"text\" size=\"15\" maxlength=\"100\" />\n";
+    echo "<br />\n"._('A short comment').":<input name=\"comment\" type=\"text\" size=\"15\" maxlength=\"100\" />\n";
   }
 
-echo "<input type=\"submit\" value=\"submit\" />\n";
+echo "<input type=\"submit\" value=\""._('submit')."\" />\n";
 
 /* has this hand been played by others? */
 $other_game_ids = DB_played_by_others($gameid);

diff --git a/include/output.php b/include/output.php
index 0f326f5a0432aadeea987f2ae6ff08bab6dd753b..7f35dd28b42f4c914387814a24abe975ff3ef608 100644 (file)
--- a/include/output.php
+++ b/include/output.php
@@ -433,12 +433,12 @@ function output_status()
 {
   global $defaulttimezone, $INDEX, $WIKI, $RSS;
 
-  if(isset($_SESSION["name"]))
+  if(isset($_SESSION['name']))
     {
-      $name = $_SESSION["name"];
+      $name = $_SESSION['name'];
 
       /* last logon time */
-      $myid  = DB_get_userid("name",$name);
+      $myid  = DB_get_userid('name',$name);
       $zone  = DB_get_user_timezone($myid);
 
       $time     = DB_get_user_timestamp($myid);
@@ -452,21 +452,21 @@ function output_status()
       /* logout info */
       echo "\n<div class=\"status\">\n";
       echo $name,"\n";
-      echo " | <a href=\"".$INDEX."\"> mypage </a>\n";
-      echo " | <a href=\"".$INDEX."?action=prefs\">settings</a>\n";
-      echo " | <a href=\"".$INDEX."?action=new\">new game</a>\n";
-      echo " | <a href=\"".$INDEX."?action=stats\">statistics</a>\n";
-      echo " | <a href=\"".$WIKI."\">wiki/bugs</a>\n";
-      echo " | <a href=\"".$RSS."?uid=".$myid."&amp;token=".$token."\">rss</a>\n";
-      echo " |&nbsp;&nbsp;&nbsp; <a href=\"".$INDEX."?action=logout\">logout</a>\n";
+      echo " | <a href=\"".$INDEX."\">"._('mypage')."</a>\n";
+      echo " | <a href=\"".$INDEX."?action=prefs\">"._('settings')."</a>\n";
+      echo " | <a href=\"".$INDEX."?action=new\">"._('new game')."</a>\n";
+      echo " | <a href=\"".$INDEX."?action=stats\">"._('statistics')."</a>\n";
+      echo " | <a href=\"".$WIKI."\">"._('wiki/bugs')."</a>\n";
+      echo " | <a href=\"".$RSS."?uid=".$myid."&amp;token=".$token."\">"._('atom')."</a>\n";
+      echo " |&nbsp;&nbsp;&nbsp; <a href=\"".$INDEX."?action=logout\">"._('logout')."</a>\n";
       echo "</div>\n";
 
-      echo "<div class=\"lastlogin\"><span>last login: ".date("r",$unixtime)."</span></div>\n";
+      echo "<div class=\"lastlogin\"><span>"._('last login').": ".date("r",$unixtime)."</span></div>\n";
     }
   else
     {
       echo "\n<div class=\"status\">\n";
-      echo "<a href=\"".$INDEX."\">login</a>\n";
+      echo "<a href=\"".$INDEX."\">"._('login')."</a>\n";
       echo "</div>\n";
     }
   return;
@@ -572,7 +572,7 @@ function output_password_recovery($email,$password)
 
 function output_user_notes($userid,$gameid,$userstatus)
 {
-  echo "<div class=\"notes\"> Personal notes: <br />\n";
+  echo "<div class=\"notes\"> "._('Personal notes').": <br />\n";
   $notes = DB_get_notes_by_userid_and_gameid($userid,$gameid);
   foreach($notes as $note)
     echo "$note <hr />\n";

diff --git a/include/preferences.php b/include/preferences.php
index b30e7cb365fe5782a513cff7fc704f1a6e55ef9b..3a841c3d88397fe78ececf8f281ef3c2db8ec2d5 100644 (file)
--- a/include/preferences.php
+++ b/include/preferences.php
@@ -332,7 +332,7 @@ echo "    <fieldset>\n";
 echo '    <legend>'._('Game-related')."</legend>\n";
 echo "      <table>\n";
 
-echo '        <tr><td>'._('Vacation:')."             </td>\n";
+echo '        <tr><td>'._('Vacation').":             </td>\n";
 if($PREF['vacation_start'])
   $value = substr($PREF['vacation_start'],0,10);
  else