From 304d4e5e9e98e4f5f2bc8f7620c5d282bfb5847d Mon Sep 17 00:00:00 2001 From: vargenau Date: Mon, 26 Nov 2012 15:42:07 +0000 Subject: [PATCH] Be consistent: E-Mail --> e-mail git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@8544 96ab9672-09ca-45d6-a79d-3d69d39ca109 --- locale/de/LC_MESSAGES/phpwiki.mo | Bin 104325 -> 104325 bytes locale/de/LC_MESSAGES/phpwiki.php | 2 +- locale/es/LC_MESSAGES/phpwiki.mo | Bin 42985 -> 42985 bytes locale/fr/LC_MESSAGES/phpwiki.mo | Bin 109239 -> 109239 bytes locale/fr/LC_MESSAGES/phpwiki.php | 2 +- locale/it/LC_MESSAGES/phpwiki.mo | Bin 17953 -> 17953 bytes locale/ja/LC_MESSAGES/phpwiki.mo | Bin 14449 -> 14449 bytes locale/nl/LC_MESSAGES/phpwiki.mo | Bin 8865 -> 8865 bytes locale/po/de.po | 38 ++++++++++++------------ locale/po/es.po | 38 ++++++++++++------------ locale/po/fr.po | 38 ++++++++++++------------ locale/po/it.po | 38 ++++++++++++------------ locale/po/ja.po | 38 ++++++++++++------------ locale/po/nl.po | 38 ++++++++++++------------ locale/po/phpwiki.pot | 38 ++++++++++++------------ locale/po/sv.po | 38 ++++++++++++------------ locale/po/zh.po | 38 ++++++++++++------------ locale/sv/LC_MESSAGES/phpwiki.mo | Bin 8332 -> 8332 bytes locale/zh/LC_MESSAGES/phpwiki.mo | Bin 55573 -> 55573 bytes themes/default/templates/userprefs.tmpl | 2 +- 20 files changed, 174 insertions(+), 174 deletions(-) diff --git a/locale/de/LC_MESSAGES/phpwiki.mo b/locale/de/LC_MESSAGES/phpwiki.mo index 8ab6d4e8e853e6ed2b616e21b2adffb3d7d425a1..52f2d7164e780a5794d5d923db47440732de470a 100644 GIT binary patch delta 292 zcmWN`PbhXnU~yIqWG;a?mzS4tkWc zgOtnUJ9~^9Il3wCPt6?XwiBPz>;37IFYEcTepiWE77<<7i6&tPM_|u4(HvZa8$=p_LsYq^4Kq|-14(O>KI({lg=zZ$eFXv{3NZ_A;necUkf!3L`#RvHTlWRFhBa{ z#wU|#n@36!Ng+FUDAl@Bx@+#PXLsbj@zUNFpBj^c->-`xUE~jC%x~q~zNEQ;-%Mn3 MuIITyyu^0rKa^2cI{*Lx delta 296 zcmZo&&(^x0ZNnB-TW$shhNaIK7;J&`Mj&koq~8N+10b#WoPoguNJjx_Qy{$0}@+&&a^Q z+R4Zu2;{47-s!)Ym5G62b6zMLBU3Ts=CUw8CLn)uTf{2HpOXzEg&DU_c8zpr+_t$l zGMkZc_vW8b>P(E=H!H?IW@X&5nKk(_Bjc{kFH@Wu8FxYJp&E=nNOc8>}=sKnpr4|>bGI(YbO?Ombl-Qoy O&bW_hyLlI*A1?q%(^hE! diff --git a/locale/de/LC_MESSAGES/phpwiki.php b/locale/de/LC_MESSAGES/phpwiki.php index f300c2e4f..4d53c2e6c 100644 --- a/locale/de/LC_MESSAGES/phpwiki.php +++ b/locale/de/LC_MESSAGES/phpwiki.php @@ -1202,7 +1202,6 @@ $locale["You must specify a directory to dump to"] = "Sie müssen zum Sichern ei $locale["You must wait for moderator approval."] = "Sie müssen auf die Zustimmung des Moderators warten."; $locale["You need to specify the userid!"] = "Sie müssen den Benutzernamen angeben!"; $locale["You stored an empty password in your '%s' page."] = "Sie haben ein leeres Passwort in Ihrer HomePage »%s« gespeichert."; -$locale["Your E-Mail"] = "Ihre E-Mail-Adresse"; $locale["Your UserPreferences have been successfully reset to default."] = "Ihre BenutzerEinstellungen wurden erfolgreich gelöscht."; $locale["Your WikiDB DB backend '%s' cannot be used for DbSession."] = "Ihr WikiDB DB backend '%s' wird von DbSession nicht unterstützt."; $locale["Your access permissions are only for a BogoUser."] = "Ihre Zugriffsberechtigung entspricht lediglich einem BogoUser."; @@ -1210,6 +1209,7 @@ $locale["Your are probably trying to edit/create an invalid version of this page $locale["Your careful attention to detail is much appreciated."] = "Die besondere Aufmerksamkeit, die Sie soeben der Bearbeitung dieser Seite gewidmet haben, wird von allen Benutzern dieses Wikis gern gesehen und hoch geschätzt."; $locale["Your changes can not be saved as they are, since doing so would overwrite the other author's changes. So, your changes and those of the other author have been combined. The result is shown below."] = "Ihre Änderungen können so, wie sie sind, nicht gespeichert werden. Das hätte unzulässigerweise die bereits gesicherten Änderungen des anderen Autors überschrieben. Deshalb sind Ihre und die Änderungen des anderen Autors miteinander kombiniert worden. Das Ergebnis sehen Sie unten."; $locale["Your current rating: "] = "Deine Bewertung: "; +$locale["Your e-mail"] = "Ihre E-Mail-Adresse"; $locale["Your home page has not been created yet so your preferences cannot not be saved."] = "Sie haben Ihre persönliche HomePage Seite noch nicht erstellt, deshalb können Ihre Einstellungen nicht gespeichert werden."; $locale["Your home page is locked so your preferences cannot not be saved."] = "Ihre persönliche HomePage Seite ist gesperrt, deshalb können Ihre Änderungen nicht gespeichert werden."; $locale["Your rating was %.1f"] = "Deine Bewertung war %.1f"; diff --git a/locale/es/LC_MESSAGES/phpwiki.mo b/locale/es/LC_MESSAGES/phpwiki.mo index dddc74bea4b2ac89a0e3559c8546513557a2eeb8..29ba25093eef8c3cd705dde6bad8c72b9c81260c 100644 GIT binary patch delta 18 acmaEPp6TUzrVUQ1%w|@`n_W|vH~|1sO$W6A delta 18 acmaEPp6TUzrVUQ1%%)aGn_W|vH~|1sKL@h_ diff --git a/locale/fr/LC_MESSAGES/phpwiki.mo b/locale/fr/LC_MESSAGES/phpwiki.mo index 2156b790cc8cc0e857ba7effc275592aacc9250b..29d0f11aab9db1fa8496b0ec043d1263d2202585 100644 GIT binary patch delta 339 zcmW;EPbh{Lb7@osP_ymWcuSPTr zBXAHZI0oYT!4%42#&%EoPfSl zre`=0+hC~3y#L!>8Bh^tP*ByXw74hvPmXN;^c;umGd*5>CMy9D|_- z(L7AR5m<&ge1LaQbBX-$9(KV;xd~4U#k+BjN=$R`9R4R?-~tSuG8wP{6Yv5?pgLok zggShJdDsb;ET#a=$V_asMG?u)a)sHE@uZLW-HfLC)T?GDQx&dB?~18$!@N%4a$Ppp zo0&glH&a&aZyHet6CEHB!#*UG^>{cS1GyTrYx?sW{AKRvzm?G>dt3EG@9gm6YBncp gPEpB^8*KIHMnw95v)0MB#Xa_MiJz5Sw0N-X4;ztQsQ>@~ diff --git a/locale/fr/LC_MESSAGES/phpwiki.php b/locale/fr/LC_MESSAGES/phpwiki.php index ff4fa1676..f40fdfb64 100644 --- a/locale/fr/LC_MESSAGES/phpwiki.php +++ b/locale/fr/LC_MESSAGES/phpwiki.php @@ -1256,7 +1256,6 @@ $locale["You must sign in to %s."] = "Vous devez vous inscrire pour %s."; $locale["You must sign in to watch pages."] = "Vous devez vous identifier pour surveiller des pages."; $locale["You must specify a directory to dump to"] = "Vous devez spécifier un répertoire pour l'archivage de la sauvegarde"; $locale["You stored an empty password in your '%s' page."] = "Vous n'avez pas saisi de mot de passe pour la page %s."; -$locale["Your E-Mail"] = "Votre adresse électronique"; $locale["Your PHP version is too old. You must have at least PHP 5.2."] = "Votre version de PHP est trop ancienne. Il faut avoir au moins PHP 5.2."; $locale["Your UserPreferences have been successfully reset to default."] = "Vos préférences ont été réinitialisées avec succès"; $locale["Your WikiDB DB backend '%s' cannot be used for DbSession."] = "Votre choix « %s » de WikiDB DB ne peut pas être utilisé pour DbSession."; @@ -1267,6 +1266,7 @@ $locale["Your careful attention to detail is much appreciated."] = "Votre souci $locale["Your changes can not be saved as they are, since doing so would overwrite the other author's changes. So, your changes and those of the other author have been combined. The result is shown below."] = "Vos modifications ne peuvent être enegistrées, puisqu'elles écraseraient celles de l'autre utilisateur. Ainsi donc, vos modifications et celles de l'autre auteur ont été combinées. Le résultat est affiché ci-dessous."; $locale["Your current rating: "] = "Votre note actuelle : "; $locale["Your current watchlist: "] = "Votre liste de suivi actuelle : "; +$locale["Your e-mail"] = "Votre adresse électronique"; $locale["Your home page has not been created yet so your preferences cannot not be saved."] = "Votre page personnelle n'a pas été créée et par conséquent vos préférences n'ont pas pu être enregistrées."; $locale["Your home page is locked so your preferences cannot not be saved."] = "Votre page personnelle est verrouillée et par conséquent vos préférences n'ont pas pu être enregistrées."; $locale["Your rating was %.1f"] = "Votre note est %.1f"; diff --git a/locale/it/LC_MESSAGES/phpwiki.mo b/locale/it/LC_MESSAGES/phpwiki.mo index 0edc6910ea6a73044f0e29faa00368aa9928c029..ccdf32a384326cc7d5a72dad0aa0c95bc556c489 100644 GIT binary patch delta 18 ZcmZ43!?>`Aal=0yW-}|}&5XJVk^n=z1@`~| delta 18 ZcmZ43!?>`Aal=0yW>YJp&5XJVk^n=l1@!;` diff --git a/locale/ja/LC_MESSAGES/phpwiki.mo b/locale/ja/LC_MESSAGES/phpwiki.mo index 4178f5550472666f6e4228f37a78cef1465eb37d..9b456767751fe30caaf6cfad81dd63df5b963d2c 100644 GIT binary patch delta 16 YcmexZ@UdXSMnz^bE91>u6!(e&07i%hMgRZ+ delta 16 YcmexZ@UdXSMnz^*E2GU@6!(e&07iNTL;wH) diff --git a/locale/nl/LC_MESSAGES/phpwiki.mo b/locale/nl/LC_MESSAGES/phpwiki.mo index d805cdb19933f9b34069894b09406c3922225262..fea35c5542c9a432635dd7c72c75919c75797032 100644 GIT binary patch delta 16 YcmZ4Jy3lpQc`;@)E91?V#LjaA06D-0eE, Carsten Klapp " ", Helmer Pardun \n" "Language-Team: \n" @@ -1106,7 +1106,7 @@ msgid "User %s removed page %s" msgstr "El usuarios %s eliminado página %s" #: ../lib/MailNotify.php:406 ../lib/plugin/WikiAdminUtils.php:120 -#: ../lib/WikiUserNew.php:1803 +#: ../lib/WikiUserNew.php:1818 msgid "E-mail address confirmation" msgstr "Verificación Del Email" @@ -6908,7 +6908,7 @@ msgstr "" msgid "Sign Out" msgstr "Registro Hacia fuera" -#: ../lib/WikiTheme.php:1060 ../lib/WikiUserNew.php:531 +#: ../lib/WikiTheme.php:1060 ../lib/WikiUserNew.php:534 #: ../lib/WikiUser.php:243 ../themes/blog/themeinfo.php:75 #: ../themes/Crao/templates/signin.tmpl:51 #: ../themes/default/templates/login.tmpl:68 @@ -6970,7 +6970,7 @@ msgstr "Acoplamientos Externos" #: ../lib/WikiUser/AdoDb.php:49 ../lib/WikiUser/AdoDb.php:210 #: ../lib/WikiUser/Db.php:60 ../lib/WikiUser/File.php:78 #: ../lib/WikiUser/IMAP.php:35 ../lib/WikiUser/LDAP.php:147 -#: ../lib/WikiUserNew.php:649 ../lib/WikiUser/PdoDb.php:47 +#: ../lib/WikiUserNew.php:652 ../lib/WikiUser/PdoDb.php:47 #: ../lib/WikiUser/PdoDb.php:125 ../lib/WikiUser/PearDb.php:45 #: ../lib/WikiUser/PearDb.php:139 ../lib/WikiUser.php:209 #: ../lib/WikiUser.php:292 ../lib/WikiUser/POP3.php:35 @@ -7047,40 +7047,40 @@ msgstr "No podía conectar con LDAP %s" msgid "Invalid username '%s' for LDAP Auth" msgstr "Username inválido ' %s' para LDAP Auth" -#: ../lib/WikiUserNew.php:453 +#: ../lib/WikiUserNew.php:456 msgid "" "Automatically created user homepage to be able to store UserPreferences." msgstr "" -#: ../lib/WikiUserNew.php:684 +#: ../lib/WikiUserNew.php:687 msgid "Invalid password." msgstr "Contraseña inválido." -#: ../lib/WikiUserNew.php:686 ../lib/WikiUser.php:213 +#: ../lib/WikiUserNew.php:689 ../lib/WikiUser.php:213 msgid "Invalid password or userid." msgstr "Contraseña o userid inválida." -#: ../lib/WikiUserNew.php:698 ../lib/WikiUser.php:215 +#: ../lib/WikiUserNew.php:701 ../lib/WikiUser.php:215 msgid "Insufficient permissions." msgstr "Permisos escasos." -#: ../lib/WikiUserNew.php:742 +#: ../lib/WikiUserNew.php:745 msgid "Empty Preferences or format of UserPreferences cookie not recognised." msgstr "" "Preferencias o formato vacías de la galleta de UsuarioPreferencias no " "reconocido." -#: ../lib/WikiUserNew.php:746 +#: ../lib/WikiUserNew.php:749 msgid "Default preferences will be used." msgstr "Las preferencias del defecto serán utilizadas." -#: ../lib/WikiUserNew.php:1291 +#: ../lib/WikiUserNew.php:1294 msgid "The length of the password is shorter than the system policy allows." msgstr "" "La longitud de la contraseña es más corta que la política del sistema " "permite." -#: ../lib/WikiUserNew.php:1318 +#: ../lib/WikiUserNew.php:1321 msgid "" "The length of the stored password is shorter than the system policy allows. " "Sorry, you cannot login.\n" @@ -7091,11 +7091,11 @@ msgstr "" " Usted tiene que pedir que el administrador de sistema reajuste su " "contraseña." -#: ../lib/WikiUserNew.php:1332 +#: ../lib/WikiUserNew.php:1335 msgid "The crypt function is not available in this version of PHP." msgstr "La función de la cripta no está disponible en esta versión de PHP." -#: ../lib/WikiUserNew.php:1333 +#: ../lib/WikiUserNew.php:1336 msgid "" "Please set ENCRYPTED_PASSWD to false in config/config.ini and probably " "change ADMIN_PASSWD." @@ -7103,11 +7103,11 @@ msgstr "" "En ENCRYPTED_PASSWD por favor fijado a falso config/config.ini y " "probablemente cambio ADMIN_PASSWD." -#: ../lib/WikiUserNew.php:1345 +#: ../lib/WikiUserNew.php:1348 msgid "Please set ENCRYPTED_PASSWD to true in config/config.ini." msgstr "ENCRYPTED_PASSWD por favor fijado a verdad en config/config.ini." -#: ../lib/WikiUserNew.php:1804 +#: ../lib/WikiUserNew.php:1819 #, php-format msgid "" "Welcome to %s!\n" @@ -7120,12 +7120,12 @@ msgstr "" "para enviar notificaciones del cambio de la página.\n" "Vea %s" -#: ../lib/WikiUserNew.php:1866 +#: ../lib/WikiUserNew.php:1881 #, php-format msgid "E-mail address '%s' is not properly formatted" msgstr "La dirección '%s' del email no se ajusta a formato correctamente" -#: ../lib/WikiUserNew.php:1870 +#: ../lib/WikiUserNew.php:1885 #, php-format msgid "E-mail address '%s' is properly formatted" msgstr "La dirección '%s' del email se ajusta a formato correctamente" @@ -8131,7 +8131,7 @@ msgid "Type it again" msgstr "" #: ../themes/default/templates/userprefs.tmpl:154 -msgid "Your E-Mail" +msgid "Your e-mail" msgstr "" #: ../themes/default/templates/userprefs.tmpl:163 diff --git a/locale/po/fr.po b/locale/po/fr.po index 684b90350..7f7613366 100644 --- a/locale/po/fr.po +++ b/locale/po/fr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PhpWiki 1.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-26 15:28+0100\n" +"POT-Creation-Date: 2012-11-26 16:38+0100\n" "PO-Revision-Date: 2004-06-22 21:10+0200\n" "Last-Translator: Pierrick Meignen , Roland " "Trique , Stéphane Gourichon \n" "Language-Team: LANGUAGE \n" @@ -1082,7 +1082,7 @@ msgid "User %s removed page %s" msgstr "ページをロックしました。" #: ../lib/MailNotify.php:406 ../lib/plugin/WikiAdminUtils.php:120 -#: ../lib/WikiUserNew.php:1803 +#: ../lib/WikiUserNew.php:1818 msgid "E-mail address confirmation" msgstr "" @@ -7018,7 +7018,7 @@ msgstr "" msgid "Sign Out" msgstr "サインサウト" -#: ../lib/WikiTheme.php:1060 ../lib/WikiUserNew.php:531 +#: ../lib/WikiTheme.php:1060 ../lib/WikiUserNew.php:534 #: ../lib/WikiUser.php:243 ../themes/blog/themeinfo.php:75 #: ../themes/Crao/templates/signin.tmpl:51 #: ../themes/default/templates/login.tmpl:68 @@ -7080,7 +7080,7 @@ msgstr "" #: ../lib/WikiUser/AdoDb.php:49 ../lib/WikiUser/AdoDb.php:210 #: ../lib/WikiUser/Db.php:60 ../lib/WikiUser/File.php:78 #: ../lib/WikiUser/IMAP.php:35 ../lib/WikiUser/LDAP.php:147 -#: ../lib/WikiUserNew.php:649 ../lib/WikiUser/PdoDb.php:47 +#: ../lib/WikiUserNew.php:652 ../lib/WikiUser/PdoDb.php:47 #: ../lib/WikiUser/PdoDb.php:125 ../lib/WikiUser/PearDb.php:45 #: ../lib/WikiUser/PearDb.php:139 ../lib/WikiUser.php:209 #: ../lib/WikiUser.php:292 ../lib/WikiUser/POP3.php:35 @@ -7159,58 +7159,58 @@ msgstr "" msgid "Invalid username '%s' for LDAP Auth" msgstr "ユーザーIDかパスワードが無効です。" -#: ../lib/WikiUserNew.php:453 +#: ../lib/WikiUserNew.php:456 msgid "" "Automatically created user homepage to be able to store UserPreferences." msgstr "" -#: ../lib/WikiUserNew.php:684 +#: ../lib/WikiUserNew.php:687 #, fuzzy msgid "Invalid password." msgstr "ユーザーIDかパスワードが無効です。" -#: ../lib/WikiUserNew.php:686 ../lib/WikiUser.php:213 +#: ../lib/WikiUserNew.php:689 ../lib/WikiUser.php:213 msgid "Invalid password or userid." msgstr "ユーザーIDかパスワードが無効です。" -#: ../lib/WikiUserNew.php:698 ../lib/WikiUser.php:215 +#: ../lib/WikiUserNew.php:701 ../lib/WikiUser.php:215 msgid "Insufficient permissions." msgstr "" -#: ../lib/WikiUserNew.php:742 +#: ../lib/WikiUserNew.php:745 msgid "Empty Preferences or format of UserPreferences cookie not recognised." msgstr "" -#: ../lib/WikiUserNew.php:746 +#: ../lib/WikiUserNew.php:749 msgid "Default preferences will be used." msgstr "" -#: ../lib/WikiUserNew.php:1291 +#: ../lib/WikiUserNew.php:1294 msgid "The length of the password is shorter than the system policy allows." msgstr "" -#: ../lib/WikiUserNew.php:1318 +#: ../lib/WikiUserNew.php:1321 msgid "" "The length of the stored password is shorter than the system policy allows. " "Sorry, you cannot login.\n" " You have to ask the System Administrator to reset your password." msgstr "" -#: ../lib/WikiUserNew.php:1332 +#: ../lib/WikiUserNew.php:1335 msgid "The crypt function is not available in this version of PHP." msgstr "" -#: ../lib/WikiUserNew.php:1333 +#: ../lib/WikiUserNew.php:1336 msgid "" "Please set ENCRYPTED_PASSWD to false in config/config.ini and probably " "change ADMIN_PASSWD." msgstr "" -#: ../lib/WikiUserNew.php:1345 +#: ../lib/WikiUserNew.php:1348 msgid "Please set ENCRYPTED_PASSWD to true in config/config.ini." msgstr "" -#: ../lib/WikiUserNew.php:1804 +#: ../lib/WikiUserNew.php:1819 #, php-format msgid "" "Welcome to %s!\n" @@ -7219,12 +7219,12 @@ msgid "" "See %s" msgstr "" -#: ../lib/WikiUserNew.php:1866 +#: ../lib/WikiUserNew.php:1881 #, php-format msgid "E-mail address '%s' is not properly formatted" msgstr "" -#: ../lib/WikiUserNew.php:1870 +#: ../lib/WikiUserNew.php:1885 #, php-format msgid "E-mail address '%s' is properly formatted" msgstr "" @@ -8251,7 +8251,7 @@ msgstr "もう一度入力" #: ../themes/default/templates/userprefs.tmpl:154 #, fuzzy -msgid "Your E-Mail" +msgid "Your e-mail" msgstr "あなたのメールアドレス:" #: ../themes/default/templates/userprefs.tmpl:163 diff --git a/locale/po/nl.po b/locale/po/nl.po index 3bccb1ea7..d7afe66f9 100644 --- a/locale/po/nl.po +++ b/locale/po/nl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PhpWiki 1.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-26 15:28+0100\n" +"POT-Creation-Date: 2012-11-26 16:38+0100\n" "PO-Revision-Date: 2000-09-30 02:23+0200\n" "Last-Translator: Jan Nieuwenhuizen \n" "Language-Team: Dutch \n" @@ -1084,7 +1084,7 @@ msgid "User %s removed page %s" msgstr "" #: ../lib/MailNotify.php:406 ../lib/plugin/WikiAdminUtils.php:120 -#: ../lib/WikiUserNew.php:1803 +#: ../lib/WikiUserNew.php:1818 msgid "E-mail address confirmation" msgstr "" @@ -6863,7 +6863,7 @@ msgstr "" msgid "Sign Out" msgstr "" -#: ../lib/WikiTheme.php:1060 ../lib/WikiUserNew.php:531 +#: ../lib/WikiTheme.php:1060 ../lib/WikiUserNew.php:534 #: ../lib/WikiUser.php:243 ../themes/blog/themeinfo.php:75 #: ../themes/Crao/templates/signin.tmpl:51 #: ../themes/default/templates/login.tmpl:68 @@ -6925,7 +6925,7 @@ msgstr "" #: ../lib/WikiUser/AdoDb.php:49 ../lib/WikiUser/AdoDb.php:210 #: ../lib/WikiUser/Db.php:60 ../lib/WikiUser/File.php:78 #: ../lib/WikiUser/IMAP.php:35 ../lib/WikiUser/LDAP.php:147 -#: ../lib/WikiUserNew.php:649 ../lib/WikiUser/PdoDb.php:47 +#: ../lib/WikiUserNew.php:652 ../lib/WikiUser/PdoDb.php:47 #: ../lib/WikiUser/PdoDb.php:125 ../lib/WikiUser/PearDb.php:45 #: ../lib/WikiUser/PearDb.php:139 ../lib/WikiUser.php:209 #: ../lib/WikiUser.php:292 ../lib/WikiUser/POP3.php:35 @@ -7002,57 +7002,57 @@ msgstr "" msgid "Invalid username '%s' for LDAP Auth" msgstr "" -#: ../lib/WikiUserNew.php:453 +#: ../lib/WikiUserNew.php:456 msgid "" "Automatically created user homepage to be able to store UserPreferences." msgstr "" -#: ../lib/WikiUserNew.php:684 +#: ../lib/WikiUserNew.php:687 msgid "Invalid password." msgstr "" -#: ../lib/WikiUserNew.php:686 ../lib/WikiUser.php:213 +#: ../lib/WikiUserNew.php:689 ../lib/WikiUser.php:213 msgid "Invalid password or userid." msgstr "" -#: ../lib/WikiUserNew.php:698 ../lib/WikiUser.php:215 +#: ../lib/WikiUserNew.php:701 ../lib/WikiUser.php:215 msgid "Insufficient permissions." msgstr "" -#: ../lib/WikiUserNew.php:742 +#: ../lib/WikiUserNew.php:745 msgid "Empty Preferences or format of UserPreferences cookie not recognised." msgstr "" -#: ../lib/WikiUserNew.php:746 +#: ../lib/WikiUserNew.php:749 msgid "Default preferences will be used." msgstr "" -#: ../lib/WikiUserNew.php:1291 +#: ../lib/WikiUserNew.php:1294 msgid "The length of the password is shorter than the system policy allows." msgstr "" -#: ../lib/WikiUserNew.php:1318 +#: ../lib/WikiUserNew.php:1321 msgid "" "The length of the stored password is shorter than the system policy allows. " "Sorry, you cannot login.\n" " You have to ask the System Administrator to reset your password." msgstr "" -#: ../lib/WikiUserNew.php:1332 +#: ../lib/WikiUserNew.php:1335 msgid "The crypt function is not available in this version of PHP." msgstr "" -#: ../lib/WikiUserNew.php:1333 +#: ../lib/WikiUserNew.php:1336 msgid "" "Please set ENCRYPTED_PASSWD to false in config/config.ini and probably " "change ADMIN_PASSWD." msgstr "" -#: ../lib/WikiUserNew.php:1345 +#: ../lib/WikiUserNew.php:1348 msgid "Please set ENCRYPTED_PASSWD to true in config/config.ini." msgstr "" -#: ../lib/WikiUserNew.php:1804 +#: ../lib/WikiUserNew.php:1819 #, php-format msgid "" "Welcome to %s!\n" @@ -7061,12 +7061,12 @@ msgid "" "See %s" msgstr "" -#: ../lib/WikiUserNew.php:1866 +#: ../lib/WikiUserNew.php:1881 #, php-format msgid "E-mail address '%s' is not properly formatted" msgstr "" -#: ../lib/WikiUserNew.php:1870 +#: ../lib/WikiUserNew.php:1885 #, php-format msgid "E-mail address '%s' is properly formatted" msgstr "" @@ -8064,7 +8064,7 @@ msgid "Type it again" msgstr "" #: ../themes/default/templates/userprefs.tmpl:154 -msgid "Your E-Mail" +msgid "Your e-mail" msgstr "" #: ../themes/default/templates/userprefs.tmpl:163 diff --git a/locale/po/phpwiki.pot b/locale/po/phpwiki.pot index e59f171c4..64831c463 100644 --- a/locale/po/phpwiki.pot +++ b/locale/po/phpwiki.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PhpWiki-1.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-26 15:28+0100\n" +"POT-Creation-Date: 2012-11-26 16:38+0100\n" "PO-Revision-Date: 2002-12-14 17:51-0500\n" "Last-Translator: Reini Urban \n" "Language-Team: LANGUAGE \n" @@ -1077,7 +1077,7 @@ msgid "User %s removed page %s" msgstr "" #: ../lib/MailNotify.php:406 ../lib/plugin/WikiAdminUtils.php:120 -#: ../lib/WikiUserNew.php:1803 +#: ../lib/WikiUserNew.php:1818 msgid "E-mail address confirmation" msgstr "" @@ -6854,7 +6854,7 @@ msgstr "" msgid "Sign Out" msgstr "" -#: ../lib/WikiTheme.php:1060 ../lib/WikiUserNew.php:531 +#: ../lib/WikiTheme.php:1060 ../lib/WikiUserNew.php:534 #: ../lib/WikiUser.php:243 ../themes/blog/themeinfo.php:75 #: ../themes/Crao/templates/signin.tmpl:51 #: ../themes/default/templates/login.tmpl:68 @@ -6916,7 +6916,7 @@ msgstr "" #: ../lib/WikiUser/AdoDb.php:49 ../lib/WikiUser/AdoDb.php:210 #: ../lib/WikiUser/Db.php:60 ../lib/WikiUser/File.php:78 #: ../lib/WikiUser/IMAP.php:35 ../lib/WikiUser/LDAP.php:147 -#: ../lib/WikiUserNew.php:649 ../lib/WikiUser/PdoDb.php:47 +#: ../lib/WikiUserNew.php:652 ../lib/WikiUser/PdoDb.php:47 #: ../lib/WikiUser/PdoDb.php:125 ../lib/WikiUser/PearDb.php:45 #: ../lib/WikiUser/PearDb.php:139 ../lib/WikiUser.php:209 #: ../lib/WikiUser.php:292 ../lib/WikiUser/POP3.php:35 @@ -6993,57 +6993,57 @@ msgstr "" msgid "Invalid username '%s' for LDAP Auth" msgstr "" -#: ../lib/WikiUserNew.php:453 +#: ../lib/WikiUserNew.php:456 msgid "" "Automatically created user homepage to be able to store UserPreferences." msgstr "" -#: ../lib/WikiUserNew.php:684 +#: ../lib/WikiUserNew.php:687 msgid "Invalid password." msgstr "" -#: ../lib/WikiUserNew.php:686 ../lib/WikiUser.php:213 +#: ../lib/WikiUserNew.php:689 ../lib/WikiUser.php:213 msgid "Invalid password or userid." msgstr "" -#: ../lib/WikiUserNew.php:698 ../lib/WikiUser.php:215 +#: ../lib/WikiUserNew.php:701 ../lib/WikiUser.php:215 msgid "Insufficient permissions." msgstr "" -#: ../lib/WikiUserNew.php:742 +#: ../lib/WikiUserNew.php:745 msgid "Empty Preferences or format of UserPreferences cookie not recognised." msgstr "" -#: ../lib/WikiUserNew.php:746 +#: ../lib/WikiUserNew.php:749 msgid "Default preferences will be used." msgstr "" -#: ../lib/WikiUserNew.php:1291 +#: ../lib/WikiUserNew.php:1294 msgid "The length of the password is shorter than the system policy allows." msgstr "" -#: ../lib/WikiUserNew.php:1318 +#: ../lib/WikiUserNew.php:1321 msgid "" "The length of the stored password is shorter than the system policy allows. " "Sorry, you cannot login.\n" " You have to ask the System Administrator to reset your password." msgstr "" -#: ../lib/WikiUserNew.php:1332 +#: ../lib/WikiUserNew.php:1335 msgid "The crypt function is not available in this version of PHP." msgstr "" -#: ../lib/WikiUserNew.php:1333 +#: ../lib/WikiUserNew.php:1336 msgid "" "Please set ENCRYPTED_PASSWD to false in config/config.ini and probably " "change ADMIN_PASSWD." msgstr "" -#: ../lib/WikiUserNew.php:1345 +#: ../lib/WikiUserNew.php:1348 msgid "Please set ENCRYPTED_PASSWD to true in config/config.ini." msgstr "" -#: ../lib/WikiUserNew.php:1804 +#: ../lib/WikiUserNew.php:1819 #, php-format msgid "" "Welcome to %s!\n" @@ -7052,12 +7052,12 @@ msgid "" "See %s" msgstr "" -#: ../lib/WikiUserNew.php:1866 +#: ../lib/WikiUserNew.php:1881 #, php-format msgid "E-mail address '%s' is not properly formatted" msgstr "" -#: ../lib/WikiUserNew.php:1870 +#: ../lib/WikiUserNew.php:1885 #, php-format msgid "E-mail address '%s' is properly formatted" msgstr "" @@ -8053,7 +8053,7 @@ msgid "Type it again" msgstr "" #: ../themes/default/templates/userprefs.tmpl:154 -msgid "Your E-Mail" +msgid "Your e-mail" msgstr "" #: ../themes/default/templates/userprefs.tmpl:163 diff --git a/locale/po/sv.po b/locale/po/sv.po index a48ecb0ce..459a6156f 100644 --- a/locale/po/sv.po +++ b/locale/po/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PhpWiki 1.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-26 15:28+0100\n" +"POT-Creation-Date: 2012-11-26 16:38+0100\n" "PO-Revision-Date: 2001-01-27 01:58+0200\n" "Last-Translator: Jon Åslund \n" "Language-Team: \n" @@ -1078,7 +1078,7 @@ msgid "User %s removed page %s" msgstr "" #: ../lib/MailNotify.php:406 ../lib/plugin/WikiAdminUtils.php:120 -#: ../lib/WikiUserNew.php:1803 +#: ../lib/WikiUserNew.php:1818 msgid "E-mail address confirmation" msgstr "" @@ -6857,7 +6857,7 @@ msgstr "" msgid "Sign Out" msgstr "Logga ut" -#: ../lib/WikiTheme.php:1060 ../lib/WikiUserNew.php:531 +#: ../lib/WikiTheme.php:1060 ../lib/WikiUserNew.php:534 #: ../lib/WikiUser.php:243 ../themes/blog/themeinfo.php:75 #: ../themes/Crao/templates/signin.tmpl:51 #: ../themes/default/templates/login.tmpl:68 @@ -6919,7 +6919,7 @@ msgstr "" #: ../lib/WikiUser/AdoDb.php:49 ../lib/WikiUser/AdoDb.php:210 #: ../lib/WikiUser/Db.php:60 ../lib/WikiUser/File.php:78 #: ../lib/WikiUser/IMAP.php:35 ../lib/WikiUser/LDAP.php:147 -#: ../lib/WikiUserNew.php:649 ../lib/WikiUser/PdoDb.php:47 +#: ../lib/WikiUserNew.php:652 ../lib/WikiUser/PdoDb.php:47 #: ../lib/WikiUser/PdoDb.php:125 ../lib/WikiUser/PearDb.php:45 #: ../lib/WikiUser/PearDb.php:139 ../lib/WikiUser.php:209 #: ../lib/WikiUser.php:292 ../lib/WikiUser/POP3.php:35 @@ -6996,57 +6996,57 @@ msgstr "" msgid "Invalid username '%s' for LDAP Auth" msgstr "" -#: ../lib/WikiUserNew.php:453 +#: ../lib/WikiUserNew.php:456 msgid "" "Automatically created user homepage to be able to store UserPreferences." msgstr "" -#: ../lib/WikiUserNew.php:684 +#: ../lib/WikiUserNew.php:687 msgid "Invalid password." msgstr "" -#: ../lib/WikiUserNew.php:686 ../lib/WikiUser.php:213 +#: ../lib/WikiUserNew.php:689 ../lib/WikiUser.php:213 msgid "Invalid password or userid." msgstr "" -#: ../lib/WikiUserNew.php:698 ../lib/WikiUser.php:215 +#: ../lib/WikiUserNew.php:701 ../lib/WikiUser.php:215 msgid "Insufficient permissions." msgstr "" -#: ../lib/WikiUserNew.php:742 +#: ../lib/WikiUserNew.php:745 msgid "Empty Preferences or format of UserPreferences cookie not recognised." msgstr "" -#: ../lib/WikiUserNew.php:746 +#: ../lib/WikiUserNew.php:749 msgid "Default preferences will be used." msgstr "" -#: ../lib/WikiUserNew.php:1291 +#: ../lib/WikiUserNew.php:1294 msgid "The length of the password is shorter than the system policy allows." msgstr "" -#: ../lib/WikiUserNew.php:1318 +#: ../lib/WikiUserNew.php:1321 msgid "" "The length of the stored password is shorter than the system policy allows. " "Sorry, you cannot login.\n" " You have to ask the System Administrator to reset your password." msgstr "" -#: ../lib/WikiUserNew.php:1332 +#: ../lib/WikiUserNew.php:1335 msgid "The crypt function is not available in this version of PHP." msgstr "" -#: ../lib/WikiUserNew.php:1333 +#: ../lib/WikiUserNew.php:1336 msgid "" "Please set ENCRYPTED_PASSWD to false in config/config.ini and probably " "change ADMIN_PASSWD." msgstr "" -#: ../lib/WikiUserNew.php:1345 +#: ../lib/WikiUserNew.php:1348 msgid "Please set ENCRYPTED_PASSWD to true in config/config.ini." msgstr "" -#: ../lib/WikiUserNew.php:1804 +#: ../lib/WikiUserNew.php:1819 #, php-format msgid "" "Welcome to %s!\n" @@ -7055,12 +7055,12 @@ msgid "" "See %s" msgstr "" -#: ../lib/WikiUserNew.php:1866 +#: ../lib/WikiUserNew.php:1881 #, php-format msgid "E-mail address '%s' is not properly formatted" msgstr "" -#: ../lib/WikiUserNew.php:1870 +#: ../lib/WikiUserNew.php:1885 #, php-format msgid "E-mail address '%s' is properly formatted" msgstr "" @@ -8056,7 +8056,7 @@ msgid "Type it again" msgstr "" #: ../themes/default/templates/userprefs.tmpl:154 -msgid "Your E-Mail" +msgid "Your e-mail" msgstr "" #: ../themes/default/templates/userprefs.tmpl:163 diff --git a/locale/po/zh.po b/locale/po/zh.po index 9aab52370..421db6679 100644 --- a/locale/po/zh.po +++ b/locale/po/zh.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PhpWiki 1.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-26 15:28+0100\n" +"POT-Creation-Date: 2012-11-26 16:38+0100\n" "PO-Revision-Date: 2004-04-21 10:08+0800\n" "Last-Translator: DruryL \n" "Language-Team: DruryL \n" @@ -1126,7 +1126,7 @@ msgid "User %s removed page %s" msgstr "頁面已被鎖定" #: ../lib/MailNotify.php:406 ../lib/plugin/WikiAdminUtils.php:120 -#: ../lib/WikiUserNew.php:1803 +#: ../lib/WikiUserNew.php:1818 #, fuzzy msgid "E-mail address confirmation" msgstr "Email 驗證." @@ -7162,7 +7162,7 @@ msgstr "" msgid "Sign Out" msgstr "簽出" -#: ../lib/WikiTheme.php:1060 ../lib/WikiUserNew.php:531 +#: ../lib/WikiTheme.php:1060 ../lib/WikiUserNew.php:534 #: ../lib/WikiUser.php:243 ../themes/blog/themeinfo.php:75 #: ../themes/Crao/templates/signin.tmpl:51 #: ../themes/default/templates/login.tmpl:68 @@ -7224,7 +7224,7 @@ msgstr "外部連結" #: ../lib/WikiUser/AdoDb.php:49 ../lib/WikiUser/AdoDb.php:210 #: ../lib/WikiUser/Db.php:60 ../lib/WikiUser/File.php:78 #: ../lib/WikiUser/IMAP.php:35 ../lib/WikiUser/LDAP.php:147 -#: ../lib/WikiUserNew.php:649 ../lib/WikiUser/PdoDb.php:47 +#: ../lib/WikiUserNew.php:652 ../lib/WikiUser/PdoDb.php:47 #: ../lib/WikiUser/PdoDb.php:125 ../lib/WikiUser/PearDb.php:45 #: ../lib/WikiUser/PearDb.php:139 ../lib/WikiUser.php:209 #: ../lib/WikiUser.php:292 ../lib/WikiUser/POP3.php:35 @@ -7304,37 +7304,37 @@ msgstr "無法為頁面 '%s' 變更權限為 '%s'." msgid "Invalid username '%s' for LDAP Auth" msgstr "錯誤的 acl" -#: ../lib/WikiUserNew.php:453 +#: ../lib/WikiUserNew.php:456 msgid "" "Automatically created user homepage to be able to store UserPreferences." msgstr "" -#: ../lib/WikiUserNew.php:684 +#: ../lib/WikiUserNew.php:687 #, fuzzy msgid "Invalid password." msgstr "錯誤的密碼或使用者帳號." -#: ../lib/WikiUserNew.php:686 ../lib/WikiUser.php:213 +#: ../lib/WikiUserNew.php:689 ../lib/WikiUser.php:213 msgid "Invalid password or userid." msgstr "錯誤的密碼或使用者帳號." -#: ../lib/WikiUserNew.php:698 ../lib/WikiUser.php:215 +#: ../lib/WikiUserNew.php:701 ../lib/WikiUser.php:215 msgid "Insufficient permissions." msgstr "權限不足." -#: ../lib/WikiUserNew.php:742 +#: ../lib/WikiUserNew.php:745 msgid "Empty Preferences or format of UserPreferences cookie not recognised." msgstr "空的偏好設定或 UserPreferences cookie 格式無法辨認." -#: ../lib/WikiUserNew.php:746 +#: ../lib/WikiUserNew.php:749 msgid "Default preferences will be used." msgstr "預設偏好設定將被使用." -#: ../lib/WikiUserNew.php:1291 +#: ../lib/WikiUserNew.php:1294 msgid "The length of the password is shorter than the system policy allows." msgstr "" -#: ../lib/WikiUserNew.php:1318 +#: ../lib/WikiUserNew.php:1321 msgid "" "The length of the stored password is shorter than the system policy allows. " "Sorry, you cannot login.\n" @@ -7343,11 +7343,11 @@ msgstr "" "密碼長度小於系統原則所允許的長度. 抱歉,你無法登入. \n" " 你必須詢問系統管理者以重設密碼." -#: ../lib/WikiUserNew.php:1332 +#: ../lib/WikiUserNew.php:1335 msgid "The crypt function is not available in this version of PHP." msgstr "此版本的 PHP 沒有 crypt 函數." -#: ../lib/WikiUserNew.php:1333 +#: ../lib/WikiUserNew.php:1336 #, fuzzy msgid "" "Please set ENCRYPTED_PASSWD to false in config/config.ini and probably " @@ -7355,12 +7355,12 @@ msgid "" msgstr "" "請在 index.php 中設定 ENCRYPTED_PASSWD 為 false 或許也要變更 ADMIN_PASSWD." -#: ../lib/WikiUserNew.php:1345 +#: ../lib/WikiUserNew.php:1348 #, fuzzy msgid "Please set ENCRYPTED_PASSWD to true in config/config.ini." msgstr "請在 index.php 中設定 ENCRYPTED_PASSWD 為 true." -#: ../lib/WikiUserNew.php:1804 +#: ../lib/WikiUserNew.php:1819 #, fuzzy, php-format msgid "" "Welcome to %s!\n" @@ -7372,12 +7372,12 @@ msgstr "" " 你的 email 帳號已經確認並且將會被用來寄送頁面變更通知. \n" " 參閱 %s" -#: ../lib/WikiUserNew.php:1866 +#: ../lib/WikiUserNew.php:1881 #, php-format msgid "E-mail address '%s' is not properly formatted" msgstr "" -#: ../lib/WikiUserNew.php:1870 +#: ../lib/WikiUserNew.php:1885 #, php-format msgid "E-mail address '%s' is properly formatted" msgstr "" @@ -8420,7 +8420,7 @@ msgstr "再輸入一次:" #: ../themes/default/templates/userprefs.tmpl:154 #, fuzzy -msgid "Your E-Mail" +msgid "Your e-mail" msgstr "你的 E-Mail:" #: ../themes/default/templates/userprefs.tmpl:163 diff --git a/locale/sv/LC_MESSAGES/phpwiki.mo b/locale/sv/LC_MESSAGES/phpwiki.mo index aa127761f87dc3fe9e1460b181bd240d64c7ee2b..1949c78484f1580187511d692ffdbe0f888c6cf0 100644 GIT binary patch delta 16 XcmeBi>~Y+%R+QPy%6Rhz(K}oKH0TBq delta 16 XcmeBi>~Y+%R+QP)%4qWj(K}oKG};Ca diff --git a/locale/zh/LC_MESSAGES/phpwiki.mo b/locale/zh/LC_MESSAGES/phpwiki.mo index e2282d0f94c6f8a510a18dbfb7fd2551b80e320f..b912f9b762fabc5c40e758cac7138678e5b5a19c 100644 GIT binary patch delta 18 ZcmbQbiFxWK<_+Dw%w|@`oBMj(y#Y!w2crN0 delta 18 ZcmbQbiFxWK<_+Dw%%)aGoBMj(y#Y!i2cZA} diff --git a/themes/default/templates/userprefs.tmpl b/themes/default/templates/userprefs.tmpl index a2d02185d..5dd277b95 100644 --- a/themes/default/templates/userprefs.tmpl +++ b/themes/default/templates/userprefs.tmpl @@ -151,7 +151,7 @@ if ( $isForm ) {

- + -- 2.45.0