TRANSLATION: some more strings and updated po.de

3 files changed, 54 insertions, 52 deletions

diff --git a/include/output.php b/include/output.php
index 23c9199..3ad0552 100644
--- a/include/output.php
+++ b/include/output.php
@@ -219,14 +219,14 @@ function output_check_for_sickness($me,$mycards)
   echo '';
   echo '    '._('Do you want to play solo?').'';
   echo '    <select name="solo" size="1">';
-  echo '      <option selected="selected">'.'No'.'</option>';
-  echo '      <option>'.'trumpless'.'</option>';
-  echo '      <option>'.'trump'.'</option>';
-  echo '      <option>'.'queen'.'</option>';
-  echo '      <option>'.'jack'.'</option>';
-  echo '      <option>'.'club'.'</option>';
-  echo '      <option>'.'spade'.'</option>';
-  echo '      <option>'.'heart'.'</option>';
+  echo '      <option value="No" selected="selected">'.'No'.'</option>';
+  echo '      <option value="trumpless">'._('trumpless').'</option>';
+  echo '      <option value="trump">'._('trump').'</option>';
+  echo '      <option value="queen">'._('queen').'</option>';
+  echo '      <option value="jack">'._('jack').'</option>';
+  echo '      <option value="club">'._('club').'</option>';
+  echo '      <option valvue="spade">'._('spade').'</option>';
+  echo '      <option value="hear">'._('heart').'</option>';
   echo '    </select>';
   echo '    <br />';
 
diff --git a/include/preferences.php b/include/preferences.php
index 3a841c3..0485d9e 100644
--- a/include/preferences.php
+++ b/include/preferences.php
@@ -337,12 +337,12 @@ if($PREF['vacation_start'])
   $value = substr($PREF['vacation_start'],0,10);
  else
    $value = '';
-echo "            <td>start:<input type=\"text\" id=\"vacation_start\" name=\"vacation_start\" size=\"10\" maxlength=\"10\" value=\"$value\" /></td>\n";
+echo "            <td>"._('start').":<input type=\"text\" id=\"vacation_start\" name=\"vacation_start\" size=\"10\" maxlength=\"10\" value=\"$value\" /></td>\n";
 if($PREF['vacation_stop'])
   $value = substr($PREF['vacation_stop'],0,10);
  else
    $value = '';
-echo "            <td>stop:<input type=\"text\" id=\"vacation_stop\" name=\"vacation_stop\" size=\"10\" maxlength=\"10\" value=\"$value\" /></td>\n";
+echo "            <td>"._('stop').":<input type=\"text\" id=\"vacation_stop\" name=\"vacation_stop\" size=\"10\" maxlength=\"10\" value=\"$value\" /></td>\n";
 if($PREF['vacation_comment'])
   $value = $PREF['vacation_comment'];
 else
@@ -351,8 +351,8 @@ echo '            <td>'._('comment:')."<input type=\"text\" id=\"vacation_commen
 if($changed_vacation == 1) echo _('changed');
 if($changed_vacation == -1) echo _('wrong date format');
 echo "</td></tr>\n";
