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

4 files changed, 214 insertions, 119 deletions

diff --git a/include/user.php b/include/user.php
index eb4f6c4..9ac127a 100644
--- a/include/user.php
+++ b/include/user.php
@@ -133,16 +133,17 @@ else
 	    $vac_start   = $myvacation[0];
 	    $vac_stop    = $myvacation[1];
 	    $vac_comment = $myvacation[2];
-	    echo "<p class=\"vacation\">Enjoy your vacation (don't forgot to change your settings once you're back). Between $vac_start and $vac_stop other users will see the following message: $vac_comment.</p>\n";
+	    echo '<p class="vacation">'._("Enjoy your vacation (don't forgot to change your settings once you're back).").
+	      " Between $vac_start and $vac_stop other users will see the following message: $vac_comment.</p>\n";
 	  }
 
-	echo "<h4>These are all your games:</h4>\n";
+	echo '<h4>'._('These are all your games').":</h4>\n";
 	/* output legend */
-	echo "<p>Games: \n";
-	echo "<span class=\"gamestatuspre\"> &nbsp; </span> =  pre-game phase ";
-	echo "<span class=\"gamestatusplay\"> &nbsp; </span> =  game in progess ";
-	echo "<span class=\"gamestatusover \"><a>N</a> </span> =  game over (N people played the same hand) <br />";
-	echo " Reminder: canceling a game can't be reversed!";
+	echo '<p>'._('Games').": \n";
+	echo '<span class="gamestatuspre"> &nbsp; </span> =  '._('pre-game phase');
+	echo '<span class="gamestatusplay"> &nbsp; </span> =  '._('game in progess');
+	echo '<span class="gamestatusover "><a>N</a> </span> = '._('game over (N people played the same hand)').' <br />';
+	echo ' '._("Reminder: canceling a game can't be reversed!");
 	echo "</p>\n";
 
 	/* get all games */
@@ -225,7 +226,7 @@ else
 			  {
 			    $output_active .= '<span class="turn">';
 			    if($userid==$myid || !$userid)
-			      $output_active .= " <strong>your</strong> turn\n";
+			      $output_active .= ' <strong>'._('your turn')."</strong>\n";
 			    else
 			      {
 				$name = DB_get_name('userid',$userid);
@@ -243,7 +244,7 @@ else
 				/* check if we need to send out a reminder */
 				if(DB_get_reminder($userid,$gameid)==0)
 				  if(time()-strtotime($gamemoddate) > 60*60*24*7)
-				    $output_active .= "<a href=\"$INDEX?action=reminder&amp;me=".$myhash."\">Send a reminder?</a> ";
+				    $output_active .= "<a href=\"$INDEX?action=reminder&amp;me=".$myhash."\">"._('Send a reminder?').'</a> ';
 
 			      };
 			    $output_active .= '</span>';
@@ -254,7 +255,7 @@ else
 
 			if($maxgame>1)
 			  {
-			    $output_active .= ' <span class="gameshidesession link">(hide/show) old</span><br />'."\n";
+			    $output_active .= ' <span class="gameshidesession link">'._('(hide/show) old').'</span><br />'."\n";
 			    $output_active .= ' <span class="gamessession">'.$sessionoutput.'</span>';
 			  }
 
@@ -295,23 +296,23 @@ else
 	  }
 
 	echo "<ul>\n ";
-	echo " <li><span class=\"gameshowall link\">show all</span> <span class=\"gamehideall link\">hide all</span></li>\n";
+	echo ' <li><span class="gameshowall link">'._('show all').'</span> <span class="gamehideall link">'._('hide all')."</span></li>\n";
 	echo $output_active;
-	echo " <li><span class=\"gameshidesession link\">hide/show inactive</span><ul class=\"gamessession\">$output_inactive </ul></li>";
+	echo ' <li><span class="gameshidesession link">'._('hide/show inactive').'</span><ul class="gamessession">'."$output_inactive </ul></li>";
 	echo "</ul>\n";
 
 	/* give a hint for new players */
 	if($count<10)
