Menu
▾
▴
[phpwiki-checkins] SF.net SVN: phpwiki:[8545] trunk
|
From: <var...@us...> - 2012-11-26 15:56:33
|
Revision: 8545
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8545&view=rev
Author: vargenau
Date: 2012-11-26 15:56:20 +0000 (Mon, 26 Nov 2012)
Log Message:
-----------
Be consistent: use e-mail
Modified Paths:
--------------
trunk/config/config-dist.ini
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/ja/LC_MESSAGES/phpwiki.php
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/locale/zh/LC_MESSAGES/phpwiki.php
trunk/pgsrc/ReleaseNotes
trunk/themes/default/templates/userprefs.tmpl
trunk/themes/fusionforge/templates/userprefs.tmpl
Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini 2012-11-26 15:42:07 UTC (rev 8544)
+++ trunk/config/config-dist.ini 2012-11-26 15:56:20 UTC (rev 8545)
@@ -166,7 +166,7 @@
; Default: true
;ENABLE_SEARCHHIGHLIGHT = false
-; You can disable email notifications.
+; You can disable e-mail notifications.
; Default: true
;ENABLE_MAILNOTIFY = false
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:42:07 UTC (rev 8544)
+++ trunk/locale/de/LC_MESSAGES/phpwiki.php 2012-11-26 15:56:20 UTC (rev 8545)
@@ -387,8 +387,6 @@
$locale["Edited by: %s"] = "Bearbeitet von: %s";
$locale["Editing pages"] = "Ändern in diesem Wiki";
$locale["Elapsed time: %s s"] = "Dauer: %s s";
-$locale["Email not yet verified."] = "E-Mail noch nicht bestätigt.";
-$locale["Email verified."] = "E-Mail bestätigt.";
$locale["Embed hidden comments in WikiPages."] = "Kommentar in WikiText verstecken.";
$locale["Empty Preferences or format of UserPreferences cookie not recognised."] = "Leere BenutzerEinstellungen oder BenutzerEinstellungs Cookie nicht erkannt.";
$locale["Empty link to: %s"] = "Leerer Link zu: %s";
@@ -431,7 +429,7 @@
$locale["FullTextSearch"] = "VolltextSuche";
$locale["FuzzyPages"] = "FuzzySuche";
$locale["General Auth Settings"] = "Allgemeine Authentifizierungs-Einstellungen";
-$locale["Get an email notification at changes of the following pages:"] = "E-Mail Nachricht bei Änderung folgender Seiten:";
+$locale["Get an e-mail notification at changes of the following pages:"] = "E-Mail Nachricht bei Änderung folgender Seiten:";
$locale["Get debugging information for %s."] = "Debug-Informationen von %s.";
$locale["Get preferences information for current user %s."] = "Zeige Benutzereinstellungen für den aktuellen Benutzer %s.";
$locale["Given password ignored."] = "Passwort ignoriert.";
@@ -681,7 +679,7 @@
$locale["None"] = "Keine";
$locale["Not enough questions answered!"] = "Nicht genügend Fragen beantwortet!";
$locale["Note that many browsers will automatically adjust the width of the editing area so that it fills the browser window. In this case, the width preference will be ignored."] = "Beachten Sie bitte, dass viele Browser die Breite der Textbox automatisch an ihre Fensterbreite anpassen. In diesem Fall wird die hier eingegebene Breite ignoriert.";
-$locale["Note, that user accounts with bouncing emails will be disabled."] = "Beachten Sie bitte, dass Benutzer mit ungültigen E-Mail-Addressen gelöscht werden.";
+$locale["Note, that user accounts with bouncing e-mails will be disabled."] = "Beachten Sie bitte, dass Benutzer mit ungültigen E-Mail-Addressen gelöscht werden.";
$locale["Note:"] = "Hinweis:";
$locale["Note: Only if you create your personal HomePage with same the pagename as your user id, you will be able to store your UserPreferences. Otherwise not."] = "Beachte: Nur wenn Sie Ihre persönliche HomePage mit dem selben Seitennamen wie Ihre Benutzernamen erzeugen, werden Sie Ihre BenutzerEinstellungen speichern können.";
$locale["Nothing found"] = "Nichts gefunden";
@@ -1250,6 +1248,8 @@
$locale["download a zip dump from this wiki"] = "um eine gezippte Sicherung von allen Wiki Seiten herunterzuladen";
$locale["dump html pages"] = "um von diesem Wiki HTML-Dateien lokal abzuspeichern";
$locale["dump serial pages"] = "um von diesem Wiki die Seiten lokal abzuspeichern";
+$locale["e-mail not yet verified."] = "E-Mail noch nicht bestätigt.";
+$locale["e-mail verified."] = "E-Mail bestätigt.";
$locale["edit area"] = "Texteingabe Fenster";
$locale["edit this page"] = "um diese Seite zu bearbeiten";
$locale["edits"] = "Änderungen";
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:42:07 UTC (rev 8544)
+++ trunk/locale/fr/LC_MESSAGES/phpwiki.php 2012-11-26 15:56:20 UTC (rev 8545)
@@ -401,8 +401,6 @@
$locale["Editing pages"] = "Modifier des pages";
$locale["Either %s is missing or DATABASE_TYPE != '%s'"] = "%s est manquant ou DATABASE_TYPE != '%s'";
$locale["Elapsed time: %s s"] = "Temps écoulé : %s s";
-$locale["Email not yet verified."] = "Adresse électronique pas encore vérifiée.";
-$locale["Email verified."] = "Adresse électronique vérifiée.";
$locale["Embed hidden comments in WikiPages."] = "Cacher des commentaires dans une page wiki.";
$locale["Empty Preferences or format of UserPreferences cookie not recognised."] = "PréférencesUtilisateurs vides, le cookie peut etre mal reconnu.";
$locale["Empty link to: %s"] = "Lien vide vers : %s";
@@ -447,7 +445,7 @@
$locale["FullTextSearch"] = "RechercheEnTexteIntégral";
$locale["FuzzyPages"] = "PagesFloues";
$locale["General Auth Settings"] = "Préférences générales d'auteur";
-$locale["Get an email notification at changes of the following pages:"] = "Recevoir une notification par courriel pour les modifications des pages suivantes :";
+$locale["Get an e-mail notification at changes of the following pages:"] = "Recevoir une notification par courriel pour les modifications des pages suivantes :";
$locale["Get debugging information for %s."] = "Obtenir des infos de déboguage pour %s.";
$locale["Get preferences information for current user %s."] = "Obtenir des infos de préférences pour l'utilisateur %s.";
$locale["Given password ignored."] = "Mot de passe ignoré.";
@@ -713,7 +711,7 @@
$locale["None"] = "Aucun(e)";
$locale["Not enough questions answered!"] = "Pas assez de réponses fournies !";
$locale["Note that many browsers will automatically adjust the width of the editing area so that it fills the browser window. In this case, the width preference will be ignored."] = "Notez que beaucoup de navigateurs ajusteront automatiquement la largeur de la zone d'édition de façon qu'elle remplisse la fenêtre. Le paramètre concernant la largeur sera ignoré dans ce cas.";
-$locale["Note, that user accounts with bouncing emails will be disabled."] = "Notez que les comptes avec une adresse électronique invalide seront désactivés.";
+$locale["Note, that user accounts with bouncing e-mails will be disabled."] = "Notez que les comptes avec une adresse électronique invalide seront désactivés.";
$locale["Note:"] = "Note :";
$locale["Note: Only if you create your personal HomePage with same the pagename as your user id, you will be able to store your UserPreferences. Otherwise not."] = "Note: Vous pourrez enregistrer vos PréférencesUtilisateurs uniquement si vous créez votre propre page d'accueil portant le nom de votre identifiant.";
$locale["Nothing found"] = "Aucun résultat";
@@ -1307,6 +1305,8 @@
$locale["download a zip dump from this wiki"] = "télécharger une sauvegarde ZIP de ce wiki";
$locale["dump html pages"] = "récupération des pages en HTML";
$locale["dump serial pages"] = "récupération des pages sérialisées";
+$locale["e-mail not yet verified."] = "Adresse électronique pas encore vérifiée.";
+$locale["e-mail verified."] = "Adresse électronique vérifiée.";
$locale["edit area"] = "zone d'édition";
$locale["edit this page"] = "modifier cette page";
$locale["edits"] = "modifications";
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/ja/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/ja/LC_MESSAGES/phpwiki.php 2012-11-26 15:42:07 UTC (rev 8544)
+++ trunk/locale/ja/LC_MESSAGES/phpwiki.php 2012-11-26 15:56:20 UTC (rev 8545)
@@ -68,8 +68,6 @@
$locale["EditMetaData"] = "METAデータの編集";
$locale["Edited by: %s"] = "編集: %s";
$locale["Editing pages"] = "ページを編集しています。";
-$locale["Email not yet verified."] = "メールアドレスを確認出来ませんでした。";
-$locale["Email verified."] = "メールアドレスを確認出来ました。";
$locale["Empty pagename!"] = "ページ名が未指定です!";
$locale["Enter your UserId to sign in"] = "ユーザーIDを入力してサインインしてください。";
$locale["Fatal PhpWiki Error"] = "致命的なPhpWikiのエラーです。";
@@ -226,6 +224,8 @@
$locale["compare revisions"] = "リビジョン比較";
$locale["current version"] = "現在のバージョン";
$locale["diff"] = "差分";
+$locale["e-mail not yet verified."] = "メールアドレスを確認出来ませんでした。";
+$locale["e-mail verified."] = "メールアドレスを確認出来ました。";
$locale["edit area"] = "編集エリア";
$locale["edit this page"] = "ページを編集しています。";
$locale["file %s not found"] = "%s: ファイルが見つかりません。";
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:42:07 UTC (rev 8544)
+++ trunk/locale/po/de.po 2012-11-26 15:56:20 UTC (rev 8545)
@@ -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:38+0100\n"
+"POT-Creation-Date: 2012-11-26 16:54+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."
@@ -712,6 +712,8 @@
#: ../lib/plugin/WikiAdminSetAcl.php:256 ../lib/upgrade.php:1128
#: ../lib/upgrade.php:1138 ../themes/blog/templates/blogform.tmpl:7
#: ../themes/default/templates/blogform.tmpl:7
+#: ../themes/default/templates/userprefs.tmpl:154
+#: ../themes/default/templates/userprefs.tmpl:163
#: ../themes/fusionforge/templates/blogform.tmpl:7
#: ../themes/fusionforge/themeinfo.php:52
msgid ": "
@@ -7965,8 +7967,6 @@
#: ../themes/default/templates/info.tmpl:163
#: ../themes/default/templates/userprefs.tmpl:141
#: ../themes/default/templates/userprefs.tmpl:144
-#: ../themes/default/templates/userprefs.tmpl:154
-#: ../themes/default/templates/userprefs.tmpl:163
#: ../themes/default/templates/userprefs.tmpl:243
#: ../themes/default/templates/userprefs.tmpl:250
#: ../themes/fusionforge/templates/userprefs.tmpl:342
@@ -8332,22 +8332,22 @@
msgstr "Gültigkeit"
#: ../themes/default/templates/userprefs.tmpl:165
-msgid "Email verified."
+msgid "e-mail verified."
msgstr "E-Mail bestätigt."
#: ../themes/default/templates/userprefs.tmpl:167
-msgid "Email not yet verified."
+msgid "e-mail not yet verified."
msgstr "E-Mail noch nicht bestätigt."
#: ../themes/default/templates/userprefs.tmpl:170
-msgid "Note, that user accounts with bouncing emails will be disabled."
+msgid "Note, that user accounts with bouncing e-mails will be disabled."
msgstr ""
"Beachten Sie bitte, dass Benutzer mit ungültigen E-Mail-Addressen gelöscht "
"werden."
#: ../themes/default/templates/userprefs.tmpl:173
#: ../themes/fusionforge/templates/userprefs.tmpl:194
-msgid "Get an email notification at changes of the following pages:"
+msgid "Get an e-mail notification at changes of the following pages:"
msgstr "E-Mail Nachricht bei Änderung folgender Seiten:"
#: ../themes/default/templates/userprefs.tmpl:178
Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po 2012-11-26 15:42:07 UTC (rev 8544)
+++ trunk/locale/po/es.po 2012-11-26 15:56:20 UTC (rev 8545)
@@ -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:38+0100\n"
+"POT-Creation-Date: 2012-11-26 16:54+0100\n"
"PO-Revision-Date: 2000-02-01 00:50-0500\n"
"Last-Translator: Pablo Roca <pr...@cl...>\n"
"Language-Team: \n"
@@ -705,6 +705,8 @@
#: ../lib/plugin/WikiAdminSetAcl.php:256 ../lib/upgrade.php:1128
#: ../lib/upgrade.php:1138 ../themes/blog/templates/blogform.tmpl:7
#: ../themes/default/templates/blogform.tmpl:7
+#: ../themes/default/templates/userprefs.tmpl:154
+#: ../themes/default/templates/userprefs.tmpl:163
#: ../themes/fusionforge/templates/blogform.tmpl:7
#: ../themes/fusionforge/themeinfo.php:52
msgid ": "
@@ -7788,8 +7790,6 @@
#: ../themes/default/templates/info.tmpl:163
#: ../themes/default/templates/userprefs.tmpl:141
#: ../themes/default/templates/userprefs.tmpl:144
-#: ../themes/default/templates/userprefs.tmpl:154
-#: ../themes/default/templates/userprefs.tmpl:163
#: ../themes/default/templates/userprefs.tmpl:243
#: ../themes/default/templates/userprefs.tmpl:250
#: ../themes/fusionforge/templates/userprefs.tmpl:342
@@ -8139,20 +8139,20 @@
msgstr ""
#: ../themes/default/templates/userprefs.tmpl:165
-msgid "Email verified."
+msgid "e-mail verified."
msgstr ""
#: ../themes/default/templates/userprefs.tmpl:167
-msgid "Email not yet verified."
+msgid "e-mail not yet verified."
msgstr ""
#: ../themes/default/templates/userprefs.tmpl:170
-msgid "Note, that user accounts with bouncing emails will be disabled."
+msgid "Note, that user accounts with bouncing e-mails will be disabled."
msgstr ""
#: ../themes/default/templates/userprefs.tmpl:173
#: ../themes/fusionforge/templates/userprefs.tmpl:194
-msgid "Get an email notification at changes of the following pages:"
+msgid "Get an e-mail notification at changes of the following pages:"
msgstr ""
#: ../themes/default/templates/userprefs.tmpl:178
Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po 2012-11-26 15:42:07 UTC (rev 8544)
+++ trunk/locale/po/fr.po 2012-11-26 15:56:20 UTC (rev 8545)
@@ -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:38+0100\n"
+"POT-Creation-Date: 2012-11-26 16:54+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."
@@ -704,6 +704,8 @@
#: ../lib/plugin/WikiAdminSetAcl.php:256 ../lib/upgrade.php:1128
#: ../lib/upgrade.php:1138 ../themes/blog/templates/blogform.tmpl:7
#: ../themes/default/templates/blogform.tmpl:7
+#: ../themes/default/templates/userprefs.tmpl:154
+#: ../themes/default/templates/userprefs.tmpl:163
#: ../themes/fusionforge/templates/blogform.tmpl:7
#: ../themes/fusionforge/themeinfo.php:52
msgid ": "
@@ -7863,8 +7865,6 @@
#: ../themes/default/templates/info.tmpl:163
#: ../themes/default/templates/userprefs.tmpl:141
#: ../themes/default/templates/userprefs.tmpl:144
-#: ../themes/default/templates/userprefs.tmpl:154
-#: ../themes/default/templates/userprefs.tmpl:163
#: ../themes/default/templates/userprefs.tmpl:243
#: ../themes/default/templates/userprefs.tmpl:250
#: ../themes/fusionforge/templates/userprefs.tmpl:342
@@ -8223,22 +8223,22 @@
msgstr "État"
#: ../themes/default/templates/userprefs.tmpl:165
-msgid "Email verified."
+msgid "e-mail verified."
msgstr "Adresse électronique vérifiée."
#: ../themes/default/templates/userprefs.tmpl:167
-msgid "Email not yet verified."
+msgid "e-mail not yet verified."
msgstr "Adresse électronique pas encore vérifiée."
#: ../themes/default/templates/userprefs.tmpl:170
-msgid "Note, that user accounts with bouncing emails will be disabled."
+msgid "Note, that user accounts with bouncing e-mails will be disabled."
msgstr ""
"Notez que les comptes avec une adresse électronique invalide seront "
"désactivés."
#: ../themes/default/templates/userprefs.tmpl:173
#: ../themes/fusionforge/templates/userprefs.tmpl:194
-msgid "Get an email notification at changes of the following pages:"
+msgid "Get an e-mail notification at changes of the following pages:"
msgstr ""
"Recevoir une notification par courriel pour les modifications des pages "
"suivantes :"
Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po 2012-11-26 15:42:07 UTC (rev 8544)
+++ trunk/locale/po/it.po 2012-11-26 15:56:20 UTC (rev 8545)
@@ -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:38+0100\n"
+"POT-Creation-Date: 2012-11-26 16:54+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"
@@ -695,6 +695,8 @@
#: ../lib/plugin/WikiAdminSetAcl.php:256 ../lib/upgrade.php:1128
#: ../lib/upgrade.php:1138 ../themes/blog/templates/blogform.tmpl:7
#: ../themes/default/templates/blogform.tmpl:7
+#: ../themes/default/templates/userprefs.tmpl:154
+#: ../themes/default/templates/userprefs.tmpl:163
#: ../themes/fusionforge/templates/blogform.tmpl:7
#: ../themes/fusionforge/themeinfo.php:52
msgid ": "
@@ -7734,8 +7736,6 @@
#: ../themes/default/templates/info.tmpl:163
#: ../themes/default/templates/userprefs.tmpl:141
#: ../themes/default/templates/userprefs.tmpl:144
-#: ../themes/default/templates/userprefs.tmpl:154
-#: ../themes/default/templates/userprefs.tmpl:163
#: ../themes/default/templates/userprefs.tmpl:243
#: ../themes/default/templates/userprefs.tmpl:250
#: ../themes/fusionforge/templates/userprefs.tmpl:342
@@ -8085,20 +8085,20 @@
msgstr ""
#: ../themes/default/templates/userprefs.tmpl:165
-msgid "Email verified."
+msgid "e-mail verified."
msgstr ""
#: ../themes/default/templates/userprefs.tmpl:167
-msgid "Email not yet verified."
+msgid "e-mail not yet verified."
msgstr ""
#: ../themes/default/templates/userprefs.tmpl:170
-msgid "Note, that user accounts with bouncing emails will be disabled."
+msgid "Note, that user accounts with bouncing e-mails will be disabled."
msgstr ""
#: ../themes/default/templates/userprefs.tmpl:173
#: ../themes/fusionforge/templates/userprefs.tmpl:194
-msgid "Get an email notification at changes of the following pages:"
+msgid "Get an e-mail notification at changes of the following pages:"
msgstr ""
#: ../themes/default/templates/userprefs.tmpl:178
Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po 2012-11-26 15:42:07 UTC (rev 8544)
+++ trunk/locale/po/ja.po 2012-11-26 15:56:20 UTC (rev 8545)
@@ -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:38+0100\n"
+"POT-Creation-Date: 2012-11-26 16:54+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"
@@ -683,6 +683,8 @@
#: ../lib/plugin/WikiAdminSetAcl.php:256 ../lib/upgrade.php:1128
#: ../lib/upgrade.php:1138 ../themes/blog/templates/blogform.tmpl:7
#: ../themes/default/templates/blogform.tmpl:7
+#: ../themes/default/templates/userprefs.tmpl:154
+#: ../themes/default/templates/userprefs.tmpl:163
#: ../themes/fusionforge/templates/blogform.tmpl:7
#: ../themes/fusionforge/themeinfo.php:52
msgid ": "
@@ -7898,8 +7900,6 @@
#: ../themes/default/templates/info.tmpl:163
#: ../themes/default/templates/userprefs.tmpl:141
#: ../themes/default/templates/userprefs.tmpl:144
-#: ../themes/default/templates/userprefs.tmpl:154
-#: ../themes/default/templates/userprefs.tmpl:163
#: ../themes/default/templates/userprefs.tmpl:243
#: ../themes/default/templates/userprefs.tmpl:250
#: ../themes/fusionforge/templates/userprefs.tmpl:342
@@ -8260,20 +8260,20 @@
msgstr "状況:"
#: ../themes/default/templates/userprefs.tmpl:165
-msgid "Email verified."
+msgid "e-mail verified."
msgstr "メールアドレスを確認出来ました。"
#: ../themes/default/templates/userprefs.tmpl:167
-msgid "Email not yet verified."
+msgid "e-mail not yet verified."
msgstr "メールアドレスを確認出来ませんでした。"
#: ../themes/default/templates/userprefs.tmpl:170
-msgid "Note, that user accounts with bouncing emails will be disabled."
+msgid "Note, that user accounts with bouncing e-mails will be disabled."
msgstr ""
#: ../themes/default/templates/userprefs.tmpl:173
#: ../themes/fusionforge/templates/userprefs.tmpl:194
-msgid "Get an email notification at changes of the following pages:"
+msgid "Get an e-mail notification at changes of the following pages:"
msgstr ""
#: ../themes/default/templates/userprefs.tmpl:178
Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po 2012-11-26 15:42:07 UTC (rev 8544)
+++ trunk/locale/po/nl.po 2012-11-26 15:56:20 UTC (rev 8545)
@@ -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:38+0100\n"
+"POT-Creation-Date: 2012-11-26 16:54+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"
@@ -689,6 +689,8 @@
#: ../lib/plugin/WikiAdminSetAcl.php:256 ../lib/upgrade.php:1128
#: ../lib/upgrade.php:1138 ../themes/blog/templates/blogform.tmpl:7
#: ../themes/default/templates/blogform.tmpl:7
+#: ../themes/default/templates/userprefs.tmpl:154
+#: ../themes/default/templates/userprefs.tmpl:163
#: ../themes/fusionforge/templates/blogform.tmpl:7
#: ../themes/fusionforge/themeinfo.php:52
msgid ": "
@@ -7721,8 +7723,6 @@
#: ../themes/default/templates/info.tmpl:163
#: ../themes/default/templates/userprefs.tmpl:141
#: ../themes/default/templates/userprefs.tmpl:144
-#: ../themes/default/templates/userprefs.tmpl:154
-#: ../themes/default/templates/userprefs.tmpl:163
#: ../themes/default/templates/userprefs.tmpl:243
#: ../themes/default/templates/userprefs.tmpl:250
#: ../themes/fusionforge/templates/userprefs.tmpl:342
@@ -8072,20 +8072,20 @@
msgstr ""
#: ../themes/default/templates/userprefs.tmpl:165
-msgid "Email verified."
+msgid "e-mail verified."
msgstr ""
#: ../themes/default/templates/userprefs.tmpl:167
-msgid "Email not yet verified."
+msgid "e-mail not yet verified."
msgstr ""
#: ../themes/default/templates/userprefs.tmpl:170
-msgid "Note, that user accounts with bouncing emails will be disabled."
+msgid "Note, that user accounts with bouncing e-mails will be disabled."
msgstr ""
#: ../themes/default/templates/userprefs.tmpl:173
#: ../themes/fusionforge/templates/userprefs.tmpl:194
-msgid "Get an email notification at changes of the following pages:"
+msgid "Get an e-mail notification at changes of the following pages:"
msgstr ""
#: ../themes/default/templates/userprefs.tmpl:178
Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot 2012-11-26 15:42:07 UTC (rev 8544)
+++ trunk/locale/po/phpwiki.pot 2012-11-26 15:56:20 UTC (rev 8545)
@@ -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:38+0100\n"
+"POT-Creation-Date: 2012-11-26 16:54+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"
@@ -683,6 +683,8 @@
#: ../lib/plugin/WikiAdminSetAcl.php:256 ../lib/upgrade.php:1128
#: ../lib/upgrade.php:1138 ../themes/blog/templates/blogform.tmpl:7
#: ../themes/default/templates/blogform.tmpl:7
+#: ../themes/default/templates/userprefs.tmpl:154
+#: ../themes/default/templates/userprefs.tmpl:163
#: ../themes/fusionforge/templates/blogform.tmpl:7
#: ../themes/fusionforge/themeinfo.php:52
msgid ": "
@@ -7710,8 +7712,6 @@
#: ../themes/default/templates/info.tmpl:163
#: ../themes/default/templates/userprefs.tmpl:141
#: ../themes/default/templates/userprefs.tmpl:144
-#: ../themes/default/templates/userprefs.tmpl:154
-#: ../themes/default/templates/userprefs.tmpl:163
#: ../themes/default/templates/userprefs.tmpl:243
#: ../themes/default/templates/userprefs.tmpl:250
#: ../themes/fusionforge/templates/userprefs.tmpl:342
@@ -8061,20 +8061,20 @@
msgstr ""
#: ../themes/default/templates/userprefs.tmpl:165
-msgid "Email verified."
+msgid "e-mail verified."
msgstr ""
#: ../themes/default/templates/userprefs.tmpl:167
-msgid "Email not yet verified."
+msgid "e-mail not yet verified."
msgstr ""
#: ../themes/default/templates/userprefs.tmpl:170
-msgid "Note, that user accounts with bouncing emails will be disabled."
+msgid "Note, that user accounts with bouncing e-mails will be disabled."
msgstr ""
#: ../themes/default/templates/userprefs.tmpl:173
#: ../themes/fusionforge/templates/userprefs.tmpl:194
-msgid "Get an email notification at changes of the following pages:"
+msgid "Get an e-mail notification at changes of the following pages:"
msgstr ""
#: ../themes/default/templates/userprefs.tmpl:178
Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po 2012-11-26 15:42:07 UTC (rev 8544)
+++ trunk/locale/po/sv.po 2012-11-26 15:56:20 UTC (rev 8545)
@@ -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:38+0100\n"
+"POT-Creation-Date: 2012-11-26 16:54+0100\n"
"PO-Revision-Date: 2001-01-27 01:58+0200\n"
"Last-Translator: Jon Åslund <jo...@he...>\n"
"Language-Team: \n"
@@ -684,6 +684,8 @@
#: ../lib/plugin/WikiAdminSetAcl.php:256 ../lib/upgrade.php:1128
#: ../lib/upgrade.php:1138 ../themes/blog/templates/blogform.tmpl:7
#: ../themes/default/templates/blogform.tmpl:7
+#: ../themes/default/templates/userprefs.tmpl:154
+#: ../themes/default/templates/userprefs.tmpl:163
#: ../themes/fusionforge/templates/blogform.tmpl:7
#: ../themes/fusionforge/themeinfo.php:52
msgid ": "
@@ -7713,8 +7715,6 @@
#: ../themes/default/templates/info.tmpl:163
#: ../themes/default/templates/userprefs.tmpl:141
#: ../themes/default/templates/userprefs.tmpl:144
-#: ../themes/default/templates/userprefs.tmpl:154
-#: ../themes/default/templates/userprefs.tmpl:163
#: ../themes/default/templates/userprefs.tmpl:243
#: ../themes/default/templates/userprefs.tmpl:250
#: ../themes/fusionforge/templates/userprefs.tmpl:342
@@ -8064,20 +8064,20 @@
msgstr ""
#: ../themes/default/templates/userprefs.tmpl:165
-msgid "Email verified."
+msgid "e-mail verified."
msgstr ""
#: ../themes/default/templates/userprefs.tmpl:167
-msgid "Email not yet verified."
+msgid "e-mail not yet verified."
msgstr ""
#: ../themes/default/templates/userprefs.tmpl:170
-msgid "Note, that user accounts with bouncing emails will be disabled."
+msgid "Note, that user accounts with bouncing e-mails will be disabled."
msgstr ""
#: ../themes/default/templates/userprefs.tmpl:173
#: ../themes/fusionforge/templates/userprefs.tmpl:194
-msgid "Get an email notification at changes of the following pages:"
+msgid "Get an e-mail notification at changes of the following pages:"
msgstr ""
#: ../themes/default/templates/userprefs.tmpl:178
Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po 2012-11-26 15:42:07 UTC (rev 8544)
+++ trunk/locale/po/zh.po 2012-11-26 15:56:20 UTC (rev 8545)
@@ -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:38+0100\n"
+"POT-Creation-Date: 2012-11-26 16:54+0100\n"
"PO-Revision-Date: 2004-04-21 10:08+0800\n"
"Last-Translator: DruryL <dr...@us...>\n"
"Language-Team: DruryL <dr...@us...>\n"
@@ -717,6 +717,8 @@
#: ../lib/plugin/WikiAdminSetAcl.php:256 ../lib/upgrade.php:1128
#: ../lib/upgrade.php:1138 ../themes/blog/templates/blogform.tmpl:7
#: ../themes/default/templates/blogform.tmpl:7
+#: ../themes/default/templates/userprefs.tmpl:154
+#: ../themes/default/templates/userprefs.tmpl:163
#: ../themes/fusionforge/templates/blogform.tmpl:7
#: ../themes/fusionforge/themeinfo.php:52
#, fuzzy
@@ -8059,8 +8061,6 @@
#: ../themes/default/templates/info.tmpl:163
#: ../themes/default/templates/userprefs.tmpl:141
#: ../themes/default/templates/userprefs.tmpl:144
-#: ../themes/default/templates/userprefs.tmpl:154
-#: ../themes/default/templates/userprefs.tmpl:163
#: ../themes/default/templates/userprefs.tmpl:243
#: ../themes/default/templates/userprefs.tmpl:250
#: ../themes/fusionforge/templates/userprefs.tmpl:342
@@ -8429,20 +8429,20 @@
msgstr "狀態:"
#: ../themes/default/templates/userprefs.tmpl:165
-msgid "Email verified."
+msgid "e-mail verified."
msgstr "Email 已被驗證."
#: ../themes/default/templates/userprefs.tmpl:167
-msgid "Email not yet verified."
+msgid "e-mail not yet verified."
msgstr "Email 尚未被驗證."
#: ../themes/default/templates/userprefs.tmpl:170
-msgid "Note, that user accounts with bouncing emails will be disabled."
-msgstr "注意, 使用者帳號的回信(bouncing emails)將被關閉."
+msgid "Note, that user accounts with bouncing e-mails will be disabled."
+msgstr "注意, 使用者帳號的回信(bouncing e-mails)將被關閉."
#: ../themes/default/templates/userprefs.tmpl:173
#: ../themes/fusionforge/templates/userprefs.tmpl:194
-msgid "Get an email notification at changes of the following pages:"
+msgid "Get an e-mail notification at changes of the following pages:"
msgstr "在變更下列頁面時取得 email 通知:"
#: ../themes/default/templates/userprefs.tmpl:178
Modified: trunk/locale/sv/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/zh/LC_MESSAGES/phpwiki.php 2012-11-26 15:42:07 UTC (rev 8544)
+++ trunk/locale/zh/LC_MESSAGES/phpwiki.php 2012-11-26 15:56:20 UTC (rev 8545)
@@ -217,8 +217,6 @@
$locale["Edited by: %s"] = "由 %s 編輯";
$locale["Editing pages"] = "編輯頁面";
$locale["Elapsed time: %s s"] = "經過時間: %s s";
-$locale["Email not yet verified."] = "Email 尚未被驗證.";
-$locale["Email verified."] = "Email 已被驗證.";
$locale["Embed hidden comments in WikiPages."] = "在 Wiki頁面嵌入隱藏意見.";
$locale["Empty Preferences or format of UserPreferences cookie not recognised."] = "空的偏好設定或 UserPreferences cookie 格式無法辨認.";
$locale["Empty link to: %s"] = "沒有連結到: %s";
@@ -244,7 +242,7 @@
$locale["FullTextSearch"] = "FullTextSearch";
$locale["FuzzyPages"] = "FuzzyPages";
$locale["General Auth Settings"] = "一般認證設定";
-$locale["Get an email notification at changes of the following pages:"] = "在變更下列頁面時取得 email 通知:";
+$locale["Get an e-mail notification at changes of the following pages:"] = "在變更下列頁面時取得 email 通知:";
$locale["Get debugging information for %s."] = "為 %s 取得除錯資訊.";
$locale["Get preferences information for current user %s."] = "為目前使用者 %s 取得偏好設定資訊.";
$locale["Go"] = "Go";
@@ -363,7 +361,7 @@
$locale["None"] = "無";
$locale["Not enough questions answered!"] = "沒有足夠的已回答問題!";
$locale["Note that many browsers will automatically adjust the width of the editing area so that it fills the browser window. In this case, the width preference will be ignored."] = "注意:許多瀏覽器會自動調整編輯區域的寬度以填滿瀏覽視窗. 在這種情況下,寬度設定將會被忽略.";
-$locale["Note, that user accounts with bouncing emails will be disabled."] = "注意, 使用者帳號的回信(bouncing emails)將被關閉.";
+$locale["Note, that user accounts with bouncing e-mails will be disabled."] = "注意, 使用者帳號的回信(bouncing e-mails)將被關閉.";
$locale["Note:"] = "注意:";
$locale["Old UserPage %s without stored password updated with empty password. Set a password in your UserPreferences."] = "Old UserPage %s without stored password updated with empty password. Set a password in your UserPreferences.";
$locale["OldStyleTable"] = "OldStyleTable";
@@ -713,6 +711,8 @@
$locale["download a zip dump from this wiki"] = "從此 wiki 下載 zip dump";
$locale["dump html pages"] = "傾印 html 頁面";
$locale["dump serial pages"] = "傾印連續頁面";
+$locale["e-mail not yet verified."] = "Email 尚未被驗證.";
+$locale["e-mail verified."] = "Email 已被驗證.";
$locale["edit area"] = "編輯區域";
$locale["edit this page"] = "編輯此頁面";
$locale["edits"] = "編輯";
Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes 2012-11-26 15:42:07 UTC (rev 8544)
+++ trunk/pgsrc/ReleaseNotes 2012-11-26 15:56:20 UTC (rev 8545)
@@ -400,7 +400,7 @@
* add a proper Content-Encoding: gzip if compressed, and omit Content-Length then.
Trick to send the correct gzipped Content-Length
* set dsn after SQL/ADODB switches in WikiDB backends for easier unit testing
-* email notifications: better From: header
+* e-mail notifications: better From: header
* add DBAUTH_PREF_INSERT: self-creating users. by John Stevens
* improved ~WikiUser/Ldap error description
* cache SystemInfo methods
Modified: trunk/themes/default/templates/userprefs.tmpl
===================================================================
--- trunk/themes/default/templates/userprefs.tmpl 2012-11-26 15:42:07 UTC (rev 8544)
+++ trunk/themes/default/templates/userprefs.tmpl 2012-11-26 15:56:20 UTC (rev 8545)
@@ -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')?>" />
@@ -160,17 +160,17 @@
<?php } ?>
</p>
<p>
- <?php echo _("Status") . _(":") ?>
+ <?php echo _("Status") . _(": ") ?>
<?php if ($pref->get('emailVerified')) { ?>
- <?php echo _("Email verified.") ?>
+ <?php echo _("e-mail verified.") ?>
<?php } else { ?>
- <?php echo _("Email not yet verified.") ?>
+ <?php echo _("e-mail not yet verified.") ?>
<?php } ?>
</p>
- </td><td><p class="hint"><?php echo _("Note, that user accounts with bouncing emails will be disabled.")?></p></td></tr>
+ </td><td><p class="hint"><?php echo _("Note, that user accounts with bouncing e-mails will be disabled.")?></p></td></tr>
<tr><td colspan="2">
- <?php echo _("Get an email notification at changes of the following pages:")?>
+ <?php echo _("Get an e-mail notification at changes of the following pages:")?>
</td></tr>
<tr>
<?php if ($isForm) { ?>
Modified: trunk/themes/fusionforge/templates/userprefs.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/userprefs.tmpl 2012-11-26 15:42:07 UTC (rev 8544)
+++ trunk/themes/fusionforge/templates/userprefs.tmpl 2012-11-26 15:56:20 UTC (rev 8545)
@@ -191,7 +191,7 @@
<tr><td colspan="2"><h3><?php echo _("E-mail Notification")?></h3></td></tr>
<tr><td colspan="2">
- <?php echo _("Get an email notification at changes of the following pages:")?>
+ <?php echo _("Get an e-mail notification at changes of the following pages:")?>
</td></tr>
<tr>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
