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

[<var...@us...>]

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]