TRANSLATION: some more strings and updated po.de

6 files changed, 495 insertions, 180 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
diff --git a/locale/de/LC_MESSAGES/edoko.mo b/locale/de/LC_MESSAGES/edoko.mo
index fc816ee..d9f528c 100644
--- a/locale/de/LC_MESSAGES/edoko.mo
+++ b/locale/de/LC_MESSAGES/edoko.mo
diff --git a/po/de.po b/po/de.po
index 90b2ab2..6060f17 100644
--- 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-26 22:33-0700\n"
-"PO-Revision-Date: 2010-05-04 19:36-0700\n"
+"POT-Creation-Date: 2010-09-21 19:52-0700\n"
+"PO-Revision-Date: 2010-09-21 20:09-0700\n"
 "Last-Translator: BK <birgit75@email.de>\n"
 "Language-Team: English\n"
 "MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr "Ansage"
 msgid "lowtrump"
 msgstr "Trumpfarmut"
 
-#: include/game.php:242 include/game.php:1916
+#: include/game.php:242 include/game.php:1918
 msgid "Score"
 msgstr "Punkte"
 
@@ -90,7 +90,7 @@ msgstr "naechstes Spiel"
 
 #: include/game.php:431 include/game.php:453 include/game.php:588
 #: include/game.php:907 include/game.php:971 include/game.php:1239
-#: include/game.php:1984 include/game.php:2016
+#: include/game.php:1986 include/game.php:2018
 msgid "Your cards are"
 msgstr "Deine Karten sind"
 
@@ -166,36 +166,36 @@ msgstr ""
 msgid "Game"
 msgstr "Spiel"
 
-#: include/game.php:1335 include/game.php:1342 include/game.php:1605
+#: include/game.php:1337 include/game.php:1344 include/game.php:1607
 msgid "Trick"
 msgstr "Stich"
 
-#: include/game.php:1907
+#: include/game.php:1909
 msgid "please wait until it's your turn!"
 msgstr "Bitte warte bis Du dran bist!"
 
-#: include/game.php:1973
+#: include/game.php:1975
 msgid "prev"
 msgstr "zurueck"
 
-#: include/game.php:1974
+#: include/game.php:1976
 msgid "next"
 msgstr "vor"
 
-#: include/game.php:2026
+#: include/game.php:2028
 msgid "Your cards were"
 msgstr "Deine Karten waren"
 
-#: include/game.php:2064
+#: include/game.php:2066
 msgid "The game is over for you... other people still need to play though"
 msgstr ""
 "Das Spiel ist fuer dich vorbei... andere muessen aber noch eine Karte spielen"
 
-#: include/game.php:2111
+#: include/game.php:2113
 msgid "A short comment"
 msgstr "Ein kurzer Kommentar"
 
-#: include/game.php:2124 include/output.php:361
+#: include/game.php:2126 include/output.php:361
 msgid "submit"
 msgstr "abschicken"
 
@@ -218,7 +218,7 @@ msgstr "Waehle Spieler aus (beachte: du musst einer der Spieler sein)"
 
 #: include/output.php:102
 msgid "Gameplay-related"
-msgstr ""
+msgstr "Spielbezogen"
 
 #: include/output.php:103
 msgid "Ten of hearts"
@@ -226,7 +226,7 @@ msgstr "Herzzehn"
 
 #: include/output.php:106
 msgid "just normal non-trump"
-msgstr ""
+msgstr "kein Trumpf"
 
 #: include/output.php:107
 msgid "first ten of hearts wins the trick"
@@ -243,37 +243,42 @@ msgstr "Keine"
 
 #: include/output.php:115
 msgid "both become highest trump (automatic call at beginning of the game)"
-msgstr ""
+msgstr "Beide werden zu dem hoechsten Trumpf"
 
 #: include/output.php:116
 msgid "first one normal, second one becomes highest (call during the game)"
 msgstr ""
+"erster Fuchs normal, zweiter als hoechster Trumpf (Ansage waehrend dem Spiel)"
 
 #: include/output.php:117
 msgid "second one become highest only in case re/contra was announced"
-msgstr ""
+msgstr "Zweiter Fuchs wird nur hoechster Trumpf nach Ansage (re/contra)"
 
 #: include/output.php:121
 msgid "Call Re/Contra, etc."
