phpwiki-checkins Mailing List for PhpWiki (Page 106)

Brought to you by: carstenklapp, dairiki, rurban, vargenau, wainstead

phpwiki-checkins — Automatic notification of CVS checkins on PhpWiki.

You can subscribe to this list here.

2000	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (43)	Nov (73)	Dec (10)
2001	Jan (34)	Feb (110)	Mar (24)	Apr (44)	May (37)	Jun (22)	Jul (20)	Aug (28)	Sep (50)	Oct (11)	Nov (132)	Dec (595)
2002	Jan (1099)	Feb (579)	Mar (63)	Apr	May	Jun	Jul	Aug (125)	Sep (101)	Oct (25)	Nov (34)	Dec (47)
2003	Jan (82)	Feb (182)	Mar (71)	Apr (3)	May (1)	Jun (3)	Jul	Aug	Sep (14)	Oct (6)	Nov (124)	Dec (68)
2004	Jan (64)	Feb (191)	Mar (199)	Apr (298)	May (252)	Jun (426)	Jul (134)	Aug (13)	Sep (96)	Oct (75)	Nov (232)	Dec (171)
2005	Jan (205)	Feb (165)	Mar (8)	Apr (74)	May (21)	Jun (19)	Jul (37)	Aug (69)	Sep (141)	Oct (118)	Nov (31)	Dec (7)
2006	Jan (5)	Feb (10)	Mar (35)	Apr (24)	May (34)	Jun (29)	Jul (5)	Aug (38)	Sep (30)	Oct (37)	Nov (30)	Dec (86)
2007	Jan (414)	Feb (40)	Mar (18)	Apr (10)	May (66)	Jun (60)	Jul (105)	Aug (55)	Sep (64)	Oct (7)	Nov (11)	Dec (5)
2008	Jan (26)	Feb (28)	Mar (79)	Apr (34)	May (61)	Jun (24)	Jul (29)	Aug (160)	Sep (62)	Oct (70)	Nov (32)	Dec (14)
2009	Jan (140)	Feb (135)	Mar (153)	Apr (53)	May (24)	Jun (138)	Jul (90)	Aug (46)	Sep (72)	Oct (84)	Nov (32)	Dec (4)
2010	Jan (13)	Feb (7)	Mar (14)	Apr (55)	May (89)	Jun (131)	Jul (41)	Aug (38)	Sep (42)	Oct (11)	Nov (27)	Dec (54)
2011	Jan (127)	Feb (16)	Mar (71)	Apr (52)	May (32)	Jun (31)	Jul (4)	Aug	Sep (45)	Oct (26)	Nov (36)	Dec (10)
2012	Jan (23)	Feb (6)	Mar (13)	Apr (18)	May (1)	Jun (4)	Jul (3)	Aug (12)	Sep (57)	Oct (96)	Nov (163)	Dec (124)
2013	Jan (11)	Feb (17)	Mar (7)	Apr (48)	May (15)	Jun (29)	Jul (12)	Aug	Sep (9)	Oct	Nov	Dec (3)
2014	Jan (4)	Feb (1)	Mar (2)	Apr (1)	May (8)	Jun (90)	Jul (104)	Aug (12)	Sep (81)	Oct (139)	Nov (111)	Dec (64)
2015	Jan (46)	Feb (74)	Mar (56)	Apr (61)	May (3)	Jun (7)	Jul (11)	Aug (5)	Sep (15)	Oct (1)	Nov (1)	Dec (15)
2016	Jan (25)	Feb (33)	Mar (24)	Apr (4)	May (24)	Jun (3)	Jul (75)	Aug	Sep (2)	Oct (38)	Nov (4)	Dec (18)
2017	Jan (8)	Feb (1)	Mar (1)	Apr	May (14)	Jun	Jul (5)	Aug (9)	Sep	Oct (23)	Nov	Dec
2018	Jan	Feb	Mar	Apr	May	Jun (2)	Jul	Aug	Sep	Oct	Nov	Dec
2019	Jan	Feb	Mar (9)	Apr (60)	May (1)	Jun	Jul (13)	Aug	Sep (11)	Oct	Nov	Dec
2020	Jan	Feb	Mar (15)	Apr (4)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (47)
2021	Jan (24)	Feb (33)	Mar (1)	Apr	May (1)	Jun (64)	Jul (71)	Aug (114)	Sep (82)	Oct (32)	Nov (76)	Dec (86)
2022	Jan (162)	Feb (41)	Mar (11)	Apr (9)	May	Jun	Jul (1)	Aug (2)	Sep	Oct	Nov	Dec (7)
2023	Jan	Feb (1)	Mar (2)	Apr	May	Jun	Jul (25)	Aug	Sep	Oct	Nov (7)	Dec
2024	Jan (7)	Feb (3)	Mar (3)	Apr (1)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2025	Jan	Feb (90)	Mar (19)	Apr	May (6)	Jun	Jul (1)	Aug	Sep	Oct	Nov	Dec

Flat | Threaded

<< < 1 .. 104 105 106 107 108 .. 538 > >> (Page 106 of 538)

[phpwiki-checkins] SF.net SVN: phpwiki:[8564] trunk/lib/plugin/SyntaxHighlighter.php

From: <var...@us...> - 2012-11-28 09:55:12

Revision: 8564
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8564&view=rev
Author:   vargenau
Date:     2012-11-28 09:55:05 +0000 (Wed, 28 Nov 2012)
Log Message:
-----------
Add {}

Modified Paths:
--------------
    trunk/lib/plugin/SyntaxHighlighter.php

Modified: trunk/lib/plugin/SyntaxHighlighter.php
===================================================================
--- trunk/lib/plugin/SyntaxHighlighter.php	2012-11-28 09:46:48 UTC (rev 8563)
+++ trunk/lib/plugin/SyntaxHighlighter.php	2012-11-28 09:55:05 UTC (rev 8564)
@@ -100,7 +100,9 @@
             // It is important that you close any pipes before calling
             // proc_close in order to avoid a deadlock
             $return_value = proc_close($process);
-            if (empty($buf)) printXML($this->error($stderr));
+            if (empty($buf)) {
+                printXML($this->error($stderr));
+            }
             return $buf;
         }
     }
@@ -114,21 +116,31 @@
         }
         if (!empty($source)) {
             $args = "";
-            if (defined('HIGHLIGHT_DATA_DIR'))
+            if (defined('HIGHLIGHT_DATA_DIR')) {
                 $args .= " --data-dir " . HIGHLIGHT_DATA_DIR;
-            if ($number != 0) $args .= " -l";
-            if ($wrap != 0) $args .= " -V";
+            }
+            if ($number != 0) {
+                 $args .= " -l";
+            }
+            if ($wrap != 0) {
+                 $args .= " -V";
+            }
             $html = HTML();
             if (!empty($color) and !preg_match('/^[\w-]+$/', $color)) {
                 $html->pushContent($this->error(fmt("invalid %s ignored", 'color')));
                 $color = false;
             }
-            if (!empty($color)) $args .= " --style $color --inline-css";
-            if (!empty($style)) $args .= " -F $style";
+            if (!empty($color)) {
+                $args .= " --style $color --inline-css";
+            }
+            if (!empty($style)) {
+                $args .= " -F $style";
+            }
             $commandLine = HIGHLIGHT_EXE . "$args -q -X -f -S $syntax";
             $code = $this->newFilterThroughCmd($source, $commandLine);
-            if (empty($code))
+            if (empty($code)) {
                 return $this->error(fmt("Couldn't start commandline '%s'", $commandLine));
+            }
             $pre = HTML::pre(HTML::raw($code));
             $html->pushContent($pre);
             return HTML($html);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8563] trunk/lib/plugin/SyntaxHighlighter.php

From: <var...@us...> - 2012-11-28 09:46:54

Revision: 8563
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8563&view=rev
Author:   vargenau
Date:     2012-11-28 09:46:48 +0000 (Wed, 28 Nov 2012)
Log Message:
-----------
Remove what has been put in Help page

Modified Paths:
--------------
    trunk/lib/plugin/SyntaxHighlighter.php

Modified: trunk/lib/plugin/SyntaxHighlighter.php
===================================================================
--- trunk/lib/plugin/SyntaxHighlighter.php	2012-11-27 17:16:31 UTC (rev 8562)
+++ trunk/lib/plugin/SyntaxHighlighter.php	2012-11-28 09:46:48 UTC (rev 8563)
@@ -25,32 +25,9 @@
  * highlighter called "highlight" (available at http://www.andre-simon.de/).
  *
  * @author: alecthomas
- *
- * syntax: See http://www.andre-simon.de/doku/highlight/highlight.html
- * style = ["ansi", "gnu", "kr", "java", "linux"]
-
-<<SyntaxHighlighter syntax=c style=kr color=emacs
-#include <stdio.h>
-
-int main() {
-printf("Lalala\n");
-}
->>
-
-I did not use beautifier, because it used up more than 8M of memory on
-my system and PHP killed it. I'm not sure whether this is a problem
-with my integration, or with beautifier itself.
-
-Fixes by Reini Urban:
-support options: syntax, style, color.
-php version switch
-HIGHLIGHT_DATA_DIR, HIGHLIGHT_EXE
  */
 if (!defined('HIGHLIGHT_EXE'))
     define('HIGHLIGHT_EXE', 'highlight');
-//define('HIGHLIGHT_EXE','/usr/local/bin/highlight');
-//define('HIGHLIGHT_EXE','/home/groups/p/ph/phpwiki/bin/highlight');
-
 // highlight requires two subdirs themes and langDefs somewhere.
 // Best by highlight.conf in $HOME, but the webserver user usually
 // doesn't have a $HOME
@@ -59,7 +36,6 @@
         define('HIGHLIGHT_DATA_DIR', 'f:\cygnus\usr\local\share\highlight');
     else
         define('HIGHLIGHT_DATA_DIR', '/usr/share/highlight');
-//define('HIGHLIGHT_DATA_DIR','/home/groups/p/ph/phpwiki/share/highlight');
 
 class WikiPlugin_SyntaxHighlighter
     extends WikiPlugin

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8562] trunk/locale

From: <var...@us...> - 2012-11-27 17:16:38

Revision: 8562
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8562&view=rev
Author:   vargenau
Date:     2012-11-27 17:16:31 +0000 (Tue, 27 Nov 2012)
Log Message:
-----------
Update Italian translation

Modified Paths:
--------------
    trunk/locale/de/LC_MESSAGES/phpwiki.mo
    trunk/locale/es/LC_MESSAGES/phpwiki.mo
    trunk/locale/fr/LC_MESSAGES/phpwiki.mo
    trunk/locale/it/LC_MESSAGES/phpwiki.mo
    trunk/locale/it/LC_MESSAGES/phpwiki.php
    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/locale/de/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

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/it/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/it/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/it/LC_MESSAGES/phpwiki.php	2012-11-27 17:11:34 UTC (rev 8561)
+++ trunk/locale/it/LC_MESSAGES/phpwiki.php	2012-11-27 17:16:31 UTC (rev 8562)
@@ -68,6 +68,7 @@
 $locale["Edit: %s"] = "Modifica: %s";
 $locale["EditText"] = "ModificaIlTesto";
 $locale["Edited by: %s"] = "Modifica: %s";
+$locale["Error: Couldn't send %s to %s"] = "Errore: Non ha potuto trasmettere %s a %s";
 $locale["Every"] = "Ogni";
 $locale["External"] = "Esterni";
 $locale["External Links"] = "Collegamenti Esterni";

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-27 17:11:34 UTC (rev 8561)
+++ trunk/locale/po/de.po	2012-11-27 17:16:31 UTC (rev 8562)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-27 18:09+0100\n"
+"POT-Creation-Date: 2012-11-27 18:15+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."

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2012-11-27 17:11:34 UTC (rev 8561)
+++ trunk/locale/po/es.po	2012-11-27 17:16:31 UTC (rev 8562)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-27 18:09+0100\n"
+"POT-Creation-Date: 2012-11-27 18:15+0100\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2012-11-27 17:11:34 UTC (rev 8561)
+++ trunk/locale/po/fr.po	2012-11-27 17:16:31 UTC (rev 8562)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-27 18:09+0100\n"
+"POT-Creation-Date: 2012-11-27 18:15+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."

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2012-11-27 17:11:34 UTC (rev 8561)
+++ trunk/locale/po/it.po	2012-11-27 17:16:31 UTC (rev 8562)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-27 18:09+0100\n"
+"POT-Creation-Date: 2012-11-27 18:15+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"
@@ -1060,7 +1060,7 @@
 #: ../lib/MailNotify.php:257
 #, php-format
 msgid "Error: Couldn't send %s to %s"
-msgstr ""
+msgstr "Errore: Non ha potuto trasmettere %s a %s"
 
 #: ../lib/MailNotify.php:286
 msgid "Page change"

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2012-11-27 17:11:34 UTC (rev 8561)
+++ trunk/locale/po/ja.po	2012-11-27 17:16:31 UTC (rev 8562)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-27 18:09+0100\n"
+"POT-Creation-Date: 2012-11-27 18:15+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"

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2012-11-27 17:11:34 UTC (rev 8561)
+++ trunk/locale/po/nl.po	2012-11-27 17:16:31 UTC (rev 8562)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-27 18:09+0100\n"
+"POT-Creation-Date: 2012-11-27 18:15+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"

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2012-11-27 17:11:34 UTC (rev 8561)
+++ trunk/locale/po/phpwiki.pot	2012-11-27 17:16:31 UTC (rev 8562)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-27 18:09+0100\n"
+"POT-Creation-Date: 2012-11-27 18:15+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"

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2012-11-27 17:11:34 UTC (rev 8561)
+++ trunk/locale/po/sv.po	2012-11-27 17:16:31 UTC (rev 8562)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-27 18:09+0100\n"
+"POT-Creation-Date: 2012-11-27 18:15+0100\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2012-11-27 17:11:34 UTC (rev 8561)
+++ trunk/locale/po/zh.po	2012-11-27 17:16:31 UTC (rev 8562)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-27 18:09+0100\n"
+"POT-Creation-Date: 2012-11-27 18:15+0100\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"

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.

[phpwiki-checkins] SF.net SVN: phpwiki:[8561] trunk/locale

From: <var...@us...> - 2012-11-27 17:11:46

Revision: 8561
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8561&view=rev
Author:   vargenau
Date:     2012-11-27 17:11:34 +0000 (Tue, 27 Nov 2012)
Log Message:
-----------
Update Japanese translation

Modified Paths:
--------------
    trunk/locale/de/LC_MESSAGES/phpwiki.mo
    trunk/locale/es/LC_MESSAGES/phpwiki.mo
    trunk/locale/fr/LC_MESSAGES/phpwiki.mo
    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/locale/de/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

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/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-27 16:54:01 UTC (rev 8560)
+++ trunk/locale/po/de.po	2012-11-27 17:11:34 UTC (rev 8561)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-27 17:50+0100\n"
+"POT-Creation-Date: 2012-11-27 18:09+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."

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2012-11-27 16:54:01 UTC (rev 8560)
+++ trunk/locale/po/es.po	2012-11-27 17:11:34 UTC (rev 8561)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-27 17:50+0100\n"
+"POT-Creation-Date: 2012-11-27 18:09+0100\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2012-11-27 16:54:01 UTC (rev 8560)
+++ trunk/locale/po/fr.po	2012-11-27 17:11:34 UTC (rev 8561)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-27 17:50+0100\n"
+"POT-Creation-Date: 2012-11-27 18:09+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."

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2012-11-27 16:54:01 UTC (rev 8560)
+++ trunk/locale/po/it.po	2012-11-27 17:11:34 UTC (rev 8561)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-27 17:50+0100\n"
+"POT-Creation-Date: 2012-11-27 18:09+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"

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2012-11-27 16:54:01 UTC (rev 8560)
+++ trunk/locale/po/ja.po	2012-11-27 17:11:34 UTC (rev 8561)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-27 17:50+0100\n"
+"POT-Creation-Date: 2012-11-27 18:09+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"
@@ -3387,14 +3387,13 @@
 msgstr ""
 
 #: ../lib/plugin/PasswordReset.php:91
-#, fuzzy, php-format
+#, php-format
 msgid "Error sending e-mail with password for user %s."
-msgstr "ユーザーIDかパスワードが無効です。"
+msgstr ""
 
 #: ../lib/plugin/PasswordReset.php:99
-#, fuzzy
 msgid "Reset password of user: "
-msgstr "ユーザーIDかパスワードが無効です。"
+msgstr ""
 
 #: ../lib/plugin/PasswordReset.php:109 ../lib/plugin/PasswordReset.php:153
 msgid "Send e-mail"
@@ -3732,9 +3731,9 @@
 msgstr ""
 
 #: ../lib/plugin/RateIt.php:282
-#, php-format
+#, fuzzy, php-format
 msgid "Prediction: %s"
-msgstr ""
+msgstr "編集: %s"
 
 #: ../lib/plugin/RateIt.php:286
 #, php-format
@@ -6672,9 +6671,8 @@
 msgstr ""
 
 #: ../lib/upgrade.php:791
-#, fuzzy
 msgid "DB admin password:"
-msgstr "ユーザーIDかパスワードが無効です。"
+msgstr ""
 
 #: ../lib/upgrade.php:824
 msgid "Check for extra page.cached_html column"
@@ -7075,9 +7073,8 @@
 #: ../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
-#, fuzzy
 msgid "Invalid username."
-msgstr "ユーザーIDかパスワードが無効です。"
+msgstr ""
 
 #: ../lib/WikiUser/AdoDb.php:168 ../lib/WikiUser/PdoDb.php:153
 #: ../lib/WikiUser/PearDb.php:158
@@ -7136,9 +7133,8 @@
 msgstr ""
 
 #: ../lib/WikiUser/LDAP.php:214
-#, fuzzy
 msgid "Wrong password: "
-msgstr "ユーザーIDかパスワードが無効です。"
+msgstr ""
 
 #: ../lib/WikiUser/LDAP.php:220
 #, php-format
@@ -7146,9 +7142,9 @@
 msgstr ""
 
 #: ../lib/WikiUser/LDAP.php:232
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid username '%s' for LDAP Auth"
-msgstr "ユーザーIDかパスワードが無効です。"
+msgstr ""
 
 #: ../lib/WikiUserNew.php:456
 msgid ""
@@ -7156,9 +7152,8 @@
 msgstr ""
 
 #: ../lib/WikiUserNew.php:687
-#, fuzzy
 msgid "Invalid password."
-msgstr "ユーザーIDかパスワードが無効です。"
+msgstr ""
 
 #: ../lib/WikiUserNew.php:689 ../lib/WikiUser.php:213
 msgid "Invalid password or userid."
@@ -7241,9 +7236,9 @@
 msgstr ""
 
 #: ../lib/WikiUser/PersonalPage.php:69
-#, fuzzy, php-format
+#, php-format
 msgid "Given password ignored."
-msgstr "ユーザーIDかパスワードが無効です。"
+msgstr ""
 
 #: ../lib/WikiUser.php:273
 msgid ""
@@ -8828,22 +8823,11 @@
 #~ msgid "Current language: '%s'"
 #~ msgstr "現在の言語: %s"
 
-#~ msgid "Current theme: '%s'"
-#~ msgstr "現在のテーマ: %s"
-
 #, fuzzy
 #~ msgid "ACL deleted for page '%s'."
 #~ msgstr "全ページ一覧"
 
 #, fuzzy
-#~ msgid "Chown"
-#~ msgstr "カウント"
-
-#, fuzzy
-#~ msgid "SpecialPages"
-#~ msgstr "シリアライズページを出力しています。"
-
-#, fuzzy
 #~ msgid "No pagename specified"
 #~ msgstr "変更点が見つかりませんでした。"
 
@@ -8851,6 +8835,14 @@
 #~ msgid "No page specified."
 #~ msgstr "変更点が見つかりませんでした。"
 
+#, fuzzy
+#~ msgid "Chown"
+#~ msgstr "カウント"
+
+#, fuzzy
+#~ msgid "SpecialPages"
+#~ msgstr "シリアライズページを出力しています。"
+
 #~ msgid "too long"
 #~ msgstr "長すぎます。"
 

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2012-11-27 16:54:01 UTC (rev 8560)
+++ trunk/locale/po/nl.po	2012-11-27 17:11:34 UTC (rev 8561)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-27 17:50+0100\n"
+"POT-Creation-Date: 2012-11-27 18:09+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"

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2012-11-27 16:54:01 UTC (rev 8560)
+++ trunk/locale/po/phpwiki.pot	2012-11-27 17:11:34 UTC (rev 8561)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-27 17:50+0100\n"
+"POT-Creation-Date: 2012-11-27 18:09+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"

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2012-11-27 16:54:01 UTC (rev 8560)
+++ trunk/locale/po/sv.po	2012-11-27 17:11:34 UTC (rev 8561)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-27 17:50+0100\n"
+"POT-Creation-Date: 2012-11-27 18:09+0100\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2012-11-27 16:54:01 UTC (rev 8560)
+++ trunk/locale/po/zh.po	2012-11-27 17:11:34 UTC (rev 8561)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-27 17:50+0100\n"
+"POT-Creation-Date: 2012-11-27 18:09+0100\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"

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.

[phpwiki-checkins] SF.net SVN: phpwiki:[8560] trunk/locale

From: <var...@us...> - 2012-11-27 16:54:12

Revision: 8560
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8560&view=rev
Author:   vargenau
Date:     2012-11-27 16:54:01 +0000 (Tue, 27 Nov 2012)
Log Message:
-----------
Update Spanish translation

Modified Paths:
--------------
    trunk/locale/de/LC_MESSAGES/phpwiki.mo
    trunk/locale/es/LC_MESSAGES/phpwiki.mo
    trunk/locale/es/LC_MESSAGES/phpwiki.php
    trunk/locale/fr/LC_MESSAGES/phpwiki.mo
    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/locale/de/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

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-27 16:36:37 UTC (rev 8559)
+++ trunk/locale/es/LC_MESSAGES/phpwiki.php	2012-11-27 16:54:01 UTC (rev 8560)
@@ -159,6 +159,7 @@
 $locale["Empty Preferences or format of UserPreferences cookie not recognised."] = "Preferencias o formato vacías de la galleta de UsuarioPreferencias no reconocido.";
 $locale["Empty link to: %s"] = "Acoplamiento vacío a: %s";
 $locale["Empty pagename!"] = "¡Escriba un nombre de página!";
+$locale["Error: Couldn't send %s to %s"] = "Error: No podía enviar %s a %s";
 $locale["Every"] = "Cada";
 $locale["External"] = "Externos";
 $locale["External Links"] = "Acoplamientos Externos";
@@ -518,7 +519,6 @@
 $locale["Your home page has not been created yet so your preferences cannot not be saved."] = "Su Home Page no se ha creado todavía así que sus preferencias no pueden ser ahorradas.";
 $locale["Your home page is locked so your preferences cannot not be saved."] = "Su Home Page ha sido bloqueada así que sus preferencias no pueden ser ahorradas.";
 $locale["Your signature"] = "Su firma";
-$locale["Your version"] = "Versión actual:";
 $locale["ZIP files of database"] = "Archivos del ZIP de la base de datos";
 $locale["[%d] See [%s]"] = "[%d] Vea [%s]";
 $locale["access this wiki via SOAP"] = "para tener acceso a este wiki vía SOAP";
@@ -570,6 +570,7 @@
 $locale["same content"] = "mismo contenido";
 $locale["saved as "] = "ahorrado como ";
 $locale["saved as %s"] = "ahorrado como %s";
+$locale["sent to %s"] = "vuelva a %s";
 $locale["the file '%s'"] = "el archivo %s";
 $locale["the session.save_path directory '%s'"] = "el directorio '%s' de session.save_path";
 $locale["today"] = "hoy";

Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

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-27 16:36:37 UTC (rev 8559)
+++ trunk/locale/po/de.po	2012-11-27 16:54:01 UTC (rev 8560)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-27 17:35+0100\n"
+"POT-Creation-Date: 2012-11-27 17:50+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."

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2012-11-27 16:36:37 UTC (rev 8559)
+++ trunk/locale/po/es.po	2012-11-27 16:54:01 UTC (rev 8560)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-27 17:35+0100\n"
+"POT-Creation-Date: 2012-11-27 17:50+0100\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -234,7 +234,7 @@
 
 #: ../lib/editpage.php:154 ../lib/editpage.php:593
 msgid "Your version"
-msgstr "Versión actual:"
+msgstr ""
 
 #: ../lib/editpage.php:154 ../lib/editpage.php:594
 msgid "Other version"
@@ -1069,12 +1069,12 @@
 #: ../lib/MailNotify.php:251
 #, php-format
 msgid "sent to %s"
-msgstr ""
+msgstr "vuelva a %s"
 
 #: ../lib/MailNotify.php:257
 #, php-format
 msgid "Error: Couldn't send %s to %s"
-msgstr ""
+msgstr "Error: No podía enviar %s a %s"
 
 #: ../lib/MailNotify.php:286
 msgid "Page change"

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2012-11-27 16:36:37 UTC (rev 8559)
+++ trunk/locale/po/fr.po	2012-11-27 16:54:01 UTC (rev 8560)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-27 17:35+0100\n"
+"POT-Creation-Date: 2012-11-27 17:50+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."

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2012-11-27 16:36:37 UTC (rev 8559)
+++ trunk/locale/po/it.po	2012-11-27 16:54:01 UTC (rev 8560)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-27 17:35+0100\n"
+"POT-Creation-Date: 2012-11-27 17:50+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"

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2012-11-27 16:36:37 UTC (rev 8559)
+++ trunk/locale/po/ja.po	2012-11-27 16:54:01 UTC (rev 8560)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-27 17:35+0100\n"
+"POT-Creation-Date: 2012-11-27 17:50+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"

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2012-11-27 16:36:37 UTC (rev 8559)
+++ trunk/locale/po/nl.po	2012-11-27 16:54:01 UTC (rev 8560)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-27 17:35+0100\n"
+"POT-Creation-Date: 2012-11-27 17:50+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"

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2012-11-27 16:36:37 UTC (rev 8559)
+++ trunk/locale/po/phpwiki.pot	2012-11-27 16:54:01 UTC (rev 8560)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-27 17:35+0100\n"
+"POT-Creation-Date: 2012-11-27 17:50+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"

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2012-11-27 16:36:37 UTC (rev 8559)
+++ trunk/locale/po/sv.po	2012-11-27 16:54:01 UTC (rev 8560)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-27 17:35+0100\n"
+"POT-Creation-Date: 2012-11-27 17:50+0100\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2012-11-27 16:36:37 UTC (rev 8559)
+++ trunk/locale/po/zh.po	2012-11-27 16:54:01 UTC (rev 8560)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-27 17:35+0100\n"
+"POT-Creation-Date: 2012-11-27 17:50+0100\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"

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.

[phpwiki-checkins] SF.net SVN: phpwiki:[8559] trunk/locale

From: <var...@us...> - 2012-11-27 16:36:49

Revision: 8559
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8559&view=rev
Author:   vargenau
Date:     2012-11-27 16:36:37 +0000 (Tue, 27 Nov 2012)
Log Message:
-----------
Update German translation

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/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/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-27 14:17:31 UTC (rev 8558)
+++ trunk/locale/de/LC_MESSAGES/phpwiki.php	2012-11-27 16:36:37 UTC (rev 8559)
@@ -116,6 +116,7 @@
 $locale["ACL"] = "ACL";
 $locale["ACL changed for page '%s'"] = "ACL für Seite '%s' geändert.";
 $locale["ACL changed for page '%s' from '%s' to '%s'."] = "ACL für Seite '%s' geändert von '%s' zu '%s'.";
+$locale["ACL deleted for page '%s'"] = "ACL für Seite '%s' gelöscht.";
 $locale["ACL not changed for page '%s'."] = "ACL für Seite '%s' nicht geändert.";
 $locale["ADDING"] = "HINZU";
 $locale["ADMIN"] = "ADMIN";
@@ -225,6 +226,7 @@
 $locale["Cannot create directory '%s'"] = "Das Verzeichnis »%s« kann nicht erzeugt werden";
 $locale["Cannot create page with empty name!"] = "Kann Seite mit leerem Namen nicht erzeugen";
 $locale["Cannot open AUTH_GROUP_FILE %s"] = "Kann AUTH_GROUP_FILE %s nicht öffnen";
+$locale["Cannot rename. New page name too long."] = "Kein Ausgewählte. Seite Name zu lang";
 $locale["Case exact?"] = "Groß-/Kleinschreibung beachten";
 $locale["Case insensitive?"] = "Groß-/Kleinschreibung beachten?";
 $locale["Category"] = "Kategorie";
@@ -328,6 +330,7 @@
 $locale["Define a translation for a specified text"] = "Definiere die Übersetzung für einen gegebenen Text";
 $locale["Define the translation for %s in %s"] = "Definiere die Übersetzung für %s nach %s";
 $locale["Del/+"] = "Lö/+";
+$locale["Delete ACL"] = "Lösche diese ACL";
 $locale["Delete this ACL"] = "Lösche diese ACL";
 $locale["Deleted"] = "Gelöscht";
 $locale["Deleted %d pages with invalid names:"] = "%d Seiten mit ungültigen Namen gelöscht:";
@@ -670,6 +673,8 @@
 $locale["No pages removed."] = "Keine Seiten gelöscht.";
 $locale["No pages renamed."] = "Keine Seiten umbenannt.";
 $locale["No pages with bad names had to be deleted."] = "Keine Seiten mit ungültigen Namen mußten gelöscht werden.";
+$locale["No revert: no page content"] = "Kein Zurückspeichern: leerer Seiteninalt";
+$locale["No revert: same version page"] = "Kein Zurückspeichern: selbe Version der Seite";
 $locale["No revisions found"] = "Keine Versionen gefunden";
 $locale["No uploaded file to upload?"] = "Keine Datei zum Hochladen?";
 $locale["NoCache"] = "OhneCache";
@@ -817,6 +822,7 @@
 $locale["Purge Page"] = "Seiten endgültig löschen";
 $locale["Purge all Pages With Invalid Names"] = "Alle Seiten mit ungültigen Namen endgültig entfernen";
 $locale["Purge all empty, unreferenced Pages"] = "Alle leeren Seiten endgültig entfernen, die nicht verlinkt sind.";
+$locale["Purge cancelled"] = "Löschen abgebrochen";
 $locale["Purge this page"] = "Lösche diese Seite endgültig";
 $locale["PurgeHtmlCache"] = "HtmlCacheSäubern";
 $locale["Purged page '%s' successfully."] = "Seite »%s« erfolgreich gelöscht.";
@@ -865,6 +871,7 @@
 $locale["Remove"] = "Löschen";
 $locale["Remove Comment"] = "Kommentare Löschen";
 $locale["Remove Page"] = "Seite Löschen";
+$locale["Remove cancelled"] = "Löschen abgebrochen";
 $locale["Remove selected pages"] = "Ausgewählte Seiten löschen";
 $locale["Remove this page"] = "Löschen der Seite";
 $locale["Removed page '%s' successfully."] = "Seite »%s« erfolgreich gelöscht.";
@@ -887,7 +894,9 @@
 $locale["Restore Anyway"] = "Ungeprüft überschreiben";
 $locale["Return to %s"] = "Zurück zu %s";
 $locale["Revert"] = "Zurückspeichern";
+$locale["Revert cancelled"] = "Zurückspeichern abgebrochen";
 $locale["Revert: %s"] = "Zurückspeichern: %s";
+$locale["Revert: missing required version argument"] = "Zurückspeichern: Parameter version muß angegeben werden";
 $locale["Reverting to a previous version of pages"] = "Zurückspeichern einer älteren Version";
 $locale["Revision Not Found"] = "Version nicht gefunden";
 $locale["RichTable"] = "ErweiterteTabellen";
@@ -1105,6 +1114,7 @@
 $locale["Uploading zip dumps"] = "Das Hochladen von ZIP-Dumps in diesem Wiki";
 $locale["Use old markup"] = "Alte Formatierungssyntax verwenden";
 $locale["User %s removed page %s"] = "Seite gelöscht %s von Benutzer %s";
+$locale["User Preferences"] = "BenutzerEinstellungen";
 $locale["User not found in LDAP"] = "Benutzer in LDAP nicht gefunden";
 $locale["User page"] = "Benutzer Seite";
 $locale["User preferences for this project"] = "Einstellungen für dieses Projekt";
@@ -1145,8 +1155,10 @@
 $locale["Warning:"] = "Achtung:";
 $locale["Warning: The search string cannot be empty!"] = "Achtung! Das Suchwort darf nicht leer sein!";
 $locale["Warning: You are editing an old revision."] = "Achtung: Sie bearbeiten eine alte Version.";
+$locale["Warning: You are editing an old revision. Saving this page will overwrite the current version."] = "Wenn Sie diese Seite jetzt speichern, wird die aktuelle Version überschrieben.";
 $locale["Watch Page"] = "Seite beobarchten";
 $locale["WatchPage"] = "SeiteBeobarten";
+$locale["WatchPage cancelled"] = "SeiteBeobarten abgebrochen";
 $locale["We have a total of %d registered users."] = "Wir haben insgesamt %d registrierte Benutzer.";
 $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";

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/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-27 14:17:31 UTC (rev 8558)
+++ trunk/locale/po/de.po	2012-11-27 16:36:37 UTC (rev 8559)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-27 15:16+0100\n"
+"POT-Creation-Date: 2012-11-27 17:35+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."
@@ -970,24 +970,20 @@
 msgstr " Konnte leider nicht automatisch einpflegen."
 
 #: ../lib/loadsave.php:1084
-#, fuzzy
 msgid "Revert: missing required version argument"
-msgstr "Parameter version muß angegeben werden"
+msgstr "Zurückspeichern: Parameter version muß angegeben werden"
 
 #: ../lib/loadsave.php:1091
-#, fuzzy
 msgid "No revert: no page content"
-msgstr "leerer Seiteninalt"
+msgstr "Kein Zurückspeichern: leerer Seiteninalt"
 
 #: ../lib/loadsave.php:1096
-#, fuzzy
 msgid "No revert: same version page"
-msgstr "selbe Version der Seite"
+msgstr "Kein Zurückspeichern: selbe Version der Seite"
 
 #: ../lib/loadsave.php:1101
-#, fuzzy
 msgid "Revert cancelled"
-msgstr "Abgebrochen"
+msgstr "Zurückspeichern abgebrochen"
 
 #: ../lib/loadsave.php:1110 ../lib/plugin/PasswordReset.php:109
 #: ../lib/plugin/PasswordReset.php:153 ../lib/plugin/UserPreferences.php:120
@@ -5181,9 +5177,8 @@
 msgstr ""
 
 #: ../lib/plugin/WatchPage.php:145
-#, fuzzy
 msgid "WatchPage cancelled"
