From 69d701b97474977c4c48367ca6ecfedfb2db0217 Mon Sep 17 00:00:00 2001 From: Arun Persaud Date: Sun, 14 Mar 2010 15:34:24 -0700 Subject: added link to bug-tracker (that is renamed wiki -> wiki/bugs) --- include/output.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/output.php b/include/output.php index 79e42c2..0f326f5 100644 --- a/include/output.php +++ b/include/output.php @@ -456,7 +456,7 @@ function output_status() echo " | settings\n"; echo " | new game\n"; echo " | statistics\n"; - echo " | wiki\n"; + echo " | wiki/bugs\n"; echo " | rss\n"; echo " |    logout\n"; echo "\n"; -- cgit v1.2.3-18-g5258 From 66ddaaf798a7ac2ed368ac19d9f64db3d957f20d Mon Sep 17 00:00:00 2001 From: Arun Persaud Date: Sun, 14 Mar 2010 16:03:19 -0700 Subject: marked more strings for translation --- include/functions.php | 2 +- include/game.php | 12 ++++++------ include/output.php | 26 +++++++++++++------------- include/preferences.php | 2 +- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/include/functions.php b/include/functions.php index a06f3d4..04d1bde 100644 --- a/include/functions.php +++ b/include/functions.php @@ -1103,7 +1103,7 @@ function display_user_menu($id) if($i==0) { echo "
\n"; - echo "It's your turn in these games:
\n"; + echo _('It\'s your turn in these games').":
\n"; } $i++; diff --git a/include/game.php b/include/game.php index db27bde..0601e44 100644 --- 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!
\n"; + echo _("please wait until it's your turn!")."
\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!
\n"; - echo "Your cards are:
\n"; + echo _('Your cards are').":
\n"; /* do we have to follow suite? */ $followsuit = 0; @@ -2013,7 +2013,7 @@ switch($mystatus) } else if($mystatus=='play' ) { - echo "Your cards are:
\n"; + echo _('Your cards are').":
\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:
\n"; + echo _('Your cards were').":
\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 "
\nA short comment:\n"; + echo "
\n"._('A short comment').":\n"; } -echo "\n"; +echo "\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 0f326f5..7f35dd2 100644 --- 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
\n"; echo $name,"\n"; - echo " | mypage \n"; - echo " | settings\n"; - echo " | new game\n"; - echo " | statistics\n"; - echo " | wiki/bugs\n"; - echo " | rss\n"; - echo " |    logout\n"; + echo " | "._('mypage')."\n"; + echo " | "._('settings')."\n"; + echo " | "._('new game')."\n"; + echo " | "._('statistics')."\n"; + echo " | "._('wiki/bugs')."\n"; + echo " | "._('atom')."\n"; + echo " |    "._('logout')."\n"; echo "
\n"; - echo "
last login: ".date("r",$unixtime)."
\n"; + echo "
"._('last login').": ".date("r",$unixtime)."
\n"; } else { echo "\n
\n"; - echo "login\n"; + echo ""._('login')."\n"; echo "
\n"; } return; @@ -572,7 +572,7 @@ function output_password_recovery($email,$password) function output_user_notes($userid,$gameid,$userstatus) { - echo "
Personal notes:
\n"; + echo "
"._('Personal notes').":
\n"; $notes = DB_get_notes_by_userid_and_gameid($userid,$gameid); foreach($notes as $note) echo "$note
\n"; diff --git a/include/preferences.php b/include/preferences.php index b30e7cb..3a841c3 100644 --- a/include/preferences.php +++ b/include/preferences.php @@ -332,7 +332,7 @@ echo "
\n"; echo ' '._('Game-related')."\n"; echo " \n"; -echo ' \n"; +echo ' \n"; if($PREF['vacation_start']) $value = substr($PREF['vacation_start'],0,10); else -- cgit v1.2.3-18-g5258 From ad65decbba0fbc5421a5a6601a1eb002d6a6e3aa Mon Sep 17 00:00:00 2001 From: Arun Persaud Date: Sun, 14 Mar 2010 16:03:39 -0700 Subject: updates German translation --- locale/de/LC_MESSAGES/edoko.mo | Bin 1119 -> 1821 bytes po/de.po | 74 +++++++++++++++++++++++++++++++++++++++-- po/messages.pot | 72 +++++++++++++++++++++++++++++++++++++-- 3 files changed, 141 insertions(+), 5 deletions(-) diff --git a/locale/de/LC_MESSAGES/edoko.mo b/locale/de/LC_MESSAGES/edoko.mo index 15b120c..81ac8f7 100644 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 7b68628..d326a38 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-03-14 15:07-0700\n" -"PO-Revision-Date: 2010-03-14 15:09-0700\n" +"POT-Creation-Date: 2010-03-14 15:48-0700\n" +"PO-Revision-Date: 2010-03-14 16:00-0700\n" "Last-Translator: Arun Persaud \n" "Language-Team: English\n" "MIME-Version: 1.0\n" @@ -16,10 +16,74 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#: include/functions.php:1106 +msgid "It's your turn in these games" +msgstr "In diesen Spielen bist Du dran" + +#: include/game.php:1907 +msgid "please wait until it's your turn!" +msgstr "Bitte warte bis Du dran bist!" + +#: include/game.php:1984 include/game.php:2016 +msgid "Your cards are" +msgstr "Deine Karten sind" + +#: include/game.php:2026 +msgid "Your cards were" +msgstr "Deine Karten waren" + +#: include/game.php:2112 +msgid "A short comment" +msgstr "Ein kurzer Kommentar" + +#: include/game.php:2115 +msgid "submit" +msgstr "" + #: include/output.php:398 msgid "Welcome to E-Doko" msgstr "Willkommen bei E-Doko" +#: include/output.php:455 +msgid "mypage" +msgstr "" + +#: include/output.php:456 +msgid "settings" +msgstr "Einstellungen" + +#: include/output.php:457 +msgid "new game" +msgstr "neues Spiel" + +#: include/output.php:458 +msgid "statistics" +msgstr "Statistik" + +#: include/output.php:459 +msgid "wiki/bugs" +msgstr "Wiki/Bugs" + +#: include/output.php:460 +msgid "atom" +msgstr "Atom" + +#: include/output.php:461 +msgid "logout" +msgstr "ausloggen" + +#: include/output.php:464 +msgid "last login" +msgstr "Letzter Login" + +#: include/output.php:469 +msgid "login" +msgstr "" + +#: include/output.php:575 +msgid "Personal notes" +msgstr "Notizen" + #: include/preferences.php:330 msgid "Your settings are" msgstr "Deine Einstellungen sind" @@ -29,7 +93,7 @@ msgid "Game-related" msgstr "" #: include/preferences.php:335 -msgid "Vacation:" +msgid "Vacation" msgstr "Urlaub" #: include/preferences.php:350 @@ -72,6 +136,10 @@ msgstr "alle 3h" msgid "every 4h" msgstr "alle 4h" +#: include/preferences.php:397 +msgid "every 6h" +msgstr "alle 6h" + #: include/preferences.php:401 msgid "every 12h" msgstr "alle 12h" diff --git a/po/messages.pot b/po/messages.pot index f6a6f32..c7b3ca5 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-03-14 15:07-0700\n" +"POT-Creation-Date: 2010-03-14 15:48-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,10 +16,74 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" +#: include/functions.php:1106 +msgid "It's your turn in these games" +msgstr "" + +#: include/game.php:1907 +msgid "please wait until it's your turn!" +msgstr "" + +#: include/game.php:1984 include/game.php:2016 +msgid "Your cards are" +msgstr "" + +#: include/game.php:2026 +msgid "Your cards were" +msgstr "" + +#: include/game.php:2112 +msgid "A short comment" +msgstr "" + +#: include/game.php:2115 +msgid "submit" +msgstr "" + #: include/output.php:398 msgid "Welcome to E-Doko" msgstr "" +#: include/output.php:455 +msgid "mypage" +msgstr "" + +#: include/output.php:456 +msgid "settings" +msgstr "" + +#: include/output.php:457 +msgid "new game" +msgstr "" + +#: include/output.php:458 +msgid "statistics" +msgstr "" + +#: include/output.php:459 +msgid "wiki/bugs" +msgstr "" + +#: include/output.php:460 +msgid "atom" +msgstr "" + +#: include/output.php:461 +msgid "logout" +msgstr "" + +#: include/output.php:464 +msgid "last login" +msgstr "" + +#: include/output.php:469 +msgid "login" +msgstr "" + +#: include/output.php:575 +msgid "Personal notes" +msgstr "" + #: include/preferences.php:330 msgid "Your settings are" msgstr "" @@ -29,7 +93,7 @@ msgid "Game-related" msgstr "" #: include/preferences.php:335 -msgid "Vacation:" +msgid "Vacation" msgstr "" #: include/preferences.php:350 @@ -72,6 +136,10 @@ msgstr "" msgid "every 4h" msgstr "" +#: include/preferences.php:397 +msgid "every 6h" +msgstr "" + #: include/preferences.php:401 msgid "every 12h" msgstr "" -- cgit v1.2.3-18-g5258
'._('Vacation:')."
'._('Vacation').":