-msgstr ""
+msgstr "Ansagen"
 
 #: include/output.php:124
 msgid ""
 "Can call re/contra on the first <strong>own</strong> card played, 90 on the "
 "second, etc."
 msgstr ""
+"Re/Contra mit der ersten <strong>eigenen</strong> Karte, U90 mit der "
+"zweiten, etc. "
 
 #: include/output.php:125
 msgid ""
 "Can call re/contra until 5th card is played, 90 until 9th card is played, "
 "etc."
-msgstr ""
+msgstr "Re/Contra bis zur fuenften Karte, U90 bis zur 9ten, etc."
 
 #: include/output.php:126
 msgid ""
 "Can call re/contra until 5th card is played, 90 if player still has 9 cards, "
 "etc."
 msgstr ""
+"Re/Contra bis die fuenfte Karte gespielt ist, U90 solange der Spieler noch 9 "
+"KKarten auf der Hand hat, etc."
 
 #: include/output.php:129
 msgid "Low trump"
@@ -283,10 +288,12 @@ msgstr "Niedrige Trumpf"
 msgid ""
 "Player can't trump a fox, that is none of his trump is higher than a fox."
 msgstr ""
+"Spieler kann keinen Fuchs stechen, dh. keine Karte ist hoeher als ein Fuchs."
 
 #: include/output.php:133
 msgid "The trump will be treated as poverty and offered to another player."
 msgstr ""
+"Die Trumpfkarten werde als Armut behandelt und an andere Spieler angeboten."
 
 #: include/output.php:134
 msgid "The game will be canceled unless there is a solo."
@@ -294,15 +301,15 @@ msgstr "Das Spiel wird annuliert, es sei denn, jemand spielt ein Solo."
 
 #: include/output.php:135
 msgid "Bad luck, the player needs to play a normal game."
-msgstr ""
+msgstr "Pech gehabt, der Spieler muss ein normales Spiel spielen."
 
 #: include/output.php:138
 msgid "Scoring-related"
-msgstr ""
+msgstr "Punktezaehlung"
 
 #: include/output.php:139
 msgid "(not yet implemented)"
-msgstr ""
+msgstr "(noch nicht implementiert)"
 
 #: include/output.php:140
 msgid "start game"
@@ -316,18 +323,47 @@ msgstr "Danke, dass du am Spiel teilnimmst"
 msgid "Do you want to play solo?"
 msgstr "Willst du Solo spielen?"
 
+#: include/output.php:223
+msgid "trumpless"
+msgstr "fleischlos"
+
+#: include/output.php:224
+msgid "trump"
+msgstr "Trumpf"
+
+#: include/output.php:225
+msgid "queen"
+msgstr "Damen"
+
+#: include/output.php:226
+msgid "jack"
+msgstr "Buben"
+
+#: include/output.php:227
+msgid "club"
+msgstr "Kreuz"
+
+#: include/output.php:228
+msgid "spade"
+msgstr "Pik"
+
+#: include/output.php:229
+msgid "heart"
+msgstr "Herz"
+
 #: include/output.php:233
 msgid "Wedding?"
 msgstr "Hochzeit?"
 
 #: include/output.php:236 include/output.php:247 include/output.php:258
-#: include/output.php:275 include/output.php:357
+#: include/output.php:275 include/output.php:357 include/preferences.php:447
 msgid "yes"
 msgstr "Ja"
 
 #: include/output.php:237 include/output.php:241 include/output.php:248
 #: include/output.php:252 include/output.php:259 include/output.php:263
 #: include/output.php:276 include/output.php:280 include/output.php:358
+#: include/preferences.php:453
 msgid "no"
 msgstr "Nein"
 
@@ -341,11 +377,11 @@ msgstr "Hast du zuviele Neuner?"
 
 #: include/output.php:269
 msgid "Do you have low trump (cancel game)?"
-msgstr ""
+msgstr "Hast du zu niedrige Trumpf (Spiel abbrechen)?"
 
 #: include/output.php:271
 msgid "Do you have low trump (poverty)?"
-msgstr ""
+msgstr "Hast du zu niedrige Trump (Armut)?"
 
 #: include/output.php:287
 msgid "count me in"