-msgstr "SeiteBeobarten"
+msgstr "SeiteBeobarten abgebrochen"
 
 #: ../lib/plugin/WatchPage.php:166
 msgid ""
@@ -5352,9 +5347,8 @@
 msgstr "Besitzer ändern zu:"
 
 #: ../lib/plugin/WikiAdminDeleteAcl.php:40
-#, fuzzy
 msgid "WikiDeleteAcl"
-msgstr "Gelöscht"
+msgstr ""
 
 #: ../lib/plugin/WikiAdminDeleteAcl.php:45
 #, fuzzy
@@ -5363,9 +5357,9 @@
 
 #: ../lib/plugin/WikiAdminDeleteAcl.php:61
 #: ../lib/plugin/WikiAdminDeleteAcl.php:66
-#, fuzzy, php-format
+#, php-format
 msgid "ACL deleted for page '%s'"
-msgstr "ACL für Seite '%s' geändert."
+msgstr "ACL für Seite '%s' gelöscht."
 
 # Any better translation? The locale/de/pgsrc/PhpWikiSystemverwalten
 # must also be renamed to match what is here.
@@ -5375,7 +5369,6 @@
 msgstr "PhpWikiSystemverwalten/AclSetzen"
 
 #: ../lib/plugin/WikiAdminDeleteAcl.php:127
-#, fuzzy
 msgid "Delete ACL"
 msgstr "Lösche diese ACL"
 
@@ -5572,9 +5565,8 @@
 msgstr "Ausgewählte Seiten umbenennen"
 
 #: ../lib/plugin/WikiAdminRename.php:84
-#, fuzzy
 msgid "Cannot rename. New page name too long."
-msgstr "Seite Name zu lang"
+msgstr "Kein Ausgewählte. Seite Name zu lang"
 
 #: ../lib/plugin/WikiAdminRename.php:86
 #, php-format
@@ -6325,9 +6317,8 @@
 msgstr "Erforderliches Argument »%s« fehlt"
 
 #: ../lib/purgepage.php:14
-#, fuzzy
 msgid "Purge cancelled"
-msgstr "Abgebrochen"
+msgstr "Löschen abgebrochen"
 
 #: ../lib/purgepage.php:21 ../lib/removepage.php:21
 msgid "Sorry, this page does not exist."
@@ -6358,9 +6349,8 @@
 "von der Datenbank permanent löschen wollen."
 
 #: ../lib/removepage.php:14
-#, fuzzy
 msgid "Remove cancelled"
-msgstr "Seite Löschen"
+msgstr "Löschen abgebrochen"
 
 #: ../lib/removepage.php:24 ../lib/removepage.php:57 ../lib/WikiTheme.php:1068
 msgid "Remove Page"
@@ -8564,7 +8554,6 @@
 msgstr ""
 
 #: ../themes/fusionforge/templates/editpage.tmpl:13
-#, fuzzy
 msgid ""
 "Warning: You are editing an old revision. Saving this page will overwrite "
 "the current version."
@@ -8622,7 +8611,6 @@
 msgstr "Meine Benutzer Seite"
 
 #: ../themes/fusionforge/templates/navbar.tmpl:27
-#, fuzzy
 msgid "User Preferences"
 msgstr "BenutzerEinstellungen"
 

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2012-11-27 14:17:31 UTC (rev 8558)
+++ trunk/locale/po/es.po	2012-11-27 16:36:37 UTC (rev 8559)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-27 15:16+0100\n"
+"POT-Creation-Date: 2012-11-27 17:35+0100\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2012-11-27 14:17:31 UTC (rev 8558)
+++ trunk/locale/po/fr.po	2012-11-27 16:36:37 UTC (rev 8559)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-27 15:16+0100\n"
+"POT-Creation-Date: 2012-11-27 17:35+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."

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2012-11-27 14:17:31 UTC (rev 8558)
+++ trunk/locale/po/it.po	2012-11-27 16:36:37 UTC (rev 8559)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-27 15:16+0100\n"
+"POT-Creation-Date: 2012-11-27 17:35+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"

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2012-11-27 14:17:31 UTC (rev 8558)
+++ trunk/locale/po/ja.po	2012-11-27 16:36:37 UTC (rev 8559)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-27 15:16+0100\n"
+"POT-Creation-Date: 2012-11-27 17:35+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"

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2012-11-27 14:17:31 UTC (rev 8558)
+++ trunk/locale/po/nl.po	2012-11-27 16:36:37 UTC (rev 8559)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-27 15:16+0100\n"
+"POT-Creation-Date: 2012-11-27 17:35+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"

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2012-11-27 14:17:31 UTC (rev 8558)
+++ trunk/locale/po/phpwiki.pot	2012-11-27 16:36:37 UTC (rev 8559)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-27 15:16+0100\n"
+"POT-Creation-Date: 2012-11-27 17:35+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"

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2012-11-27 14:17:31 UTC (rev 8558)
+++ trunk/locale/po/sv.po	2012-11-27 16:36:37 UTC (rev 8559)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-27 15:16+0100\n"
+"POT-Creation-Date: 2012-11-27 17:35+0100\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2012-11-27 14:17:31 UTC (rev 8558)
+++ trunk/locale/po/zh.po	2012-11-27 16:36:37 UTC (rev 8559)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-27 15:16+0100\n"
+"POT-Creation-Date: 2012-11-27 17:35+0100\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"

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.

[phpwiki-checkins] SF.net SVN: phpwiki:[8558] trunk/locale

From: <var...@us...> - 2012-11-27 14:17:43

Revision: 8558
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8558&view=rev
Author:   vargenau
Date:     2012-11-27 14:17:31 +0000 (Tue, 27 Nov 2012)
Log Message:
-----------
Update translations

Modified Paths:
--------------
    trunk/locale/de/LC_MESSAGES/phpwiki.mo
    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

Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

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-27 14:12:13 UTC (rev 8557)
+++ trunk/locale/fr/LC_MESSAGES/phpwiki.php	2012-11-27 14:17:31 UTC (rev 8558)
@@ -39,6 +39,7 @@
 $locale["%d pages have been renamed:"] = "%d pages ont été renommées :";
 $locale["%d pages with less than %d hits (<%d%%)."] = "%d pages ayant eu moins de %d visiteurs (<%d%%).";
 $locale["%s %s %s is disallowed on this wiki for %s user '%s' (level: %s)."] = "%s %s %s est interdit sur ce wiki pour l'utilisateur %s « %s » (niveau : %s).";
+$locale["%s KiB"] = "%s Kio";
 $locale["%s KiB (%s bytes)"] = "%s Kio (%s octets)";
 $locale["%s already exists"] = "%s existe déjà";
 $locale["%s at %s"] = "%s à %s";
@@ -1379,6 +1380,7 @@
 $locale["trailing cruft in plugin args: '%s'"] = "cochonneries terminant les arguments du plugin : « %s »";
 $locale["unknown argument '%s' to SystemInfo"] = "argument inconnu pour SystemInfo (%s)";
 $locale["unknown color %s ignored"] = "couleur %s non valable ignorée";
+$locale["unknown format."] = "format inconnu.";
 $locale["unlock this page"] = "déverrouiller cette page";
 $locale["upload a zip dump"] = "déposer un fichier zip";
 $locale["uploaded %s"] = "Téléchargé %s";

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-27 14:12:13 UTC (rev 8557)
+++ trunk/locale/po/de.po	2012-11-27 14:17:31 UTC (rev 8558)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-27 14:57+0100\n"
+"POT-Creation-Date: 2012-11-27 15:16+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."

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2012-11-27 14:12:13 UTC (rev 8557)
+++ trunk/locale/po/es.po	2012-11-27 14:17:31 UTC (rev 8558)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-27 14:57+0100\n"
+"POT-Creation-Date: 2012-11-27 15:16+0100\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2012-11-27 14:12:13 UTC (rev 8557)
+++ trunk/locale/po/fr.po	2012-11-27 14:17:31 UTC (rev 8558)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-27 14:57+0100\n"
+"POT-Creation-Date: 2012-11-27 15:16+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."
@@ -6476,7 +6476,7 @@
 
 #: ../lib/upgrade.php:109
 msgid "unknown format."
-msgstr ""
+msgstr "format inconnu."
 
 #: ../lib/upgrade.php:112
 #, php-format

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2012-11-27 14:12:13 UTC (rev 8557)
+++ trunk/locale/po/it.po	2012-11-27 14:17:31 UTC (rev 8558)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-27 14:57+0100\n"
+"POT-Creation-Date: 2012-11-27 15:16+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"

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2012-11-27 14:12:13 UTC (rev 8557)
+++ trunk/locale/po/ja.po	2012-11-27 14:17:31 UTC (rev 8558)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-27 14:57+0100\n"
+"POT-Creation-Date: 2012-11-27 15:16+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"

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2012-11-27 14:12:13 UTC (rev 8557)
+++ trunk/locale/po/nl.po	2012-11-27 14:17:31 UTC (rev 8558)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-27 14:57+0100\n"
+"POT-Creation-Date: 2012-11-27 15:16+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"

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2012-11-27 14:12:13 UTC (rev 8557)
+++ trunk/locale/po/phpwiki.pot	2012-11-27 14:17:31 UTC (rev 8558)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-27 14:57+0100\n"
+"POT-Creation-Date: 2012-11-27 15:16+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"

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2012-11-27 14:12:13 UTC (rev 8557)
+++ trunk/locale/po/sv.po	2012-11-27 14:17:31 UTC (rev 8558)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-27 14:57+0100\n"
+"POT-Creation-Date: 2012-11-27 15:16+0100\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2012-11-27 14:12:13 UTC (rev 8557)
+++ trunk/locale/po/zh.po	2012-11-27 14:17:31 UTC (rev 8558)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-27 14:57+0100\n"
+"POT-Creation-Date: 2012-11-27 15:16+0100\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"

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.

[phpwiki-checkins] SF.net SVN: phpwiki:[8557] trunk/locale/po/fr.po

From: <var...@us...> - 2012-11-27 14:12:24

Revision: 8557
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8557&view=rev
Author:   vargenau
Date:     2012-11-27 14:12:13 +0000 (Tue, 27 Nov 2012)
Log Message:
-----------
KiB --> Kio

Modified Paths:
--------------
    trunk/locale/po/fr.po

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2012-11-27 13:59:50 UTC (rev 8556)
+++ trunk/locale/po/fr.po	2012-11-27 14:12:13 UTC (rev 8557)
@@ -6411,7 +6411,7 @@
 #: ../lib/stdlib.php:1453
 #, php-format
 msgid "%s KiB"
-msgstr ""
+msgstr "%s Kio"
 
 #: ../lib/stdlib.php:1455 ../themes/MonoBook/templates/info.tmpl:30
 #, php-format

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8556] trunk/locale

From: <var...@us...> - 2012-11-27 14:00:00

Revision: 8556
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8556&view=rev
Author:   vargenau
Date:     2012-11-27 13:59:50 +0000 (Tue, 27 Nov 2012)
Log Message:
-----------
Update translations

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/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/nl/LC_MESSAGES/phpwiki.php
    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

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-27 13:51:21 UTC (rev 8555)
+++ trunk/locale/de/LC_MESSAGES/phpwiki.php	2012-11-27 13:59:50 UTC (rev 8556)
@@ -9,7 +9,6 @@
 $locale[" Additionally, try to keep the latest contributions of all authors in the last %d days (even if there are more than %d of them,) but in no case keep more than %d unique author revisions."] = "Versuche zusätzlich die neuesten Beiträge aller Autoren der letzten %d Tage aufzubewahren (auch wenn es mehr als %d sind), keinesfalls jedoch mehr als %d einzelne Autoren Revisionen.";
 $locale[" Keep the latest contributions of the last %d authors up to %d days."] = "Aufbewahrung der neueren Beiträge der letzten %d Autoren für %d Tage.";
 $locale[" Keep up to %d minor edits, but keep them no longer than %d days."] = "Aufbewahrung kleinerer Änderungen für %d, aber nicht länger als %d Tage.";
-$locale[" Skipped"] = "Ausgelassen";
 $locale[" Sorry, cannot merge."] = " Konnte leider nicht automatisch einpflegen.";
 $locale[" and "] = " und  ";
 $locale[" is identical."] = " sind identisch.";

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-27 13:51:21 UTC (rev 8555)
+++ trunk/locale/es/LC_MESSAGES/phpwiki.php	2012-11-27 13:59:50 UTC (rev 8556)
@@ -2,7 +2,6 @@
 
 $locale[" ... around %s"] = " ... alrededor de %s";
 $locale[" ... first %d bytes"] = " ... primeros octetos de %d";
-$locale[" Skipped"] = "Saltado";
 $locale[" Sorry, cannot merge."] = " Apesadumbrado, no puede combinarse.";
 $locale[" and "] = " y ";
 $locale[" is identical."] = " es idéntico.";

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-27 13:51:21 UTC (rev 8555)
+++ trunk/locale/fr/LC_MESSAGES/phpwiki.php	2012-11-27 13:59:50 UTC (rev 8556)
@@ -10,7 +10,6 @@
 $locale[" Additionally, try to keep the latest contributions of all authors in the last %d days (even if there are more than %d of them,) but in no case keep more than %d unique author revisions."] = "De plus, essayez de conserver les dernières contributions de tous les auteurs depuis les %d derniers jours (même s'il y en a plus que %d), mais ne conservez en aucun cas plus que %d versions par auteur.";
 $locale[" Keep the latest contributions of the last %d authors up to %d days."] = "Garder les dernières contributions des derniers %d auteurs jusqu'à %d jours.";
 $locale[" Keep up to %d minor edits, but keep them no longer than %d days."] = "Garder jusqu'à %d édition mineures, mais pas plus que %d jours.";
-$locale[" Skipped"] = "Ignoré";
 $locale[" Sorry, cannot merge."] = " Désolé, impossible de fusionner.";
 $locale[" and "] = " et ";
 $locale[" for all pages linking to %s"] = " pour les pages liées à %s.";

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/nl/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/nl/LC_MESSAGES/phpwiki.php	2012-11-27 13:51:21 UTC (rev 8555)
+++ trunk/locale/nl/LC_MESSAGES/phpwiki.php	2012-11-27 13:59:50 UTC (rev 8556)
@@ -1,6 +1,5 @@
 <?php
 
-$locale[" Skipped"] = "Overgeslagen";
 $locale[" is identical."] = " zijn identiek";
 $locale[" to "] = " naar ";
 $locale["%4d  %s\n"] = "%4d  %s\n";
@@ -99,6 +98,7 @@
 $locale["See %s tips for editing."] = "%s tips for veranderen.";
 $locale["Serialized file %s"] = "Geserialiseerd bestand %s";
 $locale["Sidebar"] = "Zoek";
+$locale["Skipped."] = "Overgeslagen.";
 $locale["Skipping"] = "Overgeslagen";
 $locale["Sorry for the inconvenience."] = "Excuses voor het ongemak.";
 $locale["Template Name"] = "Template Naam";

Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po	2012-11-27 13:51:21 UTC (rev 8555)
+++ trunk/locale/po/de.po	2012-11-27 13:59:50 UTC (rev 8556)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-27 11:52+0100\n"
+"POT-Creation-Date: 2012-11-27 14:57+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."
@@ -517,12 +517,12 @@
 #: ../lib/EditToolbar.php:59 ../lib/plugin/SyncWiki.php:308
 #: ../lib/plugin/SyncWiki.php:335 ../lib/plugin/SyncWiki.php:359
 #: ../lib/plugin/WikiPoll.php:228 ../lib/stdlib.php:1992
-#: ../lib/upgrade.php:201 ../lib/upgrade.php:407 ../lib/upgrade.php:421
-#: ../lib/upgrade.php:441 ../lib/upgrade.php:450 ../lib/upgrade.php:474
-#: ../lib/upgrade.php:502 ../lib/upgrade.php:551 ../lib/upgrade.php:554
-#: ../lib/upgrade.php:586 ../lib/upgrade.php:588 ../lib/upgrade.php:615
-#: ../lib/upgrade.php:675 ../lib/upgrade.php:700 ../lib/upgrade.php:848
-#: ../lib/upgrade.php:851 ../lib/upgrade.php:920
+#: ../lib/upgrade.php:197 ../lib/upgrade.php:403 ../lib/upgrade.php:417
+#: ../lib/upgrade.php:437 ../lib/upgrade.php:446 ../lib/upgrade.php:470
+#: ../lib/upgrade.php:498 ../lib/upgrade.php:547 ../lib/upgrade.php:550
+#: ../lib/upgrade.php:582 ../lib/upgrade.php:584 ../lib/upgrade.php:611
+#: ../lib/upgrade.php:671 ../lib/upgrade.php:696 ../lib/upgrade.php:844
+#: ../lib/upgrade.php:847 ../lib/upgrade.php:916
 msgid "OK"
 msgstr "OK"
 
@@ -710,8 +710,8 @@
 #: ../lib/plugin/WikiAdminSearchReplace.php:240
 #: ../lib/plugin/WikiAdminSearchReplace.php:244
 #: ../lib/plugin/WikiAdminSetAcl.php:253 ../lib/plugin/WikiAdminSetAcl.php:254
-#: ../lib/plugin/WikiAdminSetAcl.php:256 ../lib/upgrade.php:1128
-#: ../lib/upgrade.php:1138 ../themes/blog/templates/blogform.tmpl:7
+#: ../lib/plugin/WikiAdminSetAcl.php:256 ../lib/upgrade.php:1124
+#: ../lib/upgrade.php:1134 ../themes/blog/templates/blogform.tmpl:7
 #: ../themes/default/templates/blogform.tmpl:7
 #: ../themes/default/templates/userprefs.tmpl:154
 #: ../themes/default/templates/userprefs.tmpl:163
@@ -850,6 +850,8 @@
 msgstr "Die Seiten werden geschrieben"
 
 #: ../lib/loadsave.php:373 ../lib/loadsave.php:640 ../lib/stdlib.php:1046
+#: ../lib/upgrade.php:76 ../lib/upgrade.php:106 ../lib/upgrade.php:109
+#: ../lib/upgrade.php:202 ../lib/upgrade.php:1143
 msgid "Skipped."
 msgstr "Ausgelassen."
 
@@ -1010,7 +1012,7 @@
 #: ../lib/plugin/WikiAdminSelect.php:152 ../lib/plugin/WikiAdminSetAcl.php:216
 #: ../lib/plugin/WikiAdminSetExternal.php:137
 #: ../lib/plugin/WikiAdminUtils.php:308 ../lib/plugin/WikiFormRich.php:313
-#: ../lib/purgepage.php:25 ../lib/removepage.php:25 ../lib/upgrade.php:803
+#: ../lib/purgepage.php:25 ../lib/removepage.php:25 ../lib/upgrade.php:799
 #: ../themes/default/templates/login.tmpl:85
 #: ../themes/default/templates/userprefs.tmpl:290
 #: ../themes/fusionforge/templates/userprefs.tmpl:390
@@ -2457,7 +2459,7 @@
 "remove a key by leaving the value-box empty."
 msgstr ""
 
-#: ../lib/plugin/EditMetaData.php:146 ../lib/upgrade.php:801
+#: ../lib/plugin/EditMetaData.php:146 ../lib/upgrade.php:797
 msgid "Submit"
 msgstr "Eingeben"
 
@@ -3608,7 +3610,7 @@
 msgstr "%s scheint kein Zusatzprogramm zu sein."
 
 #: ../lib/plugin/PluginManager.php:128 ../lib/plugin/PluginManager.php:130
-#: ../lib/upgrade.php:212 ../themes/MonoBook/templates/navbar.tmpl:18
+#: ../lib/upgrade.php:208 ../themes/MonoBook/templates/navbar.tmpl:18
 msgid "Help"
 msgstr "Hilfe"
 
@@ -3736,7 +3738,7 @@
 "zufälliger ausgewählter Seite weiterleiten."
 
 #: ../lib/plugin/RateIt.php:92 ../lib/plugin/RateIt.php:305
-#: ../lib/upgrade.php:444
+#: ../lib/upgrade.php:440
 msgid "RateIt"
 msgstr "BewerteEs"
 
@@ -4446,9 +4448,9 @@
 
 #: ../lib/plugin/SyncWiki.php:310 ../lib/plugin/SyncWiki.php:337
 #: ../lib/plugin/SyncWiki.php:339 ../lib/plugin/SyncWiki.php:361
-#: ../lib/plugin/SyncWiki.php:363 ../lib/upgrade.php:203
-#: ../lib/upgrade.php:546 ../lib/upgrade.php:584 ../lib/upgrade.php:689
-#: ../lib/upgrade.php:904 ../lib/upgrade.php:1136
+#: ../lib/plugin/SyncWiki.php:363 ../lib/upgrade.php:199
+#: ../lib/upgrade.php:542 ../lib/upgrade.php:580 ../lib/upgrade.php:685
+#: ../lib/upgrade.php:900 ../lib/upgrade.php:1132
 msgid "FAILED"
 msgstr "FEHLER"
 
@@ -6557,251 +6559,246 @@
 msgid "always skip the HomePage."
 msgstr ""
 
-#: ../lib/upgrade.php:77 ../lib/upgrade.php:108 ../lib/upgrade.php:112
-#: ../lib/upgrade.php:206 ../lib/upgrade.php:1147
-msgid " Skipped"
-msgstr "Ausgelassen"
-
-#: ../lib/upgrade.php:102
+#: ../lib/upgrade.php:101
 msgid "newer than the existing page."
 msgstr "neuer als die bestehende Seite."
 
-#: ../lib/upgrade.php:103
+#: ../lib/upgrade.php:102
 msgid " replace "
 msgstr " ersetze mit "
 
-#: ../lib/upgrade.php:107
+#: ../lib/upgrade.php:106
 msgid "older than the existing page."
 msgstr "älter als die bestehende Seite."
 
-#: ../lib/upgrade.php:111
+#: ../lib/upgrade.php:109
 msgid "unknown format."
 msgstr ""
 
-#: ../lib/upgrade.php:115
+#: ../lib/upgrade.php:112
 #, php-format
 msgid "%s does not exist"
 msgstr "%s existiert nicht"
 
-#: ../lib/upgrade.php:123 ../lib/upgrade.php:173 ../lib/upgrade.php:393
-#: ../lib/upgrade.php:928 ../lib/upgrade.php:1018
+#: ../lib/upgrade.php:120 ../lib/upgrade.php:169 ../lib/upgrade.php:389
+#: ../lib/upgrade.php:924 ../lib/upgrade.php:1014
 #, php-format
 msgid "Check for necessary %s updates"
 msgstr ""
 
-#: ../lib/upgrade.php:124 ../themes/MonoBook/templates/actionbar.tmpl:15
+#: ../lib/upgrade.php:120 ../themes/MonoBook/templates/actionbar.tmpl:15
 #: ../themes/MonoBook/templates/actionbar.tmpl:28
 msgid "ActionPage"
 msgstr "Aktion Seite"
 
-#: ../lib/upgrade.php:126
+#: ../lib/upgrade.php:122
 msgid "_AuthInfo"
 msgstr ""
 
-#: ../lib/upgrade.php:126
+#: ../lib/upgrade.php:122
 msgid "DebugAuthInfo"
 msgstr ""
 
-#: ../lib/upgrade.php:129
+#: ../lib/upgrade.php:125
 msgid "_GroupInfo"
 msgstr ""
 
-#: ../lib/upgrade.php:129
+#: ../lib/upgrade.php:125
 msgid "GroupAuthInfo"
 msgstr ""
 
-#: ../lib/upgrade.php:163
+#: ../lib/upgrade.php:159
 #, php-format
 msgid "Check for necessary theme %s updates"
 msgstr ""
 
-#: ../lib/upgrade.php:176
+#: ../lib/upgrade.php:172
 msgid "rename to Help: pages"
 msgstr ""
 
-#: ../lib/upgrade.php:198
+#: ../lib/upgrade.php:194
 #, php-format
 msgid "rename %s to %s"
 msgstr "Seite »%s« nach umbenennen »%s«"
 
-#: ../lib/upgrade.php:227
+#: ../lib/upgrade.php:223
 msgid "MISSING"
 msgstr "FEHLEND"
 
-#: ../lib/upgrade.php:263 ../lib/upgrade.php:282 ../lib/upgrade.php:303
-#: ../lib/upgrade.php:331 ../lib/upgrade.php:377
+#: ../lib/upgrade.php:259 ../lib/upgrade.php:278 ../lib/upgrade.php:299
+#: ../lib/upgrade.php:327 ../lib/upgrade.php:373
 msgid "CREATED"
 msgstr "ERZEUGT"
 
-#: ../lib/upgrade.php:394
+#: ../lib/upgrade.php:390
 msgid "database"
 msgstr "Datenbank"
 
-#: ../lib/upgrade.php:400
+#: ../lib/upgrade.php:396
 msgid "CANCEL"
 msgstr "ABBRUCH"
 
-#: ../lib/upgrade.php:413
+#: ../lib/upgrade.php:409
 msgid "Backend type: "
 msgstr "Backend Typ: "
 
-#: ../lib/upgrade.php:417 ../lib/upgrade.php:437 ../lib/upgrade.php:446
+#: ../lib/upgrade.php:413 ../lib/upgrade.php:433 ../lib/upgrade.php:442
 #, php-format
 msgid "Check for table %s"
 msgstr "Prüfe Tabelle %s"
 
-#: ../lib/upgrade.php:461
+#: ../lib/upgrade.php:457
 msgid "Check for new session.sess_ip column"
 msgstr "Prüfe auf neue Spalte session.sess_ip column"
 
-#: ../lib/upgrade.php:467 ../lib/upgrade.php:683 ../lib/upgrade.php:833
-#: ../lib/upgrade.php:898
+#: ../lib/upgrade.php:463 ../lib/upgrade.php:679 ../lib/upgrade.php:829
+#: ../lib/upgrade.php:894
 msgid "SKIP"
 msgstr ""
 
-#: ../lib/upgrade.php:470 ../lib/upgrade.php:577 ../lib/upgrade.php:838
-#: ../lib/upgrade.php:900
+#: ../lib/upgrade.php:466 ../lib/upgrade.php:573 ../lib/upgrade.php:834
+#: ../lib/upgrade.php:896
 msgid "ADDING"
 msgstr "HINZU"
 
-#: ../lib/upgrade.php:480
+#: ../lib/upgrade.php:476
 msgid "Check for mysql session.sess_id sanity"
 msgstr "Prüfe auf mysql session.sess_id Korrektheit"
 
-#: ../lib/upgrade.php:494 ../lib/upgrade.php:499 ../lib/upgrade.php:535
-#: ../lib/upgrade.php:544
+#: ../lib/upgrade.php:490 ../lib/upgrade.php:495 ../lib/upgrade.php:531
+#: ../lib/upgrade.php:540
 msgid "fixed"
 msgstr "geändert"
 
-#: ../lib/upgrade.php:513
+#: ../lib/upgrade.php:509
 msgid "Check for mysql LOCK TABLE privilege"
 msgstr "Prüfe mysql LOCK TABLE Rechte"
 
-#: ../lib/upgrade.php:558
+#: ../lib/upgrade.php:554
 #, php-format
 msgid "version <em>%s</em> not affected"
 msgstr "version <em>%s</em> nicht betroffen"
 
-#: ../lib/upgrade.php:567
+#: ../lib/upgrade.php:563
 msgid "Check for mysql page.id auto_increment flag"
 msgstr "Prüfe auf mysql page.id auto_increment Flag"
 
-#: ../lib/upgrade.php:604
+#: ../lib/upgrade.php:600
 msgid "Check for mysql 4.1.x/5.0.0 binary search on Windows problem"
 msgstr "prüfe auf mysql 4.1.x/5.0.0 Binärsuch-Problem (nur Windows)"
 
-#: ../lib/upgrade.php:607 ../lib/upgrade.php:623 ../lib/upgrade.php:644
+#: ../lib/upgrade.php:603 ../lib/upgrade.php:619 ../lib/upgrade.php:640
 #, php-format
 msgid "version <em>%s</em>"
 msgstr "version <em>%s</em>"
 
-#: ../lib/upgrade.php:608
+#: ../lib/upgrade.php:604
 msgid "not affected"
 msgstr "nicht betroffen"
 
-#: ../lib/upgrade.php:624 ../lib/upgrade.php:645 ../lib/upgrade.php:673
-#: ../lib/upgrade.php:1126
+#: ../lib/upgrade.php:620 ../lib/upgrade.php:641 ../lib/upgrade.php:669
+#: ../lib/upgrade.php:1122
 msgid "FIXED"
 msgstr "AUSGEBESSERT"
 
-#: ../lib/upgrade.php:655
+#: ../lib/upgrade.php:651
 msgid "Check for ACCESS_LOG_SQL passwords in POST requests"
 msgstr "Prüfe auf ACCESS_LOG_SQL Passwörter in POST Requests"
 
-#: ../lib/upgrade.php:678
+#: ../lib/upgrade.php:674
 msgid "Check for ACCESS_LOG_SQL remote_host varchar(50)"
 msgstr "Prüfe auf ACCESS_LOG_SQL Passwörter in POST Requests"
 
-#: ../lib/upgrade.php:686
+#: ../lib/upgrade.php:682
 msgid "FIXING"
 msgstr ""
 
-#: ../lib/upgrade.php:782
+#: ../lib/upgrade.php:778
 msgid ""
 "Upgrade requires database privileges to CREATE and ALTER the phpwiki "
 "database."
 msgstr ""
 
-#: ../lib/upgrade.php:784
+#: ../lib/upgrade.php:780
 msgid ""
 "And on Windows at least the privilege to SELECT FROM mysql, and possibly "
 "UPDATE mysql"
 msgstr ""
 
-#: ../lib/upgrade.php:789
+#: ../lib/upgrade.php:785
 msgid "DB admin user:"
 msgstr "DB Admin Benutzername:"
 
-#: ../lib/upgrade.php:795
+#: ../lib/upgrade.php:791
 msgid "DB admin password:"
 msgstr "DB Admin passwort:"
 
-#: ../lib/upgrade.php:828
+#: ../lib/upgrade.php:824
 msgid "Check for extra page.cached_html column"
 msgstr ""
 
-#: ../lib/upgrade.php:845 ../lib/upgrade.php:911
+#: ../lib/upgrade.php:841 ../lib/upgrade.php:907
 msgid "CONVERTING"
 msgstr "KONVERTIERE"
 
-#: ../lib/upgrade.php:893
+#: ../lib/upgrade.php:889
 msgid "Check for relation field in link table"
 msgstr ""
 
-#: ../lib/upgrade.php:909
+#: ../lib/upgrade.php:905
 msgid "Rebuild entire database to upgrade relation links"
 msgstr ""
 
-#: ../lib/upgrade.php:929
+#: ../lib/upgrade.php:925
 msgid "plugin argument"
 msgstr ""
 
-#: ../lib/upgrade.php:974
+#: ../lib/upgrade.php:970
 #, php-format
 msgid "file %s not found"
 msgstr "%s nicht gefunden"
 
-#: ../lib/upgrade.php:1001
+#: ../lib/upgrade.php:997
 #, php-format
 msgid "%s not found in %s"
 msgstr "%s nicht gefunden in %s"
 
-#: ../lib/upgrade.php:1008
+#: ../lib/upgrade.php:1004
 #, php-format
 msgid "couldn't move %s to %s"
 msgstr "Kann »%s« nicht nach »%s« verschieben"
 
-#: ../lib/upgrade.php:1012
+#: ../lib/upgrade.php:1008
 #, php-format
 msgid "file %s is not writable"
 msgstr "%s ist nicht änderbar"
 
-#: ../lib/upgrade.php:1023 ../lib/upgrade.php:1033 ../lib/upgrade.php:1043
+#: ../lib/upgrade.php:1019 ../lib/upgrade.php:1029 ../lib/upgrade.php:1039
 #, php-format
 msgid "Check for %s"
 msgstr "Prüfe %s"
 
-#: ../lib/upgrade.php:1025
+#: ../lib/upgrade.php:1021
 msgid "CACHE_CONTROL is set to 'NONE', and must be changed to 'NO_CACHE'"
 msgstr ""
 
-#: ../lib/upgrade.php:1035
+#: ../lib/upgrade.php:1031
 msgid "GROUP_METHOD is set to NONE, and must be changed to \"NONE\""
 msgstr ""
 
-#: ../lib/upgrade.php:1045
+#: ../lib/upgrade.php:1041
 msgid "fix BLOG_EMPTY_DEFAULT_PREFIX into BLOG_DEFAULT_EMPTY_PREFIX"
 msgstr ""
 
-#: ../lib/upgrade.php:1157
+#: ../lib/upgrade.php:1153
 msgid "fixed with"
 msgstr "Geändert mit"
 
-#: ../lib/upgrade.php:1295
+#: ../lib/upgrade.php:1291
 msgid "Upgrade disabled: user != isAdmin"
 msgstr ""
 
-#: ../lib/upgrade.php:1300
+#: ../lib/upgrade.php:1296
 msgid "Upgrading this PhpWiki"
 msgstr ""
 
@@ -8904,6 +8901,9 @@
 msgid "View the current version"
 msgstr "Die aktuelle Version ansehen"
 
+#~ msgid " Skipped"
+#~ msgstr "Ausgelassen"
+
 #~ msgid "Current language: '%s'"
 #~ msgstr "Ihre Sprache: »%s«"
 

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2012-11-27 13:51:21 UTC (rev 8555)
+++ trunk/locale/po/es.po	2012-11-27 13:59:50 UTC (rev 8556)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-27 11:52+0100\n"
+"POT-Creation-Date: 2012-11-27 14:57+0100\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -511,12 +511,12 @@
 #: ../lib/EditToolbar.php:59 ../lib/plugin/SyncWiki.php:308
 #: ../lib/plugin/SyncWiki.php:335 ../lib/plugin/SyncWiki.php:359
 #: ../lib/plugin/WikiPoll.php:228 ../lib/stdlib.php:1992
-#: ../lib/upgrade.php:201 ../lib/upgrade.php:407 ../lib/upgrade.php:421
-#: ../lib/upgrade.php:441 ../lib/upgrade.php:450 ../lib/upgrade.php:474
-#: ../lib/upgrade.php:502 ../lib/upgrade.php:551 ../lib/upgrade.php:554
-#: ../lib/upgrade.php:586 ../lib/upgrade.php:588 ../lib/upgrade.php:615
-#: ../lib/upgrade.php:675 ../lib/upgrade.php:700 ../lib/upgrade.php:848
-#: ../lib/upgrade.php:851 ../lib/upgrade.php:920
+#: ../lib/upgrade.php:197 ../lib/upgrade.php:403 ../lib/upgrade.php:417
+#: ../lib/upgrade.php:437 ../lib/upgrade.php:446 ../lib/upgrade.php:470
+#: ../lib/upgrade.php:498 ../lib/upgrade.php:547 ../lib/upgrade.php:550
+#: ../lib/upgrade.php:582 ../lib/upgrade.php:584 ../lib/upgrade.php:611
+#: ../lib/upgrade.php:671 ../lib/upgrade.php:696 ../lib/upgrade.php:844
+#: ../lib/upgrade.php:847 ../lib/upgrade.php:916
 msgid "OK"
 msgstr ""
 
