From 85a23dab031d48ce76cadb985a0cbc671914246a Mon Sep 17 00:00:00 2001 From: Arun Persaud Date: Sun, 14 Mar 2010 14:36:04 -0700 Subject: CLEANUP: fixed a typo and added "changed" indicator to language settings --- README | 2 +- include/preferences.php | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/README b/README index 9fc1116..5271dbf 100644 --- a/README +++ b/README @@ -2,4 +2,4 @@ This is eDoKo a browser based Doppelkopf implementation with email notification. All files are under GPL, the only expection are the images of the german card deck. These have been provided by ASS Altenburg GmbH (email: info@spielkarten.com) under a free (as in beer) -license. If you want to use them too you need to email them and sign a license! \ No newline at end of file +license. If you want to use them too you need to email them and sign a license! diff --git a/include/preferences.php b/include/preferences.php index 3904899..43f97df 100644 --- a/include/preferences.php +++ b/include/preferences.php @@ -483,6 +483,7 @@ if($changed_timezone) echo "changed"; echo "\n"; echo " Language: \n"; output_select_language("language",$PREF['language']); +if($changed_language == 1) echo "changed"; echo "\n"; echo " Password(old): ", ""; @@ -537,7 +538,7 @@ if($changed_openid) echo " \n"; echo "
Submit
\n"; echo " \n"; -echo "

E-DoKo uses gravatars as icons. I

"; +echo "

E-DoKo uses gravatars as icons.

"; echo "\n"; return; -- cgit v1.2.3-18-g5258 From 0e9200ecd3372c655bea3e7dbf071c2cca2866d2 Mon Sep 17 00:00:00 2001 From: Arun Persaud Date: Sun, 14 Mar 2010 15:19:42 -0700 Subject: marked more strings for translation --- TRANSLATION | 2 +- include/preferences.php | 60 +++++++++++++++++++++--------------------- po/messages.pot | 70 ++++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 100 insertions(+), 32 deletions(-) diff --git a/TRANSLATION b/TRANSLATION index 38bbaaa..b0c99c5 100644 --- a/TRANSLATION +++ b/TRANSLATION @@ -14,7 +14,7 @@ msginit -i messages.pot -o de.po To update a po file run: cd po -msgmerge de.po messages.pot +msgmerge de.po messages.pot -o de.po Start editing and then after updating a po run: diff --git a/include/preferences.php b/include/preferences.php index 43f97df..b30e7cb 100644 --- a/include/preferences.php +++ b/include/preferences.php @@ -327,12 +327,12 @@ $timezone = DB_get_user_timezone($myid); echo "
\n"; echo "
\n"; -echo "

Your settings are

\n"; +echo '

'._('Your settings are')."