@@ -355,52 +391,52 @@ msgstr "Ich bin dabei!"
 msgid "Do you want to play a game of DoKo?"
 msgstr "Willst du eine Runde DoKo spielen?"
 
-#: include/output.php:406
+#: include/output.php:418
 msgid "Welcome to E-Doko"
 msgstr "Willkommen bei E-Doko"
 
-#: include/output.php:463
+#: include/output.php:475
 msgid "mypage"
-msgstr ""
+msgstr "Hauptseite"
 
-#: include/output.php:464
+#: include/output.php:476
 msgid "settings"
 msgstr "Einstellungen"
 
-#: include/output.php:465
+#: include/output.php:477
 msgid "new game"
 msgstr "neues Spiel"
 
-#: include/output.php:466
+#: include/output.php:478
 msgid "statistics"
 msgstr "Statistik"
 
-#: include/output.php:467
+#: include/output.php:479
 msgid "wiki/bugs"
 msgstr "Wiki/Bugs"
 
-#: include/output.php:468
+#: include/output.php:480
 msgid "atom"
 msgstr "Atom"
 
-#: include/output.php:469
+#: include/output.php:481
 msgid "logout"
 msgstr "ausloggen"
 
-#: include/output.php:472
+#: include/output.php:484
 msgid "last login"
 msgstr "Letzter Login"
 
-#: include/output.php:477
+#: include/output.php:489
 msgid "login"
-msgstr ""
+msgstr "Einloggen"
 
-#: include/output.php:583
+#: include/output.php:595
 msgid "Personal notes"
 msgstr "Notizen"
 
-#: include/output.php:712 include/output.php:724 include/output.php:736
-#: include/output.php:749
+#: include/output.php:724 include/output.php:736 include/output.php:748
+#: include/output.php:761
 msgid "Trump back"
 msgstr "Trumpf zurück"
 
@@ -410,12 +446,20 @@ msgstr "Deine Einstellungen sind"
 
 #: include/preferences.php:332
 msgid "Game-related"
-msgstr ""
+msgstr "Spielbezogen"
 
 #: include/preferences.php:335
 msgid "Vacation"
 msgstr "Urlaub"
 
+#: include/preferences.php:340
+msgid "start"
+msgstr "Starte Spiel"
+
+#: include/preferences.php:345
+msgid "stop"
+msgstr "Ende"
+
 #: include/preferences.php:350
 msgid "comment:"
 msgstr "Kommentar:"
@@ -432,6 +476,19 @@ msgstr "geaendert"
 msgid "wrong date format"
 msgstr "Falsches Datumformat"
 
+#: include/preferences.php:354
+msgid "use YYYY-MM-DD"
+msgstr "benutze JJJJ-MM-TT"
+
+#: include/preferences.php:354
+msgid "use '-'  in start field to unset vacation"
+msgstr "benutze '-' im Anfangsfeld, um den Urlaub zu beenden"
+
+#: include/preferences.php:355
+#, fuzzy
+msgid "Notification"
+msgstr "Urlaub"
+
 #: include/preferences.php:359 include/preferences.php:364
 msgid "less emails"
 msgstr "weniger E-mails"
@@ -440,6 +497,14 @@ msgstr "weniger E-mails"
 msgid "lots of emails"
 msgstr "viele E-mails"
 
+#: include/preferences.php:371
+msgid "Digest"
+msgstr ""
+
+#: include/preferences.php:377
+msgid "digest off"
+msgstr "Digest aus"
+
 #: include/preferences.php:381
 msgid "every hour"
 msgstr "stuendlich"
@@ -468,6 +533,10 @@ msgstr "alle 12h"
 msgid "every 24h"
 msgstr "alle 24h"
 
+#: include/preferences.php:412
+msgid "Autosetup"
+msgstr ""
+
 #: include/preferences.php:416 include/preferences.php:421
 msgid "accept every game"
 msgstr "jedes Spiel akzeptieren"
@@ -476,91 +545,177 @@ msgstr "jedes Spiel akzeptieren"
 msgid "ask for games"
 msgstr ""
 