@@ -703,8 +703,8 @@
 #: ../lib/plugin/WikiAdminSearchReplace.php:240
 #: ../lib/plugin/WikiAdminSearchReplace.php:244
 #: ../lib/plugin/WikiAdminSetAcl.php:253 ../lib/plugin/WikiAdminSetAcl.php:254
-#: ../lib/plugin/WikiAdminSetAcl.php:256 ../lib/upgrade.php:1128
-#: ../lib/upgrade.php:1138 ../themes/blog/templates/blogform.tmpl:7
+#: ../lib/plugin/WikiAdminSetAcl.php:256 ../lib/upgrade.php:1124
+#: ../lib/upgrade.php:1134 ../themes/blog/templates/blogform.tmpl:7
 #: ../themes/default/templates/blogform.tmpl:7
 #: ../themes/default/templates/userprefs.tmpl:154
 #: ../themes/default/templates/userprefs.tmpl:163
@@ -836,6 +836,8 @@
 msgstr "Descargar Las Páginas"
 
 #: ../lib/loadsave.php:373 ../lib/loadsave.php:640 ../lib/stdlib.php:1046
+#: ../lib/upgrade.php:76 ../lib/upgrade.php:106 ../lib/upgrade.php:109
+#: ../lib/upgrade.php:202 ../lib/upgrade.php:1143
 msgid "Skipped."
 msgstr "Saltado."
 
@@ -991,7 +993,7 @@
 #: ../lib/plugin/WikiAdminSelect.php:152 ../lib/plugin/WikiAdminSetAcl.php:216
 #: ../lib/plugin/WikiAdminSetExternal.php:137
 #: ../lib/plugin/WikiAdminUtils.php:308 ../lib/plugin/WikiFormRich.php:313
-#: ../lib/purgepage.php:25 ../lib/removepage.php:25 ../lib/upgrade.php:803
+#: ../lib/purgepage.php:25 ../lib/removepage.php:25 ../lib/upgrade.php:799
 #: ../themes/default/templates/login.tmpl:85
 #: ../themes/default/templates/userprefs.tmpl:290
 #: ../themes/fusionforge/templates/userprefs.tmpl:390
@@ -2425,7 +2427,7 @@
 "remove a key by leaving the value-box empty."
 msgstr ""
 
-#: ../lib/plugin/EditMetaData.php:146 ../lib/upgrade.php:801
+#: ../lib/plugin/EditMetaData.php:146 ../lib/upgrade.php:797
 msgid "Submit"
 msgstr ""
 
@@ -3527,7 +3529,7 @@
 msgstr ""
 
 #: ../lib/plugin/PluginManager.php:128 ../lib/plugin/PluginManager.php:130
-#: ../lib/upgrade.php:212 ../themes/MonoBook/templates/navbar.tmpl:18
+#: ../lib/upgrade.php:208 ../themes/MonoBook/templates/navbar.tmpl:18
 msgid "Help"
 msgstr "Ayuda"
 
@@ -3653,7 +3655,7 @@
 msgstr ""
 
 #: ../lib/plugin/RateIt.php:92 ../lib/plugin/RateIt.php:305
-#: ../lib/upgrade.php:444
+#: ../lib/upgrade.php:440
 msgid "RateIt"
 msgstr ""
 
@@ -4347,9 +4349,9 @@
 
 #: ../lib/plugin/SyncWiki.php:310 ../lib/plugin/SyncWiki.php:337
 #: ../lib/plugin/SyncWiki.php:339 ../lib/plugin/SyncWiki.php:361
-#: ../lib/plugin/SyncWiki.php:363 ../lib/upgrade.php:203
-#: ../lib/upgrade.php:546 ../lib/upgrade.php:584 ../lib/upgrade.php:689
-#: ../lib/upgrade.php:904 ../lib/upgrade.php:1136
+#: ../lib/plugin/SyncWiki.php:363 ../lib/upgrade.php:199
+#: ../lib/upgrade.php:542 ../lib/upgrade.php:580 ../lib/upgrade.php:685
+#: ../lib/upgrade.php:900 ../lib/upgrade.php:1132
 msgid "FAILED"
 msgstr ""
 
@@ -6387,251 +6389,246 @@
 msgid "always skip the HomePage."
 msgstr ""
 
-#: ../lib/upgrade.php:77 ../lib/upgrade.php:108 ../lib/upgrade.php:112
-#: ../lib/upgrade.php:206 ../lib/upgrade.php:1147
-msgid " Skipped"
-msgstr "Saltado"
-
-#: ../lib/upgrade.php:102
+#: ../lib/upgrade.php:101
 msgid "newer than the existing page."
 msgstr ""
 
-#: ../lib/upgrade.php:103
+#: ../lib/upgrade.php:102
 msgid " replace "
 msgstr ""
 
-#: ../lib/upgrade.php:107
+#: ../lib/upgrade.php:106
 msgid "older than the existing page."
 msgstr ""
 
-#: ../lib/upgrade.php:111
+#: ../lib/upgrade.php:109
 msgid "unknown format."
 msgstr ""
 
-#: ../lib/upgrade.php:115
+#: ../lib/upgrade.php:112
 #, php-format
 msgid "%s does not exist"
 msgstr ""
 
-#: ../lib/upgrade.php:123 ../lib/upgrade.php:173 ../lib/upgrade.php:393
-#: ../lib/upgrade.php:928 ../lib/upgrade.php:1018
+#: ../lib/upgrade.php:120 ../lib/upgrade.php:169 ../lib/upgrade.php:389
+#: ../lib/upgrade.php:924 ../lib/upgrade.php:1014
 #, php-format
 msgid "Check for necessary %s updates"
 msgstr ""
 
-#: ../lib/upgrade.php:124 ../themes/MonoBook/templates/actionbar.tmpl:15
+#: ../lib/upgrade.php:120 ../themes/MonoBook/templates/actionbar.tmpl:15
 #: ../themes/MonoBook/templates/actionbar.tmpl:28
 msgid "ActionPage"
 msgstr ""
 
-#: ../lib/upgrade.php:126
+#: ../lib/upgrade.php:122
 msgid "_AuthInfo"
 msgstr ""
 
-#: ../lib/upgrade.php:126
+#: ../lib/upgrade.php:122
 msgid "DebugAuthInfo"
 msgstr ""
 
-#: ../lib/upgrade.php:129
+#: ../lib/upgrade.php:125
 msgid "_GroupInfo"
 msgstr ""
 
-#: ../lib/upgrade.php:129
+#: ../lib/upgrade.php:125
 msgid "GroupAuthInfo"
 msgstr ""
 
-#: ../lib/upgrade.php:163
+#: ../lib/upgrade.php:159
 #, php-format
 msgid "Check for necessary theme %s updates"
 msgstr ""
 
-#: ../lib/upgrade.php:176
+#: ../lib/upgrade.php:172
 msgid "rename to Help: pages"
 msgstr ""
 
-#: ../lib/upgrade.php:198
+#: ../lib/upgrade.php:194
 #, php-format
 msgid "rename %s to %s"
 msgstr "retitula %s a %s"
 
-#: ../lib/upgrade.php:227
+#: ../lib/upgrade.php:223
 msgid "MISSING"
 msgstr ""
 
-#: ../lib/upgrade.php:263 ../lib/upgrade.php:282 ../lib/upgrade.php:303
-#: ../lib/upgrade.php:331 ../lib/upgrade.php:377
+#: ../lib/upgrade.php:259 ../lib/upgrade.php:278 ../lib/upgrade.php:299
+#: ../lib/upgrade.php:327 ../lib/upgrade.php:373
 msgid "CREATED"
 msgstr ""
 
-#: ../lib/upgrade.php:394
+#: ../lib/upgrade.php:390
 msgid "database"
 msgstr ""
 
-#: ../lib/upgrade.php:400
+#: ../lib/upgrade.php:396
 msgid "CANCEL"
 msgstr ""
 
-#: ../lib/upgrade.php:413
+#: ../lib/upgrade.php:409
 msgid "Backend type: "
 msgstr ""
 
-#: ../lib/upgrade.php:417 ../lib/upgrade.php:437 ../lib/upgrade.php:446
+#: ../lib/upgrade.php:413 ../lib/upgrade.php:433 ../lib/upgrade.php:442
 #, php-format
 msgid "Check for table %s"
 msgstr ""
 
-#: ../lib/upgrade.php:461
+#: ../lib/upgrade.php:457
 msgid "Check for new session.sess_ip column"
 msgstr ""
 
-#: ../lib/upgrade.php:467 ../lib/upgrade.php:683 ../lib/upgrade.php:833
-#: ../lib/upgrade.php:898
+#: ../lib/upgrade.php:463 ../lib/upgrade.php:679 ../lib/upgrade.php:829
+#: ../lib/upgrade.php:894
 msgid "SKIP"
 msgstr ""
 
-#: ../lib/upgrade.php:470 ../lib/upgrade.php:577 ../lib/upgrade.php:838
-#: ../lib/upgrade.php:900
+#: ../lib/upgrade.php:466 ../lib/upgrade.php:573 ../lib/upgrade.php:834
+#: ../lib/upgrade.php:896
 msgid "ADDING"
 msgstr ""
 
-#: ../lib/upgrade.php:480
+#: ../lib/upgrade.php:476
 msgid "Check for mysql session.sess_id sanity"
 msgstr ""
 
-#: ../lib/upgrade.php:494 ../lib/upgrade.php:499 ../lib/upgrade.php:535
-#: ../lib/upgrade.php:544
+#: ../lib/upgrade.php:490 ../lib/upgrade.php:495 ../lib/upgrade.php:531
+#: ../lib/upgrade.php:540
 msgid "fixed"
 msgstr "fijo"
 
-#: ../lib/upgrade.php:513
+#: ../lib/upgrade.php:509
 msgid "Check for mysql LOCK TABLE privilege"
 msgstr ""
 
-#: ../lib/upgrade.php:558
+#: ../lib/upgrade.php:554
 #, php-format
 msgid "version <em>%s</em> not affected"
 msgstr ""
 
-#: ../lib/upgrade.php:567
+#: ../lib/upgrade.php:563
 msgid "Check for mysql page.id auto_increment flag"
 msgstr ""
 
-#: ../lib/upgrade.php:604
+#: ../lib/upgrade.php:600
 msgid "Check for mysql 4.1.x/5.0.0 binary search on Windows problem"
 msgstr ""
 
-#: ../lib/upgrade.php:607 ../lib/upgrade.php:623 ../lib/upgrade.php:644
+#: ../lib/upgrade.php:603 ../lib/upgrade.php:619 ../lib/upgrade.php:640
 #, php-format
 msgid "version <em>%s</em>"
 msgstr "versión <em>%s</em>"
 
-#: ../lib/upgrade.php:608
+#: ../lib/upgrade.php:604
 msgid "not affected"
 msgstr ""
 
-#: ../lib/upgrade.php:624 ../lib/upgrade.php:645 ../lib/upgrade.php:673
-#: ../lib/upgrade.php:1126
+#: ../lib/upgrade.php:620 ../lib/upgrade.php:641 ../lib/upgrade.php:669
+#: ../lib/upgrade.php:1122
 msgid "FIXED"
 msgstr ""
 
-#: ../lib/upgrade.php:655
+#: ../lib/upgrade.php:651
 msgid "Check for ACCESS_LOG_SQL passwords in POST requests"
 msgstr ""
 
-#: ../lib/upgrade.php:678
+#: ../lib/upgrade.php:674
 msgid "Check for ACCESS_LOG_SQL remote_host varchar(50)"
 msgstr ""
 
-#: ../lib/upgrade.php:686
+#: ../lib/upgrade.php:682
 msgid "FIXING"
 msgstr ""
 
-#: ../lib/upgrade.php:782
+#: ../lib/upgrade.php:778
 msgid ""
 "Upgrade requires database privileges to CREATE and ALTER the phpwiki "
 "database."
 msgstr ""
 
-#: ../lib/upgrade.php:784
+#: ../lib/upgrade.php:780
 msgid ""
 "And on Windows at least the privilege to SELECT FROM mysql, and possibly "
 "UPDATE mysql"
 msgstr ""
 
-#: ../lib/upgrade.php:789
+#: ../lib/upgrade.php:785
 msgid "DB admin user:"
 msgstr "DB admin username:"
 
-#: ../lib/upgrade.php:795
+#: ../lib/upgrade.php:791
 msgid "DB admin password:"
 msgstr "DB admin contraseña:"
 
-#: ../lib/upgrade.php:828
+#: ../lib/upgrade.php:824
 msgid "Check for extra page.cached_html column"
 msgstr ""
 
-#: ../lib/upgrade.php:845 ../lib/upgrade.php:911
+#: ../lib/upgrade.php:841 ../lib/upgrade.php:907
 msgid "CONVERTING"
 msgstr ""
 
-#: ../lib/upgrade.php:893
+#: ../lib/upgrade.php:889
 msgid "Check for relation field in link table"
 msgstr ""
 
-#: ../lib/upgrade.php:909
+#: ../lib/upgrade.php:905
 msgid "Rebuild entire database to upgrade relation links"
 msgstr ""
 
-#: ../lib/upgrade.php:929
+#: ../lib/upgrade.php:925
 msgid "plugin argument"
 msgstr ""
 
-#: ../lib/upgrade.php:974
+#: ../lib/upgrade.php:970
 #, php-format
 msgid "file %s not found"
 msgstr "fichero %s no encontrado"
 
-#: ../lib/upgrade.php:1001
+#: ../lib/upgrade.php:997
 #, php-format
 msgid "%s not found in %s"
 msgstr ""
 
-#: ../lib/upgrade.php:1008
+#: ../lib/upgrade.php:1004
 #, php-format
 msgid "couldn't move %s to %s"
 msgstr "no podía mover %s a %s"
 
-#: ../lib/upgrade.php:1012
+#: ../lib/upgrade.php:1008
 #, php-format
 msgid "file %s is not writable"
 msgstr "fichero %s no es escribible"
 
-#: ../lib/upgrade.php:1023 ../lib/upgrade.php:1033 ../lib/upgrade.php:1043
+#: ../lib/upgrade.php:1019 ../lib/upgrade.php:1029 ../lib/upgrade.php:1039
 #, php-format
 msgid "Check for %s"
 msgstr ""
 
-#: ../lib/upgrade.php:1025
+#: ../lib/upgrade.php:1021
 msgid "CACHE_CONTROL is set to 'NONE', and must be changed to 'NO_CACHE'"
 msgstr ""
 
-#: ../lib/upgrade.php:1035
+#: ../lib/upgrade.php:1031
 msgid "GROUP_METHOD is set to NONE, and must be changed to \"NONE\""
 msgstr ""
 
-#: ../lib/upgrade.php:1045
+#: ../lib/upgrade.php:1041
 msgid "fix BLOG_EMPTY_DEFAULT_PREFIX into BLOG_DEFAULT_EMPTY_PREFIX"
 msgstr ""
 
-#: ../lib/upgrade.php:1157
+#: ../lib/upgrade.php:1153
 msgid "fixed with"
 msgstr ""
 
-#: ../lib/upgrade.php:1295
+#: ../lib/upgrade.php:1291
 msgid "Upgrade disabled: user != isAdmin"
 msgstr ""
 
-#: ../lib/upgrade.php:1300
+#: ../lib/upgrade.php:1296
 msgid "Upgrading this PhpWiki"
 msgstr ""
 
@@ -8676,6 +8673,9 @@
 msgid "View the current version"
 msgstr "Vea la versión actual"
 
+#~ msgid " Skipped"
+#~ msgstr "Saltado"
+
 #~ msgid "Chown"
 #~ msgstr "Cambie a dueño"
 

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2012-11-27 13:51:21 UTC (rev 8555)
+++ trunk/locale/po/fr.po	2012-11-27 13:59:50 UTC (rev 8556)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-27 11:52+0100\n"
+"POT-Creation-Date: 2012-11-27 14:57+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."
@@ -510,12 +510,12 @@
 #: ../lib/EditToolbar.php:59 ../lib/plugin/SyncWiki.php:308
 #: ../lib/plugin/SyncWiki.php:335 ../lib/plugin/SyncWiki.php:359
 #: ../lib/plugin/WikiPoll.php:228 ../lib/stdlib.php:1992
-#: ../lib/upgrade.php:201 ../lib/upgrade.php:407 ../lib/upgrade.php:421
-#: ../lib/upgrade.php:441 ../lib/upgrade.php:450 ../lib/upgrade.php:474
-#: ../lib/upgrade.php:502 ../lib/upgrade.php:551 ../lib/upgrade.php:554
-#: ../lib/upgrade.php:586 ../lib/upgrade.php:588 ../lib/upgrade.php:615
-#: ../lib/upgrade.php:675 ../lib/upgrade.php:700 ../lib/upgrade.php:848
-#: ../lib/upgrade.php:851 ../lib/upgrade.php:920
+#: ../lib/upgrade.php:197 ../lib/upgrade.php:403 ../lib/upgrade.php:417
+#: ../lib/upgrade.php:437 ../lib/upgrade.php:446 ../lib/upgrade.php:470
+#: ../lib/upgrade.php:498 ../lib/upgrade.php:547 ../lib/upgrade.php:550
+#: ../lib/upgrade.php:582 ../lib/upgrade.php:584 ../lib/upgrade.php:611
+#: ../lib/upgrade.php:671 ../lib/upgrade.php:696 ../lib/upgrade.php:844
+#: ../lib/upgrade.php:847 ../lib/upgrade.php:916
 msgid "OK"
 msgstr "OK"
 
@@ -702,8 +702,8 @@
 #: ../lib/plugin/WikiAdminSearchReplace.php:240
 #: ../lib/plugin/WikiAdminSearchReplace.php:244
 #: ../lib/plugin/WikiAdminSetAcl.php:253 ../lib/plugin/WikiAdminSetAcl.php:254
-#: ../lib/plugin/WikiAdminSetAcl.php:256 ../lib/upgrade.php:1128
-#: ../lib/upgrade.php:1138 ../themes/blog/templates/blogform.tmpl:7
+#: ../lib/plugin/WikiAdminSetAcl.php:256 ../lib/upgrade.php:1124
+#: ../lib/upgrade.php:1134 ../themes/blog/templates/blogform.tmpl:7
 #: ../themes/default/templates/blogform.tmpl:7
 #: ../themes/default/templates/userprefs.tmpl:154
 #: ../themes/default/templates/userprefs.tmpl:163
@@ -836,6 +836,8 @@
 msgstr "Récupération des pages"
 
 #: ../lib/loadsave.php:373 ../lib/loadsave.php:640 ../lib/stdlib.php:1046
+#: ../lib/upgrade.php:76 ../lib/upgrade.php:106 ../lib/upgrade.php:109
+#: ../lib/upgrade.php:202 ../lib/upgrade.php:1143
 msgid "Skipped."
 msgstr "Ignoré."
 
@@ -987,7 +989,7 @@
 #: ../lib/plugin/WikiAdminSelect.php:152 ../lib/plugin/WikiAdminSetAcl.php:216
 #: ../lib/plugin/WikiAdminSetExternal.php:137
 #: ../lib/plugin/WikiAdminUtils.php:308 ../lib/plugin/WikiFormRich.php:313
-#: ../lib/purgepage.php:25 ../lib/removepage.php:25 ../lib/upgrade.php:803
+#: ../lib/purgepage.php:25 ../lib/removepage.php:25 ../lib/upgrade.php:799
 #: ../themes/default/templates/login.tmpl:85
 #: ../themes/default/templates/userprefs.tmpl:290
 #: ../themes/fusionforge/templates/userprefs.tmpl:390
@@ -2428,7 +2430,7 @@
 "Ajouter ou changer le niveau de page 'key=>value'. Notez que vous pouvez "
 "supprimer une clé en lui attribuant une valeur nulle."
 
-#: ../lib/plugin/EditMetaData.php:146 ../lib/upgrade.php:801
+#: ../lib/plugin/EditMetaData.php:146 ../lib/upgrade.php:797
 msgid "Submit"
 msgstr "Soumettre"
 
@@ -3548,7 +3550,7 @@
 msgstr "%s ne semble pas être un greffon."
 
 #: ../lib/plugin/PluginManager.php:128 ../lib/plugin/PluginManager.php:130
-#: ../lib/upgrade.php:212 ../themes/MonoBook/templates/navbar.tmpl:18
+#: ../lib/upgrade.php:208 ../themes/MonoBook/templates/navbar.tmpl:18
 msgid "Help"
 msgstr "Aide"
 
@@ -3678,7 +3680,7 @@
 msgstr "Affiche une liste de pages prises au hasard sur ce wiki."
 
 #: ../lib/plugin/RateIt.php:92 ../lib/plugin/RateIt.php:305
-#: ../lib/upgrade.php:444
+#: ../lib/upgrade.php:440
 msgid "RateIt"
 msgstr "ClassezLa"
 
@@ -4378,9 +4380,9 @@
 
 #: ../lib/plugin/SyncWiki.php:310 ../lib/plugin/SyncWiki.php:337
 #: ../lib/plugin/SyncWiki.php:339 ../lib/plugin/SyncWiki.php:361
-#: ../lib/plugin/SyncWiki.php:363 ../lib/upgrade.php:203
-#: ../lib/upgrade.php:546 ../lib/upgrade.php:584 ../lib/upgrade.php:689
-#: ../lib/upgrade.php:904 ../lib/upgrade.php:1136
+#: ../lib/plugin/SyncWiki.php:363 ../lib/upgrade.php:199
+#: ../lib/upgrade.php:542 ../lib/upgrade.php:580 ../lib/upgrade.php:685
+#: ../lib/upgrade.php:900 ../lib/upgrade.php:1132
 msgid "FAILED"
 msgstr "ÉCHEC"
 
@@ -6460,251 +6462,246 @@
 msgid "always skip the HomePage."
 msgstr "toujours ignorer la page d'accueil."
 
-#: ../lib/upgrade.php:77 ../lib/upgrade.php:108 ../lib/upgrade.php:112
-#: ../lib/upgrade.php:206 ../lib/upgrade.php:1147
-msgid " Skipped"
-msgstr "Ignoré"
-
-#: ../lib/upgrade.php:102
+#: ../lib/upgrade.php:101
 msgid "newer than the existing page."
 msgstr "plus récent que la page existante."
 
-#: ../lib/upgrade.php:103
+#: ../lib/upgrade.php:102
 msgid " replace "
 msgstr " remplace "
 
-#: ../lib/upgrade.php:107
+#: ../lib/upgrade.php:106
 msgid "older than the existing page."
 msgstr "plus vieux que la page existante."
 
-#: ../lib/upgrade.php:111
+#: ../lib/upgrade.php:109
 msgid "unknown format."
 msgstr ""
 
-#: ../lib/upgrade.php:115
+#: ../lib/upgrade.php:112
 #, php-format
 msgid "%s does not exist"
 msgstr "%s n'existe pas"
 
-#: ../lib/upgrade.php:123 ../lib/upgrade.php:173 ../lib/upgrade.php:393
-#: ../lib/upgrade.php:928 ../lib/upgrade.php:1018
+#: ../lib/upgrade.php:120 ../lib/upgrade.php:169 ../lib/upgrade.php:389
+#: ../lib/upgrade.php:924 ../lib/upgrade.php:1014
 #, php-format
 msgid "Check for necessary %s updates"
 msgstr ""
 
-#: ../lib/upgrade.php:124 ../themes/MonoBook/templates/actionbar.tmpl:15
+#: ../lib/upgrade.php:120 ../themes/MonoBook/templates/actionbar.tmpl:15
 #: ../themes/MonoBook/templates/actionbar.tmpl:28
 msgid "ActionPage"
 msgstr ""
 
-#: ../lib/upgrade.php:126
+#: ../lib/upgrade.php:122
 msgid "_AuthInfo"
 msgstr ""
 
-#: ../lib/upgrade.php:126
+#: ../lib/upgrade.php:122
 msgid "DebugAuthInfo"
 msgstr ""
 
-#: ../lib/upgrade.php:129
+#: ../lib/upgrade.php:125
 msgid "_GroupInfo"
 msgstr ""
 
-#: ../lib/upgrade.php:129
+#: ../lib/upgrade.php:125
 msgid "GroupAuthInfo"
 msgstr ""
 
-#: ../lib/upgrade.php:163
+#: ../lib/upgrade.php:159
 #, php-format
 msgid "Check for necessary theme %s updates"
 msgstr ""
 
-#: ../lib/upgrade.php:176
+#: ../lib/upgrade.php:172
 msgid "rename to Help: pages"
 msgstr ""
 
-#: ../lib/upgrade.php:198
+#: ../lib/upgrade.php:194
 #, php-format
 msgid "rename %s to %s"
 msgstr "retitrez la page de '%s' à '%s'"
 
-#: ../lib/upgrade.php:227
+#: ../lib/upgrade.php:223
 msgid "MISSING"
 msgstr "MANQUANT"
 
-#: ../lib/upgrade.php:263 ../lib/upgrade.php:282 ../lib/upgrade.php:303
-#: ../lib/upgrade.php:331 ../lib/upgrade.php:377
+#: ../lib/upgrade.php:259 ../lib/upgrade.php:278 ../lib/upgrade.php:299
+#: ../lib/upgrade.php:327 ../lib/upgrade.php:373
 msgid "CREATED"
 msgstr "CRÉÉ"
 
-#: ../lib/upgrade.php:394
+#: ../lib/upgrade.php:390
 msgid "database"
 msgstr "base de données"
 
-#: ../lib/upgrade.php:400
+#: ../lib/upgrade.php:396
 msgid "CANCEL"
 msgstr "ANNULE"
 
-#: ../lib/upgrade.php:413
+#: ../lib/upgrade.php:409
 msgid "Backend type: "
 msgstr ""
 
-#: ../lib/upgrade.php:417 ../lib/upgrade.php:437 ../lib/upgrade.php:446
+#: ../lib/upgrade.php:413 ../lib/upgrade.php:433 ../lib/upgrade.php:442
 #, php-format
 msgid "Check for table %s"
 msgstr "vérifie la table %s"
 
-#: ../lib/upgrade.php:461
+#: ../lib/upgrade.php:457
 msgid "Check for new session.sess_ip column"
 msgstr "recherche une nouvelle colonne session.sess_ip"
 
-#: ../lib/upgrade.php:467 ../lib/upgrade.php:683 ../lib/upgrade.php:833
-#: ../lib/upgrade.php:898
+#: ../lib/upgrade.php:463 ../lib/upgrade.php:679 ../lib/upgrade.php:829
+#: ../lib/upgrade.php:894
 msgid "SKIP"
 msgstr ""
 
-#: ../lib/upgrade.php:470 ../lib/upgrade.php:577 ../lib/upgrade.php:838
-#: ../lib/upgrade.php:900
+#: ../lib/upgrade.php:466 ../lib/upgrade.php:573 ../lib/upgrade.php:834
+#: ../lib/upgrade.php:896
 msgid "ADDING"
 msgstr "AJOUT"
 
-#: ../lib/upgrade.php:480
+#: ../lib/upgrade.php:476
 msgid "Check for mysql session.sess_id sanity"
 msgstr ""
 
-#: ../lib/upgrade.php:494 ../lib/upgrade.php:499 ../lib/upgrade.php:535
-#: ../lib/upgrade.php:544
+#: ../lib/upgrade.php:490 ../lib/upgrade.php:495 ../lib/upgrade.php:531
+#: ../lib/upgrade.php:540
 msgid "fixed"
 msgstr ""
 
-#: ../lib/upgrade.php:513
+#: ../lib/upgrade.php:509
 msgid "Check for mysql LOCK TABLE privilege"
 msgstr ""
 
-#: ../lib/upgrade.php:558
+#: ../lib/upgrade.php:554
 #, php-format
 msgid "version <em>%s</em> not affected"
 msgstr "version <em>%s</em> non affectée"
 
-#: ../lib/upgrade.php:567
+#: ../lib/upgrade.php:563
 msgid "Check for mysql page.id auto_increment flag"
 msgstr ""
 
-#: ../lib/upgrade.php:604
+#: ../lib/upgrade.php:600
 msgid "Check for mysql 4.1.x/5.0.0 binary search on Windows problem"
 msgstr ""
 
-#: ../lib/upgrade.php:607 ../lib/upgrade.php:623 ../lib/upgrade.php:644
+#: ../lib/upgrade.php:603 ../lib/upgrade.php:619 ../lib/upgrade.php:640
 #, php-format
 msgid "version <em>%s</em>"
 msgstr "version <em>%s</em>"
 
-#: ../lib/upgrade.php:608
+#: ../lib/upgrade.php:604
 msgid "not affected"
 msgstr "non affectée"
 
-#: ../lib/upgrade.php:624 ../lib/upgrade.php:645 ../lib/upgrade.php:673
-#: ../lib/upgrade.php:1126
+#: ../lib/upgrade.php:620 ../lib/upgrade.php:641 ../lib/upgrade.php:669
+#: ../lib/upgrade.php:1122
 msgid "FIXED"
 msgstr "CORRIGÉ"
 
-#: ../lib/upgrade.php:655
+#: ../lib/upgrade.php:651
 msgid "Check for ACCESS_LOG_SQL passwords in POST requests"
 msgstr ""
 
-#: ../lib/upgrade.php:678
+#: ../lib/upgrade.php:674
 msgid "Check for ACCESS_LOG_SQL remote_host varchar(50)"
 msgstr ""
 
-#: ../lib/upgrade.php:686
+#: ../lib/upgrade.php:682
 msgid "FIXING"
 msgstr ""
 
-#: ../lib/upgrade.php:782
+#: ../lib/upgrade.php:778
 msgid ""
 "Upgrade requires database privileges to CREATE and ALTER the phpwiki "
 "database."
 msgstr ""
 
-#: ../lib/upgrade.php:784
+#: ../lib/upgrade.php:780
 msgid ""
 "And on Windows at least the privilege to SELECT FROM mysql, and possibly "
 "UPDATE mysql"
 msgstr ""
 
-#: ../lib/upgrade.php:789
+#: ../lib/upgrade.php:785
 msgid "DB admin user:"
 msgstr "DB admin nom de user :"
 
-#: ../lib/upgrade.php:795
+#: ../lib/upgrade.php:791
 msgid "DB admin password:"
 msgstr "DB admin mot de passe :"
 
-#: ../lib/upgrade.php:828
+#: ../lib/upgrade.php:824
 msgid "Check for extra page.cached_html column"
 msgstr "recherche une extra colonne page.cached_html"
 
-#: ../lib/upgrade.php:845 ../lib/upgrade.php:911
+#: ../lib/upgrade.php:841 ../lib/upgrade.php:907
 msgid "CONVERTING"
 msgstr ""
 
-#: ../lib/upgrade.php:893
+#: ../lib/upgrade.php:889
 msgid "Check for relation field in link table"
 msgstr ""
 
-#: ../lib/upgrade.php:909
+#: ../lib/upgrade.php:905
 msgid "Rebuild entire database to upgrade relation links"
 msgstr ""
 
-#: ../lib/upgrade.php:929
+#: ../lib/upgrade.php:925
 msgid "plugin argument"
 msgstr ""
 
-#: ../lib/upgrade.php:974
+#: ../lib/upgrade.php:970
 #, php-format
 msgid "file %s not found"
 msgstr "fichier %s non trouvé"
 
-#: ../lib/upgrade.php:1001
+#: ../lib/upgrade.php:997
 #, php-format
 msgid "%s not found in %s"
 msgstr "%s non trouvé dans %s"
 
-#: ../lib/upgrade.php:1008
+#: ../lib/upgrade.php:1004
 #, php-format
 msgid "couldn't move %s to %s"
 msgstr "impossible de déplacer %s en %s"
 
-#: ../lib/upgrade.php:1012
+#: ../lib/upgrade.php:1008
 #, php-format
 msgid "file %s is not writable"
 msgstr "%s n'est pas accessible en écriture"
 
-#: ../lib/upgrade.php:1023 ../lib/upgrade.php:1033 ../lib/upgrade.php:1043
+#: ../lib/upgrade.php:1019 ../lib/upgrade.php:1029 ../lib/upgrade.php:1039
 #, php-format
 msgid "Check for %s"
 msgstr "Cases à cocher"
 
-#: ../lib/upgrade.php:1025
+#: ../lib/upgrade.php:1021
 msgid "CACHE_CONTROL is set to 'NONE', and must be changed to 'NO_CACHE'"
 msgstr ""
 
-#: ../lib/upgrade.php:1035
+#: ../lib/upgrade.php:1031
 msgid "GROUP_METHOD is set to NONE, and must be changed to \"NONE\""
 msgstr ""
 
-#: ../lib/upgrade.php:1045
+#: ../lib/upgrade.php:1041
 msgid "fix BLOG_EMPTY_DEFAULT_PREFIX into BLOG_DEFAULT_EMPTY_PREFIX"
 msgstr ""
 
-#: ../lib/upgrade.php:1157
+#: ../lib/upgrade.php:1153
 msgid "fixed with"
 msgstr ""
 
-#: ../lib/upgrade.php:1295
+#: ../lib/upgrade.php:1291
 msgid "Upgrade disabled: user != isAdmin"
 msgstr "Mise à jour désactivée, vous n'êtes pas administrateur"
 
-#: ../lib/upgrade.php:1300
+#: ../lib/upgrade.php:1296
 msgid "Upgrading this PhpWiki"
 msgstr "Mise à jour du PhpWiki"
 
@@ -8775,6 +8772,9 @@
 msgid "View the current version"
 msgstr "Voir la version actuelle"
 
+#~ msgid " Skipped"
+#~ msgstr "Ignoré"
+
 #~ msgid "Current language: '%s'"
 #~ msgstr "Langage actuel : %s"
 

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2012-11-27 13:51:21 UTC (rev 8555)
+++ trunk/locale/po/it.po	2012-11-27 13:59:50 UTC (rev 8556)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-27 11:52+0100\n"
+"POT-Creation-Date: 2012-11-27 14:57+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"
@@ -501,12 +501,12 @@
 #: ../lib/EditToolbar.php:59 ../lib/plugin/SyncWiki.php:308
 #: ../lib/plugin/SyncWiki.php:335 ../lib/plugin/SyncWiki.php:359
 #: ../lib/plugin/WikiPoll.php:228 ../lib/stdlib.php:1992