-	  echo "<p class=\"newbiehint\">You can start new games using the link in the top right corner!</p>\n";
+	  echo '<p class="newbiehint">'._('You can start new games using the link in the top right corner!')."</p>\n";
 
 	/* display last 5 users that have signed up to e-DoKo */
 	$names = DB_get_names_of_new_logins(5);
-	echo "<h4>New Players:</h4>\n<p>\n";
+	echo '<h4>'._('New Players').":</h4>\n<p>\n";
 	echo implode(", ",$names).",...\n";
 	echo "</p>\n";
 
 	/* display last 5 users that logged on */
-	echo "<h4>Players last logged in:</h4>\n<p>\n";
+	echo '<h4>'._('Players last logged in').":</h4>\n<p>\n";
 
 	$names  = DB_get_names_of_last_logins(7);
 	$emails = DB_get_emails_of_last_logins(7);
diff --git a/locale/de/LC_MESSAGES/edoko.mo b/locale/de/LC_MESSAGES/edoko.mo
index a53aa6d..620bc4e 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 b2499ac..a16b5bd 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-17 23:20-0700\n"
-"PO-Revision-Date: 2010-04-17 23:24-0700\n"
+"POT-Creation-Date: 2010-04-26 22:33-0700\n"
+"PO-Revision-Date: 2010-04-26 22:44-0700\n"
 "Last-Translator: Arun Persaud <arun@nubati.net>\n"
 "Language-Team: English\n"
 "MIME-Version: 1.0\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: include/functions.php:1106
+#: include/functions.php:1105
 msgid "It's your turn in these games"
 msgstr "In diesen Spielen bist Du dran"
 
@@ -25,7 +25,6 @@ msgid "Rules"
 msgstr "Regeln"
 
 #: include/game.php:192
-#, fuzzy
 msgid "no ten of hearts"
 msgstr "Keine Herzzehner"
 
@@ -156,6 +155,8 @@ msgid ""
 "You finished the setup, but not everyone else finished it... You need to "
 "wait for the others. Just wait for an email."
 msgstr ""
+"Du hast die Anfangsphase abgeschlossen, andere allerdings noch nicht... Du "
+"musst auf die Anderen warten. Warte einfach auf die E-Mail."
 
 #: include/game.php:1291
 msgid "Game"
@@ -186,11 +187,11 @@ 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:2112
+#: include/game.php:2111
 msgid "A short comment"
 msgstr "Ein kurzer Kommentar"
 
-#: include/game.php:2115 include/output.php:361
+#: include/game.php:2124 include/output.php:361
 msgid "submit"
 msgstr "abschicken"
 
@@ -200,6 +201,8 @@ msgid ""
 "Do you want to continue playing? (This will start a new game, with %s "
 "starting the game.)"
 msgstr ""
+"Willst du weiterspielen? (Dies wuerde eine neues Spiel mit %s als "
+"Startspieler beginnen)"
 
 #: include/output.php:45
 msgid "keep playing"
@@ -207,7 +210,7 @@ msgstr "weiterspielen"
 
 #: include/output.php:57
 msgid "Select players (Remember: you need to be one of the players)"
-msgstr ""
+msgstr "Waehle Spieler aus (beachte: du musst einer der Spieler sein)"
 
 #: include/output.php:102
 msgid "Gameplay-related"
@@ -215,7 +218,7 @@ msgstr ""
 
 #: include/output.php:103
 msgid "Ten of hearts"
-msgstr ""
+msgstr "Herzzehn"
 
 #: include/output.php:106
 msgid "just normal non-trump"
@@ -223,15 +226,16 @@ msgstr ""
 
 #: include/output.php:107
 msgid "first ten of hearts wins the trick"
-msgstr ""
+msgstr "Erste Herzzehn gewinnt den Stich"
 
 #: include/output.php:111
 msgid "Schweinchen (both foxes), only in normal games or silent solos"
 msgstr ""