-#: include/user.php:136
+#: include/preferences.php:443
+#, fuzzy
+msgid "Open for new games"
+msgstr "neues Spiel"
+
+#: include/preferences.php:463 include/preferences.php:468
+msgid "German cards"
+msgstr "Franzoesisches Blatt"
+
+#: include/preferences.php:464 include/preferences.php:469
+msgid "English cards"
+msgstr "Englisches Blatt"
+
+#: include/preferences.php:477
+#, fuzzy
+msgid "Personal"
+msgstr "Notizen"
+
+#: include/preferences.php:479
+msgid "Email"
+msgstr "E-Mail"
+
+#: include/preferences.php:480
+msgid "Timezone"
+msgstr "Zeitzone"
+
+#: include/preferences.php:484
+msgid "Language"
+msgstr "Sprache"
+
+#: include/preferences.php:488
+msgid "Password(old)"
+msgstr "Passwort(alt)"
+
+#: include/preferences.php:493
+msgid "The new passwords is not long enough (you need at least 4 characters)."
+msgstr "Das neue Passwort ist nicht lange genug (mindestens 4 Zeichen)."
+
+#: include/preferences.php:496
+msgid "The new passwords don't match."
+msgstr "Die neuen Passwoerter stimmen nicht ueberein."
+
+#: include/preferences.php:499
+msgid "The old password is not correct."
+msgstr "Das alte Passwort stimmt nicht."
+
+#: include/preferences.php:506
+msgid "Password(new)"
+msgstr "Passwort(neu)"
+
+#: include/preferences.php:509
+msgid "Password(new, retype)"
+msgstr "Passwort(neu, wiederholen)"
+
+#: include/preferences.php:515
+msgid "OpenID"
+msgstr "Open-Id"
+
+#: include/preferences.php:534
+msgid "add OpenID"
+msgstr "Open-Id hinzufuegen"
+
+#: include/preferences.php:537
+msgid "Deleted some OpenIDs!"
+msgstr "Open-ID loeschen"
+
+#: include/preferences.php:539
+#, fuzzy
+msgid "Submit"
+msgstr "abschicken"
+
+#: include/preferences.php:541
+msgid ""
+"E-DoKo uses <a href=\\\"http://www.gravatar.org\\\">gravatars</a> as icons."
+msgstr ""
+"E-DoKo benutzt <a href=\\\"http://www.gravatar.org\\\">gravatars</a> als "
+"Icons."
+
+#: include/user.php:60
+msgid "Ok, I will send you a new password."
+msgstr "Ok, ich werde Dir ein neues Passwort zuschicken."
+
+#: include/user.php:64
+msgid ""
+"The new password will be valid for one day, make sure you reset it to "
+"something else."
+msgstr ""
+"Das neue Passwort wird fuer einen Tag gueltig sein, bitte setze in dieser "
+"Zeit ein neues."
+
+#: include/user.php:88
+msgid ""
+"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."
+msgstr ""
+
+#: include/user.php:138
 msgid ""
 "Enjoy your vacation (don't forgot to change your settings once you're back)."
 msgstr ""
+"Viel Spass beim Urlaub (und nicht vergessen die Urlaubseinstellung wieder "
+"auszustellen, wenn du wieder zurueck bist)."
 
-#: include/user.php:140
+#: include/user.php:142
 msgid "These are all your games"
 msgstr "Hier sind alle deine Spiele"
 
-#: include/user.php:142
+#: include/user.php:144
 msgid "Games"
 msgstr "Spiele"
 
-#: include/user.php:143
+#: include/user.php:145
 msgid "pre-game phase"
 msgstr "Anfangsphase"
 
-#: include/user.php:144
+#: include/user.php:146
 msgid "game in progess"
 msgstr "Spiel laeuft"
 
-#: include/user.php:145
+#: include/user.php:147
 msgid "game over (N people played the same hand)"
-msgstr ""
+msgstr "Spiel beendet (N Spieler haben dieses Blatt schon gespielt)"
 
-#: include/user.php:146
+#: include/user.php:148
 msgid "Reminder: canceling a game can't be reversed!"
 msgstr ""
+"Erinnerung: Abbrechen eines Spieles kann nicht rueckgaengig gemacht werden!"
 
-#: include/user.php:229
+#: include/user.php:231
 msgid "your turn"
 msgstr "Du bist dran"
 