\n"; echo "
\n"; -echo " Game-related\n"; +echo ' '._('Game-related')."\n"; echo " \n"; -echo " \n"; +echo ' \n"; if($PREF['vacation_start']) $value = substr($PREF['vacation_start'],0,10); else @@ -347,25 +347,25 @@ if($PREF['vacation_comment']) $value = $PREF['vacation_comment']; else $value = ''; -echo " \n"; echo "\n"; echo " \n"; echo " \n"; @@ -413,16 +413,16 @@ echo " \n"; echo " \n"; echo " \n"; echo " \n"; echo "
Vacation:
'._('Vacation:')." comment:"; -if($changed_vacation == 1) echo "changed"; -if($changed_vacation == -1) echo "wrong date format"; +echo ' '._('comment:').""; +if($changed_vacation == 1) echo _('changed'); +if($changed_vacation == -1) echo _('wrong date format'); echo "
use YYYY-MM-DDuse '-' in start field to unset vacation
Notification: \n"; echo " "; -if($changed_notify) echo "changed"; +if($changed_notify) echo _('changed'); echo "
Digest: \n"; @@ -378,34 +378,34 @@ echo ">digest off\n"; echo " \n"; +echo ">"._('every hour')."\n"; echo " \n"; +echo ">"._('every 2h')."\n"; echo " \n"; +echo ">"._('every 3h')."\n"; echo " \n"; +echo ">"._('every 4h')."\n"; echo " \n"; +echo ">"._('every 6h')."\n"; echo " \n"; +echo ">"._('every 12h')."\n"; echo " \n"; +echo ">"._('every 24h')."\n"; echo " "; -if($changed_digest) echo "changed"; +if($changed_digest) echo _('changed'); echo "
Autosetup: \n"; echo " "; -if($changed_autosetup) echo "changed"; +if($changed_autosetup) echo _('changed'); echo "
Sorting: \n"; @@ -438,7 +438,7 @@ if($PREF['sorting']=="high-low") echo " \n"; } echo " "; -if($changed_sorting) echo "changed"; +if($changed_sorting) echo _('changed'); echo "
Open for new games: \n"; echo " "; -if($changed_openforgames) echo "changed"; +if($changed_openforgames) echo _('changed'); echo "
Card set: \n"; @@ -469,7 +469,7 @@ if($PREF['cardset']=="altenburg") echo " \n"; } echo " "; -if($changed_cards) echo "changed"; +if($changed_cards) echo _('changed'); echo "
\n"; echo "
\n"; @@ -479,11 +479,11 @@ echo " \n"; echo " \n"; echo " \n"; echo " \n"; echo " \n"; diff --git a/po/messages.pot b/po/messages.pot index 08d1463..f6a6f32 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 11:35-0700\n" +"POT-Creation-Date: 2010-03-14 15:07-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -19,3 +19,71 @@ msgstr "" #: include/output.php:398 msgid "Welcome to E-Doko" msgstr "" + +#: include/preferences.php:330 +msgid "Your settings are" +msgstr "" + +#: include/preferences.php:332 +msgid "Game-related" +msgstr "" + +#: include/preferences.php:335 +msgid "Vacation:" +msgstr "" + +#: include/preferences.php:350 +msgid "comment:" +msgstr "" + +#: include/preferences.php:351 include/preferences.php:368 +#: include/preferences.php:408 include/preferences.php:425 +#: include/preferences.php:441 include/preferences.php:456 +#: include/preferences.php:472 include/preferences.php:482 +#: include/preferences.php:486 include/preferences.php:502 +msgid "changed" +msgstr "" + +#: include/preferences.php:352 +msgid "wrong date format" +msgstr "" + +#: include/preferences.php:359 include/preferences.php:364 +msgid "less emails" +msgstr "" + +#: include/preferences.php:360 include/preferences.php:365 +msgid "lots of emails" +msgstr "" + +#: include/preferences.php:381 +msgid "every hour" +msgstr "" + +#: include/preferences.php:385 +msgid "every 2h" +msgstr "" + +#: include/preferences.php:389 +msgid "every 3h" +msgstr "" + +#: include/preferences.php:393 +msgid "every 4h" +msgstr "" + +#: include/preferences.php:401 +msgid "every 12h" +msgstr "" + +#: include/preferences.php:405 +msgid "every 24h" +msgstr "" + +#: include/preferences.php:416 include/preferences.php:421 +msgid "accept every game" +msgstr "" + +#: include/preferences.php:417 include/preferences.php:422 +msgid "ask for games" +msgstr "" -- cgit v1.2.3-18-g5258 From 80f9422ddeba6ec513343cb0d4e314172d983fa3 Mon Sep 17 00:00:00 2001 From: Arun Persaud Date: Sun, 14 Mar 2010 15:20:14 -0700 Subject: updates German translation --- locale/de/LC_MESSAGES/edoko.mo | Bin 476 -> 1119 bytes po/de.po | 72 +++++++++++++++++++++++++++++++++++++++-- 2 files changed, 70 insertions(+), 2 deletions(-) diff --git a/locale/de/LC_MESSAGES/edoko.mo b/locale/de/LC_MESSAGES/edoko.mo index e72f5ab..15b120c 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 9d27938..7b68628 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 11:35-0700\n" -"PO-Revision-Date: 2010-03-14 12:01-0700\n" +"POT-Creation-Date: 2010-03-14 15:07-0700\n" +"PO-Revision-Date: 2010-03-14 15:09-0700\n" "Last-Translator: Arun Persaud \n" "Language-Team: English\n" "MIME-Version: 1.0\n" @@ -19,3 +19,71 @@ msgstr "" #: include/output.php:398 msgid "Welcome to E-Doko" msgstr "Willkommen bei E-Doko" + +#: include/preferences.php:330 +msgid "Your settings are" +msgstr "Deine Einstellungen sind" + +#: include/preferences.php:332 +msgid "Game-related" +msgstr "" + +#: include/preferences.php:335 +msgid "Vacation:" +msgstr "Urlaub" + +#: include/preferences.php:350 +msgid "comment:" +msgstr "Kommentar:" + +#: include/preferences.php:351 include/preferences.php:368 +#: include/preferences.php:408 include/preferences.php:425 +#: include/preferences.php:441 include/preferences.php:456 +#: include/preferences.php:472 include/preferences.php:482 +#: include/preferences.php:486 include/preferences.php:502 +msgid "changed" +msgstr "geaendert" + +#: include/preferences.php:352 +msgid "wrong date format" +msgstr "Falsches Datumformat" + +#: include/preferences.php:359 include/preferences.php:364 +msgid "less emails" +msgstr "weniger E-mails" + +#: include/preferences.php:360 include/preferences.php:365 +msgid "lots of emails" +msgstr "viele E-mails" + +#: include/preferences.php:381 +msgid "every hour" +msgstr "stuendlich" + +#: include/preferences.php:385 +msgid "every 2h" +msgstr "alle 2h" + +#: include/preferences.php:389 +msgid "every 3h" +msgstr "alle 3h" + +#: include/preferences.php:393 +msgid "every 4h" +msgstr "alle 4h" + +#: include/preferences.php:401 +msgid "every 12h" +msgstr "alle 12h" + +#: include/preferences.php:405 +msgid "every 24h" +msgstr "alle 24h" + +#: include/preferences.php:416 include/preferences.php:421 +msgid "accept every game" +msgstr "jedes Spiel akzeptieren" + +#: include/preferences.php:417 include/preferences.php:422 +msgid "ask for games" +msgstr "" -- cgit v1.2.3-18-g5258
Email: $email
Timezone: \n"; output_select_timezone("timezone",$timezone); -if($changed_timezone) echo "changed"; +if($changed_timezone) echo _('changed'); echo "
Language: \n"; output_select_language("language",$PREF['language']); -if($changed_language == 1) echo "changed"; +if($changed_language == 1) echo _('changed'); echo "
Password(old): ", ""; @@ -499,7 +499,7 @@ switch($changed_password) echo "The old password is not correct."; break; case '1': - echo "changed"; + echo _('changed'); break; } echo "