-#: ../lib/upgrade.php:201 ../lib/upgrade.php:407 ../lib/upgrade.php:421
-#: ../lib/upgrade.php:441 ../lib/upgrade.php:450 ../lib/upgrade.php:474
-#: ../lib/upgrade.php:502 ../lib/upgrade.php:551 ../lib/upgrade.php:554
-#: ../lib/upgrade.php:586 ../lib/upgrade.php:588 ../lib/upgrade.php:615
-#: ../lib/upgrade.php:675 ../lib/upgrade.php:700 ../lib/upgrade.php:848
-#: ../lib/upgrade.php:851 ../lib/upgrade.php:920
+#: ../lib/upgrade.php:197 ../lib/upgrade.php:403 ../lib/upgrade.php:417
+#: ../lib/upgrade.php:437 ../lib/upgrade.php:446 ../lib/upgrade.php:470
+#: ../lib/upgrade.php:498 ../lib/upgrade.php:547 ../lib/upgrade.php:550
+#: ../lib/upgrade.php:582 ../lib/upgrade.php:584 ../lib/upgrade.php:611
+#: ../lib/upgrade.php:671 ../lib/upgrade.php:696 ../lib/upgrade.php:844
+#: ../lib/upgrade.php:847 ../lib/upgrade.php:916
 msgid "OK"
 msgstr ""
 
@@ -693,8 +693,8 @@
 #: ../lib/plugin/WikiAdminSearchReplace.php:240
 #: ../lib/plugin/WikiAdminSearchReplace.php:244
 #: ../lib/plugin/WikiAdminSetAcl.php:253 ../lib/plugin/WikiAdminSetAcl.php:254
-#: ../lib/plugin/WikiAdminSetAcl.php:256 ../lib/upgrade.php:1128
-#: ../lib/upgrade.php:1138 ../themes/blog/templates/blogform.tmpl:7
+#: ../lib/plugin/WikiAdminSetAcl.php:256 ../lib/upgrade.php:1124
+#: ../lib/upgrade.php:1134 ../themes/blog/templates/blogform.tmpl:7
 #: ../themes/default/templates/blogform.tmpl:7
 #: ../themes/default/templates/userprefs.tmpl:154
 #: ../themes/default/templates/userprefs.tmpl:163
@@ -827,6 +827,8 @@
 msgstr ""
 
 #: ../lib/loadsave.php:373 ../lib/loadsave.php:640 ../lib/stdlib.php:1046
+#: ../lib/upgrade.php:76 ../lib/upgrade.php:106 ../lib/upgrade.php:109
+#: ../lib/upgrade.php:202 ../lib/upgrade.php:1143
 msgid "Skipped."
 msgstr ""
 
@@ -977,7 +979,7 @@
 #: ../lib/plugin/WikiAdminSelect.php:152 ../lib/plugin/WikiAdminSetAcl.php:216
 #: ../lib/plugin/WikiAdminSetExternal.php:137
 #: ../lib/plugin/WikiAdminUtils.php:308 ../lib/plugin/WikiFormRich.php:313
-#: ../lib/purgepage.php:25 ../lib/removepage.php:25 ../lib/upgrade.php:803
+#: ../lib/purgepage.php:25 ../lib/removepage.php:25 ../lib/upgrade.php:799
 #: ../themes/default/templates/login.tmpl:85
 #: ../themes/default/templates/userprefs.tmpl:290
 #: ../themes/fusionforge/templates/userprefs.tmpl:390
@@ -2405,7 +2407,7 @@
 "remove a key by leaving the value-box empty."
 msgstr ""
 
-#: ../lib/plugin/EditMetaData.php:146 ../lib/upgrade.php:801
+#: ../lib/plugin/EditMetaData.php:146 ../lib/upgrade.php:797
 msgid "Submit"
 msgstr ""
 
@@ -3507,7 +3509,7 @@
 msgstr ""
 
 #: ../lib/plugin/PluginManager.php:128 ../lib/plugin/PluginManager.php:130
-#: ../lib/upgrade.php:212 ../themes/MonoBook/templates/navbar.tmpl:18
+#: ../lib/upgrade.php:208 ../themes/MonoBook/templates/navbar.tmpl:18
 msgid "Help"
 msgstr "Aiuto"
 
@@ -3633,7 +3635,7 @@
 msgstr ""
 
 #: ../lib/plugin/RateIt.php:92 ../lib/plugin/RateIt.php:305
-#: ../lib/upgrade.php:444
+#: ../lib/upgrade.php:440
 msgid "RateIt"
 msgstr ""
 
@@ -4323,9 +4325,9 @@
 
 #: ../lib/plugin/SyncWiki.php:310 ../lib/plugin/SyncWiki.php:337
 #: ../lib/plugin/SyncWiki.php:339 ../lib/plugin/SyncWiki.php:361
-#: ../lib/plugin/SyncWiki.php:363 ../lib/upgrade.php:203
-#: ../lib/upgrade.php:546 ../lib/upgrade.php:584 ../lib/upgrade.php:689
-#: ../lib/upgrade.php:904 ../lib/upgrade.php:1136
+#: ../lib/plugin/SyncWiki.php:363 ../lib/upgrade.php:199
+#: ../lib/upgrade.php:542 ../lib/upgrade.php:580 ../lib/upgrade.php:685
+#: ../lib/upgrade.php:900 ../lib/upgrade.php:1132
 msgid "FAILED"
 msgstr ""
 
@@ -6362,251 +6364,246 @@
 msgid "always skip the HomePage."
 msgstr ""
 
-#: ../lib/upgrade.php:77 ../lib/upgrade.php:108 ../lib/upgrade.php:112
-#: ../lib/upgrade.php:206 ../lib/upgrade.php:1147
-msgid " Skipped"
-msgstr ""
-
-#: ../lib/upgrade.php:102
+#: ../lib/upgrade.php:101
 msgid "newer than the existing page."
 msgstr ""
 
-#: ../lib/upgrade.php:103
+#: ../lib/upgrade.php:102
 msgid " replace "
 msgstr ""
 
-#: ../lib/upgrade.php:107
+#: ../lib/upgrade.php:106
 msgid "older than the existing page."
 msgstr ""
 
-#: ../lib/upgrade.php:111
+#: ../lib/upgrade.php:109
 msgid "unknown format."
 msgstr ""
 
-#: ../lib/upgrade.php:115
+#: ../lib/upgrade.php:112
 #, php-format
 msgid "%s does not exist"
 msgstr ""
 
-#: ../lib/upgrade.php:123 ../lib/upgrade.php:173 ../lib/upgrade.php:393
-#: ../lib/upgrade.php:928 ../lib/upgrade.php:1018
+#: ../lib/upgrade.php:120 ../lib/upgrade.php:169 ../lib/upgrade.php:389
+#: ../lib/upgrade.php:924 ../lib/upgrade.php:1014
 #, php-format
 msgid "Check for necessary %s updates"
 msgstr ""
 
-#: ../lib/upgrade.php:124 ../themes/MonoBook/templates/actionbar.tmpl:15
+#: ../lib/upgrade.php:120 ../themes/MonoBook/templates/actionbar.tmpl:15
 #: ../themes/MonoBook/templates/actionbar.tmpl:28
 msgid "ActionPage"
 msgstr ""
 
-#: ../lib/upgrade.php:126
+#: ../lib/upgrade.php:122
 msgid "_AuthInfo"
 msgstr ""
 
-#: ../lib/upgrade.php:126
+#: ../lib/upgrade.php:122
 msgid "DebugAuthInfo"
 msgstr ""
 
-#: ../lib/upgrade.php:129
+#: ../lib/upgrade.php:125
 msgid "_GroupInfo"
 msgstr ""
 
-#: ../lib/upgrade.php:129
+#: ../lib/upgrade.php:125
 msgid "GroupAuthInfo"
 msgstr ""
 
-#: ../lib/upgrade.php:163
+#: ../lib/upgrade.php:159
 #, php-format
 msgid "Check for necessary theme %s updates"
 msgstr ""
 
-#: ../lib/upgrade.php:176
+#: ../lib/upgrade.php:172
 msgid "rename to Help: pages"
 msgstr ""
 
-#: ../lib/upgrade.php:198
+#: ../lib/upgrade.php:194
 #, php-format
 msgid "rename %s to %s"
 msgstr "cambia titolo %s a %s"
 
-#: ../lib/upgrade.php:227
+#: ../lib/upgrade.php:223
 msgid "MISSING"
 msgstr ""
 
-#: ../lib/upgrade.php:263 ../lib/upgrade.php:282 ../lib/upgrade.php:303
-#: ../lib/upgrade.php:331 ../lib/upgrade.php:377
+#: ../lib/upgrade.php:259 ../lib/upgrade.php:278 ../lib/upgrade.php:299
+#: ../lib/upgrade.php:327 ../lib/upgrade.php:373
 msgid "CREATED"
 msgstr ""
 
-#: ../lib/upgrade.php:394
+#: ../lib/upgrade.php:390
 msgid "database"
 msgstr ""
 
-#: ../lib/upgrade.php:400
+#: ../lib/upgrade.php:396
 msgid "CANCEL"
 msgstr ""
 
-#: ../lib/upgrade.php:413
+#: ../lib/upgrade.php:409
 msgid "Backend type: "
 msgstr ""
 
-#: ../lib/upgrade.php:417 ../lib/upgrade.php:437 ../lib/upgrade.php:446
+#: ../lib/upgrade.php:413 ../lib/upgrade.php:433 ../lib/upgrade.php:442
 #, php-format
 msgid "Check for table %s"
 msgstr ""
 
-#: ../lib/upgrade.php:461
+#: ../lib/upgrade.php:457
 msgid "Check for new session.sess_ip column"
 msgstr ""
 
-#: ../lib/upgrade.php:467 ../lib/upgrade.php:683 ../lib/upgrade.php:833
-#: ../lib/upgrade.php:898
+#: ../lib/upgrade.php:463 ../lib/upgrade.php:679 ../lib/upgrade.php:829
+#: ../lib/upgrade.php:894
 msgid "SKIP"
 msgstr ""
 
-#: ../lib/upgrade.php:470 ../lib/upgrade.php:577 ../lib/upgrade.php:838
-#: ../lib/upgrade.php:900
+#: ../lib/upgrade.php:466 ../lib/upgrade.php:573 ../lib/upgrade.php:834
+#: ../lib/upgrade.php:896
 msgid "ADDING"
 msgstr ""
 
-#: ../lib/upgrade.php:480
+#: ../lib/upgrade.php:476
 msgid "Check for mysql session.sess_id sanity"
 msgstr ""
 
-#: ../lib/upgrade.php:494 ../lib/upgrade.php:499 ../lib/upgrade.php:535
-#: ../lib/upgrade.php:544
+#: ../lib/upgrade.php:490 ../lib/upgrade.php:495 ../lib/upgrade.php:531
+#: ../lib/upgrade.php:540
 msgid "fixed"
 msgstr ""
 
-#: ../lib/upgrade.php:513
+#: ../lib/upgrade.php:509
 msgid "Check for mysql LOCK TABLE privilege"
 msgstr ""
 
-#: ../lib/upgrade.php:558
+#: ../lib/upgrade.php:554
 #, php-format
 msgid "version <em>%s</em> not affected"
 msgstr "versione <em>%s</em>"
 
-#: ../lib/upgrade.php:567
+#: ../lib/upgrade.php:563
 msgid "Check for mysql page.id auto_increment flag"
 msgstr ""
 
-#: ../lib/upgrade.php:604
+#: ../lib/upgrade.php:600
 msgid "Check for mysql 4.1.x/5.0.0 binary search on Windows problem"
 msgstr ""
 
-#: ../lib/upgrade.php:607 ../lib/upgrade.php:623 ../lib/upgrade.php:644
+#: ../lib/upgrade.php:603 ../lib/upgrade.php:619 ../lib/upgrade.php:640
 #, php-format
 msgid "version <em>%s</em>"
 msgstr "versione <em>%s</em>"
 
-#: ../lib/upgrade.php:608
+#: ../lib/upgrade.php:604
 msgid "not affected"
 msgstr ""
 
-#: ../lib/upgrade.php:624 ../lib/upgrade.php:645 ../lib/upgrade.php:673
-#: ../lib/upgrade.php:1126
+#: ../lib/upgrade.php:620 ../lib/upgrade.php:641 ../lib/upgrade.php:669
+#: ../lib/upgrade.php:1122
 msgid "FIXED"
 msgstr ""
 
-#: ../lib/upgrade.php:655
+#: ../lib/upgrade.php:651
 msgid "Check for ACCESS_LOG_SQL passwords in POST requests"
 msgstr ""
 
-#: ../lib/upgrade.php:678
+#: ../lib/upgrade.php:674
 msgid "Check for ACCESS_LOG_SQL remote_host varchar(50)"
 msgstr ""
 
-#: ../lib/upgrade.php:686
+#: ../lib/upgrade.php:682
 msgid "FIXING"
 msgstr ""
 
-#: ../lib/upgrade.php:782
+#: ../lib/upgrade.php:778
 msgid ""
 "Upgrade requires database privileges to CREATE and ALTER the phpwiki "
 "database."
 msgstr ""
 
-#: ../lib/upgrade.php:784
+#: ../lib/upgrade.php:780
 msgid ""
 "And on Windows at least the privilege to SELECT FROM mysql, and possibly "
 "UPDATE mysql"
 msgstr ""
 
-#: ../lib/upgrade.php:789
+#: ../lib/upgrade.php:785
 msgid "DB admin user:"
 msgstr ""
 
-#: ../lib/upgrade.php:795
+#: ../lib/upgrade.php:791
 msgid "DB admin password:"
 msgstr ""
 
-#: ../lib/upgrade.php:828
+#: ../lib/upgrade.php:824
 msgid "Check for extra page.cached_html column"
 msgstr ""
 
-#: ../lib/upgrade.php:845 ../lib/upgrade.php:911
+#: ../lib/upgrade.php:841 ../lib/upgrade.php:907
 msgid "CONVERTING"
 msgstr ""
 
-#: ../lib/upgrade.php:893
+#: ../lib/upgrade.php:889
 msgid "Check for relation field in link table"
 msgstr ""
 
-#: ../lib/upgrade.php:909
+#: ../lib/upgrade.php:905
 msgid "Rebuild entire database to upgrade relation links"
 msgstr ""
 
-#: ../lib/upgrade.php:929
+#: ../lib/upgrade.php:925
 msgid "plugin argument"
 msgstr ""
 
-#: ../lib/upgrade.php:974
+#: ../lib/upgrade.php:970
 #, php-format
 msgid "file %s not found"
 msgstr "file %s non trovato"
 
-#: ../lib/upgrade.php:1001
+#: ../lib/upgrade.php:997
 #, php-format
 msgid "%s not found in %s"
 msgstr "%s non trovato in %s"
 
-#: ../lib/upgrade.php:1008
+#: ../lib/upgrade.php:1004
 #, php-format
 msgid "couldn't move %s to %s"
 msgstr ""
 
-#: ../lib/upgrade.php:1012
+#: ../lib/upgrade.php:1008
 #, php-format
 msgid "file %s is not writable"
 msgstr ""
 
-#: ../lib/upgrade.php:1023 ../lib/upgrade.php:1033 ../lib/upgrade.php:1043
+#: ../lib/upgrade.php:1019 ../lib/upgrade.php:1029 ../lib/upgrade.php:1039
 #, php-format
 msgid "Check for %s"
 msgstr ""
 
-#: ../lib/upgrade.php:1025
+#: ../lib/upgrade.php:1021
 msgid "CACHE_CONTROL is set to 'NONE', and must be changed to 'NO_CACHE'"
 msgstr ""
 
-#: ../lib/upgrade.php:1035
+#: ../lib/upgrade.php:1031
 msgid "GROUP_METHOD is set to NONE, and must be changed to \"NONE\""
 msgstr ""
 
-#: ../lib/upgrade.php:1045
+#: ../lib/upgrade.php:1041
 msgid "fix BLOG_EMPTY_DEFAULT_PREFIX into BLOG_DEFAULT_EMPTY_PREFIX"
 msgstr ""
 
-#: ../lib/upgrade.php:1157
+#: ../lib/upgrade.php:1153
 msgid "fixed with"
 msgstr "Modifica"
 
-#: ../lib/upgrade.php:1295
+#: ../lib/upgrade.php:1291
 msgid "Upgrade disabled: user != isAdmin"
 msgstr ""
 
-#: ../lib/upgrade.php:1300
+#: ../lib/upgrade.php:1296
 msgid "Upgrading this PhpWiki"
 msgstr ""
 

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2012-11-27 13:51:21 UTC (rev 8555)
+++ trunk/locale/po/ja.po	2012-11-27 13:59:50 UTC (rev 8556)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-27 11:52+0100\n"
+"POT-Creation-Date: 2012-11-27 14:57+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"
@@ -489,12 +489,12 @@
 #: ../lib/EditToolbar.php:59 ../lib/plugin/SyncWiki.php:308
 #: ../lib/plugin/SyncWiki.php:335 ../lib/plugin/SyncWiki.php:359
 #: ../lib/plugin/WikiPoll.php:228 ../lib/stdlib.php:1992
-#: ../lib/upgrade.php:201 ../lib/upgrade.php:407 ../lib/upgrade.php:421
-#: ../lib/upgrade.php:441 ../lib/upgrade.php:450 ../lib/upgrade.php:474
-#: ../lib/upgrade.php:502 ../lib/upgrade.php:551 ../lib/upgrade.php:554
-#: ../lib/upgrade.php:586 ../lib/upgrade.php:588 ../lib/upgrade.php:615
-#: ../lib/upgrade.php:675 ../lib/upgrade.php:700 ../lib/upgrade.php:848
-#: ../lib/upgrade.php:851 ../lib/upgrade.php:920
+#: ../lib/upgrade.php:197 ../lib/upgrade.php:403 ../lib/upgrade.php:417
+#: ../lib/upgrade.php:437 ../lib/upgrade.php:446 ../lib/upgrade.php:470
+#: ../lib/upgrade.php:498 ../lib/upgrade.php:547 ../lib/upgrade.php:550
+#: ../lib/upgrade.php:582 ../lib/upgrade.php:584 ../lib/upgrade.php:611
+#: ../lib/upgrade.php:671 ../lib/upgrade.php:696 ../lib/upgrade.php:844
+#: ../lib/upgrade.php:847 ../lib/upgrade.php:916
 msgid "OK"
 msgstr ""
 
@@ -681,8 +681,8 @@
 #: ../lib/plugin/WikiAdminSearchReplace.php:240
 #: ../lib/plugin/WikiAdminSearchReplace.php:244
 #: ../lib/plugin/WikiAdminSetAcl.php:253 ../lib/plugin/WikiAdminSetAcl.php:254
-#: ../lib/plugin/WikiAdminSetAcl.php:256 ../lib/upgrade.php:1128
-#: ../lib/upgrade.php:1138 ../themes/blog/templates/blogform.tmpl:7
+#: ../lib/plugin/WikiAdminSetAcl.php:256 ../lib/upgrade.php:1124
+#: ../lib/upgrade.php:1134 ../themes/blog/templates/blogform.tmpl:7
 #: ../themes/default/templates/blogform.tmpl:7
 #: ../themes/default/templates/userprefs.tmpl:154
 #: ../themes/default/templates/userprefs.tmpl:163
@@ -814,6 +814,8 @@
 msgstr ""
 
 #: ../lib/loadsave.php:373 ../lib/loadsave.php:640 ../lib/stdlib.php:1046
+#: ../lib/upgrade.php:76 ../lib/upgrade.php:106 ../lib/upgrade.php:109
+#: ../lib/upgrade.php:202 ../lib/upgrade.php:1143
 msgid "Skipped."
 msgstr ""
 
@@ -966,7 +968,7 @@
 #: ../lib/plugin/WikiAdminSelect.php:152 ../lib/plugin/WikiAdminSetAcl.php:216
 #: ../lib/plugin/WikiAdminSetExternal.php:137
 #: ../lib/plugin/WikiAdminUtils.php:308 ../lib/plugin/WikiFormRich.php:313
-#: ../lib/purgepage.php:25 ../lib/removepage.php:25 ../lib/upgrade.php:803
+#: ../lib/purgepage.php:25 ../lib/removepage.php:25 ../lib/upgrade.php:799
 #: ../themes/default/templates/login.tmpl:85
 #: ../themes/default/templates/userprefs.tmpl:290
 #: ../themes/fusionforge/templates/userprefs.tmpl:390
@@ -2429,7 +2431,7 @@
 "remove a key by leaving the value-box empty."
 msgstr ""
 
-#: ../lib/plugin/EditMetaData.php:146 ../lib/upgrade.php:801
+#: ../lib/plugin/EditMetaData.php:146 ../lib/upgrade.php:797
 msgid "Submit"
 msgstr "送信"
 
@@ -3551,7 +3553,7 @@
 msgstr ""
 
 #: ../lib/plugin/PluginManager.php:128 ../lib/plugin/PluginManager.php:130
-#: ../lib/upgrade.php:212 ../themes/MonoBook/templates/navbar.tmpl:18
+#: ../lib/upgrade.php:208 ../themes/MonoBook/templates/navbar.tmpl:18
 msgid "Help"
 msgstr ""
 
@@ -3679,7 +3681,7 @@
 msgstr ""
 
 #: ../lib/plugin/RateIt.php:92 ../lib/plugin/RateIt.php:305
-#: ../lib/upgrade.php:444
+#: ../lib/upgrade.php:440
 msgid "RateIt"
 msgstr ""
 
@@ -4389,9 +4391,9 @@
 
 #: ../lib/plugin/SyncWiki.php:310 ../lib/plugin/SyncWiki.php:337
 #: ../lib/plugin/SyncWiki.php:339 ../lib/plugin/SyncWiki.php:361
-#: ../lib/plugin/SyncWiki.php:363 ../lib/upgrade.php:203
-#: ../lib/upgrade.php:546 ../lib/upgrade.php:584 ../lib/upgrade.php:689
-#: ../lib/upgrade.php:904 ../lib/upgrade.php:1136
+#: ../lib/plugin/SyncWiki.php:363 ../lib/upgrade.php:199
+#: ../lib/upgrade.php:542 ../lib/upgrade.php:580 ../lib/upgrade.php:685
+#: ../lib/upgrade.php:900 ../lib/upgrade.php:1132
 msgid "FAILED"
 msgstr ""
 
@@ -6491,262 +6493,257 @@
 msgid "always skip the HomePage."
 msgstr ""
 
-#: ../lib/upgrade.php:77 ../lib/upgrade.php:108 ../lib/upgrade.php:112
-#: ../lib/upgrade.php:206 ../lib/upgrade.php:1147
-msgid " Skipped"
-msgstr ""
-
-#: ../lib/upgrade.php:102
+#: ../lib/upgrade.php:101
 msgid "newer than the existing page."
 msgstr ""
 
-#: ../lib/upgrade.php:103
+#: ../lib/upgrade.php:102
 msgid " replace "
 msgstr ""
 
-#: ../lib/upgrade.php:107
+#: ../lib/upgrade.php:106
 msgid "older than the existing page."
 msgstr ""
 
-#: ../lib/upgrade.php:111
+#: ../lib/upgrade.php:109
 msgid "unknown format."
 msgstr ""
 
-#: ../lib/upgrade.php:115
+#: ../lib/upgrade.php:112
 #, php-format
 msgid "%s does not exist"
 msgstr ""
 
-#: ../lib/upgrade.php:123 ../lib/upgrade.php:173 ../lib/upgrade.php:393
-...
 
[truncated message content]

[phpwiki-checkins] SF.net SVN: phpwiki:[8555] trunk/lib/upgrade.php

From: <var...@us...> - 2012-11-27 13:51:30

Revision: 8555
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8555&view=rev
Author:   vargenau
Date:     2012-11-27 13:51:21 +0000 (Tue, 27 Nov 2012)
Log Message:
-----------
No leading space in translation

Modified Paths:
--------------
    trunk/lib/upgrade.php

Modified: trunk/lib/upgrade.php
===================================================================
--- trunk/lib/upgrade.php	2012-11-27 10:53:42 UTC (rev 8554)
+++ trunk/lib/upgrade.php	2012-11-27 13:51:21 UTC (rev 8555)
@@ -73,8 +73,7 @@
             or ($pagename == _("HomePage"))
             or ($pagename == "HomePage")
         ) {
-            echo "$path/$pagename: ", _("always skip the HomePage."),
-            _(" Skipped"), ".<br />\n";
+            echo "$path/$pagename: " . _("always skip the HomePage.") . " " . _("Skipped."), "<br />\n";
             return;
         }
 
@@ -104,12 +103,10 @@
                     LoadAny($this->request, $path . "/" . $filename);
                     echo "<br />\n";
                 } else {
-                    echo "$path/$pagename: ", _("older than the existing page."),
-                    _(" Skipped"), ".<br />\n";
+                    echo "$path/$pagename: " . _("older than the existing page.") . " " . _("Skipped."), "<br />\n";
                 }
             } else {
-                echo "$path/$pagename: ", _("unknown format."),
-                _(" Skipped"), ".<br />\n";
+                echo "$path/$pagename: " . _("unknown format.") . " " . _("Skipped.") . "<br />\n";
             }
         } else {
             echo sprintf(_("%s does not exist"), $pagename), "<br />\n";
@@ -120,8 +117,7 @@
 
     function CheckActionPageUpdate()
     {
-        echo "<h2>", sprintf(_("Check for necessary %s updates"),
-            _("ActionPage")), "</h2>\n";
+        echo "<h2>", sprintf(_("Check for necessary %s updates"), _("ActionPage")), "</h2>\n";
         // 1.3.13 before we pull in all missing pages, we rename existing ones
         $this->_rename_page_helper(_("_AuthInfo"), _("DebugAuthInfo"));
         // this is in some templates. so we keep the old name
@@ -203,7 +199,7 @@
                 echo ' <span style="color: red; font-weight: bold;">' . _("FAILED") . "</span><br />\n";
             }
         } else {
-            echo _(" Skipped"), " <br />\n";
+            echo " " . _("Skipped.") . "<br />\n";
         }
     }
 
@@ -1144,7 +1140,7 @@
     function skip()
     { // not applicable
         if (isset($this->silent_skip)) return true;
-        echo _(" Skipped"), ".<br />\n";
+        echo " " . _("Skipped.") . "<br />\n";
         flush();
         return true;
     }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8554] trunk/locale

From: <var...@us...> - 2012-11-27 10:53:54

Revision: 8554
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8554&view=rev
Author:   vargenau
Date:     2012-11-27 10:53:42 +0000 (Tue, 27 Nov 2012)
Log Message:
-----------
Update Chinese translation

Modified Paths:
--------------
    trunk/locale/de/LC_MESSAGES/phpwiki.mo
    trunk/locale/es/LC_MESSAGES/phpwiki.mo
    trunk/locale/fr/LC_MESSAGES/phpwiki.mo
    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/locale/zh/LC_MESSAGES/phpwiki.php

Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

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/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-27 10:44:21 UTC (rev 8553)
+++ trunk/locale/po/de.po	2012-11-27 10:53:42 UTC (rev 8554)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-27 11:26+0100\n"
+"POT-Creation-Date: 2012-11-27 11:52+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."

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2012-11-27 10:44:21 UTC (rev 8553)
+++ trunk/locale/po/es.po	2012-11-27 10:53:42 UTC (rev 8554)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-27 11:26+0100\n"
+"POT-Creation-Date: 2012-11-27 11:52+0100\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2012-11-27 10:44:21 UTC (rev 8553)
+++ trunk/locale/po/fr.po	2012-11-27 10:53:42 UTC (rev 8554)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-27 11:26+0100\n"
+"POT-Creation-Date: 2012-11-27 11:52+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."

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2012-11-27 10:44:21 UTC (rev 8553)
+++ trunk/locale/po/it.po	2012-11-27 10:53:42 UTC (rev 8554)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-27 11:26+0100\n"
+"POT-Creation-Date: 2012-11-27 11:52+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"

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2012-11-27 10:44:21 UTC (rev 8553)
+++ trunk/locale/po/ja.po	2012-11-27 10:53:42 UTC (rev 8554)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-27 11:26+0100\n"
+"POT-Creation-Date: 2012-11-27 11:52+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"

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2012-11-27 10:44:21 UTC (rev 8553)
+++ trunk/locale/po/nl.po	2012-11-27 10:53:42 UTC (rev 8554)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-27 11:26+0100\n"
+"POT-Creation-Date: 2012-11-27 11:52+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"

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2012-11-27 10:44:21 UTC (rev 8553)
+++ trunk/locale/po/phpwiki.pot	2012-11-27 10:53:42 UTC (rev 8554)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-27 11:26+0100\n"
+"POT-Creation-Date: 2012-11-27 11:52+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"

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2012-11-27 10:44:21 UTC (rev 8553)
+++ trunk/locale/po/sv.po	2012-11-27 10:53:42 UTC (rev 8554)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-27 11:26+0100\n"
+"POT-Creation-Date: 2012-11-27 11:52+0100\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2012-11-27 10:44:21 UTC (rev 8553)
+++ trunk/locale/po/zh.po	2012-11-27 10:53:42 UTC (rev 8554)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-27 11:26+0100\n"
+"POT-Creation-Date: 2012-11-27 11:52+0100\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -7363,7 +7363,7 @@
 "See %s"
 msgstr ""
 "歡迎 %s! \n"
-" 你的 email 帳號已經確認並且將會被用來寄送頁面變更通知. \n"
+" 你的 e-mail 帳號已經確認並且將會被用來寄送頁面變更通知. \n"
 " 參閱 %s"
 
 #: ../lib/WikiUserNew.php:1881
@@ -8390,9 +8390,8 @@
 msgstr "改變密碼"
 
 #: ../themes/default/templates/userprefs.tmpl:139
-#, fuzzy
 msgid "Set Password"
-msgstr "密碼:"
+msgstr "密碼"
 
 #: ../themes/default/templates/userprefs.tmpl:141
 msgid "New password"
@@ -8400,17 +8399,15 @@
 
 #: ../themes/default/templates/userprefs.tmpl:144
 msgid "Type it again"
-msgstr "再輸入一次:"
+msgstr "再輸入一次"
 
 #: ../themes/default/templates/userprefs.tmpl:154
-#, fuzzy
 msgid "Your e-mail"
-msgstr "你的 E-Mail:"
+msgstr "你的 E-Mail"
 
 #: ../themes/default/templates/userprefs.tmpl:163
-#, fuzzy
 msgid "Status"
-msgstr "狀態:"
+msgstr "狀態"
 
 #: ../themes/default/templates/userprefs.tmpl:165
 msgid "e-mail verified."
@@ -8427,7 +8424,7 @@
 #: ../themes/default/templates/userprefs.tmpl:173
 #: ../themes/fusionforge/templates/userprefs.tmpl:194
 msgid "Get an e-mail notification at changes of the following pages:"
-msgstr "在變更下列頁面時取得 email 通知:"
+msgstr "在變更下列頁面時取得 e-mail 通知:"
 
 #: ../themes/default/templates/userprefs.tmpl:178
 #: ../themes/fusionforge/templates/userprefs.tmpl:200

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-27 10:44:21 UTC (rev 8553)
+++ trunk/locale/zh/LC_MESSAGES/phpwiki.php	2012-11-27 10:53:42 UTC (rev 8554)
@@ -240,7 +240,7 @@
 $locale["FullTextSearch"] = "FullTextSearch";
 $locale["FuzzyPages"] = "FuzzyPages";
 $locale["General Auth Settings"] = "一般認證設定";
-$locale["Get an e-mail notification at changes of the following pages:"] = "在變更下列頁面時取得 email 通知:";
+$locale["Get an e-mail notification at changes of the following pages:"] = "在變更下列頁面時取得 e-mail 通知:";
 $locale["Get debugging information for %s."] = "為 %s 取得除錯資訊.";
 $locale["Get preferences information for current user %s."] = "為目前使用者 %s 取得偏好設定資訊.";
 $locale["Go"] = "Go";
@@ -501,6 +501,7 @@
 $locale["Select: "] = "選擇";
 $locale["Selected page '%s' passed to '%s'."] = "已選擇的頁面 '%s' 傳遞到 '%s'.";
 $locale["Serialized file %s"] = "Serialized 到檔案 %s";
+$locale["Set Password"] = "密碼";
 $locale["Set individual page permissions."] = "設定個別頁面的權限.";
 $locale["Show and add blogs for %s"] = "顯示並增加 blogs - %s";
 $locale["Show and add comments for %s"] = "顯示並對 %s 發表意見";
@@ -532,6 +533,7 @@
 $locale["Spelling Score"] = "拼字得分";
 $locale["SqlResult"] = "SqlResult";
 $locale["Statistics about %s."] = "關於 %s 的統計.";
+$locale["Status"] = "狀態";
 $locale["SteveWainstead"] = "SteveWainstead";
 $locale["SubPages of %s:"] = "%s 的子頁面:";
 $locale["Submit"] = "送出";
@@ -597,7 +599,7 @@
 $locale["Translate '%s' to '%s' in *%s*"] = "轉換 '%s' 到 '%s' 在 *%s*";
 $locale["TranslateText"] = "TranslateText";
 $locale["Translation Error!"] = "轉換錯誤!";
-$locale["Type it again"] = "再輸入一次:";
+$locale["Type it again"] = "再輸入一次";
 $locale["Unable to connect to IMAP server "] = "無法連結到 IMAP 伺服器";
 $locale["Unable to connect to LDAP server %s"] = "無法連結到 LDAP 伺服器 %s";
 $locale["Unable to open directory '%s' for reading"] = "無法開啟目錄 '%s' 進行讀取";
@@ -646,7 +648,7 @@
 $locale["Warning: The search string cannot be empty!"] = "警告: 搜尋字串不能是空白!";
 $locale["Warning: You are editing an old revision."] = "警告: 你正在編輯較舊的修訂.";
 $locale["We have a total of %d registered users."] = "共有 %d 位已註冊的使用者.";
-$locale["Welcome to %s!\nYour e-mail account is verified and\nwill be used to send page change notifications.\nSee %s"] = "歡迎 %s! \n 你的 email 帳號已經確認並且將會被用來寄送頁面變更通知. \n 參閱 %s";
+$locale["Welcome to %s!\nYour e-mail account is verified and\nwill be used to send page change notifications.\nSee %s"] = "歡迎 %s! \n 你的 e-mail 帳號已經確認並且將會被用來寄送頁面變更通知. \n 參閱 %s";
 $locale["White space converted to single space"] = "空白空格轉換為單一空格";
 $locale["Who Is Online"] = "誰在線上";
 $locale["WhoIsOnline"] = "WhoIsOnline";