-echo "<tr><td></td><td>use YYYY-MM-DD</td><td>use '-'  in start field to unset vacation</td></tr>\n";
-echo "        <tr><td>Notification:          </td><td>\n";
+echo '<tr><td></td><td>'._('use YYYY-MM-DD').'</td><td>'._("use '-'  in start field to unset vacation")."</td></tr>\n";
+echo '        <tr><td>'._('Notification').":          </td><td>\n";
 echo "          <select id=\"notify\" name=\"notify\" size=\"1\">\n";
 if($PREF['email']=="emailaddict")
   {
@@ -368,13 +368,13 @@ echo "          </select>";
 if($changed_notify) echo _('changed');
 echo " </td></tr>\n";
 
-echo "        <tr><td>Digest:          </td><td>\n";
+echo '        <tr><td>'._('Digest').":          </td><td>\n";
 echo "          <select id=\"digest\" name=\"digest\" size=\"1\">\n";
 
 $selected = "selected=\"selected\"";
 echo "            <option value=\"digest-off\"";
 if($PREF['digest']=="digest-off") echo $selected;
-echo ">digest off</option>\n";
+echo '>'._('digest off')."</option>\n";
 
 echo "            <option value=\"digest-1h\" ";
 if($PREF['digest']=="digest-1h") echo $selected;
@@ -409,7 +409,7 @@ if($changed_digest) echo _('changed');
 echo " </td></tr>\n";
 
 
-echo "        <tr><td>Autosetup:          </td><td>\n";
+echo '        <tr><td>'._('Autosetup').":          </td><td>\n";
 echo "          <select id=\"autosetup\" name=\"autosetup\" size=\"1\">\n";
 if($PREF['autosetup']=="yes")
   {
@@ -440,33 +440,33 @@ if($PREF['sorting']=="high-low")
 echo "         </select>";
 if($changed_sorting) echo _('changed');
 echo " </td></tr>\n";
-echo "        <tr><td>Open for new games:          </td><td>\n";
+echo '        <tr><td>'._('Open for new games').":          </td><td>\n";
 echo "         <select id=\"open_for_games\" name=\"open_for_games\" size=\"1\">\n";
 if($PREF['open_for_games']=="no")
   {
-    echo "           <option value=\"yes\">yes</option>\n";
+    echo "           <option value=\"yes\">"._('yes')."</option>\n";
     echo "           <option value=\"no\" selected=\"selected\">no</option>\n";
   }
  else /* default */
    {
      echo "           <option value=\"yes\" selected=\"selected\">yes</option>\n";
-     echo "           <option value=\"no\">no</option>\n";
+     echo "           <option value=\"no\">"._('no')."</option>\n";
    }
 echo "         </select>";
 if($changed_openforgames) echo _('changed');
 echo " </td></tr>\n";
 
-echo "    <tr><td>Card set:              </td><td>\n";
+echo '    <tr><td>'.('Card set').":              </td><td>\n";
 echo "         <select id=\"cards\" name=\"cards\" size=\"1\">\n";
 if($PREF['cardset']=="altenburg")
   {
-    echo "           <option value=\"altenburg\" selected=\"selected\">German cards</option>\n";
-    echo "           <option value=\"english\">English cards</option>\n";
+    echo "           <option value=\"altenburg\" selected=\"selected\">"._('German cards')."</option>\n";
+    echo "           <option value=\"english\">"._('English cards')."</option>\n";
   }
  else
    {
-     echo "           <option value=\"altenburg\">German cards</option>\n";
-     echo "           <option value=\"english\" selected=\"selected\">English cards</option>\n";
+     echo "           <option value=\"altenburg\">"._('German cards')."</option>\n";
+     echo "           <option value=\"english\" selected=\"selected\">"._('English cards')."</option>\n";
    }
 echo "         </select>";
 if($changed_cards) echo _('changed');
@@ -474,45 +474,45 @@ echo " </td></tr>\n";
 echo "      </table>\n";
 echo "    </fieldset>\n";
 echo "    <fieldset>\n";
-echo "      <legend>Personal</legend>\n";
+echo '      <legend>'._('Personal')."</legend>\n";
 echo "      <table>\n";
-echo "        <tr><td>Email:                 </td><td> $email    </td></tr>\n";
-echo "        <tr><td>Timezone:              </td><td>\n";
+echo '        <tr><td>'._('Email').":                 </td><td> $email    </td></tr>\n";
+echo '        <tr><td>'._('Timezone').":              </td><td>\n";
 output_select_timezone("timezone",$timezone);
 if($changed_timezone) echo _('changed');
 echo "</td></tr>\n";
-echo "        <tr><td>Language:              </td><td>\n";
+echo '        <tr><td>'._('Language').":              </td><td>\n";
 output_select_language("language",$PREF['language']);
 if($changed_language == 1) echo _('changed');
 echo "</td></tr>\n";
-echo "        <tr><td>Password(old):         </td><td>",
+echo '        <tr><td>'._('Password(old)').":         </td><td>",
   "<input type=\"password\" id=\"password0\" name=\"password0\" size=\"20\" maxlength=\"30\" />";
 switch($changed_password)
   {
   case '-3':
-    echo "The new passwords is not long enough (you need at least 4 characters).";
+    echo _('The new passwords is not long enough (you need at least 4 characters).');
     break;
   case '-2':
-    echo "The new passwords don't match.";
+    echo _('The new passwords don\'t match.');
     break;
   case '-1':
-    echo "The old password is not correct.";
+    echo _('The old password is not correct.');
     break;
   case '1':
     echo _('changed');
     break;
   }
 echo " </td></tr>\n";
-echo "        <tr><td>Password(new):         </td><td>",
+echo '        <tr><td>'._('Password(new)').":         </td><td>",
   "<input type=\"password\" id=\"password1\" name=\"password1\" size=\"20\" maxlength=\"30\" />",
   " </td></tr>\n";
-echo "        <tr><td>Password(new, retype): </td><td>",
+echo '        <tr><td>'._('Password(new, retype)').": </td><td>",
   "<input type=\"password\" id=\"password2\" name=\"password2\" size=\"20\" maxlength=\"30\" />",
   " </td></tr>\n";
 echo "      </table>\n";
 echo "    </fieldset>\n";
 echo "    <fieldset>\n";
-echo "      <legend>OpenID</legend>\n";
+echo '      <legend>'._('OpenID')."</legend>\n";
 
 $openids = array();
 $openids = DB_GetOpenIDsByUser($myid);
@@ -531,14 +531,14 @@ if(sizeof($openids))
     echo "     </table>\n";
   }
 
-echo "        add OpenID: ",
+echo '        '._('add OpenID').': ',
   "<input type=\"text\" id=\"openid_url\" name=\"openid_url\" size=\"20\" maxlength=\"50\" />";
 if($changed_openid)
-  echo "   Deleted some OpenIDs! <br />\n";
+  echo '   '._('Deleted some OpenIDs!')." <br />\n";
 echo "    </fieldset>\n";
-echo "    <fieldset><legend>Submit</legend><input type=\"submit\"  name=\"passwd\" value=\"set\" /></fieldset>\n";
+echo '    <fieldset><legend>'._('Submit')."</legend><input type=\"submit\"  name=\"passwd\" value=\"set\" /></fieldset>\n";
 echo "  </form>\n";
-echo " <p>E-DoKo uses <a href=\"http://www.gravatar.org\">gravatars</a> as icons.</p>";
+echo ' <p>'._('E-DoKo uses <a href=\"http://www.gravatar.org\">gravatars</a> as icons.').'</p>';
 echo "</div>\n";
 
 return;
diff --git a/include/user.php b/include/user.php
index 3046b34..e8d38f7 100644
--- a/include/user.php
+++ b/include/user.php
@@ -25,20 +25,22 @@ if(!isset($HOST))
   exit;
 
 /* test id and password, should really be done in one step */
-if(!isset($_SESSION["name"]))
+if(!isset($_SESSION['name']))
   {
-    $email     = $_REQUEST["email"];
-    $password  = $_REQUEST["password"];
+    $email     = $_REQUEST['email'];
+    $password  = $_REQUEST['password'];
   }
 else
   {
-    $name = $_SESSION["name"];
+    $name = $_SESSION['name'];
     $email     = DB_get_email('name',$name);
     $password  = DB_get_passwd_by_name($name);
   };
 
+global  $ADMIN_NAME;
+
 /* user has forgotten his password */
-if(myisset("forgot"))
+if(myisset('forgot'))
   {
     /* check if player is in the database */
     $ok = 1;
@@ -55,16 +57,16 @@ if(myisset("forgot"))
 	/* if less than N recent ones, add a new one and send out email */
 	if( $number < 5 )
 	  {
-	    echo "Ok, I send you a new password. <br />";
+	    echo _('Ok, I will send you a new password.').' <br />';
 	    if($number >1)
 	      echo "N.B. You tried this already $number times during the last day and it will only work ".
 		" 5 times during a day.<br />";
-	    echo "The new password will be valid for one day, make sure you reset it to something else.<br />";
+	    echo _('The new password will be valid for one day, make sure you reset it to something else.').'<br />';
 	    echo "Back to the  <a href=\"$INDEX\">main page</a>.";
 
 	    /* create temporary password, use the fist 8 letters of a md5 hash */
 	    $TIME  = (string) time(); /* to avoid collisions */
-	    $hash  = md5("Anewpassword".$email.$TIME);
+	    $hash  = md5('Anewpassword'.$email.$TIME);
 	    $newpw = substr($hash,1,8);
 
 	    $message = "Someone (hopefully you) requested a new password. \n".
@@ -83,8 +85,8 @@ if(myisset("forgot"))
 	  {
 	    /* make it so that people (or a robot) can request thousands of passwords within a short time
 	     * and spam a user this way */
-	    echo "Sorry you already tried 5 times during the last 24h.<br />".
-	      "You need to use one of those passwords or wait to get a new one.<br />";
+	    echo _('Sorry you already tried 5 times during the last 24h.<br />'.
+		   'You need to use one of those passwords or wait to get a new one.').'<br />';
 	    echo "Back to the <a href=\"$INDEX\">main page</a>.";
 	  }
       }
@@ -97,7 +99,7 @@ if(myisset("forgot"))
 	    "Please try <a href=\"$INDEX\">again</a>.";
 	else /* default error message */
 	  echo "Couldn't find a player with this email! <br />".
-	    "Please contact Arun, if you think this is a mistake <br />".
+	    "Please contact $ADMIN_NAME, if you think this is a mistake <br />".
 	    "or else try <a href=\"$INDEX\">again</a>.";
       }
   }
@@ -117,7 +119,7 @@ else
       {
 	/* user information is ok */
 	$myname = DB_get_name('email',$email);
-	$_SESSION["name"] = $myname;
+	$_SESSION['name'] = $myname;
 
 	$PREF = DB_get_PREF($myid);
 
@@ -126,7 +128,7 @@ else
 	display_user_menu($myid);
 
 	/* display all games the user has played */
-	echo "<div class=\"user\">";
+	echo '<div class="user">';
 
 	if($myvacation = check_vacation($myid))
 	  {
@@ -327,7 +329,7 @@ else
       }
     else
       {
-	echo "<div class=\"message\">Sorry email and password don't match. Please <a href=\"$INDEX\">try again</a>. </div>";
+	echo '<div class="message">'."Sorry email and password don't match. Please <a href=\"$INDEX\">try again</a>.".' </div>';
       }
   };
 ?>
\ No newline at end of file