Menu
▾
▴
[phpwiki-checkins] SF.net SVN: phpwiki:[8546] trunk
|
From: <var...@us...> - 2012-11-26 17:15:01
|
Revision: 8546
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8546&view=rev
Author: vargenau
Date: 2012-11-26 17:14:51 +0000 (Mon, 26 Nov 2012)
Log Message:
-----------
Be consistent: use e-mail
Modified Paths:
--------------
trunk/lib/WikiUserNew.php
trunk/lib/editpage.php
trunk/lib/plugin/ModeratedPage.php
trunk/lib/plugin/PasswordReset.php
trunk/lib/plugin/WatchPage.php
trunk/locale/de/LC_MESSAGES/phpwiki.mo
trunk/locale/de/LC_MESSAGES/phpwiki.php
trunk/locale/es/LC_MESSAGES/phpwiki.mo
trunk/locale/es/LC_MESSAGES/phpwiki.php
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
Modified: trunk/lib/WikiUserNew.php
===================================================================
--- trunk/lib/WikiUserNew.php 2012-11-26 15:56:20 UTC (rev 8545)
+++ trunk/lib/WikiUserNew.php 2012-11-26 17:14:51 UTC (rev 8546)
@@ -1816,7 +1816,7 @@
if (!empty($value) and !$verified) {
list($ok, $msg) = ValidateMail($value);
if ($ok and mail($value, "[" . WIKI_NAME . "] " . _("E-mail address confirmation"),
- sprintf(_("Welcome to %s!\nYour email account is verified and\nwill be used to send page change notifications.\nSee %s"),
+ sprintf(_("Welcome to %s!\nYour e-mail account is verified and\nwill be used to send page change notifications.\nSee %s"),
WIKI_NAME, WikiURL($GLOBALS['request']->getArg('pagename'), '', true)))
) {
$this->set('emailVerified', 1);
Modified: trunk/lib/editpage.php
===================================================================
--- trunk/lib/editpage.php 2012-11-26 15:56:20 UTC (rev 8545)
+++ trunk/lib/editpage.php 2012-11-26 17:14:51 UTC (rev 8546)
@@ -574,7 +574,7 @@
return
HTML(HTML::h2(WikiLink(_("ModeratedPage"))),
HTML::p(fmt("You can edit away, but your changes will have to be approved by the defined moderators at the definition in %s", WikiLink(_("ModeratedPage")))),
- HTML::p(fmt("The approval has a grace period of 5 days. If you have your E-Mail defined in your %s, you will get a notification of approval or rejection.",
+ HTML::p(fmt("The approval has a grace period of 5 days. If you have your e-mail defined in your %s, you will get a notification of approval or rejection.",
WikiLink(_("UserPreferences")))));
}
Modified: trunk/lib/plugin/ModeratedPage.php
===================================================================
--- trunk/lib/plugin/ModeratedPage.php 2012-11-26 15:56:20 UTC (rev 8545)
+++ trunk/lib/plugin/ModeratedPage.php 2012-11-26 17:14:51 UTC (rev 8546)
@@ -154,7 +154,7 @@
$status = $this->getSiteStatus($request, $action_page);
if (is_array($status)) {
if (empty($status['emails'])) {
- trigger_error(_("ModeratedPage: No emails for the moderators defined"),
+ trigger_error(_("ModeratedPage: No e-mails for the moderators defined"),
E_USER_WARNING);
return false;
}
@@ -180,7 +180,7 @@
if (is_array($status)) {
if (empty($status['emails'])) {
// We really should present such warnings prominently.
- trigger_error(_("ModeratedPage: No emails for the moderators defined"),
+ trigger_error(_("ModeratedPage: No e-mails for the moderators defined"),
E_USER_WARNING);
return false;
}
@@ -228,7 +228,7 @@
$moderated['status'] = $status;
}
if (empty($status['emails'])) {
- trigger_error(_("ModeratedPage: No emails for the moderators defined"),
+ trigger_error(_("ModeratedPage: No e-mails for the moderators defined"),
E_USER_WARNING);
return true;
}
@@ -261,7 +261,7 @@
$action,
join(", ", $status['moderators'])
));
- // Send email
+ // Send e-mail
require_once 'lib/MailNotify.php';
$pagename = $page->getName();
$mailer = new MailNotify($pagename);
@@ -283,7 +283,7 @@
//DELETEME!
$page->set('moderated', $moderated);
//FIXME: This msg gets lost on the edit redirect
- trigger_error(_("ModeratedPage Notification Error: Couldn't send email"),
+ trigger_error(_("ModeratedPage Notification Error: Couldn't send e-mail"),
E_USER_ERROR);
return true;
}
Modified: trunk/lib/plugin/PasswordReset.php
===================================================================
--- trunk/lib/plugin/PasswordReset.php 2012-11-26 15:56:20 UTC (rev 8545)
+++ trunk/lib/plugin/PasswordReset.php 2012-11-26 17:14:51 UTC (rev 8546)
@@ -25,7 +25,7 @@
* => action=email&user=username will send the password per email in plaintext.
*
* If no email is stored, because user might not exist,
- * => "No email stored for user %s.
+ * => "No e-mail stored for user %s.
* You need to ask an Administrator to reset this password."
* Problem: How to contact Admin? Present a link to ADMIN_USER
*
@@ -85,10 +85,10 @@
"From: $from")
)
$alert = new Alert(_("Message"),
- fmt("Email sent to the stored email address for user %s", $userid));
+ fmt("E-mail sent to the stored e-mail address for user %s", $userid));
else
$alert = new Alert(_("Error"),
- fmt("Error sending email with password for user %s.", $userid));
+ fmt("Error sending e-mail with password for user %s.", $userid));
$alert->show();
}
@@ -106,7 +106,7 @@
if (!$footer) {
$isadmin = $request->_user->isAdmin();
$footer = HTML::p(Button('submit:admin_reset[reset]',
- $isadmin ? _("Yes") : _("Send email"),
+ $isadmin ? _("Yes") : _("Send e-mail"),
$isadmin ? 'wikiadmin' : 'button'),
HTML::Raw(' '),
Button('submit:admin_reset[cancel]', _("Cancel"), 'button'));
@@ -150,7 +150,7 @@
//TODO: verify should check if the user exists, his prefs can be read/safed
// and the email is verified, even if admin.
$buttons = HTML::p(Button('submit:admin_reset[reset]',
- $isadmin ? _("Yes") : _("Send email"),
+ $isadmin ? _("Yes") : _("Send e-mail"),
$isadmin ? 'wikiadmin' : 'button'),
HTML::Raw(' '),
Button('submit:admin_reset[cancel]', _("Cancel"), 'button'));
@@ -168,7 +168,7 @@
$email = $prefs->get('email');
if (!$email) {
$alert = new Alert(_("Error"),
- HTML(fmt("No email stored for user %s.", $userid),
+ HTML(fmt("No e-mail stored for user %s.", $userid),
HTML::br(),
fmt("You need to ask an Administrator to reset this password. See below: "),
HTML::br(), WikiLink(ADMIN_USER)));
@@ -183,7 +183,7 @@
$header,
HTML(HTML::hr(),
fmt("Do you really want to reset the password of user %s?", $userid),
- $isadmin ? '' : _("An email will be sent."),
+ $isadmin ? '' : _("An e-mail will be sent."),
HiddenInputs(array('admin_reset[verify]' => 1, 'user' => $userid)),
$buttons));
} else { // verify ok, but no userid
Modified: trunk/lib/plugin/WatchPage.php
===================================================================
--- trunk/lib/plugin/WatchPage.php 2012-11-26 15:56:20 UTC (rev 8545)
+++ trunk/lib/plugin/WatchPage.php 2012-11-26 17:14:51 UTC (rev 8546)
@@ -22,7 +22,7 @@
*/
/**
- * Plugin to manage notifications emails per page. action=WatchPage
+ * Plugin to manage notifications e-mails per page. action=WatchPage
* mode = add or edit
* pagename = pagename to be added
*
@@ -39,7 +39,7 @@
function getDescription()
{
- return _("Manage notifications emails per page.");
+ return _("Manage notifications e-mails per page.");
}
function getDefaultArguments()
@@ -125,7 +125,7 @@
if (empty($email)) {
return HTML::p(
array('class' => 'error'),
- _("ERROR: No email defined! You need to do this in your "),
+ _("ERROR: No e-mail defined! You need to do this in your "),
WikiLink(_("UserPreferences")));
}
$emailVerified = $pref->get("emailVerified");
@@ -163,7 +163,7 @@
$request->_setUser($user);
$request->setArg("verify", false);
$request->setArg("add", false);
- $errmsg .= _("E-Mail Notification for the current page successfully stored in your preferences.");
+ $errmsg .= _("E-mail notification for the current page successfully stored in your preferences.");
$args['errmsg'] = HTML::div(array('class' => 'feedback'), HTML::p($errmsg));
return Template('userprefs', $args);
}
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:56:20 UTC (rev 8545)
+++ trunk/locale/de/LC_MESSAGES/phpwiki.php 2012-11-26 17:14:51 UTC (rev 8546)
@@ -396,7 +396,7 @@
$locale["Enter your UserId to sign in"] = "Tragen Sie bitte für die Anmeldung im Wiki Ihren Benutzernamen ein";
$locale["Entry on %s by %s."] = "Kommentar zu %s von %s.";
$locale["Enumeration"] = "Num. Liste";
-$locale["Error sending email with password for user %s."] = "Fehler beim Versenden der E-Mail mit dem neuen Passwort für Benutzer %s.";
+$locale["Error sending e-mail with password for user %s."] = "Fehler beim Versenden der E-Mail mit dem neuen Passwort für Benutzer %s.";
$locale["Error: Couldn't send %s to %s"] = "Fehler: Konnte nicht %s an %s senden";
$locale["Error: Empty search string."] = "Fehler: Leeres Suchwort.";
$locale["Error: The user HomePage must be a valid WikiWord. Sorry, UserPreferences cannot be saved."] = "Fehler: Ihre Homepage Seite muß ein gültiges WikiWord sein. Die BenutzerEinstellungen können deshalb leider nicht gespeichert werden.";
@@ -632,8 +632,8 @@
$locale["Missing PagePermission:"] = "Fehlende Zugriffsberechtigung:";
$locale["Missing ldap extension"] = "Fehlende php LDAP extension";
$locale["ModeratedPage"] = "ModerierteSeite";
-$locale["ModeratedPage Notification Error: Couldn't send email"] = "ModerierteSeite Benachrichtigungsfehler: Konnte kein E-Mail versenden";
-$locale["ModeratedPage: No emails for the moderators defined"] = "ModerierteSeite: Keine E-Mails für Moderatoren definiert";
+$locale["ModeratedPage Notification Error: Couldn't send e-mail"] = "ModerierteSeite Benachrichtigungsfehler: Konnte kein E-Mail versenden";
+$locale["ModeratedPage: No e-mails for the moderators defined"] = "ModerierteSeite: Keine E-Mails für Moderatoren definiert";
$locale["Modern"] = "Modern";
$locale["Modified"] = "Geändert";
$locale["Modified on %s by %s"] = "Kommentare am %s geändert von %s";
@@ -932,7 +932,7 @@
$locale["Semantic relations for %s"] = "Semantische Beziehungen für %s";
$locale["SemanticRelations"] = "SemantischeBeziehungen";
$locale["SemanticSearch"] = "SemantischeSuche";
-$locale["Send email"] = "Versende E-Mail";
+$locale["Send e-mail"] = "Versende E-Mail";
$locale["Serialized file %s"] = "Serialisierte Datei %s";
$locale["Set Password"] = "Setze Passwort";
$locale["Set USE_DB_SESSION to false."] = "Setzen Sie USE_DB_SESSION auf false.";
@@ -1151,7 +1151,7 @@
$locale["Watch Page"] = "Seite beobarchten";
$locale["WatchPage"] = "SeiteBeobarten";
$locale["We have a total of %d registered users."] = "Wir haben insgesamt %d registrierte Benutzer.";
-$locale["Welcome to %s!\nYour email account is verified and\nwill be used to send page change notifications.\nSee %s"] = "Willkommen bei %s!\nIhr E-Mail Konto ist bestätigt und\nwird benutzt, um SeitenÄnderungs Benachrichtigungen per E-Mail zu versenden.\nSiehe %s";
+$locale["Welcome to %s!\nYour e-mail account is verified and\nwill be used to send page change notifications.\nSee %s"] = "Willkommen bei %s!\nIhr E-Mail Konto ist bestätigt und\nwird benutzt, um SeitenÄnderungs Benachrichtigungen per E-Mail zu versenden.\nSiehe %s";
$locale["What links here"] = "Was verlinkt hierher";
$locale["Who Is Online"] = "Wer ist Online";
$locale["Who is Online"] = "Wer ist Online";
Modified: trunk/locale/es/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/es/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/es/LC_MESSAGES/phpwiki.php 2012-11-26 15:56:20 UTC (rev 8545)
+++ trunk/locale/es/LC_MESSAGES/phpwiki.php 2012-11-26 17:14:51 UTC (rev 8546)
@@ -497,7 +497,7 @@
$locale["View this page and all subpages"] = "Opinión esta página y todas las páginas secundaria";
$locale["W"] = "An";
$locale["WARNING: InterWikiMap page is unlocked, so not using those links."] = "ADVERTENCIA: Se abre la página de InterMapaDeWiki, tan no usando esos acoplamientos.";
-$locale["Welcome to %s!\nYour email account is verified and\nwill be used to send page change notifications.\nSee %s"] = "¡Recepción a %s!\nSe verifica y será utilizada su cuenta del email\npara enviar notificaciones del cambio de la página.\nVea %s";
+$locale["Welcome to %s!\nYour e-mail account is verified and\nwill be used to send page change notifications.\nSee %s"] = "¡Recepción a %s!\nSe verifica y será utilizada su cuenta del email\npara enviar notificaciones del cambio de la página.\nVea %s";
$locale["Width"] = "Anchura";
$locale["Wiki Admin"] = "Administración de Wiki";
$locale["Wiki Name"] = "Nombre de la Wiki";
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:56:20 UTC (rev 8545)
+++ trunk/locale/fr/LC_MESSAGES/phpwiki.php 2012-11-26 17:14:51 UTC (rev 8546)
@@ -166,7 +166,7 @@
$locale["AppendText"] = "ApposezLeTexte";
$locale["Application name"] = "Nom de l'application";
$locale["Application size: %d KiB"] = "Taille de l'application : %d Kio";
-$locale["Apply changes"] = "Appliquer les changements.";
+$locale["Apply changes"] = "Appliquer les changements";
$locale["Approve"] = "Approuver";
$locale["Archives"] = "Archives";
$locale["Are you sure you want to change the owner of the selected pages?"] = "Êtes-vous sûr de vouloir changer le propriétaire des pages sélectionnées ?";
@@ -361,7 +361,7 @@
$locale["Do you %s want to add this page \"%s\" to your WatchList?"] = "Voulez-vous %s ajouter la page « %s » à votre liste de suivi ?";
$locale["Do you really want to create the page '%s'?"] = "Voulez-vous réellement créer la page « %s » ?";
$locale["Do you really want to reset all your UserPreferences?"] = "Voulez-vous réellement réinitialiser toutes vos préférences ?";
-$locale["Do you really want to reset the password of user %s?"] = "Voulez-vous réellement réinitialiser les mot de passe de %s ?";
+$locale["Do you really want to reset the password of user %s?"] = "Voulez-vous réellement réinitialiser le mot de passe de %s ?";
$locale["Don't cache this page."] = "Ne pas mettre en cache cette page.";
$locale["Double redirect not allowed."] = "La double redirection interdit.";
$locale["Download all revisions for backup"] = "Télécharger toutes les versions pour sauvegarder";
@@ -384,7 +384,7 @@
$locale["E-mail address '%s' is properly formatted"] = "L'adresse électronique « %s » semble être bien formée.";
$locale["E-mail address confirmation"] = "Vérification de l'adresse électronique";
$locale["ERROR uploading '%s'"] = "ERREUR en déposant « %s » : ";
-$locale["ERROR: No email defined! You need to do this in your "] = "ERREUR : pas d'adresse électronique définie! Vous devez le faire dans vos ";
+$locale["ERROR: No e-mail defined! You need to do this in your "] = "ERREUR : pas d'adresse électronique définie! Vous devez le faire dans vos ";
$locale["Easy navigation buttons for %s"] = "Boutons de navigation rapide pour %s";
$locale["Edit"] = "Modifier";
$locale["Edit %s"] = "Éditer %s";
@@ -653,8 +653,8 @@
$locale["Missing %s for %s"] = "Il manque %s pour %s";
$locale["Missing PagePermission:"] = "Permission de page individuelle absente :";
$locale["ModeratedPage"] = "PageModérée";
-$locale["ModeratedPage Notification Error: Couldn't send email"] = "Erreur lors des notifications de page: Impossible d'envoyer";
-$locale["ModeratedPage: No emails for the moderators defined"] = "PageModerée: No emails for the moderators defined";
+$locale["ModeratedPage Notification Error: Couldn't send e-mail"] = "Erreur lors des notifications de page: Impossible d'envoyer";
+$locale["ModeratedPage: No e-mails for the moderators defined"] = "PageModerée: No e-mails for the moderators defined";
$locale["Modern"] = "Moderne";
$locale["Modified"] = "Modifié";
$locale["Modified on %s by %s"] = "Modifié le %s par %s";
@@ -972,7 +972,7 @@
$locale["Selected Grant checkboxes allow access, unselected checkboxes deny access."] = "Les cases sélectionnées autorisent l'accès, sinon elles l'interdisent.";
$locale["Selected Pages: "] = "Pages sélectionnées : ";
$locale["Semantic relations for %s"] = "Relations sémantiques pour %s";
-$locale["Send email"] = "Envoyer message";
+$locale["Send e-mail"] = "Envoyer message";
$locale["Serialized file %s"] = "Fichier sérialisé %s";
$locale["Set Password"] = "Choisir un mot de passe";
$locale["Set USE_DB_SESSION to false."] = "Mettre USE_DB_SESSION à false.";
@@ -1213,7 +1213,7 @@
$locale["WatchPage"] = "Suivre";
$locale["WatchPage cancelled"] = "Surveillance de la page annulée";
$locale["We have a total of %d registered users."] = "Nous avons %d utilisateurs enregistrés.";
-$locale["Welcome to %s!\nYour email account is verified and\nwill be used to send page change notifications.\nSee %s"] = "Bienvenue sur %s!\nVotre compte email a été vérifié et\nsera utilisé pour les notifications de changements de pages.\nVoir %s";
+$locale["Welcome to %s!\nYour e-mail account is verified and\nwill be used to send page change notifications.\nSee %s"] = "Bienvenue sur %s!\nVotre adresse électronique a été vérifiée et\nsera utilisée pour les notifications de changements de pages.\nVoir %s";
$locale["What links here"] = "Pages liées";
$locale["Who Is Online"] = "Qui est en ligne";
$locale["Who is Online"] = "Qui est en ligne";
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:56:20 UTC (rev 8545)
+++ trunk/locale/po/de.po 2012-11-26 17:14:51 UTC (rev 8546)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 16:54+0100\n"
+"POT-Creation-Date: 2012-11-26 18:11+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."
@@ -389,7 +389,7 @@
#: ../lib/editpage.php:577
#, php-format
msgid ""
-"The approval has a grace period of 5 days. If you have your E-Mail defined "
+"The approval has a grace period of 5 days. If you have your e-mail defined "
"in your %s, you will get a notification of approval or rejection."
msgstr ""
@@ -3042,7 +3042,7 @@
#: ../lib/plugin/ModeratedPage.php:157 ../lib/plugin/ModeratedPage.php:183
#: ../lib/plugin/ModeratedPage.php:231
-msgid "ModeratedPage: No emails for the moderators defined"
+msgid "ModeratedPage: No e-mails for the moderators defined"
msgstr "ModerierteSeite: Keine E-Mails für Moderatoren definiert"
#: ../lib/plugin/ModeratedPage.php:163
@@ -3072,7 +3072,7 @@
msgstr ""
#: ../lib/plugin/ModeratedPage.php:286
-msgid "ModeratedPage Notification Error: Couldn't send email"
+msgid "ModeratedPage Notification Error: Couldn't send e-mail"
msgstr "ModerierteSeite Benachrichtigungsfehler: Konnte kein E-Mail versenden"
#: ../lib/plugin/ModeratedPage.php:366
@@ -3434,12 +3434,12 @@
#: ../lib/plugin/PasswordReset.php:88
#, php-format
-msgid "Email sent to the stored email address for user %s"
+msgid "E-mail sent to the stored e-mail address for user %s"
msgstr ""
#: ../lib/plugin/PasswordReset.php:91
#, php-format
-msgid "Error sending email with password for user %s."
+msgid "Error sending e-mail with password for user %s."
msgstr ""
"Fehler beim Versenden der E-Mail mit dem neuen Passwort für Benutzer %s."
@@ -3448,7 +3448,7 @@
msgstr "Setze Passwort für Benutzer zurück: "
#: ../lib/plugin/PasswordReset.php:109 ../lib/plugin/PasswordReset.php:153
-msgid "Send email"
+msgid "Send e-mail"
msgstr "Versende E-Mail"
#: ../lib/plugin/PasswordReset.php:139
@@ -3465,7 +3465,7 @@
#: ../lib/plugin/PasswordReset.php:171
#, php-format
-msgid "No email stored for user %s."
+msgid "No e-mail stored for user %s."
msgstr ""
#: ../lib/plugin/PasswordReset.php:173
@@ -3478,7 +3478,7 @@
msgstr ""
#: ../lib/plugin/PasswordReset.php:186
-msgid "An email will be sent."
+msgid "An e-mail will be sent."
msgstr ""
#: ../lib/plugin/PhotoAlbum.php:100 ../themes/blog/templates/actionbar.tmpl:8
@@ -5132,7 +5132,7 @@
msgstr "SeiteBeobarten"
#: ../lib/plugin/WatchPage.php:42
-msgid "Manage notifications emails per page."
+msgid "Manage notifications e-mails per page."
msgstr ""
#: ../lib/plugin/WatchPage.php:84
@@ -5179,7 +5179,7 @@
msgstr "Sie müssen sich anmelden um Seiten zu beobarchten."
#: ../lib/plugin/WatchPage.php:128
-msgid "ERROR: No email defined! You need to do this in your "
+msgid "ERROR: No e-mail defined! You need to do this in your "
msgstr ""
#: ../lib/plugin/WatchPage.php:145
@@ -5189,7 +5189,7 @@
#: ../lib/plugin/WatchPage.php:166
msgid ""
-"E-Mail Notification for the current page successfully stored in your "
+"E-mail notification for the current page successfully stored in your "
"preferences."
msgstr ""
@@ -7278,7 +7278,7 @@
#, php-format
msgid ""
"Welcome to %s!\n"
-"Your email account is verified and\n"
+"Your e-mail account is verified and\n"
"will be used to send page change notifications.\n"
"See %s"
msgstr ""
Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po 2012-11-26 15:56:20 UTC (rev 8545)
+++ trunk/locale/po/es.po 2012-11-26 17:14:51 UTC (rev 8546)
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 16:54+0100\n"
+"POT-Creation-Date: 2012-11-26 18:11+0100\n"
"PO-Revision-Date: 2000-02-01 00:50-0500\n"
"Last-Translator: Pablo Roca <pr...@cl...>\n"
"Language-Team: \n"
@@ -387,7 +387,7 @@
#: ../lib/editpage.php:577
#, php-format
msgid ""
-"The approval has a grace period of 5 days. If you have your E-Mail defined "
+"The approval has a grace period of 5 days. If you have your e-mail defined "
"in your %s, you will get a notification of approval or rejection."
msgstr ""
@@ -2994,7 +2994,7 @@
#: ../lib/plugin/ModeratedPage.php:157 ../lib/plugin/ModeratedPage.php:183
#: ../lib/plugin/ModeratedPage.php:231
-msgid "ModeratedPage: No emails for the moderators defined"
+msgid "ModeratedPage: No e-mails for the moderators defined"
msgstr ""
#: ../lib/plugin/ModeratedPage.php:163
@@ -3024,7 +3024,7 @@
msgstr ""
#: ../lib/plugin/ModeratedPage.php:286
-msgid "ModeratedPage Notification Error: Couldn't send email"
+msgid "ModeratedPage Notification Error: Couldn't send e-mail"
msgstr ""
#: ../lib/plugin/ModeratedPage.php:366
@@ -3358,12 +3358,12 @@
#: ../lib/plugin/PasswordReset.php:88
#, php-format
-msgid "Email sent to the stored email address for user %s"
+msgid "E-mail sent to the stored e-mail address for user %s"
msgstr ""
#: ../lib/plugin/PasswordReset.php:91
#, php-format
-msgid "Error sending email with password for user %s."
+msgid "Error sending e-mail with password for user %s."
msgstr ""
#: ../lib/plugin/PasswordReset.php:99
@@ -3371,7 +3371,7 @@
msgstr "Restablecimiento de la contraseña de usuario: "
#: ../lib/plugin/PasswordReset.php:109 ../lib/plugin/PasswordReset.php:153
-msgid "Send email"
+msgid "Send e-mail"
msgstr ""
#: ../lib/plugin/PasswordReset.php:139
@@ -3388,7 +3388,7 @@
#: ../lib/plugin/PasswordReset.php:171
#, php-format
-msgid "No email stored for user %s."
+msgid "No e-mail stored for user %s."
msgstr ""
#: ../lib/plugin/PasswordReset.php:173
@@ -3401,7 +3401,7 @@
msgstr ""
#: ../lib/plugin/PasswordReset.php:186
-msgid "An email will be sent."
+msgid "An e-mail will be sent."
msgstr ""
#: ../lib/plugin/PhotoAlbum.php:100 ../themes/blog/templates/actionbar.tmpl:8
@@ -5012,7 +5012,7 @@
msgstr ""
#: ../lib/plugin/WatchPage.php:42
-msgid "Manage notifications emails per page."
+msgid "Manage notifications e-mails per page."
msgstr ""
#: ../lib/plugin/WatchPage.php:84
@@ -5059,7 +5059,7 @@
msgstr ""
#: ../lib/plugin/WatchPage.php:128
-msgid "ERROR: No email defined! You need to do this in your "
+msgid "ERROR: No e-mail defined! You need to do this in your "
msgstr ""
#: ../lib/plugin/WatchPage.php:145
@@ -5069,7 +5069,7 @@
#: ../lib/plugin/WatchPage.php:166
msgid ""
-"E-Mail Notification for the current page successfully stored in your "
+"E-mail notification for the current page successfully stored in your "
"preferences."
msgstr ""
@@ -7113,7 +7113,7 @@
#, php-format
msgid ""
"Welcome to %s!\n"
-"Your email account is verified and\n"
+"Your e-mail account is verified and\n"
"will be used to send page change notifications.\n"
"See %s"
msgstr ""
Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po 2012-11-26 15:56:20 UTC (rev 8545)
+++ trunk/locale/po/fr.po 2012-11-26 17:14:51 UTC (rev 8546)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 16:54+0100\n"
+"POT-Creation-Date: 2012-11-26 18:11+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."
@@ -385,7 +385,7 @@
#: ../lib/editpage.php:577
#, php-format
msgid ""
-"The approval has a grace period of 5 days. If you have your E-Mail defined "
+"The approval has a grace period of 5 days. If you have your e-mail defined "
"in your %s, you will get a notification of approval or rejection."
msgstr ""
@@ -3004,8 +3004,8 @@
#: ../lib/plugin/ModeratedPage.php:157 ../lib/plugin/ModeratedPage.php:183
#: ../lib/plugin/ModeratedPage.php:231
-msgid "ModeratedPage: No emails for the moderators defined"
-msgstr "PageModerée: No emails for the moderators defined"
+msgid "ModeratedPage: No e-mails for the moderators defined"
+msgstr "PageModerée: No e-mails for the moderators defined"
#: ../lib/plugin/ModeratedPage.php:163
#, php-format
@@ -3034,7 +3034,7 @@
msgstr ""
#: ../lib/plugin/ModeratedPage.php:286
-msgid "ModeratedPage Notification Error: Couldn't send email"
+msgid "ModeratedPage Notification Error: Couldn't send e-mail"
msgstr "Erreur lors des notifications de page: Impossible d'envoyer"
#: ../lib/plugin/ModeratedPage.php:366
@@ -3375,12 +3375,12 @@
#: ../lib/plugin/PasswordReset.php:88
#, php-format
-msgid "Email sent to the stored email address for user %s"
+msgid "E-mail sent to the stored e-mail address for user %s"
msgstr ""
#: ../lib/plugin/PasswordReset.php:91
#, php-format
-msgid "Error sending email with password for user %s."
+msgid "Error sending e-mail with password for user %s."
msgstr ""
#: ../lib/plugin/PasswordReset.php:99
@@ -3388,7 +3388,7 @@
msgstr ""
#: ../lib/plugin/PasswordReset.php:109 ../lib/plugin/PasswordReset.php:153
-msgid "Send email"
+msgid "Send e-mail"
msgstr "Envoyer message"
#: ../lib/plugin/PasswordReset.php:139
@@ -3405,7 +3405,7 @@
#: ../lib/plugin/PasswordReset.php:171
#, php-format
-msgid "No email stored for user %s."
+msgid "No e-mail stored for user %s."
msgstr ""
#: ../lib/plugin/PasswordReset.php:173
@@ -3415,10 +3415,10 @@
#: ../lib/plugin/PasswordReset.php:185
#, php-format
msgid "Do you really want to reset the password of user %s?"
-msgstr "Voulez-vous réellement réinitialiser les mot de passe de %s ?"
+msgstr "Voulez-vous réellement réinitialiser le mot de passe de %s ?"
#: ../lib/plugin/PasswordReset.php:186
-msgid "An email will be sent."
+msgid "An e-mail will be sent."
msgstr ""
#: ../lib/plugin/PhotoAlbum.php:100 ../themes/blog/templates/actionbar.tmpl:8
@@ -5064,7 +5064,7 @@
msgstr "Suivre"
#: ../lib/plugin/WatchPage.php:42
-msgid "Manage notifications emails per page."
+msgid "Manage notifications e-mails per page."
msgstr ""
#: ../lib/plugin/WatchPage.php:84
@@ -5111,7 +5111,7 @@
msgstr "Vous devez vous identifier pour surveiller des pages."
#: ../lib/plugin/WatchPage.php:128
-msgid "ERROR: No email defined! You need to do this in your "
+msgid "ERROR: No e-mail defined! You need to do this in your "
msgstr ""
"ERREUR : pas d'adresse électronique définie! Vous devez le faire dans vos "
@@ -5121,7 +5121,7 @@
#: ../lib/plugin/WatchPage.php:166
msgid ""
-"E-Mail Notification for the current page successfully stored in your "
+"E-mail notification for the current page successfully stored in your "
"preferences."
msgstr ""
@@ -7183,13 +7183,13 @@
#, php-format
msgid ""
"Welcome to %s!\n"
-"Your email account is verified and\n"
+"Your e-mail account is verified and\n"
"will be used to send page change notifications.\n"
"See %s"
msgstr ""
"Bienvenue sur %s!\n"
-"Votre compte email a été vérifié et\n"
-"sera utilisé pour les notifications de changements de pages.\n"
+"Votre adresse électronique a été vérifiée et\n"
+"sera utilisée pour les notifications de changements de pages.\n"
"Voir %s"
#: ../lib/WikiUserNew.php:1881
@@ -7281,7 +7281,7 @@
#: ../lib/WysiwygEdit/Wikiwyg.php:72
msgid "Apply changes"
-msgstr "Appliquer les changements."
+msgstr "Appliquer les changements"
#: ../lib/WysiwygEdit/Wikiwyg.php:73
msgid "Exit toolbar"
Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po 2012-11-26 15:56:20 UTC (rev 8545)
+++ trunk/locale/po/it.po 2012-11-26 17:14:51 UTC (rev 8546)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 16:54+0100\n"
+"POT-Creation-Date: 2012-11-26 18:11+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"
@@ -376,7 +376,7 @@
#: ../lib/editpage.php:577
#, php-format
msgid ""
-"The approval has a grace period of 5 days. If you have your E-Mail defined "
+"The approval has a grace period of 5 days. If you have your e-mail defined "
"in your %s, you will get a notification of approval or rejection."
msgstr ""
@@ -2974,7 +2974,7 @@
#: ../lib/plugin/ModeratedPage.php:157 ../lib/plugin/ModeratedPage.php:183
#: ../lib/plugin/ModeratedPage.php:231
-msgid "ModeratedPage: No emails for the moderators defined"
+msgid "ModeratedPage: No e-mails for the moderators defined"
msgstr ""
#: ../lib/plugin/ModeratedPage.php:163
@@ -3004,7 +3004,7 @@
msgstr ""
#: ../lib/plugin/ModeratedPage.php:286
-msgid "ModeratedPage Notification Error: Couldn't send email"
+msgid "ModeratedPage Notification Error: Couldn't send e-mail"
msgstr ""
#: ../lib/plugin/ModeratedPage.php:366
@@ -3338,12 +3338,12 @@
#: ../lib/plugin/PasswordReset.php:88
#, php-format
-msgid "Email sent to the stored email address for user %s"
+msgid "E-mail sent to the stored e-mail address for user %s"
msgstr ""
#: ../lib/plugin/PasswordReset.php:91
#, php-format
-msgid "Error sending email with password for user %s."
+msgid "Error sending e-mail with password for user %s."
msgstr ""
#: ../lib/plugin/PasswordReset.php:99
@@ -3351,7 +3351,7 @@
msgstr ""
#: ../lib/plugin/PasswordReset.php:109 ../lib/plugin/PasswordReset.php:153
-msgid "Send email"
+msgid "Send e-mail"
msgstr ""
#: ../lib/plugin/PasswordReset.php:139
@@ -3368,7 +3368,7 @@
#: ../lib/plugin/PasswordReset.php:171
#, php-format
-msgid "No email stored for user %s."
+msgid "No e-mail stored for user %s."
msgstr ""
#: ../lib/plugin/PasswordReset.php:173
@@ -3381,7 +3381,7 @@
msgstr ""
#: ../lib/plugin/PasswordReset.php:186
-msgid "An email will be sent."
+msgid "An e-mail will be sent."
msgstr ""
#: ../lib/plugin/PhotoAlbum.php:100 ../themes/blog/templates/actionbar.tmpl:8
@@ -4988,7 +4988,7 @@
msgstr ""
#: ../lib/plugin/WatchPage.php:42
-msgid "Manage notifications emails per page."
+msgid "Manage notifications e-mails per page."
msgstr ""
#: ../lib/plugin/WatchPage.php:84
@@ -5035,7 +5035,7 @@
msgstr ""
#: ../lib/plugin/WatchPage.php:128
-msgid "ERROR: No email defined! You need to do this in your "
+msgid "ERROR: No e-mail defined! You need to do this in your "
msgstr ""
#: ../lib/plugin/WatchPage.php:145
@@ -5045,7 +5045,7 @@
#: ../lib/plugin/WatchPage.php:166
msgid ""
-"E-Mail Notification for the current page successfully stored in your "
+"E-mail notification for the current page successfully stored in your "
"preferences."
msgstr ""
@@ -7071,7 +7071,7 @@
#, php-format
msgid ""
"Welcome to %s!\n"
-"Your email account is verified and\n"
+"Your e-mail account is verified and\n"
"will be used to send page change notifications.\n"
"See %s"
msgstr ""
Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po 2012-11-26 15:56:20 UTC (rev 8545)
+++ trunk/locale/po/ja.po 2012-11-26 17:14:51 UTC (rev 8546)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 16:54+0100\n"
+"POT-Creation-Date: 2012-11-26 18:11+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"
@@ -373,7 +373,7 @@
#: ../lib/editpage.php:577
#, php-format
msgid ""
-"The approval has a grace period of 5 days. If you have your E-Mail defined "
+"The approval has a grace period of 5 days. If you have your e-mail defined "
"in your %s, you will get a notification of approval or rejection."
msgstr ""
@@ -3012,7 +3012,7 @@
#: ../lib/plugin/ModeratedPage.php:157 ../lib/plugin/ModeratedPage.php:183
#: ../lib/plugin/ModeratedPage.php:231
-msgid "ModeratedPage: No emails for the moderators defined"
+msgid "ModeratedPage: No e-mails for the moderators defined"
msgstr ""
#: ../lib/plugin/ModeratedPage.php:163
@@ -3042,7 +3042,7 @@
msgstr ""
#: ../lib/plugin/ModeratedPage.php:286
-msgid "ModeratedPage Notification Error: Couldn't send email"
+msgid "ModeratedPage Notification Error: Couldn't send e-mail"
msgstr ""
#: ../lib/plugin/ModeratedPage.php:366
@@ -3380,12 +3380,12 @@
#: ../lib/plugin/PasswordReset.php:88
#, php-format
-msgid "Email sent to the stored email address for user %s"
+msgid "E-mail sent to the stored e-mail address for user %s"
msgstr ""
#: ../lib/plugin/PasswordReset.php:91
#, fuzzy, php-format
-msgid "Error sending email with password for user %s."
+msgid "Error sending e-mail with password for user %s."
msgstr "ユーザーIDかパスワードが無効です。"
#: ../lib/plugin/PasswordReset.php:99
@@ -3394,7 +3394,7 @@
msgstr "ユーザーIDかパスワードが無効です。"
#: ../lib/plugin/PasswordReset.php:109 ../lib/plugin/PasswordReset.php:153
-msgid "Send email"
+msgid "Send e-mail"
msgstr ""
#: ../lib/plugin/PasswordReset.php:139
@@ -3411,7 +3411,7 @@
#: ../lib/plugin/PasswordReset.php:171
#, php-format
-msgid "No email stored for user %s."
+msgid "No e-mail stored for user %s."
msgstr ""
#: ../lib/plugin/PasswordReset.php:173
@@ -3424,7 +3424,7 @@
msgstr ""
#: ../lib/plugin/PasswordReset.php:186
-msgid "An email will be sent."
+msgid "An e-mail will be sent."
msgstr ""
#: ../lib/plugin/PhotoAlbum.php:100 ../themes/blog/templates/actionbar.tmpl:8
@@ -5064,7 +5064,7 @@
msgstr "幅"
#: ../lib/plugin/WatchPage.php:42
-msgid "Manage notifications emails per page."
+msgid "Manage notifications e-mails per page."
msgstr ""
#: ../lib/plugin/WatchPage.php:84
@@ -5113,7 +5113,7 @@
msgstr "%s としてサインインしました"
#: ../lib/plugin/WatchPage.php:128
-msgid "ERROR: No email defined! You need to do this in your "
+msgid "ERROR: No e-mail defined! You need to do this in your "
msgstr ""
#: ../lib/plugin/WatchPage.php:145
@@ -5123,7 +5123,7 @@
#: ../lib/plugin/WatchPage.php:166
msgid ""
-"E-Mail Notification for the current page successfully stored in your "
+"E-mail notification for the current page successfully stored in your "
"preferences."
msgstr ""
@@ -7216,7 +7216,7 @@
#, php-format
msgid ""
"Welcome to %s!\n"
-"Your email account is verified and\n"
+"Your e-mail account is verified and\n"
"will be used to send page change notifications.\n"
"See %s"
msgstr ""
Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po 2012-11-26 15:56:20 UTC (rev 8545)
+++ trunk/locale/po/nl.po 2012-11-26 17:14:51 UTC (rev 8546)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 16:54+0100\n"
+"POT-Creation-Date: 2012-11-26 18:11+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"
@@ -379,7 +379,7 @@
#: ../lib/editpage.php:577
#, php-format
msgid ""
-"The approval has a grace period of 5 days. If you have your E-Mail defined "
+"The approval has a grace period of 5 days. If you have your e-mail defined "
"in your %s, you will get a notification of approval or rejection."
msgstr ""
@@ -2966,7 +2966,7 @@
#: ../lib/plugin/ModeratedPage.php:157 ../lib/plugin/ModeratedPage.php:183
#: ../lib/plugin/ModeratedPage.php:231
-msgid "ModeratedPage: No emails for the moderators defined"
+msgid "ModeratedPage: No e-mails for the moderators defined"
msgstr ""
#: ../lib/plugin/ModeratedPage.php:163
@@ -2996,7 +2996,7 @@
msgstr ""
#: ../lib/plugin/ModeratedPage.php:286
-msgid "ModeratedPage Notification Error: Couldn't send email"
+msgid "ModeratedPage Notification Error: Couldn't send e-mail"
msgstr ""
#: ../lib/plugin/ModeratedPage.php:366
@@ -3330,12 +3330,12 @@
#: ../lib/plugin/PasswordReset.php:88
#, php-format
-msgid "Email sent to the stored email address for user %s"
+msgid "E-mail sent to the stored e-mail address for user %s"
msgstr ""
#: ../lib/plugin/PasswordReset.php:91
#, php-format
-msgid "Error sending email with password for user %s."
+msgid "Error sending e-mail with password for user %s."
msgstr ""
#: ../lib/plugin/PasswordReset.php:99
@@ -3343,7 +3343,7 @@
msgstr ""
#: ../lib/plugin/PasswordReset.php:109 ../lib/plugin/PasswordReset.php:153
-msgid "Send email"
+msgid "Send e-mail"
msgstr ""
#: ../lib/plugin/PasswordReset.php:139
@@ -3360,7 +3360,7 @@
#: ../lib/plugin/PasswordReset.php:171
#, php-format
-msgid "No email stored for user %s."
+msgid "No e-mail stored for user %s."
msgstr ""
#: ../lib/plugin/PasswordReset.php:173
@@ -3373,7 +3373,7 @@
msgstr ""
#: ../lib/plugin/PasswordReset.php:186
-msgid "An email will be sent."
+msgid "An e-mail will be sent."
msgstr ""
#: ../lib/plugin/PhotoAlbum.php:100 ../themes/blog/templates/actionbar.tmpl:8
@@ -4980,7 +4980,7 @@
msgstr ""
#: ../lib/plugin/WatchPage.php:42
-msgid "Manage notifications emails per page."
+msgid "Manage notifications e-mails per page."
msgstr ""
#: ../lib/plugin/WatchPage.php:84
@@ -5027,7 +5027,7 @@
msgstr ""
#: ../lib/plugin/WatchPage.php:128
-msgid "ERROR: No email defined! You need to do this in your "
+msgid "ERROR: No e-mail defined! You need to do this in your "
msgstr ""
#: ../lib/plugin/WatchPage.php:145
@@ -5036,7 +5036,7 @@
#: ../lib/plugin/WatchPage.php:166
msgid ""
-"E-Mail Notification for the current page successfully stored in your "
+"E-mail notification for the current page successfully stored in your "
"preferences."
msgstr ""
@@ -7058,7 +7058,7 @@
#, php-format
msgid ""
"Welcome to %s!\n"
-"Your email account is verified and\n"
+"Your e-mail account is verified and\n"
"will be used to send page change notifications.\n"
"See %s"
msgstr ""
Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot 2012-11-26 15:56:20 UTC (rev 8545)
+++ trunk/locale/po/phpwiki.pot 2012-11-26 17:14:51 UTC (rev 8546)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki-1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 16:54+0100\n"
+"POT-Creation-Date: 2012-11-26 18:11+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"
@@ -373,7 +373,7 @@
#: ../lib/editpage.php:577
#, php-format
msgid ""
-"The approval has a grace period of 5 days. If you have your E-Mail defined "
+"The approval has a grace period of 5 days. If you have your e-mail defined "
"in your %s, you will get a notification of approval or rejection."
msgstr ""
@@ -2959,7 +2959,7 @@
#: ../lib/plugin/ModeratedPage.php:157 ../lib/plugin/ModeratedPage.php:183
#: ../lib/plugin/ModeratedPage.php:231
-msgid "ModeratedPage: No emails for the moderators defined"
+msgid "ModeratedPage: No e-mails for the moderators defined"
msgstr ""
#: ../lib/plugin/ModeratedPage.php:163
@@ -2989,7 +2989,7 @@
msgstr ""
#: ../lib/plugin/ModeratedPage.php:286
-msgid "ModeratedPage Notification Error: Couldn't send email"
+msgid "ModeratedPage Notification Error: Couldn't send e-mail"
msgstr ""
#: ../lib/plugin/ModeratedPage.php:366
@@ -3323,12 +3323,12 @@
#: ../lib/plugin/PasswordReset.php:88
#, php-format
-msgid "Email sent to the stored email address for user %s"
+msgid "E-mail sent to the stored e-mail address for user %s"
msgstr ""
#: ../lib/plugin/PasswordReset.php:91
#, php-format
-msgid "Error sending email with password for user %s."
+msgid "Error sending e-mail with password for user %s."
msgstr ""
#: ../lib/plugin/PasswordReset.php:99
@@ -3336,7 +3336,7 @@
msgstr ""
#: ../lib/plugin/PasswordReset.php:109 ../lib/plugin/PasswordReset.php:153
-msgid "Send email"
+msgid "Send e-mail"
msgstr ""
#: ../lib/plugin/PasswordReset.php:139
@@ -3353,7 +3353,7 @@
#: ../lib/plugin/PasswordReset.php:171
#, php-format
-msgid "No email stored for user %s."
+msgid "No e-mail stored for user %s."
msgstr ""
#: ../lib/plugin/PasswordReset.php:173
@@ -3366,7 +3366,7 @@
msgstr ""
#: ../lib/plugin/PasswordReset.php:186
-msgid "An email will be sent."
+msgid "An e-mail will be sent."
msgstr ""
#: ../lib/plugin/PhotoAlbum.php:100 ../themes/blog/templates/actionbar.tmpl:8
@@ -4973,7 +4973,7 @@
msgstr ""
#: ../lib/plugin/WatchPage.php:42
-msgid "Manage notifications emails per page."
+msgid "Manage notifications e-mails per page."
msgstr ""
#: ../lib/plugin/WatchPage.php:84
@@ -5020,7 +5020,7 @@
msgstr ""
#: ../lib/plugin/WatchPage.php:128
-msgid "ERROR: No email defined! You need to do this in your "
+msgid "ERROR: No e-mail defined! You need to do this in your "
msgstr ""
#: ../lib/plugin/WatchPage.php:145
@@ -5029,7 +5029,7 @@
#: ../lib/plugin/WatchPage.php:166
msgid ""
-"E-Mail Notification for the current page successfully stored in your "
+"E-mail notification for the current page successfully stored in your "
"preferences."
msgstr ""
@@ -7049,7 +7049,7 @@
#, php-format
msgid ""
"Welcome to %s!\n"
-"Your email account is verified and\n"
+"Your e-mail account is verified and\n"
"will be used to send page change notifications.\n"
"See %s"
msgstr ""
Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po 2012-11-26 15:56:20 UTC (rev 8545)
+++ trunk/locale/po/sv.po 2012-11-26 17:14:51 UTC (rev 8546)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 16:54+0100\n"
+"POT-Creation-Date: 2012-11-26 18:11+0100\n"
"PO-Revision-Date: 2001-01-27 01:58+0200\n"
"Last-Translator: Jon Åslund <jo...@he...>\n"
"Language-Team: \n"
@@ -374,7 +374,7 @@
#: ../lib/editpage.php:577
#, php-format
msgid ""
-"The approval has a grace period of 5 days. If you have your E-Mail defined "
+"The approval has a grace period of 5 days. If you have your e-mail defined "
"in your %s, you will get a notification of approval or rejection."
msgstr ""
@@ -2961,7 +2961,7 @@
#: ../lib/plugin/ModeratedPage.php:157 ../lib/plugin/ModeratedPage.php:183
#: ../lib/plugin/ModeratedPage.php:231
-msgid "ModeratedPage: No emails for the moderators defined"
+msgid "ModeratedPage: No e-mails for the moderators defined"
msgstr ""
#: ../lib/plugin/ModeratedPage.php:163
@@ -2991,7 +2991,7 @@
msgstr ""
#: ../lib/plugin/ModeratedPage.php:286
-msgid "ModeratedPage Notification Error: Couldn't send email"
+msgid "ModeratedPage Notification Error: Couldn't send e-mail"
msgstr ""
#: ../lib/plugin/ModeratedPage.php:366
@@ -3325,12 +3325,12 @@
#: ../lib/plugin/PasswordReset.php:88
#, php-format
-msgid "Email sent to the stored email address for user %s"
+msgid "E-mail sent to the stored e-mail address for user %s"
msgstr ""
#: ../lib/plugin/PasswordReset.php:91
#, php-format
-msgid "Error sending email with password for user %s."
+msgid "Error sending e-mail with password for user %s."
msgstr ""
#: ../lib/plugin/PasswordReset.php:99
@@ -3338,7 +3338,7 @@
msgstr ""
#: ../lib/plugin/PasswordReset.php:109 ../lib/plugin/PasswordReset.php:153
-msgid "Send email"
+msgid "Send e-mail"
msgstr ""
#: ../lib/plugin/PasswordReset.php:139
@@ -3355,7 +3355,7 @@
#: ../lib/plugin/PasswordReset.php:171
#, php-format
-msgid "No email stored for user %s."
+msgid "No e-mail stored for user %s."
msgstr ""
#: ../lib/plugin/PasswordReset.php:173
@@ -3368,7 +3368,7 @@
msgstr ""
#: ../lib/plugin/PasswordReset.php:186
-msgid "An email will be sent."
+msgid "An e-mail will be sent."
msgstr ""
#: ../lib/plugin/PhotoAlbum.php:100 ../themes/blog/templates/actionbar.tmpl:8
@@ -4975,7 +4975,7 @@
msgstr ""
#: ../lib/plugin/WatchPage.php:42
-msgid "Manage notifications emails per page."
+msgid "Manage notifications e-mails per page."
msgstr ""
#: ../lib/plugin/WatchPage.php:84
@@ -5022,7 +5022,7 @@
msgstr ""
#: ../lib/plugin/WatchPage.php:128
-msgid "ERROR: No email defined! You need to do this in your "
+msgid "ERROR: No e-mail defined! You need to do this in your "
msgstr ""
#: ../lib/plugin/WatchPage.php:145
@@ -5031,7 +5031,7 @@
#: ../lib/plugin/WatchPage.php:166
msgid ""
-"E-Mail Notification for the current page successfully stored in your "
+"E-mail notification for the current page successfully stored in your "
"preferences."
msgstr ""
@@ -7052,7 +7052,7 @@
#, php-format
msgid ""
"Welcome to %s!\n"
-"Your email account is verified and\n"
+"Your e-mail account is verified and\n"
"will be used to send page change notifications.\n"
"See %s"
msgstr ""
Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po 2012-11-26 15:56:20 UTC (rev 8545)
+++ trunk/locale/po/zh.po 2012-11-26 17:14:51 UTC (rev 8546)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 16:54+0100\n"
+"POT-Creation-Date: 2012-11-26 18:11+0100\n"
"PO-Revision-Date: 2004-04-21 10:08+0800\n"
"Last-Translator: DruryL <dr...@us...>\n"
"Language-Team: DruryL <dr...@us...>\n"
@@ -383,7 +383,7 @@
#: ../lib/editpage.php:577
#, php-format
msgid ""
-"The approval has a grace period of 5 days. If you have your E-Mail defined "
+"The approval has a grace period of 5 days. If you have your e-mail defined "
"in your %s, you will get a notification of approval or rejection."
msgstr ""
@@ -3081,7 +3081,7 @@
#: ../lib/plugin/ModeratedPage.php:157 ../lib/plugin/ModeratedPage.php:183
#: ../lib/plugin/ModeratedPage.php:231
-msgid "ModeratedPage: No emails for the moderators defined"
+msgid "ModeratedPage: No e-mails for the moderators defined"
msgstr ""
#: ../lib/plugin/ModeratedPage.php:163
@@ -3112,7 +3112,7 @@
#: ../lib/plugin/ModeratedPage.php:286
#, fuzzy
-msgid "ModeratedPage Notification Error: Couldn't send email"
+msgid "ModeratedPage Notification Error: Couldn't send e-mail"
msgstr "PageChange 通知錯誤: 無法送 %s 給 %s"
#: ../lib/plugin/ModeratedPage.php:366
@@ -3458,12 +3458,12 @@
#: ../lib/plugin/PasswordReset.php:88
#, php-format
-msgid "Email sent to the stored email address for user %s"
+msgid "E-mail sent to the stored e-mail address for user %s"
msgstr ""
#: ../lib/plugin/PasswordReset.php:91
#, fuzzy, php-format
-msgid "Error sending email with password for user %s."
+msgid "Error sending e-mail with password for user %s."
msgstr "錯誤的密碼或使用者帳號."
#: ../lib/plugin/PasswordReset.php:99
@@ -3472,7 +3472,7 @@
msgstr "錯誤的密碼或使用者帳號."
#: ../lib/plugin/PasswordReset.php:109 ../lib/plugin/PasswordReset.php:153
-msgid "Send email"
+msgid "Send e-mail"
msgstr ""
#: ../lib/plugin/PasswordReset.php:139
@@ -3489,7 +3489,7 @@
#: ../lib/plugin/PasswordReset.php:171
#, php-format
-msgid "No email stored for user %s."
+msgid "No e-mail stored for user %s."
msgstr ""
#: ../lib/plugin/PasswordReset.php:173
@@ -3503,7 +3503,7 @@
msgstr ""
#: ../lib/plugin/PasswordReset.php:186
-msgid "An email will be sent."
+msgid "An e-mail will be sent."
msgstr ""
#: ../lib/plugin/PhotoAlbum.php:100 ../themes/blog/templates/actionbar.tmpl:8
@@ -5187,7 +5187,7 @@
msgstr "寬度"
#: ../lib/plugin/WatchPage.php:42
-msgid "Manage notifications emails per page."
+msgid "Manage notifications e-mails per page."
msgstr ""
#: ../lib/plugin/WatchPage.php:84
@@ -5236,7 +5236,7 @@
msgstr "你必須簽入才能 %s."
#: ../lib/plugin/WatchPage.php:128
-msgid "ERROR: No email defined! You need to do this in your "
+msgid "ERROR: No e-mail defined! You need to do this in your "
msgstr ""
#: ../lib/plugin/WatchPage.php:145
@@ -5246,7 +5246,7 @@
#: ../lib/plugin/WatchPage.php:166
msgid ""
-"E-Mail Notification for the current page successfully stored in your "
+"E-mail notification for the current page successfully stored in your "
"preferences."
msgstr ""
@@ -7366,7 +7366,7 @@
#, fuzzy, php-format
msgid ""
"Welcome to %s!\n"
-"Your email account is verified and\n"
+"Your e-mail account is verified and\n"
"will be used to send page change notifications.\n"
"See %s"
msgstr ""
Modified: trunk/locale/sv/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