@@ -683,6 +685,7 @@
 $locale["Your browser should have redirected you to %s."] = "你的瀏覽器應該會重導向到 %s.";
 $locale["Your careful attention to detail is much appreciated."] = "感謝你的小心關注.";
 $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."] = "無法儲存你所變更的部份,在你編輯的這段時間,已經有其他作者變更了.所以你所變更的部份已經和其他作者變更的部份合併.結果顯示在下面.";
+$locale["Your e-mail"] = "你的 E-Mail";
 $locale["Your home page has not been created yet so your preferences cannot not be saved."] = "你的首頁還未被建立,所以你的偏好設定無法儲存.";
 $locale["Your home page is locked so your preferences cannot not be saved."] = "你的首頁已經被鎖定,所以你的偏好設定無法被儲存.";
 $locale["Your rating was %.1f"] = "你的評比是 %.1f";

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8553] trunk/pgsrc

From: <var...@us...> - 2012-11-27 10:44:32

Revision: 8553
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8553&view=rev
Author:   vargenau
Date:     2012-11-27 10:44:21 +0000 (Tue, 27 Nov 2012)
Log Message:
-----------
Use semicolon

Modified Paths:
--------------
    trunk/pgsrc/Help%2FAllPagesPlugin
    trunk/pgsrc/Help%2FAllUsersPlugin
    trunk/pgsrc/Help%2FBackLinksPlugin
    trunk/pgsrc/Help%2FFullTextSearchPlugin
    trunk/pgsrc/Help%2FIncludePagesPlugin
    trunk/pgsrc/Help%2FLikePagesPlugin
    trunk/pgsrc/Help%2FLinkDatabasePlugin
    trunk/pgsrc/Help%2FListPagesPlugin
    trunk/pgsrc/Help%2FListSubpagesPlugin
    trunk/pgsrc/Help%2FMostPopularPlugin
    trunk/pgsrc/Help%2FRandomPagePlugin
    trunk/pgsrc/Help%2FRecentReferrersPlugin
    trunk/pgsrc/Help%2FSemanticSearchPlugin
    trunk/pgsrc/Help%2FTitleSearchPlugin
    trunk/pgsrc/Help%2FUnfoldSubpagesPlugin
    trunk/pgsrc/Help%2FWantedPagesPlugin
    trunk/pgsrc/Help%2FWikiAdminSelectPlugin
    trunk/pgsrc/Help%2F_WikiTranslationPlugin

Modified: trunk/pgsrc/Help%2FAllPagesPlugin
===================================================================
--- trunk/pgsrc/Help%2FAllPagesPlugin	2012-11-27 10:28:13 UTC (rev 8552)
+++ trunk/pgsrc/Help%2FAllPagesPlugin	2012-11-27 10:44:21 UTC (rev 8553)
@@ -1,4 +1,4 @@
-Date: Wed,  1 Jun 2011 14:29:50 +0000
+Date: Tue, 27 Nov 2012 11:38:57 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FAllPagesPlugin;
@@ -16,7 +16,7 @@
 
 == Arguments ==
 