+"Schweinchen (beide Fuechse), nur in normalen Spielen oder stiller Hochzeit"
 
 #: include/output.php:114
 msgid "none"
-msgstr ""
+msgstr "Keine"
 
 #: include/output.php:115
 msgid "both become highest trump (automatic call at beginning of the game)"
@@ -308,38 +312,6 @@ msgstr "Danke, dass du am Spiel teilnimmst"
 msgid "Do you want to play solo?"
 msgstr "Willst du Solo spielen?"
 
-#: include/output.php:222
-msgid "No"
-msgstr "Nein"
-
-#: 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?"
@@ -379,52 +351,52 @@ msgstr ""
 msgid "Do you want to play a game of DoKo?"
 msgstr ""
 
-#: include/output.php:393
+#: include/output.php:406
 msgid "Welcome to E-Doko"
 msgstr "Willkommen bei E-Doko"
 
-#: include/output.php:450
+#: include/output.php:463
 msgid "mypage"
 msgstr ""
 
-#: include/output.php:451
+#: include/output.php:464
 msgid "settings"
 msgstr "Einstellungen"
 
-#: include/output.php:452
+#: include/output.php:465
 msgid "new game"
 msgstr "neues Spiel"
 
-#: include/output.php:453
+#: include/output.php:466
 msgid "statistics"
 msgstr "Statistik"
 
-#: include/output.php:454
+#: include/output.php:467
 msgid "wiki/bugs"
 msgstr "Wiki/Bugs"
 
-#: include/output.php:455
+#: include/output.php:468
 msgid "atom"
 msgstr "Atom"
 
-#: include/output.php:456
+#: include/output.php:469
 msgid "logout"
 msgstr "ausloggen"
 
-#: include/output.php:459
+#: include/output.php:472
 msgid "last login"
 msgstr "Letzter Login"
 
-#: include/output.php:464
+#: include/output.php:477
 msgid "login"
 msgstr ""
 
-#: include/output.php:570
+#: include/output.php:583
 msgid "Personal notes"
 msgstr "Notizen"
 
-#: include/output.php:699 include/output.php:711 include/output.php:723
-#: include/output.php:736
+#: include/output.php:712 include/output.php:724 include/output.php:736
+#: include/output.php:749
 msgid "Trump back"
 msgstr ""
 
@@ -499,3 +471,92 @@ msgstr "jedes Spiel akzeptieren"
 #: include/preferences.php:417 include/preferences.php:422
 msgid "ask for games"
 msgstr ""
+
+#: include/user.php:136
+msgid ""
+"Enjoy your vacation (don't forgot to change your settings once you're back)."
+msgstr ""
+
+#: include/user.php:140
+msgid "These are all your games"
+msgstr "Hier sind alle deine Spiele"
+
+#: include/user.php:142
+msgid "Games"
+msgstr "Spiele"
+
+#: include/user.php:143
+msgid "pre-game phase"
+msgstr "Anfangsphase"
+
+#: include/user.php:144
+msgid "game in progess"
+msgstr "Spiel laeuft"
+
+#: include/user.php:145
+msgid "game over (N people played the same hand)"
+msgstr ""
+
+#: include/user.php:146
+msgid "Reminder: canceling a game can't be reversed!"
+msgstr ""
+
+#: include/user.php:229
+msgid "your turn"
+msgstr ""
+
+#: include/user.php:247
+msgid "Send a reminder?"
+msgstr ""
+
+#: include/user.php:258
+msgid "(hide/show) old"
+msgstr ""
+
+#: include/user.php:299
+msgid "show all"
+msgstr "zeige alle"
+
+#: include/user.php:299
+msgid "hide all"
+msgstr ""
+
+#: include/user.php:301
+msgid "hide/show inactive"
+msgstr ""
+
+#: include/user.php:306
+msgid "You can start new games using the link in the top right corner!"
+msgstr ""
+
+#: include/user.php:310
+msgid "New Players"
+msgstr "Neue Mitspieler"
+
+#: include/user.php:315
+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 e1bb062..c3e1b9d 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-17 23:20-0700\n"
+"POT-Creation-Date: 2010-04-26 22:33-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"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: include/functions.php:1106
+#: include/functions.php:1105
 msgid "It's your turn in these games"
 msgstr ""
 