-#: include/user.php:247
+#: include/user.php:249
 msgid "Send a reminder?"
-msgstr ""
+msgstr "eine Erinnerungsemail schicken?"
 
-#: include/user.php:258
-msgid "(hide/show) old"
-msgstr ""
+#: include/user.php:260
+msgid "show old"
+msgstr "zeige alte"
+
+#: include/user.php:261
+msgid "hide old"
+msgstr "verstecke alte"
 
-#: include/user.php:299
+#: include/user.php:302
 msgid "show all"
 msgstr "zeige alle"
 
-#: include/user.php:299
+#: include/user.php:302
 msgid "hide all"
-msgstr ""
+msgstr "verstecke alle"
 
-#: include/user.php:301
-msgid "hide/show inactive"
-msgstr ""
+#: include/user.php:304
+msgid "show inactive"
+msgstr "zeige inaktive"
+
+#: include/user.php:304
+msgid "hide inactive"
+msgstr "verstecke inaktive"
 
-#: include/user.php:306
+#: include/user.php:309
 msgid "You can start new games using the link in the top right corner!"
-msgstr ""
+msgstr "Du kannst neue Runden mit dem Link oben rechts starten!"
 
-#: include/user.php:310
+#: include/user.php:313
 msgid "New Players"
 msgstr "Neue Mitspieler"
 
-#: include/user.php:315
+#: include/user.php:318
 msgid "Players last logged in"
 msgstr "Zuletzt eingeloggt"
 
 #~ msgid "No"
 #~ msgstr "Nein"
-
-#~ msgid "trumpless"
-#~ msgstr "fleischlos"
-
-#~ msgid "trump"
-#~ msgstr "Trumpf"
-
-#~ msgid "queen"
-#~ msgstr "Damen"
-
-#~ msgid "jack"
-#~ msgstr "Buben"
-
-#~ msgid "club"
-#~ msgstr "Kreuz"
-
-#~ msgid "spade"
-#~ msgstr "Pik"
-
-#~ msgid "heart"
-#~ msgstr "Herz"
diff --git a/po/messages.pot b/po/messages.pot
index c3e1b9d..063f706 100644
--- 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-26 22:33-0700\n"
+"POT-Creation-Date: 2010-09-21 19:52-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,7 +76,7 @@ msgstr ""
 msgid "lowtrump"
 msgstr ""
 
-#: include/game.php:242 include/game.php:1916
+#: include/game.php:242 include/game.php:1918
 msgid "Score"
 msgstr ""
 
@@ -90,7 +90,7 @@ msgstr ""
 
 #: include/game.php:431 include/game.php:453 include/game.php:588
 #: include/game.php:907 include/game.php:971 include/game.php:1239
-#: include/game.php:1984 include/game.php:2016
+#: include/game.php:1986 include/game.php:2018
 msgid "Your cards are"
 msgstr ""
 
@@ -152,35 +152,35 @@ msgstr ""
 msgid "Game"
 msgstr ""
 
-#: include/game.php:1335 include/game.php:1342 include/game.php:1605
+#: include/game.php:1337 include/game.php:1344 include/game.php:1607
 msgid "Trick"
 msgstr ""
 
-#: include/game.php:1907
+#: include/game.php:1909
 msgid "please wait until it's your turn!"
 msgstr ""
 
-#: include/game.php:1973
+#: include/game.php:1975
 msgid "prev"
 msgstr ""
 
-#: include/game.php:1974
+#: include/game.php:1976
 msgid "next"
 msgstr ""
 
-#: include/game.php:2026
+#: include/game.php:2028
 msgid "Your cards were"
 msgstr ""
 
-#: include/game.php:2064
+#: include/game.php:2066
 msgid "The game is over for you... other people still need to play though"
 msgstr ""
 
-#: include/game.php:2111
+#: include/game.php:2113
 msgid "A short comment"
 msgstr ""
 
-#: include/game.php:2124 include/output.php:361
+#: include/game.php:2126 include/output.php:361
 msgid "submit"
 msgstr ""
 
@@ -298,18 +298,47 @@ msgstr ""
 msgid "Do you want to play solo?"
 msgstr ""
 
