Menu
▾
▴
[phpwiki-checkins] SF.net SVN: phpwiki:[8544] trunk
|
From: <var...@us...> - 2012-11-26 15:42:20
|
Revision: 8544
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8544&view=rev
Author: vargenau
Date: 2012-11-26 15:42:07 +0000 (Mon, 26 Nov 2012)
Log Message:
-----------
Be consistent: E-Mail --> e-mail
Modified Paths:
--------------
trunk/locale/de/LC_MESSAGES/phpwiki.mo
trunk/locale/de/LC_MESSAGES/phpwiki.php
trunk/locale/es/LC_MESSAGES/phpwiki.mo
trunk/locale/fr/LC_MESSAGES/phpwiki.mo
trunk/locale/fr/LC_MESSAGES/phpwiki.php
trunk/locale/it/LC_MESSAGES/phpwiki.mo
trunk/locale/ja/LC_MESSAGES/phpwiki.mo
trunk/locale/nl/LC_MESSAGES/phpwiki.mo
trunk/locale/po/de.po
trunk/locale/po/es.po
trunk/locale/po/fr.po
trunk/locale/po/it.po
trunk/locale/po/ja.po
trunk/locale/po/nl.po
trunk/locale/po/phpwiki.pot
trunk/locale/po/sv.po
trunk/locale/po/zh.po
trunk/locale/sv/LC_MESSAGES/phpwiki.mo
trunk/locale/zh/LC_MESSAGES/phpwiki.mo
trunk/themes/default/templates/userprefs.tmpl
Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/de/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/de/LC_MESSAGES/phpwiki.php 2012-11-26 15:21:04 UTC (rev 8543)
+++ trunk/locale/de/LC_MESSAGES/phpwiki.php 2012-11-26 15:42:07 UTC (rev 8544)
@@ -1202,7 +1202,6 @@
$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 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";
Modified: trunk/locale/es/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/fr/LC_MESSAGES/phpwiki.php 2012-11-26 15:21:04 UTC (rev 8543)
+++ trunk/locale/fr/LC_MESSAGES/phpwiki.php 2012-11-26 15:42:07 UTC (rev 8544)
@@ -1256,7 +1256,6 @@
$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 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";
Modified: trunk/locale/it/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/ja/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/nl/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po 2012-11-26 15:21:04 UTC (rev 8543)
+++ trunk/locale/po/de.po 2012-11-26 15:42:07 UTC (rev 8544)
@@ -6,7 +6,7 @@
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-10-31 02:23+0200\n"
"Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
"<car...@us...>, Helmer Pardun <pardunpress@t-online."
@@ -1125,7 +1125,7 @@
msgstr "Seite gelöscht %s von Benutzer %s"
#: ../lib/MailNotify.php:406 ../lib/plugin/WikiAdminUtils.php:120
-#: ../lib/WikiUserNew.php:1803
+#: ../lib/WikiUserNew.php:1818
msgid "E-mail address confirmation"
msgstr "E-Mail Bestätigung"
@@ -7075,7 +7075,7 @@
msgid "Sign Out"
msgstr "Abmelden"
-#: ../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
@@ -7137,7 +7137,7 @@
#: ../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
@@ -7214,38 +7214,38 @@
msgid "Invalid username '%s' for LDAP Auth"
msgstr "Ungültiger Benutzername »%s« für 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 "Ungültiges Passwort."
-#: ../lib/WikiUserNew.php:686 ../lib/WikiUser.php:213
+#: ../lib/WikiUserNew.php:689 ../lib/WikiUser.php:213
msgid "Invalid password or userid."
msgstr "Ungültiges Passwort oder falscher Benutzername."
# (wörtlich=unzureichende Erlaubnisse)
-#: ../lib/WikiUserNew.php:698 ../lib/WikiUser.php:215
+#: ../lib/WikiUserNew.php:701 ../lib/WikiUser.php:215
msgid "Insufficient permissions."
msgstr "Keine ausreichenden Zugangsrechte."
-#: ../lib/WikiUserNew.php:742
+#: ../lib/WikiUserNew.php:745
msgid "Empty Preferences or format of UserPreferences cookie not recognised."
msgstr ""
"Leere BenutzerEinstellungen oder BenutzerEinstellungs Cookie nicht erkannt."
-#: ../lib/WikiUserNew.php:746
+#: ../lib/WikiUserNew.php:749
msgid "Default preferences will be used."
msgstr "Die Vorgabe Benutzereinstellungen werden verwendent."
-#: ../lib/WikiUserNew.php:1291
+#: ../lib/WikiUserNew.php:1294
msgid "The length of the password is shorter than the system policy allows."
msgstr "Die Länge des Passwortes ist kürzer als vom System gefordert."
-#: ../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"
@@ -7255,11 +7255,11 @@
"Sie können sich leider nicht anmelden.\n"
" Sie müssen den System Administrator bitten, Ihr Passwort neu zu setzen."
-#: ../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."
@@ -7267,12 +7267,12 @@
"Sie haben vergessen ENCRYPTED_PASSWD auf true zu setzen. Bitte aktualisieren "
"Sie config/config.ini und überprüfen sie auch ADMIN_PASSWD."
-#: ../lib/WikiUserNew.php:1345
+#: ../lib/WikiUserNew.php:1348
msgid "Please set ENCRYPTED_PASSWD to true in config/config.ini."
msgstr ""
"Sie haben vergessen ENCRYPTED_PASSWD auf true in config/config.ini zu setzen."
-#: ../lib/WikiUserNew.php:1804
+#: ../lib/WikiUserNew.php:1819
#, php-format
msgid ""
"Welcome to %s!\n"
@@ -7286,12 +7286,12 @@
"versenden.\n"
"Siehe %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 ""
@@ -8324,7 +8324,7 @@
msgstr "Bitte hier wiederholen"
#: ../themes/default/templates/userprefs.tmpl:154
-msgid "Your E-Mail"
+msgid "Your e-mail"
msgstr "Ihre E-Mail-Adresse"
#: ../themes/default/templates/userprefs.tmpl:163
Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po 2012-11-26 15:21:04 UTC (rev 8543)
+++ trunk/locale/po/es.po 2012-11-26 15:42:07 UTC (rev 8544)
@@ -11,7 +11,7 @@
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-02-01 00:50-0500\n"
"Last-Translator: Pablo Roca <pr...@cl...>\n"
"Language-Team: \n"
@@ -1106,7 +1106,7 @@
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 @@
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 @@
#: ../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 @@
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 @@
" 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 @@
"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 @@
"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 @@
msgstr ""
#: ../themes/default/templates/userprefs.tmpl:154
-msgid "Your E-Mail"
+msgid "Your e-mail"
msgstr ""
#: ../themes/default/templates/userprefs.tmpl:163
Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po 2012-11-26 15:21:04 UTC (rev 8543)
+++ trunk/locale/po/fr.po 2012-11-26 15:42:07 UTC (rev 8544)
@@ -6,7 +6,7 @@
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 <mei...@wa...>, Roland "
"Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -1101,7 +1101,7 @@
msgstr "L'utilisateur %s a supprimé la page %s"
#: ../lib/MailNotify.php:406 ../lib/plugin/WikiAdminUtils.php:120
-#: ../lib/WikiUserNew.php:1803
+#: ../lib/WikiUserNew.php:1818
msgid "E-mail address confirmation"
msgstr "Vérification de l'adresse électronique"
@@ -6983,7 +6983,7 @@
msgid "Sign Out"
msgstr "Se déconnecter"
-#: ../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
@@ -7045,7 +7045,7 @@
#: ../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
@@ -7122,36 +7122,36 @@
msgid "Invalid username '%s' for LDAP Auth"
msgstr "Utilisateur non valide « %s » dans l'annuaire LDAP"
-#: ../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 "Mot de passe invalide."
-#: ../lib/WikiUserNew.php:686 ../lib/WikiUser.php:213
+#: ../lib/WikiUserNew.php:689 ../lib/WikiUser.php:213
msgid "Invalid password or userid."
msgstr "Mot de passe ou utilisateur non valide :"
-#: ../lib/WikiUserNew.php:698 ../lib/WikiUser.php:215
+#: ../lib/WikiUserNew.php:701 ../lib/WikiUser.php:215
msgid "Insufficient permissions."
msgstr "Permissions insuffisantes."
-#: ../lib/WikiUserNew.php:742
+#: ../lib/WikiUserNew.php:745
msgid "Empty Preferences or format of UserPreferences cookie not recognised."
msgstr "PréférencesUtilisateurs vides, le cookie peut etre mal reconnu."
-#: ../lib/WikiUserNew.php:746
+#: ../lib/WikiUserNew.php:749
msgid "Default preferences will be used."
msgstr "Les préférences par défaut seront utilisées."
-#: ../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"
@@ -7160,12 +7160,12 @@
"La taille de votre mot de passe est trop petite, vous ne pouvez pas vous "
"connecter. Veuillez contacter l'administrateur pour le changer."
-#: ../lib/WikiUserNew.php:1332
+#: ../lib/WikiUserNew.php:1335
msgid "The crypt function is not available in this version of PHP."
msgstr ""
"La fonction de cryptage n'est pas disponible dans cette version 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."
@@ -7173,11 +7173,11 @@
"Veuillez définir ENCRYPTED_PASSWD à false dans config/config.ini et "
"probablement l'ADMIN_PASSWD."
-#: ../lib/WikiUserNew.php:1345
+#: ../lib/WikiUserNew.php:1348
msgid "Please set ENCRYPTED_PASSWD to true in config/config.ini."
msgstr "Veuillez définir ENCRYPTED_PASSWD à true dans config/config.ini."
-#: ../lib/WikiUserNew.php:1804
+#: ../lib/WikiUserNew.php:1819
#, php-format
msgid ""
"Welcome to %s!\n"
@@ -7190,12 +7190,12 @@
"sera utilisé pour les notifications de changements de pages.\n"
"Voir %s"
-#: ../lib/WikiUserNew.php:1866
+#: ../lib/WikiUserNew.php:1881
#, php-format
msgid "E-mail address '%s' is not properly formatted"
msgstr "L'adresse électronique « %s » ne semble pas être bien formée."
-#: ../lib/WikiUserNew.php:1870
+#: ../lib/WikiUserNew.php:1885
#, php-format
msgid "E-mail address '%s' is properly formatted"
msgstr "L'adresse électronique « %s » semble être bien formée."
@@ -8215,7 +8215,7 @@
msgstr "Retapez-le"
#: ../themes/default/templates/userprefs.tmpl:154
-msgid "Your E-Mail"
+msgid "Your e-mail"
msgstr "Votre adresse électronique"
#: ../themes/default/templates/userprefs.tmpl:163
Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po 2012-11-26 15:21:04 UTC (rev 8543)
+++ trunk/locale/po/it.po 2012-11-26 15:42:07 UTC (rev 8544)
@@ -7,7 +7,7 @@
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: 2005-02-12 16:23+0100\n"
"Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n"
"Language-Team: \n"
@@ -1092,7 +1092,7 @@
msgstr "Utente %s pagina %s rimossa"
#: ../lib/MailNotify.php:406 ../lib/plugin/WikiAdminUtils.php:120
-#: ../lib/WikiUserNew.php:1803
+#: ../lib/WikiUserNew.php:1818
msgid "E-mail address confirmation"
msgstr ""
@@ -6876,7 +6876,7 @@
msgid "Sign Out"
msgstr "Logout"
-#: ../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
@@ -6938,7 +6938,7 @@
#: ../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
@@ -7015,57 +7015,57 @@
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 "Password o nome utente errati."
-#: ../lib/WikiUserNew.php:698 ../lib/WikiUser.php:215
+#: ../lib/WikiUserNew.php:701 ../lib/WikiUser.php:215
msgid "Insufficient permissions."
msgstr "Permessi insufficienti."
-#: ../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"
@@ -7074,12 +7074,12 @@
"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 ""
@@ -8077,7 +8077,7 @@
msgstr ""
#: ../themes/default/templates/userprefs.tmpl:154
-msgid "Your E-Mail"
+msgid "Your e-mail"
msgstr ""
#: ../themes/default/templates/userprefs.tmpl:163
Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po 2012-11-26 15:21:04 UTC (rev 8543)
+++ trunk/locale/po/ja.po 2012-11-26 15:42:07 UTC (rev 8544)
@@ -6,7 +6,7 @@
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: 2003-06-07 09:01+0900\n"
"Last-Translator: Tadashi Jokagi <web...@el...>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
@@ -1082,7 +1082,7 @@
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 @@
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 @@
#: ../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 @@
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 @@
"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 @@
#: ../themes/default/templates/userprefs.tmpl:154
#, fuzzy
-msgid "Your E-Mail"
+msgid "Your e-mail"
msgstr "あなたのメールアドレス:"
#: ../themes/default/templates/userprefs.tmpl:163
Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po 2012-11-26 15:21:04 UTC (rev 8543)
+++ trunk/locale/po/nl.po 2012-11-26 15:42:07 UTC (rev 8544)
@@ -8,7 +8,7 @@
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 <ja...@gn...>\n"
"Language-Team: Dutch <nl...@li...>\n"
@@ -1084,7 +1084,7 @@
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 @@
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 @@
#: ../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 @@
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 @@
"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 @@
msgstr ""
#: ../themes/default/templates/userprefs.tmpl:154
-msgid "Your E-Mail"
+msgid "Your e-mail"
msgstr ""
#: ../themes/default/templates/userprefs.tmpl:163
Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot 2012-11-26 15:21:04 UTC (rev 8543)
+++ trunk/locale/po/phpwiki.pot 2012-11-26 15:42:07 UTC (rev 8544)
@@ -6,7 +6,7 @@
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 <ru...@us...>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
@@ -1077,7 +1077,7 @@
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 @@
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 @@
#: ../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 @@
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 @@
"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 @@
msgstr ""
#: ../themes/default/templates/userprefs.tmpl:154
-msgid "Your E-Mail"
+msgid "Your e-mail"
msgstr ""
#: ../themes/default/templates/userprefs.tmpl:163
Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po 2012-11-26 15:21:04 UTC (rev 8543)
+++ trunk/locale/po/sv.po 2012-11-26 15:42:07 UTC (rev 8544)
@@ -7,7 +7,7 @@
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 <jo...@he...>\n"
"Language-Team: \n"
@@ -1078,7 +1078,7 @@
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 @@
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 @@
#: ../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 @@
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 @@
"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 @@
msgstr ""
#: ../themes/default/templates/userprefs.tmpl:154
-msgid "Your E-Mail"
+msgid "Your e-mail"
msgstr ""
#: ../themes/default/templates/userprefs.tmpl:163
Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po 2012-11-26 15:21:04 UTC (rev 8543)
+++ trunk/locale/po/zh.po 2012-11-26 15:42:07 UTC (rev 8544)
@@ -6,7 +6,7 @@
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 <dr...@us...>\n"
"Language-Team: DruryL <dr...@us...>\n"
@@ -1126,7 +1126,7 @@
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 @@
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 @@
#: ../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 @@
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 @@
"密碼長度小於系統原則所允許的長度. 抱歉,你無法登入. \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 @@
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 @@
" 你的 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 @@
#: ../themes/default/templates/userprefs.tmpl:154
#, fuzzy
-msgid "Your E-Mail"
+msgid "Your e-mail"
msgstr "你的 E-Mail:"
#: ../themes/default/templates/userprefs.tmpl:163
Modified: trunk/locale/sv/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/themes/default/templates/userprefs.tmpl
===================================================================
--- trunk/themes/default/templates/userprefs.tmpl 2012-11-26 15:21:04 UTC (rev 8543)
+++ trunk/themes/default/templates/userprefs.tmpl 2012-11-26 15:42:07 UTC (rev 8544)
@@ -151,7 +151,7 @@
<tr><td>
<p>
- <?php echo _("Your E-Mail"). _(":")?>
+ <?php echo _("Your e-mail"). _(":")?>
<?php if ($isForm) { ?>
<input type="text" name="pref[email]" size="30" maxlength="60"
value="<?php echo $pref->get('email')?>" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