@@ -176,11 +176,11 @@ msgstr ""
 msgid "The game is over for you... other people still need to play though"
 msgstr ""
 
-#: include/game.php:2112
+#: include/game.php:2111
 msgid "A short comment"
 msgstr ""
 
-#: include/game.php:2115 include/output.php:361
+#: include/game.php:2124 include/output.php:361
 msgid "submit"
 msgstr ""
 
@@ -298,38 +298,6 @@ msgstr ""
 msgid "Do you want to play solo?"
 msgstr ""
 
-#: include/output.php:222
-msgid "No"
-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 ""
@@ -369,52 +337,52 @@ msgstr ""
 msgid "Do you want to play a game of DoKo?"
 msgstr ""
 
-#: include/output.php:393
+#: include/output.php:406
 msgid "Welcome to E-Doko"
 msgstr ""
 
-#: include/output.php:450
+#: include/output.php:463
 msgid "mypage"
 msgstr ""
 
-#: include/output.php:451
+#: include/output.php:464
 msgid "settings"
 msgstr ""
 
-#: include/output.php:452
+#: include/output.php:465
 msgid "new game"
 msgstr ""
 
-#: include/output.php:453
+#: include/output.php:466
 msgid "statistics"
 msgstr ""
 
-#: include/output.php:454
+#: include/output.php:467
 msgid "wiki/bugs"
 msgstr ""
 
-#: include/output.php:455
+#: include/output.php:468
 msgid "atom"
 msgstr ""
 
-#: include/output.php:456
+#: include/output.php:469
 msgid "logout"
 msgstr ""
 
-#: include/output.php:459
+#: include/output.php:472
 msgid "last login"
 msgstr ""
 
-#: include/output.php:464
+#: include/output.php:477
 msgid "login"
 msgstr ""
 
-#: include/output.php:570
+#: include/output.php:583
 msgid "Personal notes"
 msgstr ""
 
-#: include/output.php:699 include/output.php:711 include/output.php:723
-#: include/output.php:736
+#: include/output.php:712 include/output.php:724 include/output.php:736
+#: include/output.php:749
 msgid "Trump back"
 msgstr ""
 
@@ -489,3 +457,68 @@ msgstr ""
 #: include/preferences.php:417 include/preferences.php:422
 msgid "ask for games"
 msgstr ""
+
+#: include/user.php:136
+msgid ""
+"Enjoy your vacation (don't forgot to change your settings once you're back)."
+msgstr ""
+
+#: include/user.php:140
+msgid "These are all your games"
+msgstr ""
+
+#: include/user.php:142
+msgid "Games"
+msgstr ""
+
+#: include/user.php:143
+msgid "pre-game phase"
+msgstr ""
+
+#: include/user.php:144
+msgid "game in progess"
+msgstr ""
+
+#: include/user.php:145
+msgid "game over (N people played the same hand)"
+msgstr ""
+
+#: include/user.php:146
+msgid "Reminder: canceling a game can't be reversed!"
+msgstr ""
+
+#: include/user.php:229
+msgid "your turn"
+msgstr ""
+
+#: include/user.php:247
+msgid "Send a reminder?"
+msgstr ""
+
+#: include/user.php:258
+msgid "(hide/show) old"
+msgstr ""
+
+#: include/user.php:299
+msgid "show all"
+msgstr ""
+
+#: include/user.php:299
+msgid "hide all"
+msgstr ""
+
+#: include/user.php:301
+msgid "hide/show inactive"
+msgstr ""
+
+#: include/user.php:306
+msgid "You can start new games using the link in the top right corner!"
+msgstr ""
+
+#: include/user.php:310
+msgid "New Players"
+msgstr ""
+
+#: include/user.php:315
+msgid "Players last logged in"
+msgstr ""