+#: include/output.php:223
+msgid "trumpless"
+msgstr ""
+
+#: include/output.php:224
+msgid "trump"
+msgstr ""
+
+#: include/output.php:225
+msgid "queen"
+msgstr ""
+
+#: include/output.php:226
+msgid "jack"
+msgstr ""
+
+#: include/output.php:227
+msgid "club"
+msgstr ""
+
+#: include/output.php:228
+msgid "spade"
+msgstr ""
+
+#: include/output.php:229
+msgid "heart"
+msgstr ""
+
 #: include/output.php:233
 msgid "Wedding?"
 msgstr ""
 
 #: include/output.php:236 include/output.php:247 include/output.php:258
-#: include/output.php:275 include/output.php:357
+#: include/output.php:275 include/output.php:357 include/preferences.php:447
 msgid "yes"
 msgstr ""
 
 #: include/output.php:237 include/output.php:241 include/output.php:248
 #: include/output.php:252 include/output.php:259 include/output.php:263
 #: include/output.php:276 include/output.php:280 include/output.php:358
+#: include/preferences.php:453
 msgid "no"
 msgstr ""
 
@@ -337,52 +366,52 @@ msgstr ""
 msgid "Do you want to play a game of DoKo?"
 msgstr ""
 
-#: include/output.php:406
+#: include/output.php:418
 msgid "Welcome to E-Doko"
 msgstr ""
 
-#: include/output.php:463
+#: include/output.php:475
 msgid "mypage"
 msgstr ""
 
-#: include/output.php:464
+#: include/output.php:476
 msgid "settings"
 msgstr ""
 
-#: include/output.php:465
+#: include/output.php:477
 msgid "new game"
 msgstr ""
 
-#: include/output.php:466
+#: include/output.php:478
 msgid "statistics"
 msgstr ""
 
-#: include/output.php:467
+#: include/output.php:479
 msgid "wiki/bugs"
 msgstr ""
 
-#: include/output.php:468
+#: include/output.php:480
 msgid "atom"
 msgstr ""
 
-#: include/output.php:469
+#: include/output.php:481
 msgid "logout"
 msgstr ""
 
-#: include/output.php:472
+#: include/output.php:484
 msgid "last login"
 msgstr ""
 
-#: include/output.php:477
+#: include/output.php:489
 msgid "login"
 msgstr ""
 
-#: include/output.php:583
+#: include/output.php:595
 msgid "Personal notes"
 msgstr ""
 
-#: include/output.php:712 include/output.php:724 include/output.php:736
-#: include/output.php:749
+#: include/output.php:724 include/output.php:736 include/output.php:748
+#: include/output.php:761
 msgid "Trump back"
 msgstr ""
 
@@ -398,6 +427,14 @@ msgstr ""
 msgid "Vacation"
 msgstr ""
 
+#: include/preferences.php:340
+msgid "start"
+msgstr ""
+
+#: include/preferences.php:345
+msgid "stop"
+msgstr ""
+
 #: include/preferences.php:350
 msgid "comment:"
 msgstr ""
@@ -414,6 +451,18 @@ msgstr ""
 msgid "wrong date format"
 msgstr ""
 
+#: include/preferences.php:354
+msgid "use YYYY-MM-DD"
+msgstr ""
+
+#: include/preferences.php:354
+msgid "use '-'  in start field to unset vacation"
+msgstr ""
+
+#: include/preferences.php:355
+msgid "Notification"
+msgstr ""
+
 #: include/preferences.php:359 include/preferences.php:364
 msgid "less emails"
 msgstr ""
@@ -422,6 +471,14 @@ msgstr ""
 msgid "lots of emails"
 msgstr ""
 
+#: include/preferences.php:371
+msgid "Digest"
+msgstr ""
+
+#: include/preferences.php:377
+msgid "digest off"
+msgstr ""
+
 #: include/preferences.php:381
 msgid "every hour"
 msgstr ""
@@ -450,6 +507,10 @@ msgstr ""
 msgid "every 24h"
 msgstr ""
 
+#: include/preferences.php:412
+msgid "Autosetup"
+msgstr ""
+
 #: include/preferences.php:416 include/preferences.php:421
 msgid "accept every game"
 msgstr ""
@@ -458,67 +519,164 @@ msgstr ""
 msgid "ask for games"
 msgstr ""
 