-All [[Help:PageList|PageList]] arguments, plus the following ones.
+All [[Help:PageList|PageList]] arguments, plus the following ones:
 
 {| class="bordered"
 |-

Modified: trunk/pgsrc/Help%2FAllUsersPlugin
===================================================================
--- trunk/pgsrc/Help%2FAllUsersPlugin	2012-11-27 10:28:13 UTC (rev 8552)
+++ trunk/pgsrc/Help%2FAllUsersPlugin	2012-11-27 10:44:21 UTC (rev 8553)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Tue, 27 Nov 2012 11:38:57 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FAllUsersPlugin;
@@ -17,7 +17,7 @@
 
 == Arguments ==
 
-All [[Help:PageList|PageList]] arguments, plus the following ones.
+All [[Help:PageList|PageList]] arguments, plus the following ones:
 
 {| class="bordered"
 |-

Modified: trunk/pgsrc/Help%2FBackLinksPlugin
===================================================================
--- trunk/pgsrc/Help%2FBackLinksPlugin	2012-11-27 10:28:13 UTC (rev 8552)
+++ trunk/pgsrc/Help%2FBackLinksPlugin	2012-11-27 10:44:21 UTC (rev 8553)
@@ -1,4 +1,4 @@
-Date: Thu,  9 Dec 2010 14:51:45 +0000
+Date: Tue, 27 Nov 2012 11:38:57 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FBackLinksPlugin;
@@ -17,7 +17,7 @@
 
 == Arguments ==
 
-All [[Help:PageList|PageList]] arguments, plus the following ones.
+All [[Help:PageList|PageList]] arguments, plus the following ones:
 
 {| class="bordered"
 |-

Modified: trunk/pgsrc/Help%2FFullTextSearchPlugin
===================================================================
--- trunk/pgsrc/Help%2FFullTextSearchPlugin	2012-11-27 10:28:13 UTC (rev 8552)
+++ trunk/pgsrc/Help%2FFullTextSearchPlugin	2012-11-27 10:44:21 UTC (rev 8553)
@@ -1,4 +1,4 @@
-Date: Thu,  9 Dec 2010 14:39:15 +0000
+Date: Tue, 27 Nov 2012 11:38:57 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FFullTextSearchPlugin;
@@ -16,7 +16,7 @@
 
 == Arguments ==
 
-All [[Help:PageList|PageList]] arguments, plus the following ones.
+All [[Help:PageList|PageList]] arguments, plus the following ones:
 
 {| class="bordered"
 |-

Modified: trunk/pgsrc/Help%2FIncludePagesPlugin
===================================================================
--- trunk/pgsrc/Help%2FIncludePagesPlugin	2012-11-27 10:28:13 UTC (rev 8552)
+++ trunk/pgsrc/Help%2FIncludePagesPlugin	2012-11-27 10:44:21 UTC (rev 8553)
@@ -1,4 +1,4 @@
-Date: Thu,  9 Dec 2010 17:45:27 +0000
+Date: Tue, 27 Nov 2012 11:38:57 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FIncludePagesPlugin;
@@ -16,7 +16,7 @@
 
 == Arguments ==
 
-All arguments from [[Help:IncludePagePlugin|IncludePage]] plugin, plus the following ones.
+All arguments from [[Help:IncludePagePlugin|IncludePage]] plugin, plus the following ones:
 
 {| class="bordered"
 |-

Modified: trunk/pgsrc/Help%2FLikePagesPlugin
===================================================================
--- trunk/pgsrc/Help%2FLikePagesPlugin	2012-11-27 10:28:13 UTC (rev 8552)
+++ trunk/pgsrc/Help%2FLikePagesPlugin	2012-11-27 10:44:21 UTC (rev 8553)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Tue, 27 Nov 2012 11:38:57 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FLikePagesPlugin;
@@ -17,7 +17,7 @@
 
 == Arguments ==
 
-All [[Help:PageList|PageList]] arguments, plus the following ones.
+All [[Help:PageList|PageList]] arguments, plus the following ones:
 
 {| class="bordered"
 |-

Modified: trunk/pgsrc/Help%2FLinkDatabasePlugin
===================================================================
--- trunk/pgsrc/Help%2FLinkDatabasePlugin	2012-11-27 10:28:13 UTC (rev 8552)
+++ trunk/pgsrc/Help%2FLinkDatabasePlugin	2012-11-27 10:44:21 UTC (rev 8553)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Tue, 27 Nov 2012 11:38:57 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FLinkDatabasePlugin;
@@ -17,7 +17,7 @@
 
 == Arguments ==
 
-All [[Help:PageList|PageList]] arguments, plus the following ones.
+All [[Help:PageList|PageList]] arguments, plus the following ones:
 
 {| class="bordered"
 |-

Modified: trunk/pgsrc/Help%2FListPagesPlugin
===================================================================
--- trunk/pgsrc/Help%2FListPagesPlugin	2012-11-27 10:28:13 UTC (rev 8552)
+++ trunk/pgsrc/Help%2FListPagesPlugin	2012-11-27 10:44:21 UTC (rev 8553)
@@ -1,4 +1,4 @@
-Date: Thu,  9 Dec 2010 14:51:45 +0000
+Date: Tue, 27 Nov 2012 11:38:57 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FListPagesPlugin;
@@ -24,7 +24,7 @@
 
 == Arguments ==
 
-All [[Help:PageList|PageList]] arguments, plus the following ones.
+All [[Help:PageList|PageList]] arguments, plus the following ones:
 
 {| class="bordered"
 |-

Modified: trunk/pgsrc/Help%2FListSubpagesPlugin
===================================================================
--- trunk/pgsrc/Help%2FListSubpagesPlugin	2012-11-27 10:28:13 UTC (rev 8552)
+++ trunk/pgsrc/Help%2FListSubpagesPlugin	2012-11-27 10:44:21 UTC (rev 8553)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Tue, 27 Nov 2012 11:38:57 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FListSubpagesPlugin;
@@ -17,7 +17,7 @@
 
 == Arguments ==
 
-All [[Help:PageList|PageList]] arguments, plus the following ones.
+All [[Help:PageList|PageList]] arguments, plus the following ones:
 
 {| class="bordered"
 |-

Modified: trunk/pgsrc/Help%2FMostPopularPlugin
===================================================================
--- trunk/pgsrc/Help%2FMostPopularPlugin	2012-11-27 10:28:13 UTC (rev 8552)
+++ trunk/pgsrc/Help%2FMostPopularPlugin	2012-11-27 10:44:21 UTC (rev 8553)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Tue, 27 Nov 2012 11:38:57 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FMostPopularPlugin;
@@ -17,7 +17,7 @@
 
 == Arguments ==
 
-All [[Help:PageList|PageList]] arguments, plus the following ones.
+All [[Help:PageList|PageList]] arguments, plus the following ones:
 
 {| class="bordered"
 |-

Modified: trunk/pgsrc/Help%2FRandomPagePlugin
===================================================================
--- trunk/pgsrc/Help%2FRandomPagePlugin	2012-11-27 10:28:13 UTC (rev 8552)
+++ trunk/pgsrc/Help%2FRandomPagePlugin	2012-11-27 10:44:21 UTC (rev 8553)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Tue, 27 Nov 2012 11:38:57 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FRandomPagePlugin;
@@ -16,7 +16,7 @@
 
 == Arguments ==
 
-All [[Help:PageList|PageList]] arguments, plus the following ones.
+All [[Help:PageList|PageList]] arguments, plus the following ones:
 
 {| class="bordered"
 |-

Modified: trunk/pgsrc/Help%2FRecentReferrersPlugin
===================================================================
--- trunk/pgsrc/Help%2FRecentReferrersPlugin	2012-11-27 10:28:13 UTC (rev 8552)
+++ trunk/pgsrc/Help%2FRecentReferrersPlugin	2012-11-27 10:44:21 UTC (rev 8553)
@@ -1,4 +1,4 @@
-Date: Thu,  9 Dec 2010 18:04:52 +0000
+Date: Tue, 27 Nov 2012 11:38:57 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FRecentReferrersPlugin;
@@ -17,7 +17,7 @@
 
 == Arguments ==
 
-All [[Help:PageList|PageList]] arguments, plus the following ones.
+All [[Help:PageList|PageList]] arguments, plus the following ones:
 
 {| class="bordered"
 |-

Modified: trunk/pgsrc/Help%2FSemanticSearchPlugin
===================================================================
--- trunk/pgsrc/Help%2FSemanticSearchPlugin	2012-11-27 10:28:13 UTC (rev 8552)
+++ trunk/pgsrc/Help%2FSemanticSearchPlugin	2012-11-27 10:44:21 UTC (rev 8553)
@@ -1,4 +1,4 @@
-Date: Thu, 16 Dec 2010 14:00:38 +0000
+Date: Tue, 27 Nov 2012 11:38:57 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FSemanticSearchPlugin;
@@ -35,7 +35,7 @@
 
 == Arguments ==
 
-All [[Help:PageList|PageList]] arguments, plus the following ones.
+All [[Help:PageList|PageList]] arguments, plus the following ones:
 
 {| class="bordered"
 |-

Modified: trunk/pgsrc/Help%2FTitleSearchPlugin
===================================================================
--- trunk/pgsrc/Help%2FTitleSearchPlugin	2012-11-27 10:28:13 UTC (rev 8552)
+++ trunk/pgsrc/Help%2FTitleSearchPlugin	2012-11-27 10:44:21 UTC (rev 8553)
@@ -1,4 +1,4 @@
-Date: Thu,  9 Dec 2010 14:39:15 +0000
+Date: Tue, 27 Nov 2012 11:38:57 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FTitleSearchPlugin;
@@ -19,7 +19,7 @@
 
 == Arguments ==
 
-All [[Help:PageList|PageList]] arguments, plus the following ones.
+All [[Help:PageList|PageList]] arguments, plus the following ones:
 
 {| class="bordered"
 |-

Modified: trunk/pgsrc/Help%2FUnfoldSubpagesPlugin
===================================================================
--- trunk/pgsrc/Help%2FUnfoldSubpagesPlugin	2012-11-27 10:28:13 UTC (rev 8552)
+++ trunk/pgsrc/Help%2FUnfoldSubpagesPlugin	2012-11-27 10:44:21 UTC (rev 8553)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Tue, 27 Nov 2012 11:38:57 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FUnfoldSubpagesPlugin;
@@ -28,7 +28,7 @@
 
 == Arguments ==
 
-All [[Help:PageList|PageList]] arguments, plus the following ones.
+All [[Help:PageList|PageList]] arguments, plus the following ones:
 
 {| class="bordered"
 |-

Modified: trunk/pgsrc/Help%2FWantedPagesPlugin
===================================================================
--- trunk/pgsrc/Help%2FWantedPagesPlugin	2012-11-27 10:28:13 UTC (rev 8552)
+++ trunk/pgsrc/Help%2FWantedPagesPlugin	2012-11-27 10:44:21 UTC (rev 8553)
@@ -1,4 +1,4 @@
-Date: Thu,  9 Dec 2010 14:51:45 +0000
+Date: Tue, 27 Nov 2012 11:38:57 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FWantedPagesPlugin;
@@ -19,7 +19,7 @@
 
 == Arguments ==
 
-All [[Help:PageList|PageList]] arguments, plus the following ones.
+All [[Help:PageList|PageList]] arguments, plus the following ones:
 
 {| class="bordered"
 |-

Modified: trunk/pgsrc/Help%2FWikiAdminSelectPlugin
===================================================================
--- trunk/pgsrc/Help%2FWikiAdminSelectPlugin	2012-11-27 10:28:13 UTC (rev 8552)
+++ trunk/pgsrc/Help%2FWikiAdminSelectPlugin	2012-11-27 10:44:21 UTC (rev 8553)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Tue, 27 Nov 2012 11:38:57 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FWikiAdminSelectPlugin;
@@ -16,7 +16,7 @@
 
 == Arguments ==
 
-All ~PageList arguments, plus the following ones.
+All [[Help:PageList|PageList]] arguments, plus the following ones:
 
 {| class="bordered"
 |-

Modified: trunk/pgsrc/Help%2F_WikiTranslationPlugin
===================================================================
--- trunk/pgsrc/Help%2F_WikiTranslationPlugin	2012-11-27 10:28:13 UTC (rev 8552)
+++ trunk/pgsrc/Help%2F_WikiTranslationPlugin	2012-11-27 10:44:21 UTC (rev 8553)
@@ -1,4 +1,4 @@
-Date: Thu,  9 Dec 2010 14:51:45 +0000
+Date: Tue, 27 Nov 2012 11:38:57 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2F_WikiTranslationPlugin;
@@ -21,7 +21,7 @@
 
 == Arguments ==
 
-All [[Help:PageList|PageList]] arguments, plus the following ones.
+All [[Help:PageList|PageList]] arguments, plus the following ones:
 
 languages:
   comma delimited string of de,en,sv,...

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8552] trunk/locale

From: <var...@us...> - 2012-11-27 10:28:28

Revision: 8552
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8552&view=rev
Author:   vargenau
Date:     2012-11-27 10:28:13 +0000 (Tue, 27 Nov 2012)
Log Message:
-----------
Update translations

Modified Paths:
--------------
    trunk/locale/de/LC_MESSAGES/phpwiki.mo
    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

Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

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-27 09:46:24 UTC (rev 8551)
+++ trunk/locale/fr/LC_MESSAGES/phpwiki.php	2012-11-27 10:28:13 UTC (rev 8552)
@@ -1307,8 +1307,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["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-27 09:46:24 UTC (rev 8551)
+++ trunk/locale/ja/LC_MESSAGES/phpwiki.php	2012-11-27 10:28:13 UTC (rev 8552)
@@ -42,6 +42,7 @@
 $locale["Create: %s"] = "作成: %s";
 $locale["Creating pages"] = "ページを作成しています。";
 $locale["Current language"] = "現在の言語";
+$locale["Current theme"] = "現在のテーマ";
 $locale["Date Format"] = "データフォーマット";
 $locale["DebugInfo"] = "デバグ情報";
 $locale["Default theme: '%s'"] = "デフォルトテーマ: %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-27 09:46:24 UTC (rev 8551)
+++ trunk/locale/po/de.po	2012-11-27 10:28:13 UTC (rev 8552)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-27 10:45+0100\n"
+"POT-Creation-Date: 2012-11-27 11:26+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."

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2012-11-27 09:46:24 UTC (rev 8551)
+++ trunk/locale/po/es.po	2012-11-27 10:28:13 UTC (rev 8552)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-27 10:45+0100\n"
+"POT-Creation-Date: 2012-11-27 11:26+0100\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2012-11-27 09:46:24 UTC (rev 8551)
+++ trunk/locale/po/fr.po	2012-11-27 10:28:13 UTC (rev 8552)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-27 10:45+0100\n"
+"POT-Creation-Date: 2012-11-27 11:26+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."
@@ -8202,11 +8202,11 @@
 
 #: ../themes/default/templates/userprefs.tmpl:165
 msgid "e-mail verified."
-msgstr "Adresse électronique vérifiée."
+msgstr "adresse électronique vérifiée."
 
 #: ../themes/default/templates/userprefs.tmpl:167
 msgid "e-mail not yet verified."
-msgstr "Adresse électronique pas encore vérifiée."
+msgstr "adresse électronique pas encore vérifiée."
 
 #: ../themes/default/templates/userprefs.tmpl:170
 msgid "Note, that user accounts with bouncing e-mails will be disabled."

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2012-11-27 09:46:24 UTC (rev 8551)
+++ trunk/locale/po/it.po	2012-11-27 10:28:13 UTC (rev 8552)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-27 10:45+0100\n"
+"POT-Creation-Date: 2012-11-27 11:26+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"

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2012-11-27 09:46:24 UTC (rev 8551)
+++ trunk/locale/po/ja.po	2012-11-27 10:28:13 UTC (rev 8552)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-27 10:45+0100\n"
+"POT-Creation-Date: 2012-11-27 11:26+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"
@@ -4544,7 +4544,7 @@
 #: ../lib/plugin/SystemInfo.php:484
 #: ../themes/default/templates/userprefs.tmpl:132
 msgid "Current theme"
-msgstr ""
+msgstr "現在のテーマ"
 
 #: ../lib/plugin/SystemInfo.php:486
 #, php-format

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2012-11-27 09:46:24 UTC (rev 8551)
+++ trunk/locale/po/nl.po	2012-11-27 10:28:13 UTC (rev 8552)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-27 10:45+0100\n"
+"POT-Creation-Date: 2012-11-27 11:26+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"

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2012-11-27 09:46:24 UTC (rev 8551)
+++ trunk/locale/po/phpwiki.pot	2012-11-27 10:28:13 UTC (rev 8552)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-27 10:45+0100\n"
+"POT-Creation-Date: 2012-11-27 11:26+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"

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2012-11-27 09:46:24 UTC (rev 8551)
+++ trunk/locale/po/sv.po	2012-11-27 10:28:13 UTC (rev 8552)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-27 10:45+0100\n"
+"POT-Creation-Date: 2012-11-27 11:26+0100\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2012-11-27 09:46:24 UTC (rev 8551)
+++ trunk/locale/po/zh.po	2012-11-27 10:28:13 UTC (rev 8552)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-27 10:45+0100\n"
+"POT-Creation-Date: 2012-11-27 11:26+0100\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -7355,7 +7355,7 @@
 msgstr "請在 index.php 中設定 ENCRYPTED_PASSWD 為 true."
 
 #: ../lib/WikiUserNew.php:1819
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Welcome to %s!\n"
 "Your e-mail account is verified and\n"

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-27 09:46:24 UTC (rev 8551)
+++ trunk/locale/zh/LC_MESSAGES/phpwiki.php	2012-11-27 10:28:13 UTC (rev 8552)
@@ -646,6 +646,7 @@
 $locale["Warning: The search string cannot be empty!"] = "警告: 搜尋字串不能是空白!";
 $locale["Warning: You are editing an old revision."] = "警告: 你正在編輯較舊的修訂.";
 $locale["We have a total of %d registered users."] = "共有 %d 位已註冊的使用者.";
+$locale["Welcome to %s!\nYour e-mail account is verified and\nwill be used to send page change notifications.\nSee %s"] = "歡迎 %s! \n 你的 email 帳號已經確認並且將會被用來寄送頁面變更通知. \n 參閱 %s";
 $locale["White space converted to single space"] = "空白空格轉換為單一空格";
 $locale["Who Is Online"] = "誰在線上";
 $locale["WhoIsOnline"] = "WhoIsOnline";

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8551] trunk/locale

From: <var...@us...> - 2012-11-27 09:46:37

Revision: 8551
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8551&view=rev
Author:   vargenau
Date:     2012-11-27 09:46:24 +0000 (Tue, 27 Nov 2012)
Log Message:
-----------
Update French translation

Modified Paths:
--------------
    trunk/locale/de/LC_MESSAGES/phpwiki.mo
    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

Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

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 19:51:33 UTC (rev 8550)
+++ trunk/locale/fr/LC_MESSAGES/phpwiki.php	2012-11-27 09:46:24 UTC (rev 8551)
@@ -441,7 +441,7 @@
 $locale["FrameInclude"] = "InclureUnCadre";
 $locale["From english to %s: "] = "De l'Anglais au %s: ";
 $locale["Full changes"] = "Changements exhaustifs";
-$locale["Full text search results for “%s”"] = "Résultats de la recherche en texte intégral de ' %s '";
+$locale["Full text search results for “%s”"] = "Résultats de la recherche en texte intégral de « %s »";
 $locale["FullDump"] = "SauvegardeTotale";
 $locale["FullRecentChanges"] = "DernièresModifs";
 $locale["FullTextSearch"] = "RechercheEnTexteIntégral";
@@ -761,8 +761,8 @@
 $locale["Page dump"] = "Cliché de la page";
 $locale["Page info"] = "Infos sur la page";
 $locale["Page name too long"] = "Le nom de la page est trop long";
-$locale["Page names with prefix '%s'"] = "Noms de page ayant le préfixe ' %s '";
-$locale["Page names with suffix '%s'"] = "Noms de page ayant le suffixe ' %s '";
+$locale["Page names with prefix '%s'"] = "Noms de page ayant le préfixe « %s »";
+$locale["Page names with suffix '%s'"] = "Noms de page ayant le suffixe « %s »";
 $locale["Page now external."] = "La page est maintenant externe.";
 $locale["Page now locked."] = "La page est maintenant verrouillée.";
 $locale["Page now not-external."] = "La page est maintenant interne.";

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 19:51:33 UTC (rev 8550)
+++ trunk/locale/po/de.po	2012-11-27 09:46:24 UTC (rev 8551)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 20:47+0100\n"
+"POT-Creation-Date: 2012-11-27 10:45+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."

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2012-11-26 19:51:33 UTC (rev 8550)
+++ trunk/locale/po/es.po	2012-11-27 09:46:24 UTC (rev 8551)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 20:47+0100\n"
+"POT-Creation-Date: 2012-11-27 10:45+0100\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2012-11-26 19:51:33 UTC (rev 8550)
+++ trunk/locale/po/fr.po	2012-11-27 09:46:24 UTC (rev 8551)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 20:47+0100\n"
+"POT-Creation-Date: 2012-11-27 10:45+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."
@@ -2566,7 +2566,7 @@
 #: ../lib/plugin/FullTextSearch.php:92 ../lib/plugin/FullTextSearch.php:127
 #, php-format
 msgid "Full text search results for “%s”"
-msgstr "Résultats de la recherche en texte intégral de ' %s '"
+msgstr "Résultats de la recherche en texte intégral de « %s »"
 
 #: ../lib/plugin/FullTextSearch.php:117
 #, php-format
@@ -2879,12 +2879,12 @@
 #: ../lib/plugin/LikePages.php:66
 #, php-format
 msgid "Page names with prefix '%s'"
-msgstr "Noms de page ayant le préfixe ' %s '"
+msgstr "Noms de page ayant le préfixe « %s »"
 
 #: ../lib/plugin/LikePages.php:68
 #, php-format
 msgid "Page names with suffix '%s'"
-msgstr "Noms de page ayant le suffixe ' %s '"
+msgstr "Noms de page ayant le suffixe « %s »"
 
 #: ../lib/plugin/LikePages.php:77
 #, php-format

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2012-11-26 19:51:33 UTC (rev 8550)
+++ trunk/locale/po/it.po	2012-11-27 09:46:24 UTC (rev 8551)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 20:47+0100\n"
+"POT-Creation-Date: 2012-11-27 10:45+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"

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2012-11-26 19:51:33 UTC (rev 8550)
+++ trunk/locale/po/ja.po	2012-11-27 09:46:24 UTC (rev 8551)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 20:47+0100\n"
+"POT-Creation-Date: 2012-11-27 10:45+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"

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2012-11-26 19:51:33 UTC (rev 8550)
+++ trunk/locale/po/nl.po	2012-11-27 09:46:24 UTC (rev 8551)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 20:47+0100\n"
+"POT-Creation-Date: 2012-11-27 10:45+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"

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2012-11-26 19:51:33 UTC (rev 8550)
+++ trunk/locale/po/phpwiki.pot	2012-11-27 09:46:24 UTC (rev 8551)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 20:47+0100\n"
+"POT-Creation-Date: 2012-11-27 10:45+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"

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2012-11-26 19:51:33 UTC (rev 8550)
+++ trunk/locale/po/sv.po	2012-11-27 09:46:24 UTC (rev 8551)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 20:47+0100\n"
+"POT-Creation-Date: 2012-11-27 10:45+0100\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2012-11-26 19:51:33 UTC (rev 8550)
+++ trunk/locale/po/zh.po	2012-11-27 09:46:24 UTC (rev 8551)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 20:47+0100\n"
+"POT-Creation-Date: 2012-11-27 10:45+0100\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"

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.

[phpwiki-checkins] SF.net SVN: phpwiki:[8550] trunk/lib/plugin

From: <var...@us...> - 2012-11-26 19:51:39

Revision: 8550
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8550&view=rev
Author:   vargenau
Date:     2012-11-26 19:51:33 +0000 (Mon, 26 Nov 2012)
Log Message:
-----------
Less messages

Modified Paths:
--------------
    trunk/lib/plugin/IncludePage.php
    trunk/lib/plugin/UnfoldSubpages.php

Modified: trunk/lib/plugin/IncludePage.php
===================================================================
--- trunk/lib/plugin/IncludePage.php	2012-11-26 19:49:36 UTC (rev 8549)
+++ trunk/lib/plugin/IncludePage.php	2012-11-26 19:51:33 UTC (rev 8550)
@@ -105,7 +105,7 @@
 
         // Check if user is allowed to get the Page.
         if (!mayAccessPage('view', $page)) {
-            return $this->error(sprintf(_("Illegal inclusion of page %s: no read access"),
+            return $this->error(sprintf(_("Illegal inclusion of page %s: no read access."),
                 $page));
         }
 

Modified: trunk/lib/plugin/UnfoldSubpages.php
===================================================================
--- trunk/lib/plugin/UnfoldSubpages.php	2012-11-26 19:49:36 UTC (rev 8549)
+++ trunk/lib/plugin/UnfoldSubpages.php	2012-11-26 19:51:33 UTC (rev 8550)
@@ -108,7 +108,7 @@
 
             // Check if user is allowed to get the Page.
             if (!mayAccessPage('view', $cpagename)) {
-                return $this->error(sprintf(_("Illegal inclusion of page %s: no read access"),
+                return $this->error(sprintf(_("Illegal inclusion of page %s: no read access."),
                     $cpagename));
             }
 
@@ -140,7 +140,7 @@
 
                     // Check if user is allowed to get the Page.
                     if (!mayAccessPage('view', $cpagename)) {
-                        return $this->error(sprintf(_("Illegal inclusion of page %s: no read access"),
+                        return $this->error(sprintf(_("Illegal inclusion of page %s: no read access."),
                             $cpagename));
                     }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8549] trunk/locale

From: <var...@us...> - 2012-11-26 19:49:44

Revision: 8549
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8549&view=rev
Author:   vargenau
Date:     2012-11-26 19:49:36 +0000 (Mon, 26 Nov 2012)
Log Message:
-----------
Less messages

Modified Paths:
--------------
    trunk/locale/de/LC_MESSAGES/phpwiki.mo
    trunk/locale/es/LC_MESSAGES/phpwiki.mo
    trunk/locale/fr/LC_MESSAGES/phpwiki.mo
    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/locale/de/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

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/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 19:37:47 UTC (rev 8548)
+++ trunk/locale/po/de.po	2012-11-26 19:49:36 UTC (rev 8549)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 20:35+0100\n"
+"POT-Creation-Date: 2012-11-26 20:47+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."
@@ -2784,11 +2784,11 @@
 msgid "Page '%s' does not exist"
 msgstr "Seite »%s« existiert nicht"
 
-#: ../lib/plugin/IncludePage.php:108 ../lib/plugin/UnfoldSubpages.php:111
-#: ../lib/plugin/UnfoldSubpages.php:143
+#: ../lib/plugin/IncludePage.php:108 ../lib/plugin/Template.php:141
+#: ../lib/plugin/UnfoldSubpages.php:111 ../lib/plugin/UnfoldSubpages.php:143
 #, php-format
-msgid "Illegal inclusion of page %s: no read access"
-msgstr ""
+msgid "Illegal inclusion of page %s: no read access."
+msgstr "Fehler beim Einfügen der Seite %s: kein Lesezugriff."
 
 #: ../lib/plugin/IncludePage.php:115 ../lib/plugin/Template.php:148
 msgid "Error: rev must be a positive integer."
@@ -4682,11 +4682,6 @@
 msgid "Parametrized page inclusion."
 msgstr ""
 
-#: ../lib/plugin/Template.php:141
-#, php-format
-msgid "Illegal inclusion of page %s: no read access."
-msgstr "Fehler beim Einfügen der Seite %s: kein Lesezugriff."
-
 #: ../lib/plugin/TeX2png.php:46
 msgid "TeX2png"
 msgstr ""

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2012-11-26 19:37:47 UTC (rev 8548)
+++ trunk/locale/po/es.po	2012-11-26 19:49:36 UTC (rev 8549)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 20:35+0100\n"
+"POT-Creation-Date: 2012-11-26 20:47+0100\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -2745,10 +2745,10 @@
 msgid "Page '%s' does not exist"
 msgstr "La página '%s' no existe"
 
-#: ../lib/plugin/IncludePage.php:108 ../lib/plugin/UnfoldSubpages.php:111
-#: ../lib/plugin/UnfoldSubpages.php:143
+#: ../lib/plugin/IncludePage.php:108 ../lib/plugin/Template.php:141
+#: ../lib/plugin/UnfoldSubpages.php:111 ../lib/plugin/UnfoldSubpages.php:143
 #, php-format
-msgid "Illegal inclusion of page %s: no read access"
+msgid "Illegal inclusion of page %s: no read access."
 msgstr ""
 
 #: ../lib/plugin/IncludePage.php:115 ../lib/plugin/Template.php:148
@@ -4577,11 +4577,6 @@
 msgid "Parametrized page inclusion."
 msgstr ""
 
-#: ../lib/plugin/Template.php:141
-#, php-format
-msgid "Illegal inclusion of page %s: no read access."
-msgstr ""
-
 #: ../lib/plugin/TeX2png.php:46
 msgid "TeX2png"
 msgstr ""

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2012-11-26 19:37:47 UTC (rev 8548)
+++ trunk/locale/po/fr.po	2012-11-26 19:49:36 UTC (rev 8549)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 20:35+0100\n"
+"POT-Creation-Date: 2012-11-26 20:47+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."
@@ -2750,11 +2750,11 @@
 msgid "Page '%s' does not exist"
 msgstr "La page « %s » n'existe pas"
 
-#: ../lib/plugin/IncludePage.php:108 ../lib/plugin/UnfoldSubpages.php:111
-#: ../lib/plugin/UnfoldSubpages.php:143
+#: ../lib/plugin/IncludePage.php:108 ../lib/plugin/Template.php:141
+#: ../lib/plugin/UnfoldSubpages.php:111 ../lib/plugin/UnfoldSubpages.php:143
 #, php-format
-msgid "Illegal inclusion of page %s: no read access"
-msgstr ""
+msgid "Illegal inclusion of page %s: no read access."
+msgstr "insertion récursive de la page %s ignoré"
 
 #: ../lib/plugin/IncludePage.php:115 ../lib/plugin/Template.php:148
 msgid "Error: rev must be a positive integer."
@@ -4614,11 +4614,6 @@
 msgid "Parametrized page inclusion."
 msgstr ""
 
-#: ../lib/plugin/Template.php:141
-#, php-format
-msgid "Illegal inclusion of page %s: no read access."
-msgstr "insertion récursive de la page %s ignoré"
-
 #: ../lib/plugin/TeX2png.php:46
 msgid "TeX2png"
 msgstr "TeX2png"

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2012-11-26 19:37:47 UTC (rev 8548)
+++ trunk/locale/po/it.po	2012-11-26 19:49:36 UTC (rev 8549)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 20:35+0100\n"
+"POT-Creation-Date: 2012-11-26 20:47+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"
@@ -2725,10 +2725,10 @@
 msgid "Page '%s' does not exist"
 msgstr ""
 
-#: ../lib/plugin/IncludePage.php:108 ../lib/plugin/UnfoldSubpages.php:111
-#: ../lib/plugin/UnfoldSubpages.php:143
+#: ../lib/plugin/IncludePage.php:108 ../lib/plugin/Template.php:141
+#: ../lib/plugin/UnfoldSubpages.php:111 ../lib/plugin/UnfoldSubpages.php:143
 #, php-format
-msgid "Illegal inclusion of page %s: no read access"
+msgid "Illegal inclusion of page %s: no read access."
 msgstr ""
 
 #: ../lib/plugin/IncludePage.php:115 ../lib/plugin/Template.php:148
@@ -4553,11 +4553,6 @@
 msgid "Parametrized page inclusion."
 msgstr ""
 
-#: ../lib/plugin/Template.php:141
-#, php-format
-msgid "Illegal inclusion of page %s: no read access."
-msgstr ""
-
 #: ../lib/plugin/TeX2png.php:46
 msgid "TeX2png"
 msgstr ""

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2012-11-26 19:37:47 UTC (rev 8548)
+++ trunk/locale/po/ja.po	2012-11-26 19:49:36 UTC (rev 8549)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 20:35+0100\n"
+"POT-Creation-Date: 2012-11-26 20:47+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"
@@ -2753,10 +2753,10 @@
 msgid "Page '%s' does not exist"
 msgstr ""
 
-#: ../lib/plugin/IncludePage.php:108 ../lib/plugin/UnfoldSubpages.php:111
-#: ../lib/plugin/UnfoldSubpages.php:143
+#: ../lib/plugin/IncludePage.php:108 ../lib/plugin/Template.php:141
+#: ../lib/plugin/UnfoldSubpages.php:111 ../lib/plugin/UnfoldSubpages.php:143
 #, php-format
-msgid "Illegal inclusion of page %s: no read access"
+msgid "Illegal inclusion of page %s: no read access."
 msgstr ""
 
 #: ../lib/plugin/IncludePage.php:115 ../lib/plugin/Template.php:148
@@ -4620,11 +4620,6 @@
 msgid "Parametrized page inclusion."
 msgstr ""
 
-#: ../lib/plugin/Template.php:141
-#, php-format
-msgid "Illegal inclusion of page %s: no read access."
-msgstr ""
-
 #: ../lib/plugin/TeX2png.php:46
 msgid "TeX2png"
 msgstr ""

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2012-11-26 19:37:47 UTC (rev 8548)
+++ trunk/locale/po/nl.po	2012-11-26 19:49:36 UTC (rev 8549)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 20:35+0100\n"
+"POT-Creation-Date: 2012-11-26 20:47+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"
@@ -2717,10 +2717,10 @@
 msgid "Page '%s' does not exist"
 msgstr ""
 
-#: ../lib/plugin/IncludePage.php:108 ../lib/plugin/UnfoldSubpages.php:111
-#: ../lib/plugin/UnfoldSubpages.php:143
+#: ../lib/plugin/IncludePage.php:108 ../lib/plugin/Template.php:141
+#: ../lib/plugin/UnfoldSubpages.php:111 ../lib/plugin/UnfoldSubpages.php:143
 #, php-format
-msgid "Illegal inclusion of page %s: no read access"
+msgid "Illegal inclusion of page %s: no read access."
 msgstr ""
 
 #: ../lib/plugin/IncludePage.php:115 ../lib/plugin/Template.php:148
@@ -4545,11 +4545,6 @@
 msgid "Parametrized page inclusion."
 msgstr ""
 
-#: ../lib/plugin/Template.php:141
-#, php-format
-msgid "Illegal inclusion of page %s: no read access."
-msgstr ""
-
 #: ../lib/plugin/TeX2png.php:46
 msgid "TeX2png"
 msgstr ""

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2012-11-26 19:37:47 UTC (rev 8548)
+++ trunk/locale/po/phpwiki.pot	2012-11-26 19:49:36 UTC (rev 8549)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 20:35+0100\n"
+"POT-Creation-Date: 2012-11-26 20:47+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"
@@ -2710,10 +2710,10 @@
 msgid "Page '%s' does not exist"
 msgstr ""
 
-#: ../lib/plugin/IncludePage.php:108 ../lib/plugin/UnfoldSubpages.php:111
-#: ../lib/plugin/UnfoldSubpages.php:143
+#: ../lib/plugin/IncludePage.php:108 ../lib/plugin/Template.php:141
+#: ../lib/plugin/UnfoldSubpages.php:111 ../lib/plugin/UnfoldSubpages.php:143
 #, php-format
-msgid "Illegal inclusion of page %s: no read access"
+msgid "Illegal inclusion of page %s: no read access."
 msgstr ""
 
 #: ../lib/plugin/IncludePage.php:115 ../lib/plugin/Template.php:148
@@ -4538,11 +4538,6 @@
 msgid "Parametrized page inclusion."
 msgstr ""
 
-#: ../lib/plugin/Template.php:141
-#, php-format
-msgid "Illegal inclusion of page %s: no read access."
-msgstr ""
-
 #: ../lib/plugin/TeX2png.php:46
 msgid "TeX2png"
 msgstr ""

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2012-11-26 19:37:47 UTC (rev 8548)
+++ trunk/locale/po/sv.po	2012-11-26 19:49:36 UTC (rev 8549)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 20:35+0100\n"
+"POT-Creation-Date: 2012-11-26 20:47+0100\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -2712,10 +2712,10 @@
 msgid "Page '%s' does not exist"
 msgstr ""
 
-#: ../lib/plugin/IncludePage.php:108 ../lib/plugin/UnfoldSubpages.php:111
-#: ../lib/plugin/UnfoldSubpages.php:143
+#: ../lib/plugin/IncludePage.php:108 ../lib/plugin/Template.php:141
+#: ../lib/plugin/UnfoldSubpages.php:111 ../lib/plugin/UnfoldSubpages.php:143
 #, php-format
-msgid "Illegal inclusion of page %s: no read access"
+msgid "Illegal inclusion of page %s: no read access."
 msgstr ""
 
 #: ../lib/plugin/IncludePage.php:115 ../lib/plugin/Template.php:148
@@ -4540,11 +4540,6 @@
 msgid "Parametrized page inclusion."
 msgstr ""
 
-#: ../lib/plugin/Template.php:141
-#, php-format
-msgid "Illegal inclusion of page %s: no read access."
-msgstr ""
-
 #: ../lib/plugin/TeX2png.php:46
 msgid "TeX2png"
 msgstr ""

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2012-11-26 19:37:47 UTC (rev 8548)
+++ trunk/locale/po/zh.po	2012-11-26 19:49:36 UTC (rev 8549)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 20:35+0100\n"
+"POT-Creation-Date: 2012-11-26 20:47+0100\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -2817,10 +2817,10 @@
 msgid "Page '%s' does not exist"
 msgstr "群組 %s 不存在"
 
-#: ../lib/plugin/IncludePage.php:108 ../lib/plugin/UnfoldSubpages.php:111
-#: ../lib/plugin/UnfoldSubpages.php:143
+#: ../lib/plugin/IncludePage.php:108 ../lib/plugin/Template.php:141
+#: ../lib/plugin/UnfoldSubpages.php:111 ../lib/plugin/UnfoldSubpages.php:143
 #, fuzzy, php-format
-msgid "Illegal inclusion of page %s: no read access"
+msgid "Illegal inclusion of page %s: no read access."
 msgstr "忽略頁面 %s 的遞迴含括"
 
 #: ../lib/plugin/IncludePage.php:115 ../lib/plugin/Template.php:148
@@ -4736,11 +4736,6 @@
 msgid "Parametrized page inclusion."
 msgstr ""
 
-#: ../lib/plugin/Template.php:141
-#, fuzzy, php-format
-msgid "Illegal inclusion of page %s: no read access."
-msgstr "忽略頁面 %s 的遞迴含括"
-
 #: ../lib/plugin/TeX2png.php:46
 msgid "TeX2png"
 msgstr ""
@@ -9026,6 +9021,10 @@
 msgid "View the current version"
 msgstr "查看目前版本"
 
+#, fuzzy
+#~ msgid "Illegal inclusion of page %s: no read access"
+#~ msgstr "忽略頁面 %s 的遞迴含括"
+
 #~ msgid "Current language: '%s'"
 #~ msgstr "目前語言: '%s'"
 

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.

[phpwiki-checkins] SF.net SVN: phpwiki:[8548] trunk

From: <var...@us...> - 2012-11-26 19:37:57

Revision: 8548
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8548&view=rev
Author:   vargenau
Date:     2012-11-26 19:37:47 +0000 (Mon, 26 Nov 2012)
Log Message:
-----------
Less messages

Modified Paths:
--------------
    trunk/lib/plugin/ModeratedPage.php
    trunk/lib/plugin/SystemInfo.php
    trunk/lib/plugin/WikiAdminDeleteAcl.php
    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/themes/default/templates/userprefs.tmpl

Modified: trunk/lib/plugin/ModeratedPage.php
===================================================================
--- trunk/lib/plugin/ModeratedPage.php	2012-11-26 17:44:33 UTC (rev 8547)
+++ trunk/lib/plugin/ModeratedPage.php	2012-11-26 19:37:47 UTC (rev 8548)
@@ -63,7 +63,7 @@
     {
         $args = $this->getArgs($argstr, $request);
 
-        // Handle moderation request from urls sent by email
+        // Handle moderation request from URLs sent by e-mail
         if (!empty($args['id']) and !empty($args['pass'])) {
             if (!$args['page']) {
                 return $this->error(sprintf(_("A required argument '%s' is missing."), 'page'));
@@ -154,8 +154,7 @@
         $status = $this->getSiteStatus($request, $action_page);
         if (is_array($status)) {
             if (empty($status['emails'])) {
-                trigger_error(_("ModeratedPage: No e-mails for the moderators defined"),
-                    E_USER_WARNING);
+                trigger_error(_("No e-mails for the moderators defined"), E_USER_WARNING);
                 return false;
             }
             $page->set('moderation', array('status' => $status));
@@ -180,8 +179,7 @@
         if (is_array($status)) {
             if (empty($status['emails'])) {
                 // We really should present such warnings prominently.
-                trigger_error(_("ModeratedPage: No e-mails for the moderators defined"),
-                    E_USER_WARNING);
+                trigger_error(_("No e-mails for the moderators defined"), E_USER_WARNING);
                 return false;
             }
             $page->set('moderation', array('status' => $status));
@@ -228,8 +226,7 @@
             $moderated['status'] = $status;
         }
         if (empty($status['emails'])) {
-            trigger_error(_("ModeratedPage: No e-mails for the moderators defined"),
-                E_USER_WARNING);
+            trigger_error(_("No e-mails for the moderators defined"), E_USER_WARNING);
             return true;
         }
         // which action?

Modified: trunk/lib/plugin/SystemInfo.php
===================================================================
--- trunk/lib/plugin/SystemInfo.php	2012-11-26 17:44:33 UTC (rev 8547)
+++ trunk/lib/plugin/SystemInfo.php	2012-11-26 19:37:47 UTC (rev 8548)
@@ -468,7 +468,7 @@
         return sprintf(_("Total of %d languages: "),
             count($available_languages))
             . implode(', ', $available_languages) . ". "
-            . sprintf(_("Current language: '%s'"), $GLOBALS['LANG'])
+            . _("Current language") . _(": ") . $GLOBALS['LANG']
             . ((DEFAULT_LANGUAGE != $GLOBALS['LANG'])
                 ? ". " . sprintf(_("Default language: '%s'"), DEFAULT_LANGUAGE)
                 : '');
@@ -481,7 +481,7 @@
         natcasesort($available_themes);
         return sprintf(_("Total of %d themes: "), count($available_themes))
             . implode(', ', $available_themes) . ". "
-            . sprintf(_("Current theme: '%s'"), $WikiTheme->_name)
+            . _("Current theme") . _(": ") . $WikiTheme->_name
             . ((THEME != $WikiTheme->_name)
                 ? ". " . sprintf(_("Default theme: '%s'"), THEME)
                 : '');

Modified: trunk/lib/plugin/WikiAdminDeleteAcl.php
===================================================================
--- trunk/lib/plugin/WikiAdminDeleteAcl.php	2012-11-26 17:44:33 UTC (rev 8547)
+++ trunk/lib/plugin/WikiAdminDeleteAcl.php	2012-11-26 19:37:47 UTC (rev 8548)
@@ -63,7 +63,7 @@
             $version = $current->getVersion();
             $meta = $current->_data;
             $text = $current->getPackedContent();
-            $meta['summary'] = sprintf(_("ACL deleted for page '%s'."), $pagename);
+            $meta['summary'] = sprintf(_("ACL deleted for page '%s'"), $pagename);
             $meta['is_minor_edit'] = 1;
             $meta['author'] = $request->_user->UserName();
             unset($meta['mtime']); // force new date

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 17:44:33 UTC (rev 8547)
+++ trunk/locale/de/LC_MESSAGES/phpwiki.php	2012-11-26 19:37:47 UTC (rev 8548)
@@ -312,10 +312,8 @@
 $locale["Created directory '%s' for the page dump..."] = "Ein Verzeichnis »%s« wurde erzeugt, um die Dateien abzulegen...";
 $locale["Creating pages"] = "Neue Seiten erzeugen";
 $locale["Creator"] = "Erzeuger";
-$locale["Current Language"] = "Ausgewählte Sprache";
-$locale["Current Theme"] = "Ausgewählte Darstellung";
-$locale["Current language: '%s'"] = "Ihre Sprache: »%s«";
-$locale["Current theme: '%s'"] = "Ihre Benutzeroberfläche: »%s«";
+$locale["Current language"] = "Ausgewählte Sprache";
+$locale["Current theme"] = "Ausgewählte Darstellung";
 $locale["CurrentTime"] = "AktuelleZeit";
 $locale["DB admin password:"] = "DB Admin passwort:";
 $locale["DB admin user:"] = "DB Admin Benutzername:";
@@ -633,7 +631,6 @@
 $locale["Missing ldap extension"] = "Fehlende php LDAP extension";
 $locale["ModeratedPage"] = "ModerierteSeite";
 $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";
@@ -661,6 +658,7 @@
 $locale["No changes found"] = "Keine Änderungen gefunden.";
 $locale["No changes."] = "Keine Änderungen.";
 $locale["No comments found"] = "Keine Kommentare gefunden.";
+$locale["No e-mails for the moderators defined"] = "Keine E-Mails für Moderatoren definiert";
 $locale["No empty, unreferenced pages were found."] = "Keine leeren, unverlinkten Seiten gefunden.";
 $locale["No metadata for %s"] = "Keine Meta-Daten für %s";
 $locale["No or not enough GROUP_DB SQL statements defined"] = "Keine oder zu wenige GROUP_DB SQL Statements definiert";

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 17:44:33 UTC (rev 8547)
+++ trunk/locale/fr/LC_MESSAGES/phpwiki.php	2012-11-26 19:37:47 UTC (rev 8548)
@@ -69,7 +69,7 @@
 $locale["%s parameter missing"] = "%s paramètre manquant";
 $locale["%s words"] = "%s mots";
 $locale["%s: %s"] = "%s : %s";
-$locale["%s: Bad action"] = "%s : Mauvaise action";
+$locale["%s: Bad action"] = "%s : mauvaise action";
 $locale["%s: Can't open dba database"] = "%s : impossible d'ouvrir la base de données dba";
 $locale["%s: Date of new revision is %s"] = "%s : la date de la nouvelle version est %s";
 $locale["%s: argument index out of range"] = "%s : index d'argument hors intervalle";
@@ -117,7 +117,6 @@
 $locale["ACL"] = "ACL";
 $locale["ACL changed for page '%s'"] = "ACL modifié pour la page %s.";
 $locale["ACL deleted for page '%s'"] = "ACL supprimée pour la page %s";
-$locale["ACL deleted for page '%s'."] = "ACL supprimée pour la page %s.";
 $locale["ACL not changed for page '%s'."] = "ACL inchangée pour la page %s.";
 $locale["ACL type"] = "Type d'ACL";
 $locale["ADDING"] = "AJOUT";
@@ -319,10 +318,8 @@
 $locale["Created directory '%s' for the page dump..."] = "Répertoire « %s » créé pour la sauvegarde...";
 $locale["Creating pages"] = "Créer des pages";
 $locale["Creator"] = "Créateur";
-$locale["Current Language"] = "Ma langue";
-$locale["Current Theme"] = "Mon thème";
-$locale["Current language: '%s'"] = "Langage actuel : %s";
-$locale["Current theme: '%s'"] = "Thème actuel : '%s'";
+$locale["Current language"] = "Ma langue";
+$locale["Current theme"] = "Mon thème";
 $locale["CurrentTime"] = "Heure actuelle";
 $locale["DB admin password:"] = "DB admin mot de passe :";
 $locale["DB admin user:"] = "DB admin nom de user :";
@@ -658,8 +655,7 @@
 $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 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["ModeratedPage Notification Error: Couldn't send e-mail"] = "Erreur lors des notifications de page: impossible d'envoyer";
 $locale["Modern"] = "Moderne";
 $locale["Modified"] = "Modifié";
 $locale["Modified on %s by %s"] = "Modifié le %s par %s";

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 17:44:33 UTC (rev 8547)
+++ trunk/locale/ja/LC_MESSAGES/phpwiki.php	2012-11-26 19:37:47 UTC (rev 8548)
@@ -41,9 +41,7 @@
 $locale["Count"] = "カウント";
 $locale["Create: %s"] = "作成: %s";
 $locale["Creating pages"] = "ページを作成しています。";
-$locale["Current Language"] = "現在の言語";
-$locale["Current language: '%s'"] = "現在の言語: %s";
-$locale["Current theme: '%s'"] = "現在のテーマ: %s";
+$locale["Current language"] = "現在の言語";
 $locale["Date Format"] = "データフォーマット";
 $locale["DebugInfo"] = "デバグ情報";
 $locale["Default theme: '%s'"] = "デフォルトテーマ: %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 17:44:33 UTC (rev 8547)
+++ trunk/locale/po/de.po	2012-11-26 19:37:47 UTC (rev 8548)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 18:43+0100\n"
+"POT-Creation-Date: 2012-11-26 20:35+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."
@@ -352,11 +352,11 @@
 
 #: ../lib/editpage.php:575 ../lib/editpage.php:576 ../lib/main.php:832
 #: ../lib/main.php:1218 ../lib/plugin/ModeratedPage.php:43
-#: ../lib/plugin/ModeratedPage.php:153 ../lib/plugin/ModeratedPage.php:226
-#: ../lib/plugin/ModeratedPage.php:268 ../lib/plugin/ModeratedPage.php:271
-#: ../lib/plugin/ModeratedPage.php:273 ../lib/plugin/ModeratedPage.php:275
-#: ../lib/plugin/ModeratedPage.php:360 ../lib/plugin/ModeratedPage.php:364
-#: ../lib/plugin/ModeratedPage.php:420 ../lib/plugin/ModeratedPage.php:446
+#: ../lib/plugin/ModeratedPage.php:153 ../lib/plugin/ModeratedPage.php:224
+#: ../lib/plugin/ModeratedPage.php:265 ../lib/plugin/ModeratedPage.php:268
+#: ../lib/plugin/ModeratedPage.php:270 ../lib/plugin/ModeratedPage.php:272
+#: ../lib/plugin/ModeratedPage.php:357 ../lib/plugin/ModeratedPage.php:361
+#: ../lib/plugin/ModeratedPage.php:417 ../lib/plugin/ModeratedPage.php:443
 msgid "ModeratedPage"
 msgstr "ModerierteSeite"
 
@@ -701,10 +701,11 @@
 msgid "Invalid [] syntax ignored"
 msgstr "Ungültige [] syntax ignoriert"
 
-#: ../lib/InlineParser.php:358 ../lib/plugin/ModeratedPage.php:268
-#: ../lib/plugin/ModeratedPage.php:271 ../lib/plugin/ModeratedPage.php:364
+#: ../lib/InlineParser.php:358 ../lib/plugin/ModeratedPage.php:265
+#: ../lib/plugin/ModeratedPage.php:268 ../lib/plugin/ModeratedPage.php:361
 #: ../lib/plugin/SemanticSearch.php:163 ../lib/plugin/SemanticSearch.php:246
-#: ../lib/plugin/SpellCheck.php:187 ../lib/plugin/WikiAdminRename.php:277
+#: ../lib/plugin/SpellCheck.php:187 ../lib/plugin/SystemInfo.php:471
+#: ../lib/plugin/SystemInfo.php:484 ../lib/plugin/WikiAdminRename.php:277
 #: ../lib/plugin/WikiAdminRename.php:283
 #: ../lib/plugin/WikiAdminSearchReplace.php:240
 #: ../lib/plugin/WikiAdminSearchReplace.php:244
@@ -1389,7 +1390,7 @@
 msgid "You must wait for moderator approval."
 msgstr "Sie müssen auf die Zustimmung des Moderators warten."
 
-#: ../lib/main.php:846 ../lib/plugin/ModeratedPage.php:319
+#: ../lib/main.php:846 ../lib/plugin/ModeratedPage.php:316
 #, php-format
 msgid "%s: Bad action"
 msgstr "%s: Ungültige Aktion"
@@ -3040,12 +3041,12 @@
 msgid "Support moderated pages"
 msgstr "Unterstütze moderierte Seiten"
 
-#: ../lib/plugin/ModeratedPage.php:157 ../lib/plugin/ModeratedPage.php:183
-#: ../lib/plugin/ModeratedPage.php:231
-msgid "ModeratedPage: No e-mails for the moderators defined"
-msgstr "ModerierteSeite: Keine E-Mails für Moderatoren definiert"
+#: ../lib/plugin/ModeratedPage.php:157 ../lib/plugin/ModeratedPage.php:182
+#: ../lib/plugin/ModeratedPage.php:229
+msgid "No e-mails for the moderators defined"
+msgstr "Keine E-Mails für Moderatoren definiert"
 
-#: ../lib/plugin/ModeratedPage.php:163
+#: ../lib/plugin/ModeratedPage.php:162
 #, php-format
 msgid ""
 "ModeratedPage status update:\n"
@@ -3053,12 +3054,12 @@
 "  require_access: '%s'"
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:168
+#: ../lib/plugin/ModeratedPage.php:167
 #, php-format
 msgid "'%s' is no ModeratedPage anymore."
 msgstr "'%s' ist keine ModeratierteSeite mehr."
 
-#: ../lib/plugin/ModeratedPage.php:189
+#: ../lib/plugin/ModeratedPage.php:187
 #, php-format
 msgid ""
 "ModeratedPage status update: '%s' is now a ModeratedPage.\n"
@@ -3066,42 +3067,42 @@
 "  require_access: '%s'"
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:260
+#: ../lib/plugin/ModeratedPage.php:257
 #, php-format
 msgid "%s: action forwarded to moderator %s"
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:286
+#: ../lib/plugin/ModeratedPage.php:283
 msgid "ModeratedPage Notification Error: Couldn't send e-mail"
 msgstr "ModerierteSeite Benachrichtigungsfehler: Konnte kein E-Mail versenden"
 
-#: ../lib/plugin/ModeratedPage.php:366
+#: ../lib/plugin/ModeratedPage.php:363
 #, php-format
 msgid "%s approved your wiki action from %s"
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:379
+#: ../lib/plugin/ModeratedPage.php:376
 msgid "Please approve or reject this request:"
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:415
+#: ../lib/plugin/ModeratedPage.php:412
 msgid "Reason: "
 msgstr "Grund: "
 
-#: ../lib/plugin/ModeratedPage.php:416
+#: ../lib/plugin/ModeratedPage.php:413
 msgid "Approve"
 msgstr "Akzeptieren"
 
-#: ../lib/plugin/ModeratedPage.php:418
+#: ../lib/plugin/ModeratedPage.php:415
 msgid "Reject"
 msgstr "Ablehnen"
 
-#: ../lib/plugin/ModeratedPage.php:447 ../lib/plugin/ModeratedPage.php:454
+#: ../lib/plugin/ModeratedPage.php:444 ../lib/plugin/ModeratedPage.php:451
 #, php-format
 msgid "<<ModeratedPage ... >> not found in first line of %s"
 msgstr "<<ModeratedPage ... >> nicht in erster Zeile von %s gefunden"
 
-#: ../lib/plugin/ModeratedPage.php:450
+#: ../lib/plugin/ModeratedPage.php:447
 #, php-format
 msgid "%s is not locked!"
 msgstr "%s ist nicht gesperrt!"
@@ -4588,9 +4589,9 @@
 msgstr "%d Sprache gesamt: "
 
 #: ../lib/plugin/SystemInfo.php:471
-#, php-format
-msgid "Current language: '%s'"
-msgstr "Ihre Sprache: »%s«"
+#: ../themes/default/templates/userprefs.tmpl:133
+msgid "Current language"
+msgstr "Ausgewählte Sprache"
 
 #: ../lib/plugin/SystemInfo.php:473
 #, php-format
@@ -4603,9 +4604,9 @@
 msgstr "%d Benutzeroberfläche gesamt: "
 
 #: ../lib/plugin/SystemInfo.php:484
-#, php-format
-msgid "Current theme: '%s'"
-msgstr "Ihre Benutzeroberfläche: »%s«"
+#: ../themes/default/templates/userprefs.tmpl:132
+msgid "Current theme"
+msgstr "Ausgewählte Darstellung"
 
 #: ../lib/plugin/SystemInfo.php:486
 #, php-format
@@ -5364,15 +5365,11 @@
 msgstr "Vorgabe Zugriffsrecht"
 
 #: ../lib/plugin/WikiAdminDeleteAcl.php:61
+#: ../lib/plugin/WikiAdminDeleteAcl.php:66
 #, fuzzy, php-format
 msgid "ACL deleted for page '%s'"
 msgstr "ACL für Seite '%s' geändert."
 
-#: ../lib/plugin/WikiAdminDeleteAcl.php:66
-#, fuzzy, php-format
-msgid "ACL deleted for page '%s'."
-msgstr "ACL für Seite '%s' nicht geändert."
-
 # Any better translation? The locale/de/pgsrc/PhpWikiSystemverwalten
 # must also be renamed to match what is here.
 #: ../lib/plugin/WikiAdminDeleteAcl.php:89
@@ -8295,18 +8292,10 @@
 msgid "Theme"
 msgstr "Benutzeroberfläche"
 
-#: ../themes/default/templates/userprefs.tmpl:132
-msgid "Current Theme"
-msgstr "Ausgewählte Darstellung"
-
 #: ../themes/default/templates/userprefs.tmpl:133
 msgid "Language"
 msgstr "Sprache"
 
-#: ../themes/default/templates/userprefs.tmpl:133
-msgid "Current Language"
-msgstr "Ausgewählte Sprache"
-
 #: ../themes/default/templates/userprefs.tmpl:139
 msgid "Change Password"
 msgstr "Ändere Passwort"
@@ -8920,6 +8909,16 @@
 msgid "View the current version"
 msgstr "Die aktuelle Version ansehen"
 
+#~ msgid "Current language: '%s'"
+#~ msgstr "Ihre Sprache: »%s«"
+
+#~ msgid "Current theme: '%s'"
+#~ msgstr "Ihre Benutzeroberfläche: »%s«"
+
+#, fuzzy
+#~ msgid "ACL deleted for page '%s'."
+#~ msgstr "ACL für Seite '%s' nicht geändert."
+
 #~ msgid "Chown"
 #~ msgstr "Chown"
 

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2012-11-26 17:44:33 UTC (rev 8547)
+++ trunk/locale/po/es.po	2012-11-26 19:37:47 UTC (rev 8548)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 18:43+0100\n"
+"POT-Creation-Date: 2012-11-26 20:35+0100\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -350,11 +350,11 @@
 
 #: ../lib/editpage.php:575 ../lib/editpage.php:576 ../lib/main.php:832
 #: ../lib/main.php:1218 ../lib/plugin/ModeratedPage.php:43
-#: ../lib/plugin/ModeratedPage.php:153 ../lib/plugin/ModeratedPage.php:226
-#: ../lib/plugin/ModeratedPage.php:268 ../lib/plugin/ModeratedPage.php:271
-#: ../lib/plugin/ModeratedPage.php:273 ../lib/plugin/ModeratedPage.php:275
-#: ../lib/plugin/ModeratedPage.php:360 ../lib/plugin/ModeratedPage.php:364
-#: ../lib/plugin/ModeratedPage.php:420 ../lib/plugin/ModeratedPage.php:446
+#: ../lib/plugin/ModeratedPage.php:153 ../lib/plugin/ModeratedPage.php:224
+#: ../lib/plugin/ModeratedPage.php:265 ../lib/plugin/ModeratedPage.php:268
+#: ../lib/plugin/ModeratedPage.php:270 ../lib/plugin/ModeratedPage.php:272
+#: ../lib/plugin/ModeratedPage.php:357 ../lib/plugin/ModeratedPage.php:361
+#: ../lib/plugin/ModeratedPage.php:417 ../lib/plugin/ModeratedPage.php:443
 msgid "ModeratedPage"
 msgstr "PáginaModerada"
 
@@ -694,10 +694,11 @@
 msgid "Invalid [] syntax ignored"
 msgstr "[] el sintaxis inválido no hizo caso"
 
-#: ../lib/InlineParser.php:358 ../lib/plugin/ModeratedPage.php:268
-#: ../lib/plugin/ModeratedPage.php:271 ../lib/plugin/ModeratedPage.php:364
+#: ../lib/InlineParser.php:358 ../lib/plugin/ModeratedPage.php:265
+#: ../lib/plugin/ModeratedPage.php:268 ../lib/plugin/ModeratedPage.php:361
 #: ../lib/plugin/SemanticSearch.php:163 ../lib/plugin/SemanticSearch.php:246
-#: ../lib/plugin/SpellCheck.php:187 ../lib/plugin/WikiAdminRename.php:277
+#: ../lib/plugin/SpellCheck.php:187 ../lib/plugin/SystemInfo.php:471
+#: ../lib/plugin/SystemInfo.php:484 ../lib/plugin/WikiAdminRename.php:277
 #: ../lib/plugin/WikiAdminRename.php:283
 #: ../lib/plugin/WikiAdminSearchReplace.php:240
 #: ../lib/plugin/WikiAdminSearchReplace.php:244
@@ -1367,7 +1368,7 @@
 msgid "You must wait for moderator approval."
 msgstr "Usted debe esperar la aprobación del asesor."
 
-#: ../lib/main.php:846 ../lib/plugin/ModeratedPage.php:319
+#: ../lib/main.php:846 ../lib/plugin/ModeratedPage.php:316
 #, php-format
 msgid "%s: Bad action"
 msgstr "%s: Mala acción"
@@ -2992,12 +2993,12 @@
 msgid "Support moderated pages"
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:157 ../lib/plugin/ModeratedPage.php:183
-#: ../lib/plugin/ModeratedPage.php:231
-msgid "ModeratedPage: No e-mails for the moderators defined"
+#: ../lib/plugin/ModeratedPage.php:157 ../lib/plugin/ModeratedPage.php:182
+#: ../lib/plugin/ModeratedPage.php:229
+msgid "No e-mails for the moderators defined"
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:163
+#: ../lib/plugin/ModeratedPage.php:162
 #, php-format
 msgid ""
 "ModeratedPage status update:\n"
@@ -3005,12 +3006,12 @@
 "  require_access: '%s'"
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:168
+#: ../lib/plugin/ModeratedPage.php:167
 #, php-format
 msgid "'%s' is no ModeratedPage anymore."
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:189
+#: ../lib/plugin/ModeratedPage.php:187
 #, php-format
 msgid ""
 "ModeratedPage status update: '%s' is now a ModeratedPage.\n"
@@ -3018,42 +3019,42 @@
 "  require_access: '%s'"
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:260
+#: ../lib/plugin/ModeratedPage.php:257
 #, php-format
 msgid "%s: action forwarded to moderator %s"
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:286
+#: ../lib/plugin/ModeratedPage.php:283
 msgid "ModeratedPage Notification Error: Couldn't send e-mail"
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:366
+#: ../lib/plugin/ModeratedPage.php:363
 #, php-format
 msgid "%s approved your wiki action from %s"
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:379
+#: ../lib/plugin/ModeratedPage.php:376
 msgid "Please approve or reject this request:"
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:415
+#: ../lib/plugin/ModeratedPage.php:412
 msgid "Reason: "
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:416
+#: ../lib/plugin/ModeratedPage.php:413
 msgid "Approve"
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:418
+#: ../lib/plugin/ModeratedPage.php:415
 msgid "Reject"
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:447 ../lib/plugin/ModeratedPage.php:454
+#: ../lib/plugin/ModeratedPage.php:444 ../lib/plugin/ModeratedPage.php:451
 #, php-format
 msgid "<<ModeratedPage ... >> not found in first line of %s"
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:450
+#: ../lib/plugin/ModeratedPage.php:447
 #, php-format
 msgid "%s is not locked!"
 msgstr "¡%s no está bloqueado!"
@@ -4483,8 +4484,8 @@
 msgstr ""
 
 #: ../lib/plugin/SystemInfo.php:471
-#, php-format
-msgid "Current language: '%s'"
+#: ../themes/default/templates/userprefs.tmpl:133
+msgid "Current language"
 msgstr ""
 
 #: ../lib/plugin/SystemInfo.php:473
@@ -4498,8 +4499,8 @@
 msgstr ""
 
 #: ../lib/plugin/SystemInfo.php:484
-#, php-format
-msgid "Current theme: '%s'"
+#: ../themes/default/templates/userprefs.tmpl:132
+msgid "Current theme"
 msgstr ""
 
 #: ../lib/plugin/SystemInfo.php:486
@@ -5242,15 +5243,11 @@
 msgstr "Permisos escasos."
 
 #: ../lib/plugin/WikiAdminDeleteAcl.php:61
+#: ../lib/plugin/WikiAdminDeleteAcl.php:66
 #, php-format
 msgid "ACL deleted for page '%s'"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminDeleteAcl.php:66
-#, php-format
-msgid "ACL deleted for page '%s'."
-msgstr ""
-
 #: ../lib/plugin/WikiAdminDeleteAcl.php:89
 #, fuzzy
 msgid "PhpWikiAdministration/AdminAclDelete"
@@ -8102,18 +8099,10 @@
 msgid "Theme"
 msgstr ""
 
-#: ../themes/default/templates/userprefs.tmpl:132
-msgid "Current Theme"
-msgstr ""
-
 #: ../themes/default/templates/userprefs.tmpl:133
 msgid "Language"
 msgstr ""
 
-#: ../themes/default/templates/userprefs.tmpl:133
-msgid "Current Language"
-msgstr ""
-
 #: ../themes/default/templates/userprefs.tmpl:139
 msgid "Change Password"
 msgstr "Change Contraseña"

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2012-11-26 17:44:33 UTC (rev 8547)
+++ trunk/locale/po/fr.po	2012-11-26 19:37:47 UTC (rev 8548)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 18:43+0100\n"
+"POT-Creation-Date: 2012-11-26 20:35+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."
@@ -348,11 +348,11 @@
 
 #: ../lib/editpage.php:575 ../lib/editpage.php:576 ../lib/main.php:832
 #: ../lib/main.php:1218 ../lib/plugin/ModeratedPage.php:43
-#: ../lib/plugin/ModeratedPage.php:153 ../lib/plugin/ModeratedPage.php:226
-#: ../lib/plugin/ModeratedPage.php:268 ../lib/plugin/ModeratedPage.php:271
-#: ../lib/plugin/ModeratedPage.php:273 ../lib/plugin/ModeratedPage.php:275
-#: ../lib/plugin/ModeratedPage.php:360 ../lib/plugin/ModeratedPage.php:364
-#: ../lib/plugin/ModeratedPage.php:420 ../lib/plugin/ModeratedPage.php:446
+#: ../lib/plugin/ModeratedPage.php:153 ../lib/plugin/ModeratedPage.php:224
+#: ../lib/plugin/ModeratedPage.php:265 ../lib/plugin/ModeratedPage.php:268
+#: ../lib/plugin/ModeratedPage.php:270 ../lib/plugin/ModeratedPage.php:272
+#: ../lib/plugin/ModeratedPage.php:357 ../lib/plugin/ModeratedPage.php:361
+#: ../lib/plugin/ModeratedPage.php:417 ../lib/plugin/ModeratedPage.php:443
 msgid "ModeratedPage"
 msgstr "PageModérée"
 
@@ -693,10 +693,11 @@
 msgid "Invalid [] syntax ignored"
 msgstr "Syntaxe [] invalide ignorée"
 
-#: ../lib/InlineParser.php:358 ../lib/plugin/ModeratedPage.php:268
-#: ../lib/plugin/ModeratedPage.php:271 ../lib/plugin/ModeratedPage.php:364
+#: ../lib/InlineParser.php:358 ../lib/plugin/ModeratedPage.php:265
+#: ../lib/plugin/ModeratedPage.php:268 ../lib/plugin/ModeratedPage.php:361
 #: ../lib/plugin/SemanticSearch.php:163 ../lib/plugin/SemanticSearch.php:246
-#: ../lib/plugin/SpellCheck.php:187 ../lib/plugin/WikiAdminRename.php:277
+#: ../lib/plugin/SpellCheck.php:187 ../lib/plugin/SystemInfo.php:471
+#: ../lib/plugin/SystemInfo.php:484 ../lib/plugin/WikiAdminRename.php:277
 #: ../lib/plugin/WikiAdminRename.php:283
 #: ../lib/plugin/WikiAdminSearchReplace.php:240
 #: ../lib/plugin/WikiAdminSearchReplace.php:244
@@ -1362,10 +1363,10 @@
 msgid "You must wait for moderator approval."
 msgstr ""
 
-#: ../lib/main.php:846 ../lib/plugin/ModeratedPage.php:319
+#: ../lib/main.php:846 ../lib/plugin/ModeratedPage.php:316
 #, php-format
 msgid "%s: Bad action"
-msgstr "%s : Mauvaise action"
+msgstr "%s : mauvaise action"
 
 #: ../lib/main.php:864
 msgid "Fatal PhpWiki Error"
@@ -3002,12 +3003,12 @@
 msgid "Support moderated pages"
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:157 ../lib/plugin/ModeratedPage.php:183
-#: ../lib/plugin/ModeratedPage.php:231
-msgid "ModeratedPage: No e-mails for the moderators defined"
-msgstr "PageModerée: No e-mails for the moderators defined"
+#: ../lib/plugin/ModeratedPage.php:157 ../lib/plugin/ModeratedPage.php:182
+#: ../lib/plugin/ModeratedPage.php:229
+msgid "No e-mails for the moderators defined"
+msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:163
+#: ../lib/plugin/ModeratedPage.php:162
 #, php-format
 msgid ""
 "ModeratedPage status update:\n"
@@ -3015,12 +3016,12 @@
 "  require_access: '%s'"
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:168
+#: ../lib/plugin/ModeratedPage.php:167
 #, php-format
 msgid "'%s' is no ModeratedPage anymore."
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:189
+#: ../lib/plugin/ModeratedPage.php:187
 #, php-format
 msgid ""
 "ModeratedPage status update: '%s' is now a ModeratedPage.\n"
@@ -3028,42 +3029,42 @@
 "  require_access: '%s'"
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:260
+#: ../lib/plugin/ModeratedPage.php:257
 #, php-format
 msgid "%s: action forwarded to moderator %s"
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:286
+#: ../lib/plugin/ModeratedPage.php:283
 msgid "ModeratedPage Notification Error: Couldn't send e-mail"
-msgstr "Erreur lors des notifications de page: Impossible d'envoyer"
+msgstr "Erreur lors des notifications de page: impossible d'envoyer"
 
-#: ../lib/plugin/ModeratedPage.php:366
+#: ../lib/plugin/ModeratedPage.php:363
 #, php-format
 msgid "%s approved your wiki action from %s"
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:379
+#: ../lib/plugin/ModeratedPage.php:376
 msgid "Please approve or reject this request:"
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:415
+#: ../lib/plugin/ModeratedPage.php:412
 msgid "Reason: "
 msgstr "Raison : "
 
-#: ../lib/plugin/ModeratedPage.php:416
+#: ../lib/plugin/ModeratedPage.php:413
 msgid "Approve"
 msgstr "Approuver"
 
-#: ../lib/plugin/ModeratedPage.php:418
+#: ../lib/plugin/ModeratedPage.php:415
 msgid "Reject"
 msgstr "Rejeter"
 
-#: ../lib/plugin/ModeratedPage.php:447 ../lib/plugin/ModeratedPage.php:454
+#: ../lib/plugin/ModeratedPage.php:444 ../lib/plugin/ModeratedPage.php:451
 #, php-format
 msgid "<<ModeratedPage ... >> not found in first line of %s"
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:450
+#: ../lib/plugin/ModeratedPage.php:447
 #, php-format
 msgid "%s is not locked!"
 msgstr "%s n'est pas verrouillé!"
@@ -4519,9 +4520,9 @@
 msgstr "%d langages au total : "
 
 #: ../lib/plugin/SystemInfo.php:471
-#, php-format
-msgid "Current language: '%s'"
-msgstr "Langage actuel : %s"
+#: ../themes/default/templates/userprefs.tmpl:133
+msgid "Current language"
+msgstr "Ma langue"
 
 #: ../lib/plugin/SystemInfo.php:473
 #, php-format
@@ -4534,9 +4535,9 @@
 msgstr "%d thèmes au total: "
 
 #: ../lib/plugin/SystemInfo.php:484
-#, php-format
-msgid "Current theme: '%s'"
-msgstr "Thème actuel : '%s'"
+#: ../themes/default/templates/userprefs.tmpl:132
+msgid "Current theme"
+msgstr "Mon thème"
 
 #: ../lib/plugin/SystemInfo.php:486
 #, php-format
@@ -5296,15 +5297,11 @@
 msgstr "Supprimer les permissions de page."
 
 #: ../lib/plugin/WikiAdminDeleteAcl.php:61
+#: ../lib/plugin/WikiAdminDeleteAcl.php:66
 #, php-format
 msgid "ACL deleted for page '%s'"
 msgstr "ACL supprimée pour la page %s"
 
-#: ../lib/plugin/WikiAdminDeleteAcl.php:66
-#, php-format
-msgid "ACL deleted for page '%s'."
-msgstr "ACL supprimée pour la page %s."
-
 #: ../lib/plugin/WikiAdminDeleteAcl.php:89
 msgid "PhpWikiAdministration/AdminAclDelete"
 msgstr ""
@@ -8180,18 +8177,10 @@
 msgid "Theme"
 msgstr "Thème"
 
-#: ../themes/default/templates/userprefs.tmpl:132
-msgid "Current Theme"
-msgstr "Mon thème"
-
 #: ../themes/default/templates/userprefs.tmpl:133
 msgid "Language"
 msgstr "Langue"
 
-#: ../themes/default/templates/userprefs.tmpl:133
-msgid "Current Language"
-msgstr "Ma langue"
-
 #: ../themes/default/templates/userprefs.tmpl:139
 msgid "Change Password"
 msgstr "Modifier mon mot de passe"
@@ -8791,6 +8780,15 @@
 msgid "View the current version"
 msgstr "Voir la version actuelle"
 
+#~ msgid "Current language: '%s'"
+#~ msgstr "Langage actuel : %s"
+
+#~ msgid "Current theme: '%s'"
+#~ msgstr "Thème actuel : '%s'"
+
+#~ msgid "ACL deleted for page '%s'."
+#~ msgstr "ACL supprimée pour la page %s."
+
 #~ msgid "Chown"
 #~ msgstr "Chown"
 

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2012-11-26 17:44:33 UTC (rev 8547)
+++ trunk/locale/po/it.po	2012-11-26 19:37:47 UTC (rev 8548)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 18:43+0100\n"
+"POT-Creation-Date: 2012-11-26 20:35+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"
@@ -339,11 +339,11 @@
 
 #: ../lib/editpage.php:575 ../lib/editpage.php:576 ../lib/main.php:832
 #: ../lib/main.php:1218 ../lib/plugin/ModeratedPage.php:43
-#: ../lib/plugin/ModeratedPage.php:153 ../lib/plugin/ModeratedPage.php:226
-#: ../lib/plugin/ModeratedPage.php:268 ../lib/plugin/ModeratedPage.php:271
-#: ../lib/plugin/ModeratedPage.php:273 ../lib/plugin/ModeratedPage.php:275
-#: ../lib/plugin/ModeratedPage.php:360 ../lib/plugin/ModeratedPage.php:364
-#: ../lib/plugin/ModeratedPage.php:420 ../lib/plugin/ModeratedPage.php:446
+#: ../lib/plugin/ModeratedPage.php:153 ../lib/plugin/ModeratedPage.php:224
+#: ../lib/plugin/ModeratedPage.php:265 ../lib/plugin/ModeratedPage.php:268
+#: ../lib/plugin/ModeratedPage.php:270 ../lib/plugin/ModeratedPage.php:272
+#: ../lib/plugin/ModeratedPage.php:357 ../lib/plugin/ModeratedPage.php:361
+#: ../lib/plugin/ModeratedPage.php:417 ../lib/plugin/ModeratedPage.php:443
 msgid "ModeratedPage"
 msgstr "PaginaModerata"
 
@@ -684,10 +684,11 @@
 msgid "Invalid [] syntax ignored"
 msgstr ""
 
-#: ../lib/InlineParser.php:358 ../lib/plugin/ModeratedPage.php:268
-#: ../lib/plugin/ModeratedPage.php:271 ../lib/plugin/ModeratedPage.php:364
+#: ../lib/InlineParser.php:358 ../lib/plugin/ModeratedPage.php:265
+#: ../lib/plugin/ModeratedPage.php:268 ../lib/plugin/ModeratedPage.php:361
 #: ../lib/plugin/SemanticSearch.php:163 ../lib/plugin/SemanticSearch.php:246
-#: ../lib/plugin/SpellCheck.php:187 ../lib/plugin/WikiAdminRename.php:277
+#: ../lib/plugin/SpellCheck.php:187 ../lib/plugin/SystemInfo.php:471
+#: ../lib/plugin/SystemInfo.php:484 ../lib/plugin/WikiAdminRename.php:277
 #: ../lib/plugin/WikiAdminRename.php:283
 #: ../lib/plugin/WikiAdminSearchReplace.php:240
 #: ../lib/plugin/WikiAdminSearchReplace.php:244
@@ -1351,7 +1352,7 @@
 msgid "You must wait for moderator approval."
 msgstr ""
 
-#: ../lib/main.php:846 ../lib/plugin/ModeratedPage.php:319
+#: ../lib/main.php:846 ../lib/plugin/ModeratedPage.php:316
 #, php-format
 msgid "%s: Bad action"
 msgstr ""
@@ -2972,12 +2973,12 @@
 msgid "Support moderated pages"
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:157 ../lib/plugin/ModeratedPage.php:183
-#: ../lib/plugin/ModeratedPage.php:231
-msgid "ModeratedPage: No e-mails for the moderators defined"
+#: ../lib/plugin/ModeratedPage.php:157 ../lib/plugin/ModeratedPage.php:182
+#: ../lib/plugin/ModeratedPage.php:229
+msgid "No e-mails for the moderators defined"
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:163
+#: ../lib/plugin/ModeratedPage.php:162
 #, php-format
 msgid ""
 "ModeratedPage status update:\n"
@@ -2985,12 +2986,12 @@
 "  require_access: '%s'"
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:168
+#: ../lib/plugin/ModeratedPage.php:167
 #, php-format
 msgid "'%s' is no ModeratedPage anymore."
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:189
+#: ../lib/plugin/ModeratedPage.php:187
 #, php-format
 msgid ""
 "ModeratedPage status update: '%s' is now a ModeratedPage.\n"
@@ -2998,42 +2999,42 @@
 "  require_access: '%s'"
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:260
+#: ../lib/plugin/ModeratedPage.php:257
 #, php-format
 msgid "%s: action forwarded to moderator %s"
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:286
+#: ../lib/plugin/ModeratedPage.php:283
 msgid "ModeratedPage Notification Error: Couldn't send e-mail"
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:366
+#: ../lib/plugin/ModeratedPage.php:363
 #, php-format
 msgid "%s approved your wiki action from %s"
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:379
+#: ../lib/plugin/ModeratedPage.php:376
 msgid "Please approve or reject this request:"
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:415
+#: ../lib/plugin/ModeratedPage.php:412
 msgid "Reason: "
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:416
+#: ../lib/plugin/ModeratedPage.php:413
 msgid "Approve"
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:418
+#: ../lib/plugin/ModeratedPage.php:415
 msgid "Reject"
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:447 ../lib/plugin/ModeratedPage.php:454
+#: ../lib/plugin/ModeratedPage.php:444 ../lib/plugin/ModeratedPage.php:451
 #, php-format
 msgid "<<ModeratedPage ... >> not found in first line of %s"
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:450
+#: ../lib/plugin/ModeratedPage.php:447
 #, php-format
 msgid "%s is not locked!"
 msgstr ""
@@ -4459,8 +4460,8 @@
 msgstr ""
 
 #: ../lib/plugin/SystemInfo.php:471
-#, php-format
-msgid "Current language: '%s'"
+#: ../themes/default/templates/userprefs.tmpl:133
+msgid "Current language"
 msgstr ""
 
 #: ../lib/plugin/SystemInfo.php:473
@@ -4474,8 +4475,8 @@
 msgstr ""
 
 #: ../lib/plugin/SystemInfo.php:484
-#, php-format
-msgid "Current theme: '%s'"
+#: ../themes/default/templates/userprefs.tmpl:132
+msgid "Current theme"
 msgstr ""
 
 #: ../lib/plugin/SystemInfo.php:486
@@ -5218,15 +5219,11 @@
 msgstr "Permessi insufficienti."
 
 #: ../lib/plugin/WikiAdminDeleteAcl.php:61
+#: ../lib/plugin/WikiAdminDeleteAcl.php:66
 #, php-format
 msgid "ACL deleted for page '%s'"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminDeleteAcl.php:66
-#, php-format
-msgid "ACL deleted for page '%s'."
-msgstr ""
-
 #: ../lib/plugin/WikiAdminDeleteAcl.php:89
 #, fuzzy
 msgid "PhpWikiAdministration/AdminAclDelete"
@@ -8048,18 +8045,10 @@
 msgid "Theme"
 msgstr ""
 
-#: ../themes/default/templates/userprefs.tmpl:132
-msgid "Current Theme"
-msgstr ""
-
 #: ../themes/default/templates/userprefs.tmpl:133
 msgid "Language"
 msgstr ""
 
-#: ../themes/default/templates/userprefs.tmpl:133
-msgid "Current Language"
-msgstr ""
-
 #: ../themes/default/templates/userprefs.tmpl:139
 msgid "Change Password"
 msgstr ""

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2012-11-26 17:44:33 UTC (rev 8547)
+++ trunk/locale/po/ja.po	2012-11-26 19:37:47 UTC (rev 8548)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 18:43+0100\n"
+"POT-Creation-Date: 2012-11-26 20:35+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"
@@ -336,11 +336,11 @@
 
 #: ../lib/editpage.php:575 ../lib/editpage.php:576 ../lib/main.php:832
 #: ../lib/main.php:1218 ../lib/plugin/ModeratedPage.php:43
-#: ../lib/plugin/ModeratedPage.php:153 ../lib/plugin/ModeratedPage.php:226
-#: ../lib/plugin/ModeratedPage.php:268 ../lib/plugin/ModeratedPage.php:271
-#: ../lib/plugin/ModeratedPage.php:273 ../lib/plugin/ModeratedPage.php:275
-#: ../lib/plugin/ModeratedPage.php:360 ../lib/plugin/ModeratedPage.php:364
-#: ../lib/plugin/ModeratedPage.php:420 ../lib/plugin/ModeratedPage.php:446
+#: ../lib/plugin/ModeratedPage.php:153 ../lib/plugin/ModeratedPage.php:224
+#: ../lib/plugin/ModeratedPage.php:265 ../lib/plugin/ModeratedPage.php:268
+#: ../lib/plugin/ModeratedPage.php:270 ../lib/plugin/ModeratedPage.php:272
+#: ../lib/plugin/ModeratedPage.php:357 ../lib/plugin/ModeratedPage.php:361
+#: ../lib/plugin/ModeratedPage.php:417 ../lib/plugin/ModeratedPage.php:443
 msgid "ModeratedPage"
 msgstr ""
 
@@ -672,10 +672,11 @@
 msgid "Invalid [] syntax ignored"
 msgstr ""
 
-#: ../lib/InlineParser.php:358 ../lib/plugin/ModeratedPage.php:268
-#: ../lib/plugin/ModeratedPage.php:271 ../lib/plugin/ModeratedPage.php:364
+#: ../lib/InlineParser.php:358 ../lib/plugin/ModeratedPage.php:265
+#: ../lib/plugin/ModeratedPage.php:268 ../lib/plugin/ModeratedPage.php:361
 #: ../lib/plugin/SemanticSearch.php:163 ../lib/plugin/SemanticSearch.php:246
-#: ../lib/plugin/SpellCheck.php:187 ../lib/plugin/WikiAdminRename.php:277
+#: ../lib/plugin/SpellCheck.php:187 ../lib/plugin/SystemInfo.php:471
+#: ../lib/plugin/SystemInfo.php:484 ../lib/plugin/WikiAdminRename.php:277
 #: ../lib/plugin/WikiAdminRename.php:283
 #: ../lib/plugin/WikiAdminSearchReplace.php:240
 #: ../lib/plugin/WikiAdminSearchReplace.php:244
@@ -1350,7 +1351,7 @@
 msgid "You must wait for moderator approval."
 msgstr ""
 
-#: ../lib/main.php:846 ../lib/plugin/ModeratedPage.php:319
+#: ../lib/main.php:846 ../lib/plugin/ModeratedPage.php:316
 #, php-format
 msgid "%s: Bad action"
 msgstr "%s: 正しくない操作です。"
@@ -3010,12 +3011,12 @@
 msgid "Support moderated pages"
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:157 ../lib/plugin/ModeratedPage.php:183
-#: ../lib/plugin/ModeratedPage.php:231
-msgid "ModeratedPage: No e-mails for the moderators defined"
+#: ../lib/plugin/ModeratedPage.php:157 ../lib/plugin/ModeratedPage.php:182
+#: ../lib/plugin/ModeratedPage.php:229
+msgid "No e-mails for the moderators defined"
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:163
+#: ../lib/plugin/ModeratedPage.php:162
 #, php-format
 msgid ""
 "ModeratedPage status update:\n"
@@ -3023,12 +3024,12 @@
 "  require_access: '%s'"
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:168
+#: ../lib/plugin/ModeratedPage.php:167
 #, php-format
 msgid "'%s' is no ModeratedPage anymore."
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:189
+#: ../lib/plugin/ModeratedPage.php:187
 #, php-format
 msgid ""
 "ModeratedPage status update: '%s' is now a ModeratedPage.\n"
@@ -3036,42 +3037,42 @@
 "  require_access: '%s'"
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:260
+#: ../lib/plugin/ModeratedPage.php:257
 #, php-format
 msgid "%s: action forwarded to moderator %s"
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:286
+#: ../lib/plugin/ModeratedPage.php:283
 msgid "ModeratedPage Notification Error: Couldn't send e-mail"
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:366
+#: ../lib/plugin/ModeratedPage.php:363
 #, php-format
 msgid "%s approved your wiki action from %s"
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:379
+#: ../lib/plugin/ModeratedPage.php:376
 msgid "Please approve or reject this request:"
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:415
+#: ../lib/plugin/ModeratedPage.php:412
 msgid "Reason: "
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:416
+#: ../lib/plugin/ModeratedPage.php:413
 msgid "Approve"
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:418
+#: ../lib/plugin/ModeratedPage.php:415
 msgid "Reject"
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:447 ../lib/plugin/ModeratedPage.php:454
+#: ../lib/plugin/ModeratedPage.php:444 ../lib/plugin/ModeratedPage.php:451
 #, php-format
 msgid "<<ModeratedPage ... >> not found in first line of %s"
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:450
+#: ../lib/plugin/ModeratedPage.php:447
 #, php-format
 msgid "%s is not locked!"
 msgstr ""
@@ -4526,9 +4527,9 @@
 msgstr ""
 
 #: ../lib/plugin/SystemInfo.php:471
-#, php-format
-msgid "Current language: '%s'"
-msgstr "現在の言語: %s"
+#: ../themes/default/templates/userprefs.tmpl:133
+msgid "Current language"
+msgstr "現在の言語"
 
 #: ../lib/plugin/SystemInfo.php:473
 #, php-format
@@ -4541,9 +4542,9 @@
 msgstr "総テーマ数: %d"
 
 #: ../lib/plugin/SystemInfo.php:484
-#, php-format
-msgid "Current theme: '%s'"
-msgstr "現在のテーマ: %s"
+#: ../themes/default/templates/userprefs.tmpl:132
+msgid "Current theme"
+msgstr ""
 
 #: ../lib/plugin/SystemInfo.php:486
 #, php-format
@@ -5304,15 +5305,11 @@
 msgstr ""
 
 #: ../lib/plugin/WikiAdminDeleteAcl.php:61
+#: ../lib/plugin/WikiAdminDeleteAcl.php:66
 #, fuzzy, php-format
 msgid "ACL deleted for page '%s'"
 msgstr "全ページ一覧"
 
-#: ../lib/plugin/WikiAdminDeleteAcl.php:66
-#, fuzzy, php-format
-msgid "ACL deleted for page '%s'."
-msgstr "全ページ一覧"
-
 #: ../lib/plugin/WikiAdminDeleteAcl.php:89
 msgid "PhpWikiAdministration/AdminAclDelete"
 msgstr ""
@@ -8220,18 +8217,10 @@
 msgid "Theme"
 msgstr "テーマ"
 
-#: ../themes/default/templates/userprefs.tmpl:132
-msgid "Current Theme"
-msgstr ""
-
 #: ../themes/default/templates/userprefs.tmpl:133
 msgid "Language"
 msgstr "言語"
 
-#: ../themes/default/templates/userprefs.tmpl:133
-msgid "Current Language"
-msgstr "現在の言語"
-
 #: ../themes/default/templates/userprefs.tmpl:139
 msgid "Change Password"
 msgstr "パスワード変更"
@@ -8844,7 +8833,17 @@
 msgid "View the current version"
 msgstr "現在のバージョンを表示する"
 
+#~ msgid "Current language: '%s'"
+#~ msgstr "現在の言語: %s"
+
+#~ msgid "Current theme: '%s'"
+#~ msgstr "現在のテーマ: %s"
+
 #, fuzzy
+#~ msgid "ACL deleted for page '%s'."
+#~ msgstr "全ページ一覧"
+
+#, fuzzy
 #~ msgid "Chown"
 #~ msgstr "カウント"
 

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2012-11-26 17:44:33 UTC (rev 8547)
+++ trunk/locale/po/nl.po	2012-11-26 19:37:47 UTC (rev 8548)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 18:43+0100\n"
+"POT-Creation-Date: 2012-11-26 20:35+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"
@@ -342,11 +342,11 @@
 
 #: ../lib/editpage.php:575 ../lib/editpage.php:576 ../lib/main.php:832
 #: ../lib/main.php:1218 ../lib/plugin/ModeratedPage.php:43
-#: ../lib/plugin/ModeratedPage.php:153 ../lib/plugin/ModeratedPage.php:226
-#: ../lib/plugin/ModeratedPage.php:268 ../lib/plugin/ModeratedPage.php:271
-#: ../lib/plugin/ModeratedPage.php:273 ../lib/plugin/ModeratedPage.php:275
-#: ../lib/plugin/ModeratedPage.php:360 ../lib/plugin/ModeratedPage.php:364
-#: ../lib/plugin/ModeratedPage.php:420 ../lib/plugin/ModeratedPage.php:446
+#: ../lib/plugin/ModeratedPage.php:153 ../lib/plugin/ModeratedPage.php:224
+#: ../lib/plugin/ModeratedPage.php:265 ../lib/plugin/ModeratedPage.php:268
+#: ../lib/plugin/ModeratedPage.php:270 ../lib/plugin/ModeratedPage.php:272
+#: ../lib/plugin/ModeratedPage.php:357 ../lib/plugin/ModeratedPage.php:361
+#: ../lib/plugin/ModeratedPage.php:417 ../lib/plugin/ModeratedPage.php:443
 msgid "ModeratedPage"
 msgstr ""
 
@@ -678,10 +678,11 @@
 msgid "Invalid [] syntax ignored"
 msgstr ""
 
-#: ../lib/InlineParser.php:358 ../lib/plugin/ModeratedPage.php:268
-#: ../lib/plugin/ModeratedPage.php:271 ../lib/plugin/ModeratedPage.php:364
+#: ../lib/InlineParser.php:358 ../lib/plugin/ModeratedPage.php:265
+#: ../lib/plugin/ModeratedPage.php:268 ../lib/plugin/ModeratedPage.php:361
 #: ../lib/plugin/SemanticSearch.php:163 ../lib/plugin/SemanticSearch.php:246
-#: ../lib/plugin/SpellCheck.php:187 ../lib/plugin/WikiAdminRename.php:277
+#: ../lib/plugin/SpellCheck.php:187 ../lib/plugin/SystemInfo.php:471
+#: ../lib/plugin/SystemInfo.php:484 ../lib/plugin/WikiAdminRename.php:277
 #: ../lib/plugin/WikiAdminRename.php:283
 #: ../lib/plugin/WikiAdminSearchReplace.php:240
 #: ../lib/plugin/WikiAdminSearchReplace.php:244
@@ -1343,7 +1344,7 @@
 msgid "You must wait for moderator approval."
 msgstr ""
 
-#: ../lib/main.php:846 ../lib/plugin/ModeratedPage.php:319
+#: ../lib/main.php:846 ../lib/plugin/ModeratedPage.php:316
 #, php-format
 msgid "%s: Bad action"
 msgstr ""
@@ -2964,12 +2965,12 @@
 msgid "Support moderated pages"
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:157 ../lib/plugin/ModeratedPage.php:183
-#: ../lib/plugin/ModeratedPage.php:231
-msgid "ModeratedPage: No e-mails for the moderators defined"
+#: ../lib/plugin/ModeratedPage.php:157 ../lib/plugin/ModeratedPage.php:182
+#: ../lib/plugin/ModeratedPage.php:229
+msgid "No e-mails for the moderators defined"
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:163
+#: ../lib/plugin/ModeratedPage.php:162
 #, php-format
 msgid ""
 "ModeratedPage status update:\n"
@@ -2977,12 +2978,12 @@
 "  require_access: '%s'"
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:168
+#: ../lib/plugin/ModeratedPage.php:167
 #, php-format
 msgid "'%s' is no ModeratedPage anymore."
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:189
+#: ../lib/plugin/ModeratedPage.php:187
 #, php-format
 msgid ""
 "ModeratedPage status update: '%s' is now a ModeratedPage.\n"
@@ -2990,42 +2991,42 @@
 "  require_access: '%s'"
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:260
+#: ../lib/plugin/ModeratedPage.php:257
 #, php-format
 msgid "%s: action forwarded to moderator %s"
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:286
+#: ../lib/plugin/ModeratedPage.php:283
 msgid "ModeratedPage Notification Error: Couldn't send e-mail"
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:366
+#: ../lib/plugin/ModeratedPage.php:363
 #, php-format
 msgid "%s approved your wiki action from %s"
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:379
+#: ../lib/plugin/ModeratedPage.php:376
 msgid "Please approve or reject this request:"
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:415
+#: ../lib/plugin/ModeratedPage.php:412
 msgid "Reason: "
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:416
+#: ../lib/plugin/ModeratedPage.php:413
 msgid "Approve"
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:418
+#: ../lib/plugin/ModeratedPage.php:415
 msgid "Reject"
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:447 ../lib/plugin/ModeratedPage.php:454
+#: ../lib/plugin/ModeratedPage.php:444 ../lib/plugin/ModeratedPage.php:451
 #, php-format
 msgid "<<ModeratedPage ... >> not found in first line of %s"
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:450
+#: ../lib/plugin/ModeratedPage.php:447
 #, php-format
 msgid "%s is not locked!"
 msgstr ""
@@ -4451,8 +4452,8 @@
 msgstr ""
 
 #: ../lib/plugin/SystemInfo.php:471
-#, php-format
-msgid "Current language: '%s'"
+#: ../themes/default/templates/userprefs.tmpl:133
+msgid "Current language"
 msgstr ""
 
 #: ../lib/plugin/SystemInfo.php:473
@@ -4466,8 +4467,8 @@
 msgstr ""
 
 #: ../lib/plugin/SystemInfo.php:484
-#, php-format
-msgid "Current theme: '%s'"
+#: ../themes/default/templates/userprefs.tmpl:132
+msgid "Current theme"
 msgstr ""
 
 #: ../lib/plugin/SystemInfo.php:486
@@ -5207,15 +5208,11 @@
 msgstr ""
 
 #: ../lib/plugin/WikiAdminDeleteAcl.php:61
+#: ../lib/plugin/WikiAdminDeleteAcl.php:66
 #, php-format
 msgid "ACL deleted for page '%s'"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminDeleteAcl.php:66
-#, php-format
-msgid "ACL deleted for page '%s'."
-msgstr ""
-
 #: ../lib/plugin/WikiAdminDeleteAcl.php:89
 #, fuzzy
 msgid "PhpWikiAdministration/AdminAclDelete"
@@ -8035,18 +8032,10 @@
 msgid "Theme"
 msgstr ""
 
-#: ../themes/default/templates/userprefs.tmpl:132
-msgid "Current Theme"
-msgstr ""
-
 #: ../themes/default/templates/userprefs.tmpl:133
 msgid "Language"
 msgstr ""
 
-#: ../themes/default/templates/userprefs.tmpl:133
-msgid "Current Language"
-msgstr ""
-
 #: ../themes/default/templates/userprefs.tmpl:139
 msgid "Change Password"
 msgstr ""

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2012-11-26 17:44:33 UTC (rev 8547)
+++ trunk/locale/po/phpwiki.pot	2012-11-26 19:37:47 UTC (rev 8548)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 18:43+0100\n"
+"POT-Creation-Date: 2012-11-26 20:35+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"
@@ -336,11 +336,11 @@
 
 #: ../lib/editpage.php:575 ../lib/editpage.php:576 ../lib/main.php:832
 #: ../lib/main.php:1218 ../lib/plugin/ModeratedPage.php:43
-#: ../lib/plugin/ModeratedPage.php:153 ../lib/plugin/ModeratedPage.php:226
-#: ../lib/plugin/ModeratedPage.php:268 ../lib/plugin/ModeratedPage.php:271
-#: ../lib/plugin/ModeratedPage.php:273 ../lib/plugin/ModeratedPage.php:275
-#: ../lib/plugin/ModeratedPage.php:360 ../lib/plugin/ModeratedPage.php:364
-#: ../lib/plugin/ModeratedPage.php:420 ../lib/plugin/ModeratedPage.php:446
+#: ../lib/plugin/ModeratedPage.php:153 ../lib/plugin/ModeratedPage.php:224
+#: ../lib/plugin/ModeratedPage.php:265 ../lib/plugin/ModeratedPage.php:268
+#: ../lib/plugin/ModeratedPage.php:270 ../lib/plugin/ModeratedPage.php:272
+#: ../lib/plugin/ModeratedPage.php:357 ../lib/plugin/ModeratedPage.php:361
+#: ../lib/plugin/ModeratedPage.php:417 ../lib/plugin/ModeratedPage.php:443
 msgid "ModeratedPage"
 msgstr ""
 
@@ -672,10 +672,11 @@
 msgid "Invalid [] syntax ignored"
 msgstr ""
 
-#: ../lib/InlineParser.php:358 ../lib/plugin/ModeratedPage.php:268
-#: ../lib/plugin/ModeratedPage.php:271 ../lib/plugin/ModeratedPage.php:364
+#: ../lib/InlineParser.php:358 ../lib/plugin/ModeratedPage.php:265
+#: ../lib/plugin/ModeratedPage.php:268 ../lib/plugin/ModeratedPage.php:361
 #: ../lib/plugin/SemanticSearch.php:163 ../lib/plugin/SemanticSearch.php:246
-#: ../lib/plugin/SpellCheck.php:187 ../lib/plugin/WikiAdminRename.php:277
+#: ../lib/plugin/SpellCheck.php:187 ../lib/plugin/SystemInfo.php:471
+#: ../lib/plugin/SystemInfo.php:484 ../lib/plugin/WikiAdminRename.php:277
 #: ../lib/plugin/WikiAdminRename.php:283
 #: ../lib/plugin/WikiAdminSearchReplace.php:240
 #: ../lib/plugin/WikiAdminSearchReplace.php:244
@@ -1336,7 +1337,7 @@
 msgid "You must wait for moderator approval."
 msgstr ""
 
-#: ../lib/main.php:846 ../lib/plugin/ModeratedPage.php:319
+#: ../lib/main.php:846 ../lib/plugin/ModeratedPage.php:316
 #, php-format
 msgid "%s: Bad action"
 msgstr ""
@@ -2957,12 +2958,12 @@
 msgid "Support moderated pages"
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:157 ../lib/plugin/ModeratedPage.php:183
-#: ../lib/plugin/ModeratedPage.php:231
-msgid "ModeratedPage: No e-mails for the moderators defined"
+#: ../lib/plugin/ModeratedPage.php:157 ../lib/plugin/ModeratedPage.php:182
+#: ../lib/plugin/ModeratedPage.php:229
+msgid "No e-mails for the moderators defined"
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:163
+#: ../lib/plugin/ModeratedPage.php:162
 #, php-format
 msgid ""
 "ModeratedPage status update:\n"
@@ -2970,12 +2971,12 @@
 "  require_access: '%s'"
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:168
+#: ../lib/plugin/ModeratedPage.php:167
 #, php-format
 msgid "'%s' is no ModeratedPage anymore."
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:189
+#: ../lib/plugin/ModeratedPage.php:187
 #, php-format
 msgid ""
 "ModeratedPage status update: '%s' is now a ModeratedPage.\n"
@@ -2983,42 +2984,42 @@
 "  require_access: '%s'"
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:260
+#: ../lib/plugin/ModeratedPage.php:257
 #, php-format
 msgid "%s: action forwarded to moderator %s"
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:286
+#: ../lib/plugin/ModeratedPage.php:283
 msgid "ModeratedPage Notification Error: Couldn't send e-mail"
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:366
+#: ../lib/plugin/ModeratedPage.php:363
 #, php-format
 msgid "%s approved your wiki action from %s"
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:379
+#: ../lib/plugin/ModeratedPage.php:376
 msgid "Please approve or reject this request:"
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:415
+#: ../lib/plugin/ModeratedPage.php:412
 msgid "Reason: "
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:416
+#: ../lib/plugin/ModeratedPage.php:413
 msgid "Approve"
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:418
+#: ../lib/plugin/ModeratedPage.php:415
 msgid "Reject"
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:447 ../lib/plugin/ModeratedPage.php:454
+#: ../lib/plugin/ModeratedPage.php:444 ../lib/plugin/ModeratedPage.php:451
 #, php-format
 msgid "<<ModeratedPage ... >> not found in first line of %s"
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:450
+#: ../lib/plugin/ModeratedPage.php:447
 #, php-format
 msgid "%s is not locked!"
 msgstr ""
@@ -4444,8 +4445,8 @@
 msgstr ""
 
 #: ../lib/plugin/SystemInfo.php:471
-#, php-format
-msgid "Current language: '%s'"
+#: ../themes/default/templates/userprefs.tmpl:133
+msgid "Current language"
 msgstr ""
 
 #: ../lib/plugin/SystemInfo.php:473
@@ -4459,8 +4460,8 @@
 msgstr ""
 
 #: ../lib/plugin/SystemInfo.php:484
-#, php-format
-msgid "Current theme: '%s'"
+#: ../themes/default/templates/userprefs.tmpl:132
+msgid "Current theme"
 msgstr ""
 
 #: ../lib/plugin/SystemInfo.php:486
@@ -5200,15 +5201,11 @@
 msgstr ""
 
 #: ../lib/plugin/WikiAdminDeleteAcl.php:61
+#: ../lib/plugin/WikiAdminDeleteAcl.php:66
 #, php-format
 msgid "ACL deleted for page '%s'"
 msgstr ""
 
-#: ../lib/plugin/WikiAdminDeleteAcl.php:66
-#, php-format
-msgid "ACL deleted for page '%s'."
-msgstr ""
-
 #: ../lib/plugin/WikiAdminDeleteAcl.php:89
 msgid "PhpWikiAdministration/AdminAclDelete"
 msgstr ""
@@ -8024,18 +8021,10 @@
 msgid "Theme"
 msgstr ""
 
-#: ../themes/default/templates/userprefs.tmpl:132
-msgid "Current Theme"
-msgstr ""
-
 #: ../themes/default/templates/userprefs.tmpl:133
 msgid "Language"
 msgstr ""
 
-#: ../themes/default/templates/userprefs.tmpl:133
-msgid "Current Language"
-msgstr ""
-
 #: ../themes/default/templates/userprefs.tmpl:139
 msgid "Change Password"
 msgstr ""

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2012-11-26 17:44:33 UTC (rev 8547)
+++ trunk/locale/po/sv.po	2012-11-26 19:37:47 UTC (rev 8548)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 18:43+0100\n"
+"POT-Creation-Date: 2012-11-26 20:35+0100\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -337,11 +337,11 @@
 
 #: ../lib/editpage.php:575 ../lib/editpage.php:576 ../lib/main.php:832
 #: ../lib/main.php:1218 ../lib/plugin/ModeratedPage.php:43
-#: ../lib/plugin/ModeratedPage.php:153 ../lib/plugin/ModeratedPage.php:226
-#: ../lib/plugin/ModeratedPage.php:268 ../lib/plugin/ModeratedPage.php:271
-#: ../lib/plugin/ModeratedPage.php:273 ../lib/plugin/ModeratedPage.php:275
-#: ../lib/plugin/ModeratedPage.php:360 ../lib/plugin/ModeratedPage.php:364
-#: ../lib/plugin/ModeratedPage.php:420 ../lib/plugin/ModeratedPage.php:446
+#: ../lib/plugin/ModeratedPage.php:153 ../lib/plugin/ModeratedPage.php:224
+#: ../lib/plugin/ModeratedPage.php:265 ../lib/plugin/ModeratedPage.php:268
+#: ../lib/plugin/ModeratedPage.php:270 ../lib/plugin/ModeratedPage.php:272
+#: ../lib/plugin/ModeratedPage.php:357 ../lib/plugin/ModeratedPage.php:361
+#: ../lib/plugin/ModeratedPage.php:417 ../lib/plugin/ModeratedPage.php:443
 msgid "ModeratedPage"
 msgstr ""
 
@@ -673,10 +673,11 @@
 msgid "Invalid [] syntax ignored"
 msgstr ""
 
-#: ../lib/InlineParser.php:358 ../lib/plugin/ModeratedPage.php:268
-#: ../lib/plugin/ModeratedPage.php:271 ../lib/plugin/ModeratedPage.php:364
+#: ../lib/InlineParser.php:358 ../lib/plugin/ModeratedPage.php:265
+#: ../lib/plugin/ModeratedPage.php:268 ../lib/plugin/ModeratedPage.php:361
 #: ../lib/plugin/SemanticSearch.php:163 ../lib/plugin/SemanticSearch.php:246
-#: ../lib/plugin/SpellCheck.php:187 ../lib/plugin/WikiAdminRename.php:277
+#: ../lib/plugin/SpellCheck.php:187 ../lib/plugin/SystemInfo.php:471
+#: ../lib/plugin/SystemInfo.php:484 ../lib/plugin/WikiAdminRename.php:277
 #: ../lib/plugin/WikiAdminRename.php:283
 #: ../lib/plugin/WikiAdminSearchReplace.php:240
 #: ../lib/plugin/WikiAdminSearchReplace.php:244
@@ -1337,7 +1338,7 @@
 msgid "You must wait for moderator approval."
 msgstr ""
 
-#: ../lib/main.php:846 ../lib/plugin/ModeratedPage.php:319
+#: ../lib/main.php:846 ../lib/plugin/ModeratedPage.php:316
 #, php-format
 msgid "%s: Bad action"
 msgstr ""
@@ -2959,12 +2960,12 @@
 msgid "Support moderated pages"
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:157 ../lib/plugin/ModeratedPage.php:183
-#: ../lib/plugin/ModeratedPage.php:231
-msgid "ModeratedPage: No e-mails for the moderators defined"
+#: ../lib/plugin/ModeratedPage.php:157 ../lib/plugin/ModeratedPage.php:182
+#: ../lib/plugin/ModeratedPage.php:229
+msgid "No e-mails for the moderators defined"
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:163
+#: ../lib/plugin/ModeratedPage.php:162
 #, php-format
 msgid ""
 "ModeratedPage status update:\n"
@@ -2972,12 +2973,12 @@
 "  require_access: '%s'"
 msgstr ""
 
-#: ../lib/plugin/ModeratedPage.php:168
+#...
 
[truncated message content]

[phpwiki-checkins] SF.net SVN: phpwiki:[8547] trunk/locale

From: <var...@us...> - 2012-11-26 17:44:41

Revision: 8547
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8547&view=rev
Author:   vargenau
Date:     2012-11-26 17:44:33 +0000 (Mon, 26 Nov 2012)
Log Message:
-----------
Update French translation

Modified Paths:
--------------
    trunk/locale/de/LC_MESSAGES/phpwiki.mo
    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

Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

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 17:14:51 UTC (rev 8546)
+++ trunk/locale/fr/LC_MESSAGES/phpwiki.php	2012-11-26 17:44:33 UTC (rev 8547)
@@ -116,7 +116,9 @@
 $locale["ACCESS DENIED: You must log in to upload files."] = "ACCES REFUSE: Vous devez être connecté pour uploader.";
 $locale["ACL"] = "ACL";
 $locale["ACL changed for page '%s'"] = "ACL modifié pour la page %s.";
-$locale["ACL not changed for page '%s'."] = "ACL inchangé pour la page %s.";
+$locale["ACL deleted for page '%s'"] = "ACL supprimée pour la page %s";
+$locale["ACL deleted for page '%s'."] = "ACL supprimée pour la page %s.";
+$locale["ACL not changed for page '%s'."] = "ACL inchangée pour la page %s.";
 $locale["ACL type"] = "Type d'ACL";
 $locale["ADDING"] = "AJOUT";
 $locale["ADMIN"] = "ADMIN";
@@ -224,6 +226,7 @@
 $locale["Cancel your rating"] = "Annuler la notation";
 $locale["Cannot create directory '%s'"] = "Impossible de créer le répertoire : « %s »";
 $locale["Cannot open AUTH_GROUP_FILE %s"] = "Impossible d'ouvrir AUTH_GROUP_FILE %s";
+$locale["Cannot rename. New page name too long."] = "Impossible de renommer. Le nom de la page est trop long.";
 $locale["Case exact?"] = "respect de la casse";
 $locale["Case insensitive?"] = "Insensible à la casse ?";
 $locale["Category"] = "Catégorie";
@@ -334,6 +337,8 @@
 $locale["Define a translation for a specified text"] = "Traduire du texte";
 $locale["Define the translation for %s in %s"] = "Définir la traduction pour %s en %s";
 $locale["Del/+"] = "Suppr/+";
+$locale["Delete ACL"] = "Supprimer l'ACL";
+$locale["Delete page permissions."] = "Supprimer les permissions de page.";
 $locale["Delete this ACL"] = "Supprimer cette ACL";
 $locale["Deleted"] = "Supprimé";
 $locale["Deleted %d pages with invalid names:"] = "%d pages ont été supprimées à cause de leur nom invalide:";
@@ -968,6 +973,7 @@
 $locale["Select the pages to change:"] = "Sélectionnez les pages à modifier :";
 $locale["Select the pages to rename:"] = "Sélectionnez les pages à renommer :";
 $locale["Select the pages to search and replace"] = "Sélectionner ci-dessous les pages dans lesquelles la recherche sera effectuée :";
+$locale["Select the pages where to delete access rights"] = "Sélectionnez les pages dont vous voulez supprimer les droits d'accès";
 $locale["Select: "] = "Sélectionner : ";
 $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 : ";

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 17:14:51 UTC (rev 8546)
+++ trunk/locale/po/de.po	2012-11-26 17:44:33 UTC (rev 8547)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 18:11+0100\n"
+"POT-Creation-Date: 2012-11-26 18:43+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."

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2012-11-26 17:14:51 UTC (rev 8546)
+++ trunk/locale/po/es.po	2012-11-26 17:44:33 UTC (rev 8547)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 18:11+0100\n"
+"POT-Creation-Date: 2012-11-26 18:43+0100\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2012-11-26 17:14:51 UTC (rev 8546)
+++ trunk/locale/po/fr.po	2012-11-26 17:44:33 UTC (rev 8547)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 18:11+0100\n"
+"POT-Creation-Date: 2012-11-26 18:43+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."
@@ -5288,39 +5288,34 @@
 msgstr "Changer le propriétaire par : "
 
 #: ../lib/plugin/WikiAdminDeleteAcl.php:40
-#, fuzzy
 msgid "WikiDeleteAcl"
-msgstr "Supprimé"
+msgstr ""
 
 #: ../lib/plugin/WikiAdminDeleteAcl.php:45
-#, fuzzy
 msgid "Delete page permissions."
-msgstr "permission de page par défaut"
+msgstr "Supprimer les permissions de page."
 
 #: ../lib/plugin/WikiAdminDeleteAcl.php:61
-#, fuzzy, php-format
+#, php-format
 msgid "ACL deleted for page '%s'"
-msgstr "ACL modifié pour la page %s."
+msgstr "ACL supprimée pour la page %s"
 
 #: ../lib/plugin/WikiAdminDeleteAcl.php:66
-#, fuzzy, php-format
+#, php-format
 msgid "ACL deleted for page '%s'."
-msgstr "ACL inchangé pour la page %s."
+msgstr "ACL supprimée pour la page %s."
 
 #: ../lib/plugin/WikiAdminDeleteAcl.php:89
-#, fuzzy
 msgid "PhpWikiAdministration/AdminAclDelete"
-msgstr "AdministrationDePhpWiki/Remplacer"
+msgstr ""
 
 #: ../lib/plugin/WikiAdminDeleteAcl.php:127
-#, fuzzy
 msgid "Delete ACL"
-msgstr "Supprimer cette ACL"
+msgstr "Supprimer l'ACL"
 
 #: ../lib/plugin/WikiAdminDeleteAcl.php:129
-#, fuzzy
 msgid "Select the pages where to delete access rights"
-msgstr "Sélectionnez les pages dont vous voulez changer le propriétaire"
+msgstr "Sélectionnez les pages dont vous voulez supprimer les droits d'accès"
 
 #: ../lib/plugin/WikiAdminDeleteAcl.php:154
 #: ../lib/plugin/WikiAdminSetAcl.php:243
@@ -5501,9 +5496,8 @@
 msgstr "Renommer les pages sélectionnées"
 
 #: ../lib/plugin/WikiAdminRename.php:84
-#, fuzzy
 msgid "Cannot rename. New page name too long."
-msgstr "Le nom de la page est trop long"
+msgstr "Impossible de renommer. Le nom de la page est trop long."
 
 #: ../lib/plugin/WikiAdminRename.php:86
 #, php-format
@@ -5671,7 +5665,7 @@
 #: ../lib/plugin/WikiAdminSetAcl.php:96
 #, php-format
 msgid "ACL not changed for page '%s'."
-msgstr "ACL inchangé pour la page %s."
+msgstr "ACL inchangée pour la page %s."
 
 #: ../lib/plugin/WikiAdminSetAcl.php:100
 #, php-format

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2012-11-26 17:14:51 UTC (rev 8546)
+++ trunk/locale/po/it.po	2012-11-26 17:44:33 UTC (rev 8547)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 18:11+0100\n"
+"POT-Creation-Date: 2012-11-26 18:43+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"

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2012-11-26 17:14:51 UTC (rev 8546)
+++ trunk/locale/po/ja.po	2012-11-26 17:44:33 UTC (rev 8547)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 18:11+0100\n"
+"POT-Creation-Date: 2012-11-26 18:43+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"

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2012-11-26 17:14:51 UTC (rev 8546)
+++ trunk/locale/po/nl.po	2012-11-26 17:44:33 UTC (rev 8547)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 18:11+0100\n"
+"POT-Creation-Date: 2012-11-26 18:43+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"

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2012-11-26 17:14:51 UTC (rev 8546)
+++ trunk/locale/po/phpwiki.pot	2012-11-26 17:44:33 UTC (rev 8547)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 18:11+0100\n"
+"POT-Creation-Date: 2012-11-26 18:43+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"

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2012-11-26 17:14:51 UTC (rev 8546)
+++ trunk/locale/po/sv.po	2012-11-26 17:44:33 UTC (rev 8547)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 18:11+0100\n"
+"POT-Creation-Date: 2012-11-26 18:43+0100\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2012-11-26 17:14:51 UTC (rev 8546)
+++ trunk/locale/po/zh.po	2012-11-26 17:44:33 UTC (rev 8547)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 18:11+0100\n"
+"POT-Creation-Date: 2012-11-26 18:43+0100\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"

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.

[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('&nbsp;'),
                 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('&nbsp;'),
                     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.

[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.

[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.

[phpwiki-checkins] SF.net SVN: phpwiki:[8543] trunk/lib/WikiUserNew.php

From: <var...@us...> - 2012-11-26 15:21:13

Revision: 8543
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8543&view=rev
Author:   vargenau
Date:     2012-11-26 15:21:04 +0000 (Mon, 26 Nov 2012)
Log Message:
-----------
Do not return value

Modified Paths:
--------------
    trunk/lib/WikiUserNew.php

Modified: trunk/lib/WikiUserNew.php
===================================================================
--- trunk/lib/WikiUserNew.php	2012-11-26 15:13:37 UTC (rev 8542)
+++ trunk/lib/WikiUserNew.php	2012-11-26 15:21:04 UTC (rev 8543)
@@ -1803,7 +1803,7 @@
     {
         // e-mail address is already checked by FusionForge
         if (FUSIONFORGE) {
-            return $value;
+            return;
         }
         if (!empty($this->_init)) {
             return;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8542] trunk/lib/WikiUserNew.php

From: <var...@us...> - 2012-11-26 15:13:47

Revision: 8542
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8542&view=rev
Author:   vargenau
Date:     2012-11-26 15:13:37 +0000 (Mon, 26 Nov 2012)
Log Message:
-----------
Always return

Modified Paths:
--------------
    trunk/lib/WikiUserNew.php

Modified: trunk/lib/WikiUserNew.php
===================================================================
--- trunk/lib/WikiUserNew.php	2012-11-26 14:54:34 UTC (rev 8541)
+++ trunk/lib/WikiUserNew.php	2012-11-26 15:13:37 UTC (rev 8542)
@@ -395,8 +395,11 @@
 
     function UserName()
     {
-        if (!empty($this->_userid))
+        if (!empty($this->_userid)) {
             return $this->_userid;
+        } else {
+            return '';
+        }
     }
 
     function getPreferences()
@@ -1519,8 +1522,11 @@
 
     function getraw($name)
     {
-        if (!empty($this->{$name}))
+        if (!empty($this->{$name})) {
             return $this->{$name};
+        } else {
+            return '';
+        }
     }
 
     // stores the value as $this->$name, and not as $this->value (clever?)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8541] trunk/lib/WikiUserNew.php

From: <var...@us...> - 2012-11-26 14:54:41

Revision: 8541
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8541&view=rev
Author:   vargenau
Date:     2012-11-26 14:54:34 +0000 (Mon, 26 Nov 2012)
Log Message:
-----------
Add {}

Modified Paths:
--------------
    trunk/lib/WikiUserNew.php

Modified: trunk/lib/WikiUserNew.php
===================================================================
--- trunk/lib/WikiUserNew.php	2012-11-26 14:35:56 UTC (rev 8540)
+++ trunk/lib/WikiUserNew.php	2012-11-26 14:54:34 UTC (rev 8541)
@@ -1769,13 +1769,17 @@
     function sanify($value)
     {
         // e-mail address is already checked by FusionForge
-        if (FUSIONFORGE) return $value;
+        if (FUSIONFORGE) {
+            return $value;
+        }
         // check for valid email address
-        if ($this->get('email') == $value and $this->getraw('emailVerified'))
+        if ($this->get('email') == $value and $this->getraw('emailVerified')) {
             return $value;
+        }
         // hack!
-        if ($value == 1 or $value === true)
+        if ($value == 1 or $value === true) {
             return $value;
+        }
         list($ok, $msg) = ValidateMail($value, 'noconnect');
         if ($ok) {
             return $value;
@@ -1792,12 +1796,17 @@
     function update($value)
     {
         // e-mail address is already checked by FusionForge
-        if (FUSIONFORGE) return $value;
-        if (!empty($this->_init)) return;
+        if (FUSIONFORGE) {
+            return $value;
+        }
+        if (!empty($this->_init)) {
+            return;
+        }
         $verified = $this->getraw('emailVerified');
         // hack!
-        if (($value == 1 or $value === true) and $verified)
+        if (($value == 1 or $value === true) and $verified) {
             return;
+        }
         if (!empty($value) and !$verified) {
             list($ok, $msg) = ValidateMail($value);
             if ($ok and mail($value, "[" . WIKI_NAME . "] " . _("E-mail address confirmation"),

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8540] trunk

From: <var...@us...> - 2012-11-26 14:36:07

Revision: 8540
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8540&view=rev
Author:   vargenau
Date:     2012-11-26 14:35:56 +0000 (Mon, 26 Nov 2012)
Log Message:
-----------
'on windows' --> 'on Windows'

Modified Paths:
--------------
    trunk/lib/Units.php
    trunk/lib/WikiUserNew.php
    trunk/lib/upgrade.php
    trunk/locale/de/LC_MESSAGES/phpwiki.mo
    trunk/locale/de/LC_MESSAGES/phpwiki.php
    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/pgsrc/Help%2FPloticusPlugin
    trunk/pgsrc/ReleaseNotes

Modified: trunk/lib/Units.php
===================================================================
--- trunk/lib/Units.php	2012-11-26 14:31:03 UTC (rev 8539)
+++ trunk/lib/Units.php	2012-11-26 14:35:56 UTC (rev 8540)
@@ -15,7 +15,7 @@
  * Windows requires the cygwin /usr/bin/units.
  * All successfully parsed unit definitions are stored in the wikidb,
  * so that subsequent expansions will not require /usr/bin/units be called again.
- * So far even on windows (cygwin) the process is fast enough.
+ * So far even on Windows (cygwin) the process is fast enough.
  *
  * TODO: understand dates and maybe times
  *   YYYY-MM-DD, "CW"ww/yy (CalendarWeek)

Modified: trunk/lib/WikiUserNew.php
===================================================================
--- trunk/lib/WikiUserNew.php	2012-11-26 14:31:03 UTC (rev 8539)
+++ trunk/lib/WikiUserNew.php	2012-11-26 14:35:56 UTC (rev 8540)
@@ -1870,7 +1870,7 @@
         return array(true, sprintf(_("E-mail address '%s' is properly formatted"), $email));
 
     list ($Username, $Domain) = explode("@", $email);
-    //Todo: getmxrr workaround on windows or manual input field to verify it manually
+    //Todo: getmxrr workaround on Windows or manual input field to verify it manually
     if (!isWindows() and getmxrr($Domain, $MXHost)) { // avoid warning on Windows.
         $ConnectAddress = $MXHost[0];
     } else {

Modified: trunk/lib/upgrade.php
===================================================================
--- trunk/lib/upgrade.php	2012-11-26 14:31:03 UTC (rev 8539)
+++ trunk/lib/upgrade.php	2012-11-26 14:35:56 UTC (rev 8540)
@@ -601,7 +601,7 @@
         // Illegal mix of collations (latin1_bin,IMPLICIT) and
         // (utf8_general_ci, COERCIBLE) for operation '='])
         if (isWindows() and substr($backend_type, 0, 5) == 'mysql') {
-            echo _("Check for mysql 4.1.x/5.0.0 binary search on windows problem"), " ...";
+            echo _("Check for mysql 4.1.x/5.0.0 binary search on Windows problem"), " ...";
             $mysql_version = $this->dbi->_backend->_serverinfo['version'];
             if ($mysql_version < 401.0) {
                 echo sprintf(_("version <em>%s</em>"), $mysql_version), " ",
@@ -775,13 +775,13 @@
             }
         }
         // Check if the privileges are enough. Need CREATE and ALTER perms.
-        // And on windows: SELECT FROM mysql, possibly: UPDATE mysql.
+        // And on Windows: SELECT FROM mysql, possibly: UPDATE mysql.
         $form = HTML::form(array("method" => "post",
                 "action" => $this->request->getPostURL(),
                 "accept-charset" => $GLOBALS['charset']),
             HTML::p(_("Upgrade requires database privileges to CREATE and ALTER the phpwiki database."),
                 HTML::br(),
-                _("And on windows at least the privilege to SELECT FROM mysql, and possibly UPDATE mysql")),
+                _("And on Windows at least the privilege to SELECT FROM mysql, and possibly UPDATE mysql")),
             HiddenInputs(array('action' => 'upgrade',
                 'overwrite' => $this->request->getArg('overwrite'))),
             HTML::table(array("cellspacing" => 4),
@@ -979,7 +979,7 @@
             if (isWindows())
                 $tmp = str_replace("/", "\\", $tmp);
             // Detect the existing linesep at first line. fgets strips it even if 'rb'.
-            // Before we simply assumed \r\n on windows local files.
+            // Before we simply assumed \r\n on Windows local files.
             $s = fread($in, 1024);
             rewind($in);
             $linesep = (substr_count($s, "\r\n") > substr_count($s, "\n")) ? "\r\n" : "\n";

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 14:31:03 UTC (rev 8539)
+++ trunk/locale/de/LC_MESSAGES/phpwiki.php	2012-11-26 14:35:56 UTC (rev 8540)
@@ -253,7 +253,7 @@
 $locale["Check for %s"] = "Prüfe %s";
 $locale["Check for ACCESS_LOG_SQL passwords in POST requests"] = "Prüfe auf ACCESS_LOG_SQL Passwörter in POST Requests";
 $locale["Check for ACCESS_LOG_SQL remote_host varchar(50)"] = "Prüfe auf ACCESS_LOG_SQL Passwörter in POST Requests";
-$locale["Check for mysql 4.1.x/5.0.0 binary search on windows problem"] = "prüfe auf mysql 4.1.x/5.0.0 Binärsuch-Problem (nur Windows)";
+$locale["Check for mysql 4.1.x/5.0.0 binary search on Windows problem"] = "prüfe auf mysql 4.1.x/5.0.0 Binärsuch-Problem (nur Windows)";
 $locale["Check for mysql LOCK TABLE privilege"] = "Prüfe mysql LOCK TABLE Rechte";
 $locale["Check for mysql page.id auto_increment flag"] = "Prüfe auf mysql page.id auto_increment Flag";
 $locale["Check for mysql session.sess_id sanity"] = "Prüfe auf mysql session.sess_id Korrektheit";

Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po	2012-11-26 14:31:03 UTC (rev 8539)
+++ trunk/locale/po/de.po	2012-11-26 14:35:56 UTC (rev 8540)
@@ -6693,7 +6693,7 @@
 msgstr "Prüfe auf mysql page.id auto_increment Flag"
 
 #: ../lib/upgrade.php:604
-msgid "Check for mysql 4.1.x/5.0.0 binary search on windows problem"
+msgid "Check for mysql 4.1.x/5.0.0 binary search on Windows problem"
 msgstr "prüfe auf mysql 4.1.x/5.0.0 Binärsuch-Problem (nur Windows)"
 
 #: ../lib/upgrade.php:607 ../lib/upgrade.php:623 ../lib/upgrade.php:644
@@ -6730,7 +6730,7 @@
 
 #: ../lib/upgrade.php:784
 msgid ""
-"And on windows at least the privilege to SELECT FROM mysql, and possibly "
+"And on Windows at least the privilege to SELECT FROM mysql, and possibly "
 "UPDATE mysql"
 msgstr ""
 

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2012-11-26 14:31:03 UTC (rev 8539)
+++ trunk/locale/po/es.po	2012-11-26 14:35:56 UTC (rev 8540)
@@ -6523,7 +6523,7 @@
 msgstr ""
 
 #: ../lib/upgrade.php:604
-msgid "Check for mysql 4.1.x/5.0.0 binary search on windows problem"
+msgid "Check for mysql 4.1.x/5.0.0 binary search on Windows problem"
 msgstr ""
 
 #: ../lib/upgrade.php:607 ../lib/upgrade.php:623 ../lib/upgrade.php:644
@@ -6560,7 +6560,7 @@
 
 #: ../lib/upgrade.php:784
 msgid ""
-"And on windows at least the privilege to SELECT FROM mysql, and possibly "
+"And on Windows at least the privilege to SELECT FROM mysql, and possibly "
 "UPDATE mysql"
 msgstr ""
 

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2012-11-26 14:31:03 UTC (rev 8539)
+++ trunk/locale/po/fr.po	2012-11-26 14:35:56 UTC (rev 8540)
@@ -6602,7 +6602,7 @@
 msgstr ""
 
 #: ../lib/upgrade.php:604
-msgid "Check for mysql 4.1.x/5.0.0 binary search on windows problem"
+msgid "Check for mysql 4.1.x/5.0.0 binary search on Windows problem"
 msgstr ""
 
 #: ../lib/upgrade.php:607 ../lib/upgrade.php:623 ../lib/upgrade.php:644
@@ -6639,7 +6639,7 @@
 
 #: ../lib/upgrade.php:784
 msgid ""
-"And on windows at least the privilege to SELECT FROM mysql, and possibly "
+"And on Windows at least the privilege to SELECT FROM mysql, and possibly "
 "UPDATE mysql"
 msgstr ""
 

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2012-11-26 14:31:03 UTC (rev 8539)
+++ trunk/locale/po/it.po	2012-11-26 14:35:56 UTC (rev 8540)
@@ -6498,7 +6498,7 @@
 msgstr ""
 
 #: ../lib/upgrade.php:604
-msgid "Check for mysql 4.1.x/5.0.0 binary search on windows problem"
+msgid "Check for mysql 4.1.x/5.0.0 binary search on Windows problem"
 msgstr ""
 
 #: ../lib/upgrade.php:607 ../lib/upgrade.php:623 ../lib/upgrade.php:644
@@ -6535,7 +6535,7 @@
 
 #: ../lib/upgrade.php:784
 msgid ""
-"And on windows at least the privilege to SELECT FROM mysql, and possibly "
+"And on Windows at least the privilege to SELECT FROM mysql, and possibly "
 "UPDATE mysql"
 msgstr ""
 

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2012-11-26 14:31:03 UTC (rev 8539)
+++ trunk/locale/po/ja.po	2012-11-26 14:35:56 UTC (rev 8540)
@@ -6635,7 +6635,7 @@
 msgstr ""
 
 #: ../lib/upgrade.php:604
-msgid "Check for mysql 4.1.x/5.0.0 binary search on windows problem"
+msgid "Check for mysql 4.1.x/5.0.0 binary search on Windows problem"
 msgstr ""
 
 #: ../lib/upgrade.php:607 ../lib/upgrade.php:623 ../lib/upgrade.php:644
@@ -6672,7 +6672,7 @@
 
 #: ../lib/upgrade.php:784
 msgid ""
-"And on windows at least the privilege to SELECT FROM mysql, and possibly "
+"And on Windows at least the privilege to SELECT FROM mysql, and possibly "
 "UPDATE mysql"
 msgstr ""
 

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2012-11-26 14:31:03 UTC (rev 8539)
+++ trunk/locale/po/nl.po	2012-11-26 14:35:56 UTC (rev 8540)
@@ -6485,7 +6485,7 @@
 msgstr ""
 
 #: ../lib/upgrade.php:604
-msgid "Check for mysql 4.1.x/5.0.0 binary search on windows problem"
+msgid "Check for mysql 4.1.x/5.0.0 binary search on Windows problem"
 msgstr ""
 
 #: ../lib/upgrade.php:607 ../lib/upgrade.php:623 ../lib/upgrade.php:644
@@ -6522,7 +6522,7 @@
 
 #: ../lib/upgrade.php:784
 msgid ""
-"And on windows at least the privilege to SELECT FROM mysql, and possibly "
+"And on Windows at least the privilege to SELECT FROM mysql, and possibly "
 "UPDATE mysql"
 msgstr ""
 

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2012-11-26 14:31:03 UTC (rev 8539)
+++ trunk/locale/po/phpwiki.pot	2012-11-26 14:35:56 UTC (rev 8540)
@@ -6476,7 +6476,7 @@
 msgstr ""
 
 #: ../lib/upgrade.php:604
-msgid "Check for mysql 4.1.x/5.0.0 binary search on windows problem"
+msgid "Check for mysql 4.1.x/5.0.0 binary search on Windows problem"
 msgstr ""
 
 #: ../lib/upgrade.php:607 ../lib/upgrade.php:623 ../lib/upgrade.php:644
@@ -6513,7 +6513,7 @@
 
 #: ../lib/upgrade.php:784
 msgid ""
-"And on windows at least the privilege to SELECT FROM mysql, and possibly "
+"And on Windows at least the privilege to SELECT FROM mysql, and possibly "
 "UPDATE mysql"
 msgstr ""
 

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2012-11-26 14:31:03 UTC (rev 8539)
+++ trunk/locale/po/sv.po	2012-11-26 14:35:56 UTC (rev 8540)
@@ -6479,7 +6479,7 @@
 msgstr ""
 
 #: ../lib/upgrade.php:604
-msgid "Check for mysql 4.1.x/5.0.0 binary search on windows problem"
+msgid "Check for mysql 4.1.x/5.0.0 binary search on Windows problem"
 msgstr ""
 
 #: ../lib/upgrade.php:607 ../lib/upgrade.php:623 ../lib/upgrade.php:644
@@ -6516,7 +6516,7 @@
 
 #: ../lib/upgrade.php:784
 msgid ""
-"And on windows at least the privilege to SELECT FROM mysql, and possibly "
+"And on Windows at least the privilege to SELECT FROM mysql, and possibly "
 "UPDATE mysql"
 msgstr ""
 

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2012-11-26 14:31:03 UTC (rev 8539)
+++ trunk/locale/po/zh.po	2012-11-26 14:35:56 UTC (rev 8540)
@@ -6774,7 +6774,7 @@
 msgstr ""
 
 #: ../lib/upgrade.php:604
-msgid "Check for mysql 4.1.x/5.0.0 binary search on windows problem"
+msgid "Check for mysql 4.1.x/5.0.0 binary search on Windows problem"
 msgstr ""
 
 #: ../lib/upgrade.php:607 ../lib/upgrade.php:623 ../lib/upgrade.php:644
@@ -6812,7 +6812,7 @@
 
 #: ../lib/upgrade.php:784
 msgid ""
-"And on windows at least the privilege to SELECT FROM mysql, and possibly "
+"And on Windows at least the privilege to SELECT FROM mysql, and possibly "
 "UPDATE mysql"
 msgstr ""
 

Modified: trunk/pgsrc/Help%2FPloticusPlugin
===================================================================
--- trunk/pgsrc/Help%2FPloticusPlugin	2012-11-26 14:31:03 UTC (rev 8539)
+++ trunk/pgsrc/Help%2FPloticusPlugin	2012-11-26 14:35:56 UTC (rev 8540)
@@ -81,7 +81,7 @@
 == Optional Configuration ==
 
 config.ini:
-  PLOTICUS_EXE = pl.exe (on windows)
+  PLOTICUS_EXE = pl.exe (on Windows)
   PLOTICUS_EXE = /usr/local/bin/pl (elsewhere)
 
 prefabs need the environment variable PLOTICUS_PREFABS. Default: /usr/share/ploticus.

Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2012-11-26 14:31:03 UTC (rev 8539)
+++ trunk/pgsrc/ReleaseNotes	2012-11-26 14:35:56 UTC (rev 8540)
@@ -207,7 +207,7 @@
 * fixed fortune error handling
 * fixed limit handling with multiple pagelists: don't overwrite request arg
 * change PageDump Content-Type header for download to application/octet-stream to avoid
-  pesty .txt suffixes on windows clients
+  pesty .txt suffixes on Windows clients
 * fixed wikilens with dba and RATING_STORAGE=SQL. RATING_STORAGE=WIKIPAGE not yet fixed.
 * fixed action=diff error with external links
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

286 messages has been excluded from this view by a project administrator.

Flat | Threaded

<< < 1 .. 104 105 106 107 108 .. 538 > >> (Page 106 of 538)