-#: include/user.php:136
+#: include/preferences.php:443
+msgid "Open for new games"
+msgstr ""
+
+#: include/preferences.php:463 include/preferences.php:468
+msgid "German cards"
+msgstr ""
+
+#: include/preferences.php:464 include/preferences.php:469
+msgid "English cards"
+msgstr ""
+
+#: include/preferences.php:477
+msgid "Personal"
+msgstr ""
+
+#: include/preferences.php:479
+msgid "Email"
+msgstr ""
+
+#: include/preferences.php:480
+msgid "Timezone"
+msgstr ""
+
+#: include/preferences.php:484
+msgid "Language"
+msgstr ""
+
+#: include/preferences.php:488
+msgid "Password(old)"
+msgstr ""
+
+#: include/preferences.php:493
+msgid "The new passwords is not long enough (you need at least 4 characters)."
+msgstr ""
+
+#: include/preferences.php:496
+msgid "The new passwords don't match."
+msgstr ""
+
+#: include/preferences.php:499
+msgid "The old password is not correct."
+msgstr ""
+
+#: include/preferences.php:506
+msgid "Password(new)"
+msgstr ""
+
+#: include/preferences.php:509
+msgid "Password(new, retype)"
+msgstr ""
+
+#: include/preferences.php:515
+msgid "OpenID"
+msgstr ""
+
+#: include/preferences.php:534
+msgid "add OpenID"
+msgstr ""
+
+#: include/preferences.php:537
+msgid "Deleted some OpenIDs!"
+msgstr ""
+
+#: include/preferences.php:539
+msgid "Submit"
+msgstr ""
+
+#: include/preferences.php:541
+msgid ""
+"E-DoKo uses <a href=\\\"http://www.gravatar.org\\\">gravatars</a> as icons."
+msgstr ""
+
+#: include/user.php:60
+msgid "Ok, I will send you a new password."
+msgstr ""
+
+#: include/user.php:64
+msgid ""
+"The new password will be valid for one day, make sure you reset it to "
+"something else."
+msgstr ""
+
+#: include/user.php:88
+msgid ""
+"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."
+msgstr ""
+
+#: include/user.php:138
 msgid ""
 "Enjoy your vacation (don't forgot to change your settings once you're back)."
 msgstr ""
 
-#: include/user.php:140
+#: include/user.php:142
 msgid "These are all your games"
 msgstr ""
 
-#: include/user.php:142
+#: include/user.php:144
 msgid "Games"
 msgstr ""
 
-#: include/user.php:143
+#: include/user.php:145
 msgid "pre-game phase"
 msgstr ""
 
-#: include/user.php:144
+#: include/user.php:146
 msgid "game in progess"
 msgstr ""
 
-#: include/user.php:145
+#: include/user.php:147
 msgid "game over (N people played the same hand)"
 msgstr ""
 
-#: include/user.php:146
+#: include/user.php:148
 msgid "Reminder: canceling a game can't be reversed!"
 msgstr ""
 
-#: include/user.php:229
+#: include/user.php:231
 msgid "your turn"
 msgstr ""
 
-#: include/user.php:247
+#: include/user.php:249
 msgid "Send a reminder?"
 msgstr ""
 
-#: include/user.php:258
-msgid "(hide/show) old"
+#: include/user.php:260
+msgid "show old"
+msgstr ""
+
+#: include/user.php:261
+msgid "hide old"
 msgstr ""
 
-#: include/user.php:299
+#: include/user.php:302
 msgid "show all"
 msgstr ""
 
-#: include/user.php:299
+#: include/user.php:302
 msgid "hide all"
 msgstr ""
 
-#: include/user.php:301
-msgid "hide/show inactive"
+#: include/user.php:304
+msgid "show inactive"
+msgstr ""
+
+#: include/user.php:304
+msgid "hide inactive"
 msgstr ""
 
-#: include/user.php:306
+#: include/user.php:309
 msgid "You can start new games using the link in the top right corner!"
 msgstr ""
 
-#: include/user.php:310
+#: include/user.php:313
 msgid "New Players"
 msgstr ""
 
-#: include/user.php:315
+#: include/user.php:318
 msgid "Players last logged in"
 msgstr ""