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

[phpwiki-checkins] SF.net SVN: phpwiki:[8239] trunk/themes/fusionforge/pgsrc

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

Revision: 8239
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8239&view=rev
Author:   vargenau
Date:     2012-02-02 10:01:41 +0000 (Thu, 02 Feb 2012)
Log Message:
-----------
Update date: must be more recent than global pgsrc

Modified Paths:
--------------
    trunk/themes/fusionforge/pgsrc/FindPage
    trunk/themes/fusionforge/pgsrc/HomePage
    trunk/themes/fusionforge/pgsrc/InterWikiMap
    trunk/themes/fusionforge/pgsrc/PhpWikiAdministration
    trunk/themes/fusionforge/pgsrc/PhpWikiAdministration%2FSetAclSimple
    trunk/themes/fusionforge/pgsrc/SetGlobalAccessRightsSimple
    trunk/themes/fusionforge/pgsrc/SpecialPages
    trunk/themes/fusionforge/pgsrc/UpLoad

Modified: trunk/themes/fusionforge/pgsrc/FindPage
===================================================================
--- trunk/themes/fusionforge/pgsrc/FindPage	2012-01-27 18:04:41 UTC (rev 8238)
+++ trunk/themes/fusionforge/pgsrc/FindPage	2012-02-02 10:01:41 UTC (rev 8239)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Sep 2010 13:47:11 +0000
+Date: Thu,  2 Feb 2012 10:58:18 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;

Modified: trunk/themes/fusionforge/pgsrc/HomePage
===================================================================
--- trunk/themes/fusionforge/pgsrc/HomePage	2012-01-27 18:04:41 UTC (rev 8238)
+++ trunk/themes/fusionforge/pgsrc/HomePage	2012-02-02 10:01:41 UTC (rev 8239)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Sep 2010 13:47:11 +0000
+Date: Thu,  2 Feb 2012 10:58:18 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;

Modified: trunk/themes/fusionforge/pgsrc/InterWikiMap
===================================================================
--- trunk/themes/fusionforge/pgsrc/InterWikiMap	2012-01-27 18:04:41 UTC (rev 8238)
+++ trunk/themes/fusionforge/pgsrc/InterWikiMap	2012-02-02 10:01:41 UTC (rev 8239)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Sep 2010 13:47:11 +0000
+Date: Thu,  2 Feb 2012 10:58:18 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;

Modified: trunk/themes/fusionforge/pgsrc/PhpWikiAdministration
===================================================================
--- trunk/themes/fusionforge/pgsrc/PhpWikiAdministration	2012-01-27 18:04:41 UTC (rev 8238)
+++ trunk/themes/fusionforge/pgsrc/PhpWikiAdministration	2012-02-02 10:01:41 UTC (rev 8239)
@@ -1,4 +1,4 @@
-Date: Wed, 13 Apr 2011 18:02:22 +0000
+Date: Thu,  2 Feb 2012 10:58:18 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;

Modified: trunk/themes/fusionforge/pgsrc/PhpWikiAdministration%2FSetAclSimple
===================================================================
--- trunk/themes/fusionforge/pgsrc/PhpWikiAdministration%2FSetAclSimple	2012-01-27 18:04:41 UTC (rev 8238)
+++ trunk/themes/fusionforge/pgsrc/PhpWikiAdministration%2FSetAclSimple	2012-02-02 10:01:41 UTC (rev 8239)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Sep 2010 13:47:11 +0000
+Date: Thu,  2 Feb 2012 10:58:18 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;

Modified: trunk/themes/fusionforge/pgsrc/SetGlobalAccessRightsSimple
===================================================================
--- trunk/themes/fusionforge/pgsrc/SetGlobalAccessRightsSimple	2012-01-27 18:04:41 UTC (rev 8238)
+++ trunk/themes/fusionforge/pgsrc/SetGlobalAccessRightsSimple	2012-02-02 10:01:41 UTC (rev 8239)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Sep 2010 13:47:11 +0000
+Date: Thu,  2 Feb 2012 10:58:18 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;

Modified: trunk/themes/fusionforge/pgsrc/SpecialPages
===================================================================
--- trunk/themes/fusionforge/pgsrc/SpecialPages	2012-01-27 18:04:41 UTC (rev 8238)
+++ trunk/themes/fusionforge/pgsrc/SpecialPages	2012-02-02 10:01:41 UTC (rev 8239)
@@ -1,4 +1,4 @@
-Date: Fri,  1 Jul 2011 10:08:24 +0000
+Date: Thu,  2 Feb 2012 10:58:18 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;

Modified: trunk/themes/fusionforge/pgsrc/UpLoad
===================================================================
--- trunk/themes/fusionforge/pgsrc/UpLoad	2012-01-27 18:04:41 UTC (rev 8238)
+++ trunk/themes/fusionforge/pgsrc/UpLoad	2012-02-02 10:01:41 UTC (rev 8239)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Sep 2010 13:47:11 +0000
+Date: Thu,  2 Feb 2012 10:58:18 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;

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

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

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

Revision: 8238
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8238&view=rev
Author:   vargenau
Date:     2012-01-27 18:04:41 +0000 (Fri, 27 Jan 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/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-01-27 18:03:50 UTC (rev 8237)
+++ trunk/locale/fr/LC_MESSAGES/phpwiki.php	2012-01-27 18:04:41 UTC (rev 8238)
@@ -49,7 +49,7 @@
 $locale["%s days"] = "%s jours";
 $locale["%s does not appear to be a WikiPlugin."] = "%s ne semble pas être un greffon.";
 $locale["%s does not exist"] = "%s n'existe pas";
-$locale["%s does not know about the language '%s', using 'en' instead."] = "%s ne connait pas le langage '%s', utilisation de 'en' a la place.";
+$locale["%s does not know about the language '%s', using 'en' instead."] = "%s ne connait pas le langage « %s » utilisation de 'en' a la place.";
 $locale["%s has no subpages defined."] = "La page %s n'a aucune sous-page définie.";
 $locale["%s is disallowed on this wiki."] = "L'action %s est interdite sur ce wiki.";
 $locale["%s is empty"] = "%s est vide";
@@ -79,7 +79,7 @@
 $locale["%s: no such revision %d."] = "%s(%d) : version inexistante";
 $locale["%s: not a subclass of WikiPlugin."] = "%s n'est pas une sous-classe de WikiPlugin.";
 $locale["%s: not defined"] = "%s : non défini";
-$locale["'%s': Bad page name"] = "'%s' : nom de page non valide";
+$locale["'%s': Bad page name"] = "« %s » : nom de page non valide";
 $locale["'%s': corrupt file"] = "'%s' : ce fichier est abîmé";
 $locale["(%d Links)"] = "(%d liens)";
 $locale["(Copy your changes to the clipboard. You can try editing a different page or save your text in a text editor.)"] = "(Copiez vos modifications dans le presse-papier. Vous pouvez essayer de modifier une page différente ou enregistrer votre texte à l'aide d'un éditeur).";
@@ -124,8 +124,8 @@
 $locale["About"] = "À propos de";
 $locale["Access"] = "Accès";
 $locale["Access Rights"] = "Droits d'accès";
-$locale["Access denied to change page '%s'."] = "Accès refusé pour changer la page '%s'.";
-$locale["Access denied to rename page '%s'."] = "Accès refusé pour renommer la page '%s'.";
+$locale["Access denied to change page '%s'."] = "Accès refusé pour changer la page « %s ».";
+$locale["Access denied to rename page '%s'."] = "Accès refusé pour renommer la page « %s ».";
 $locale["Access for you is forbidden to %s."] = "L'accès à %s vous est interdit.";
 $locale["Action Page"] = "Page d'action";
 $locale["Add %s"] = "Ajouter %s";
@@ -178,7 +178,7 @@
 $locale["Are you sure you want to replace text in the selected files?"] = "Etes-vous sur de vouloir rechercher et remplacer dans les fichiers sélectionnées ?";
 $locale["Argument '%s' not declared by plugin."] = "argument '%s' non déclaré par le plugin.";
 $locale["Arguments"] = "Arguments";
-$locale["Attempting to use the directory '%s' instead."] = "Tentative d'utilisation du répertoire '%s' à la place.";
+$locale["Attempting to use the directory '%s' instead."] = "Tentative d'utilisation du répertoire « %s » à la place.";
 $locale["Attribute"] = "Attribut";
 $locale["Attribute %s, value: %s"] = "Attribut %s, valeur : %s";
 $locale["Attributes"] = "Attributs";
@@ -219,7 +219,7 @@
 $locale["Can't inflate data: zlib support not enabled in this PHP"] = "Impossible de décompresser les données : le support de zlib n'a pas été validé dans ce PHP";
 $locale["Can't mix '%s' with '%s' type format strings"] = "Impossible de mélanger les chaînes de type '%s' et '%s'";
 $locale["Can't open the upload logfile."] = "Impossible d'ouvrir le journal des fichiers déposés.";
-$locale["Can't open zip file '%s' for reading"] = "Impossible d'ouvrir le fichier zip '%s' en lecture";
+$locale["Can't open zip file '%s' for reading"] = "Impossible d'ouvrir le fichier zip « %s » en lecture";
 $locale["Cancel"] = "Annuler";
 $locale["Cancel your rating"] = "Annuler la notation";
 $locale["Cannot create directory '%s'"] = "Impossible de créer le répertoire : « %s »";
@@ -301,8 +301,8 @@
 $locale["Could not change owner of page '%s' to '%s'."] = "Impossible de changer le propriétaire '%s' à '%s'.";
 $locale["Couldn't chmod page '%s' to '%s'."] = "Impossible de changer le mode '%s' à '%s'.";
 $locale["Couldn't connect to %s"] = "Impossible d'établir une connexion à la base de données : %s";
-$locale["Couldn't rename page '%s' to '%s'."] = "Impossible de renommer la page '%s' en '%s'.";
-$locale["Couldn't start commandline '%s'"] = "Impossible de lancer la ligne de commande '%s'";
+$locale["Couldn't rename page '%s' to '%s'."] = "Impossible de renommer la page « %s » en « %s ».";
+$locale["Couldn't start commandline '%s'"] = "Impossible de lancer la ligne de commande « %s »";
 $locale["Count"] = "Nombre";
 $locale["Create Page"] = "Créer la page";
 $locale["Create a Wiki page by the provided name."] = "Créer une page wiki avec le nom demandé.";
@@ -313,6 +313,7 @@
 $locale["CreatePage"] = "CréerUnePage";
 $locale["CreateToc"] = "CréerUneTdm";
 $locale["Created by CreatePage"] = "Créée par CréerUnePage";
+$locale["Created by: %s"] = "Créée par : %s";
 $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";
@@ -340,8 +341,8 @@
 $locale["Describe %s here."] = "Décrire %s ici.";
 $locale["Description"] = "Description";
 $locale["Dialog"] = "Dialogue";
-$locale["Didn't purge page '%s'. Access denied."] = "Page '%s' non purgée. Accès refusé.";
-$locale["Didn't remove page '%s'. Access denied."] = "Page '%s' non supprimée. Accès refusé.";
+$locale["Didn't purge page '%s'. Access denied."] = "Page « %s » non purgée. Accès refusé.";
+$locale["Didn't remove page '%s'. Access denied."] = "Page « %s » non supprimée. Accès refusé.";
 $locale["Diff previous Author"] = "Différences avec l'auteur précédent";
 $locale["Diff previous Revision"] = "Différences avec la version précédente";
 $locale["Diff: %s"] = "Diff : %s";
@@ -359,7 +360,7 @@
 $locale["Do not send minor modifications"] = "Ne pas envoyer les modifications mineures";
 $locale["Do not send my own modifications"] = "Ne pas envoyer mes propres modifications";
 $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 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["Don't cache this page."] = "Ne pas mettre en cache cette page.";
@@ -380,10 +381,10 @@
 $locale["Dynamically include the content from another wiki page."] = "Inclure dynamiquement le texte d'une autre page wiki.";
 $locale["E-mail"] = "Adresse électronique";
 $locale["E-mail Notification"] = "Courriel de notification";
-$locale["E-mail address '%s' is not properly formatted"] = "L'adresse électronique '%s' ne semble pas être bien formée.";
-$locale["E-mail address '%s' is properly formatted"] = "L'adresse électronique '%s' semble être bien formée.";
+$locale["E-mail address '%s' is not properly formatted"] = "L'adresse électronique « %s » ne semble pas être bien formée.";
+$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 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["Easy navigation buttons for %s"] = "Boutons de navigation rapide pour %s";
 $locale["Edit"] = "Modifier";
@@ -528,7 +529,7 @@
 $locale["I'm sorry.  Version %d of %s is not in the database."] = "Je suis désolé. La version %d de %s n'est pas dans la base de données.";
 $locale["Ignore wiki formatting"] = "Ignorer la syntaxe wiki";
 $locale["Illegal access to page %s: no read access"] = "Accès en lecture interdit pour la page « %s ».";
-$locale["Illegal character '%s' in page name."] = "Caractère '%s' interdit dans le nom de la page.";
+$locale["Illegal character '%s' in page name."] = "Caractère « %s » interdit dans le nom de la page.";
 $locale["Illegal characters in external URL."] = "Caractère interdit dans une URL externe.";
 $locale["Illegal chars %s removed"] = "Caractères interdits %s supprimés";
 $locale["Illegal inclusion of page %s: no read access."] = "insertion récursive de la page %s ignoré";
@@ -571,7 +572,7 @@
 $locale["Invalid image size"] = "Taille d'image invalide";
 $locale["Invalid password or userid."] = "Mot de passe ou utilisateur non valide :";
 $locale["Invalid password."] = "Mot de passe invalide.";
-$locale["Invalid username '%s' for LDAP Auth"] = "Utilisateur non valide '%s' dans l'annuaire LDAP";
+$locale["Invalid username '%s' for LDAP Auth"] = "Utilisateur non valide « %s » dans l'annuaire LDAP";
 $locale["Invalid username."] = "Identifiant d'utilisateur invalide.";
 $locale["Is External"] = "Est externe";
 $locale["Italic text"] = "Italique";
@@ -648,7 +649,7 @@
 $locale["Merge Edit"] = "Fusionner les modifications";
 $locale["Merge and Edit: %s"] = "Fusionner et modifier : %s";
 $locale["Message"] = "Message";
-$locale["Method '%s' not implemented in this GROUP_METHOD %s"] = "La méthode '%s' n'est pas implémentée dans ce GROUP_METHOD (%s)";
+$locale["Method '%s' not implemented in this GROUP_METHOD %s"] = "La méthode « %s » n'est pas implémentée dans ce GROUP_METHOD (%s)";
 $locale["Minor"] = "Mineur";
 $locale["Minor Edit"] = "Modification mineure";
 $locale["Miscellaneous utility functions for the Administrator."] = "Plusieurs fonctions pour l'administration d'un wiki.";
@@ -747,7 +748,7 @@
 $locale["Page"] = "Page";
 $locale["Page %s not found."] = "Page %s non trouvée.";
 $locale["Page '%s' already exists. Ignored."] = "La page %s existe déjà. Ignorée.";
-$locale["Page '%s' does not exist"] = "La page '%s' n'existe pas";
+$locale["Page '%s' does not exist"] = "La page « %s » n'existe pas";
 $locale["Page '%s' does not exist."] = "La page « %s » n'existe pas";
 $locale["Page Content: "] = "Contenu de la page : ";
 $locale["Page Execution took %s seconds"] = "L'exécution de la page a pris %s secondes";
@@ -758,6 +759,7 @@
 $locale["Page Type"] = "Type de page";
 $locale["Page Version"] = "Version de la page";
 $locale["Page change"] = "Modification de la page";
+$locale["Page creation"] = "Création de la page";
 $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";
@@ -798,7 +800,7 @@
 $locale["Permanently purge selected pages"] = "Purger définitivement les pages sélectionnées";
 $locale["Permanently remove all selected pages."] = "Supprimer toutes les pages sélectionnées en permanence.";
 $locale["Permission"] = "Permission";
-$locale["Personal Auth Settings for '%s'"] = "Préférences personnelles pour '%s'";
+$locale["Personal Auth Settings for '%s'"] = "Préférences personnelles pour « %s »";
 $locale["Personal language:"] = "Ma langue :";
 $locale["Personal theme:"] = "Thème personnel :";
 $locale["PgsrcTranslation"] = "TraductionPgsrc";
@@ -864,7 +866,7 @@
 $locale["Purge cancelled"] = "Purge de la page annulée";
 $locale["Purge this page"] = "Purger cette page";
 $locale["PurgeHtmlCache"] = "PurgerLeCache";
-$locale["Purged page '%s' successfully."] = "Page '%s' purgée avec succès";
+$locale["Purged page '%s' successfully."] = "Page « %s » purgée avec succès";
 $locale["Purging pages"] = "Purger des pages";
 $locale["Querying backend directly for '%s'"] = "Requête directe au backend pour « %s »";
 $locale["Quick Search"] = "Recherche rapide";
@@ -916,14 +918,15 @@
 $locale["Remove cancelled"] = "Suppression de la page annulée";
 $locale["Remove selected pages"] = "Supprimer les pages sélectionnées";
 $locale["Remove this page"] = "Supprimer cette page";
-$locale["Removed page '%s' successfully."] = "Page '%s' supprimée avec succès";
+$locale["Removed page '%s' successfully."] = "Page « %s » supprimée avec succès";
 $locale["Removing pages"] = "Supprimer les pages";
 $locale["Rename"] = "Renommer";
 $locale["Rename Page"] = "Renommer la page";
 $locale["Rename selected pages"] = "Renommer les pages sélectionnées";
 $locale["Rename to"] = "Renommer en";
 $locale["Renamed by: %s"] = "Renommée par : %s";
-$locale["Renamed page from '%s' to '%s'."] = "Page renommée de '%s' à '%s'.";
+$locale["Renamed page from '%s' to '%s'."] = "Page renommée de « %s » à « %s ».";
+$locale["Renaming created redirect page from '%s' to '%s'"] = "Le renommage a créé une redirection de « %s » à « %s »";
 $locale["Replace"] = "Remplacer";
 $locale["Replace with"] = "Remplacer par";
 $locale["Replaced '%s' with '%s' in page '%s'."] = "%s a bien été modifié par %s dans la page %s.";
@@ -1084,7 +1087,7 @@
 $locale["The upload logfile exists but is not writable."] = "Le journal des dépôts existe mais ne peut être modifié.";
 $locale["The wordwrap of the preview doesn't take nested markup or list indentation into consideration!"] = "Le retour chariot de la prévisualisation ne prend pas en compte les marques des listes indentées !";
 $locale["Theme"] = "Thème";
-$locale["There is already a file with name %s uploaded."] = "Un fichier portant le nom '%s' existe déjà.";
+$locale["There is already a file with name %s uploaded."] = "Un fichier portant le nom « %s » existe déjà.";
 $locale["There is no image creation data available to id '%s'. Please reload referring page."] = "Aucune image ne correspond à l'id %s. Veuillez recharger cette page.";
 $locale["These page titles match fuzzy with '%s'"] = "Ces titres de pages correspondent de manière floue à « %s »";
 $locale["These pages share an initial or final title word with '%s'"] = "Ces pages partagent un mot initial ou final dans leur titre avec %s";
@@ -1104,8 +1107,8 @@
 $locale["Title 2"] = "Titre 2";
 $locale["Title 3"] = "Titre 3";
 $locale["Title Search"] = "Rechercher dans les titres";
-$locale["Title search results for '%s'"] = "Résultat de recherche sur les titres de pages pour '%s'";
-$locale["Title search results for '%s' (%d total)"] = "Résultat de recherche sur les titres de pages pour '%s' (%d au total)";
+$locale["Title search results for '%s'"] = "Résultat de recherche sur les titres de pages pour « %s »";
+$locale["Title search results for '%s' (%d total)"] = "Résultat de recherche sur les titres de pages pour « %s » (%d au total)";
 $locale["Title:"] = "Titre :";
 $locale["TitleSearch"] = "RechercheParTitre";
 $locale["To add check 'Add' near the dropdown list."] = "Pour ajouter cocher 'Add' près de la liste déroulante.";
@@ -1137,7 +1140,7 @@
 $locale["Unable to connect to IMAP server "] = "Impossible de se connecter au serveur IMAP ";
 $locale["Unable to connect to LDAP server %s"] = "Impossible de se connecter à l'annuaire LDAP de l'hôte %s";
 $locale["Unable to find src='%s'"] = "Impossible de trouver src=%s";
-$locale["Unable to open directory '%s' for reading"] = "Impossible d'ouvrir le répertoire '%s' en lecture";
+$locale["Unable to open directory '%s' for reading"] = "Impossible d'ouvrir le répertoire « %s » en lecture";
 $locale["Unable to read src='%s'"] = "Impossible de lire src=%s";
 $locale["Undefined method %s for special group %s"] = "Méthode non définie %s pour le groupe %s";
 $locale["Undo"] = "Annuler l'action";
@@ -1239,7 +1242,7 @@
 $locale["XML-RPC access"] = "Accès XML-RPC";
 $locale["Yes"] = "Oui";
 $locale["You are about to purge '%s'!"] = "Vous êtes sur le point de purger '%s' !";
-$locale["You are about to remove '%s'!"] = "Vous êtes sur le point de supprimer '%s' !";
+$locale["You are about to remove '%s'!"] = "Vous êtes sur le point de supprimer « %s » !";
 $locale["You are signed but not authenticated as %s. "] = "Vous êtes enregistré mais pas connecté en tant que %s. ";
 $locale["You are signed in as %s"] = "Vous êtes connecté comme %s";
 $locale["You are viewing an old revision of this page."] = "Vous lisez une ancienne version de cette page.";
@@ -1259,7 +1262,7 @@
 $locale["Your E-Mail"] = "Votre adresse électronique";
 $locale["Your PHP version is too old. You must have at least PHP 4.3.9"] = "Votre version de PHP est trop ancienne. Il faut avoir au moins PHP 4.3.9";
 $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.";
+$locale["Your WikiDB DB backend '%s' cannot be used for DbSession."] = "Votre choix « %s » de WikiDB DB ne peut pas être utilisé pour DbSession.";
 $locale["Your access permissions are only for a BogoUser."] = "Vos permissions d'acces sont celles d'un utilisateur Bogo.";
 $locale["Your are probably trying to edit/create an invalid version of this page."] = "Vous essayez probablement de modifier ou de créer une version invalide de cette page.";
 $locale["Your browser should have redirected you to %s."] = "Votre navigateur aurait du vous redirigé vers %s.";
@@ -1283,7 +1286,7 @@
 $locale["access this wiki via XML-RPC"] = "accéder à ce wiki via XML-RPC";
 $locale["add "] = "ajouter";
 $locale["always skip the HomePage."] = "toujours ignorer la page d'accueil.";
-$locale["argument '%s' not declared by plugin"] = "argument '%s' non déclaré par le plugin";
+$locale["argument '%s' not declared by plugin"] = "argument « %s » non déclaré par le plugin";
 $locale["authenticated"] = "authentifié";
 $locale["blog"] = "blog";
 $locale["by"] = "par";
@@ -1295,7 +1298,7 @@
 $locale["compare revisions"] = "comparer les versions";
 $locale["content is identical to current version %d - no new revision created"] = "le contenu est identique à la version en cours %d - pas de nouvelle version";
 $locale["couldn't move %s to %s"] = "impossible de déplacer %s en %s";
-$locale["couldn't open file '%s' for writing"] = "Impossible d'ouvrir le fichier '%s' en écriture";
+$locale["couldn't open file '%s' for writing"] = "Impossible d'ouvrir le fichier « %s » en écriture";
 $locale["create this page"] = "créer cette page";
 $locale["current version"] = "version actuelle";
 $locale["database"] = "base de données";
@@ -1371,11 +1374,11 @@
 $locale["sortby=mtime not supported with MostPopular"] = "sortby=mtime non supporté avec MostPopular";
 $locale["stddev: %2.3f"] = "écart-type : %2.3f";
 $locale["the file '%s'"] = "le fichier « %s »";
-$locale["the session.save_path directory '%s'"] = "le répertoire 'session.save_path' '%s'";
+$locale["the session.save_path directory '%s'"] = "le répertoire 'session.save_path' « %s »";
 $locale["to"] = "à";
 $locale["today"] = "aujourd'hui";
 $locale["total hits: %d"] = "%d visites totales";
-$locale["trailing cruft in plugin args: '%s'"] = "cochonneries terminant les arguments du plugin : '%s'";
+$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["unlock this page"] = "déverrouiller cette page";

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-01-27 18:03:50 UTC (rev 8237)
+++ trunk/locale/po/de.po	2012-01-27 18:04:41 UTC (rev 8238)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-23 16:55+0100\n"
+"POT-Creation-Date: 2012-01-27 19:03+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."
@@ -934,7 +934,7 @@
 msgid "from %s"
 msgstr "von %s"
 
-#: ../lib/loadsave.php:979 ../lib/MailNotify.php:293
+#: ../lib/loadsave.php:979 ../lib/MailNotify.php:304
 #: ../lib/plugin/RecentChanges.php:137
 msgid "New page"
 msgstr "Neue Seite"
@@ -1109,51 +1109,61 @@
 msgid "Uploading %s"
 msgstr "%s wird hochgeladen"
 
-#: ../lib/MailNotify.php:197
+#: ../lib/MailNotify.php:202
 #, php-format
 msgid "PageChange Notification of %s"
 msgstr "SeitenÄnderung Benachrichtigung von %s"
 
-#: ../lib/MailNotify.php:236
+#: ../lib/MailNotify.php:243
 #, php-format
 msgid "sent to %s"
 msgstr "an %s gesendet"
 
-#: ../lib/MailNotify.php:242
+#: ../lib/MailNotify.php:249
 #, php-format
 msgid "Error: Couldn't send %s to %s"
 msgstr "Fehler: Konnte nicht %s an %s senden"
 
-#: ../lib/MailNotify.php:264
+#: ../lib/MailNotify.php:277
 msgid "Page change"
 msgstr "Seiten Änderung"
 
-#: ../lib/MailNotify.php:298
+#: ../lib/MailNotify.php:300
+#, fuzzy
+msgid "Page creation"
+msgstr "Seiten Version"
+
+#: ../lib/MailNotify.php:307
+#, fuzzy, php-format
+msgid "Created by: %s"
+msgstr "Erzeugen: %s"
+
+#: ../lib/MailNotify.php:309
 #, php-format
 msgid "Summary: %s"
 msgstr "Zusammenfassung: %s"
 
-#: ../lib/MailNotify.php:308
+#: ../lib/MailNotify.php:319
 #, fuzzy, php-format
 msgid "Renamed by: %s"
 msgstr "umbenannt von %s"
 
-#: ../lib/MailNotify.php:309
+#: ../lib/MailNotify.php:320
 #, php-format
 msgid "Page rename %s to %s"
 msgstr "Seite »%s« nach umbenennen »%s«"
 
-#: ../lib/MailNotify.php:345
+#: ../lib/MailNotify.php:356
 #, php-format
 msgid "User %s removed page %s"
 msgstr "Seite gelöscht %s von Benutzer %s"
 
-#: ../lib/MailNotify.php:381 ../lib/plugin/WikiAdminUtils.php:113
+#: ../lib/MailNotify.php:392 ../lib/plugin/WikiAdminUtils.php:113
 #: ../lib/WikiUserNew.php:1782
 msgid "E-mail address confirmation"
 msgstr "E-Mail Bestätigung"
 
-#: ../lib/MailNotify.php:384
+#: ../lib/MailNotify.php:395
 #, php-format
 msgid ""
 "Someone, probably you from IP address %s, has registered an\n"

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2012-01-27 18:03:50 UTC (rev 8237)
+++ trunk/locale/po/es.po	2012-01-27 18:04:41 UTC (rev 8238)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-23 16:55+0100\n"
+"POT-Creation-Date: 2012-01-27 19:03+0100\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -920,7 +920,7 @@
 msgid "from %s"
 msgstr "de %s"
 
-#: ../lib/loadsave.php:979 ../lib/MailNotify.php:293
+#: ../lib/loadsave.php:979 ../lib/MailNotify.php:304
 #: ../lib/plugin/RecentChanges.php:137
 msgid "New page"
 msgstr "Página nueva"
@@ -1090,51 +1090,61 @@
 msgid "Uploading %s"
 msgstr "%s uploading"
 
-#: ../lib/MailNotify.php:197
+#: ../lib/MailNotify.php:202
 #, php-format
 msgid "PageChange Notification of %s"
 msgstr "Pagine la notificación del cambio de %s"
 
-#: ../lib/MailNotify.php:236
+#: ../lib/MailNotify.php:243
 #, php-format
 msgid "sent to %s"
 msgstr ""
 
-#: ../lib/MailNotify.php:242
+#: ../lib/MailNotify.php:249
 #, php-format
 msgid "Error: Couldn't send %s to %s"
 msgstr ""
 
-#: ../lib/MailNotify.php:264
+#: ../lib/MailNotify.php:277
 msgid "Page change"
 msgstr "Cambio de la página"
 
-#: ../lib/MailNotify.php:298
+#: ../lib/MailNotify.php:300
+#, fuzzy
+msgid "Page creation"
+msgstr "Versión de la página"
+
+#: ../lib/MailNotify.php:307
+#, fuzzy, php-format
+msgid "Created by: %s"
+msgstr "Cree: %s"
+
+#: ../lib/MailNotify.php:309
 #, php-format
 msgid "Summary: %s"
 msgstr ""
 
-#: ../lib/MailNotify.php:308
+#: ../lib/MailNotify.php:319
 #, fuzzy, php-format
 msgid "Renamed by: %s"
 msgstr "retitulado de %s"
 
-#: ../lib/MailNotify.php:309
+#: ../lib/MailNotify.php:320
 #, php-format
 msgid "Page rename %s to %s"
 msgstr "La página retitula %s a %s"
 
-#: ../lib/MailNotify.php:345
+#: ../lib/MailNotify.php:356
 #, php-format
 msgid "User %s removed page %s"
 msgstr "El usuarios %s eliminado página %s"
 
-#: ../lib/MailNotify.php:381 ../lib/plugin/WikiAdminUtils.php:113
+#: ../lib/MailNotify.php:392 ../lib/plugin/WikiAdminUtils.php:113
 #: ../lib/WikiUserNew.php:1782
 msgid "E-mail address confirmation"
 msgstr "Verificación Del Email"
 
-#: ../lib/MailNotify.php:384
+#: ../lib/MailNotify.php:395
 #, php-format
 msgid ""
 "Someone, probably you from IP address %s, has registered an\n"

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2012-01-27 18:03:50 UTC (rev 8237)
+++ trunk/locale/po/it.po	2012-01-27 18:04:41 UTC (rev 8238)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-23 16:55+0100\n"
+"POT-Creation-Date: 2012-01-27 19:03+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"
@@ -911,7 +911,7 @@
 msgid "from %s"
 msgstr "dalla %s"
 
-#: ../lib/loadsave.php:979 ../lib/MailNotify.php:293
+#: ../lib/loadsave.php:979 ../lib/MailNotify.php:304
 #: ../lib/plugin/RecentChanges.php:137
 msgid "New page"
 msgstr "Nuova pagina"
@@ -1076,51 +1076,61 @@
 msgid "Uploading %s"
 msgstr ""
 
-#: ../lib/MailNotify.php:197
+#: ../lib/MailNotify.php:202
 #, php-format
 msgid "PageChange Notification of %s"
 msgstr "Pagini la notifica del cambiamento di %s"
 
-#: ../lib/MailNotify.php:236
+#: ../lib/MailNotify.php:243
 #, php-format
 msgid "sent to %s"
 msgstr ""
 
-#: ../lib/MailNotify.php:242
+#: ../lib/MailNotify.php:249
 #, php-format
 msgid "Error: Couldn't send %s to %s"
 msgstr ""
 
-#: ../lib/MailNotify.php:264
+#: ../lib/MailNotify.php:277
 msgid "Page change"
 msgstr "Cambiamento della pagina"
 
-#: ../lib/MailNotify.php:298
+#: ../lib/MailNotify.php:300
+#, fuzzy
+msgid "Page creation"
+msgstr "Versione della Pagina"
+
+#: ../lib/MailNotify.php:307
+#, fuzzy, php-format
+msgid "Created by: %s"
+msgstr "Salvata: %s"
+
+#: ../lib/MailNotify.php:309
 #, php-format
 msgid "Summary: %s"
 msgstr "Commenti: %s"
 
-#: ../lib/MailNotify.php:308
+#: ../lib/MailNotify.php:319
 #, fuzzy, php-format
 msgid "Renamed by: %s"
 msgstr "Modifica: %s"
 
-#: ../lib/MailNotify.php:309
+#: ../lib/MailNotify.php:320
 #, php-format
 msgid "Page rename %s to %s"
 msgstr "La pagina cambia titolo %s a %s"
 
-#: ../lib/MailNotify.php:345
+#: ../lib/MailNotify.php:356
 #, php-format
 msgid "User %s removed page %s"
 msgstr "Utente %s pagina %s rimossa"
 
-#: ../lib/MailNotify.php:381 ../lib/plugin/WikiAdminUtils.php:113
+#: ../lib/MailNotify.php:392 ../lib/plugin/WikiAdminUtils.php:113
 #: ../lib/WikiUserNew.php:1782
 msgid "E-mail address confirmation"
 msgstr ""
 
-#: ../lib/MailNotify.php:384
+#: ../lib/MailNotify.php:395
 #, php-format
 msgid ""
 "Someone, probably you from IP address %s, has registered an\n"

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2012-01-27 18:03:50 UTC (rev 8237)
+++ trunk/locale/po/ja.po	2012-01-27 18:04:41 UTC (rev 8238)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-23 16:55+0100\n"
+"POT-Creation-Date: 2012-01-27 19:03+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"
@@ -898,7 +898,7 @@
 msgid "from %s"
 msgstr "%s から"
 
-#: ../lib/loadsave.php:979 ../lib/MailNotify.php:293
+#: ../lib/loadsave.php:979 ../lib/MailNotify.php:304
 #: ../lib/plugin/RecentChanges.php:137
 #, fuzzy
 msgid "New page"
@@ -1065,52 +1065,62 @@
 msgid "Uploading %s"
 msgstr "%s をアップロード中です。"
 
-#: ../lib/MailNotify.php:197
+#: ../lib/MailNotify.php:202
 #, fuzzy, php-format
 msgid "PageChange Notification of %s"
 msgstr "メール通知"
 
-#: ../lib/MailNotify.php:236
+#: ../lib/MailNotify.php:243
 #, fuzzy, php-format
 msgid "sent to %s"
 msgstr "%s に戻る"
 
-#: ../lib/MailNotify.php:242
+#: ../lib/MailNotify.php:249
 #, fuzzy, php-format
 msgid "Error: Couldn't send %s to %s"
 msgstr "メール通知"
 
-#: ../lib/MailNotify.php:264
+#: ../lib/MailNotify.php:277
 #, fuzzy
 msgid "Page change"
 msgstr "変更しませんでした。"
 
-#: ../lib/MailNotify.php:298
+#: ../lib/MailNotify.php:300
+#, fuzzy
+msgid "Page creation"
+msgstr "ページバージョン"
+
+#: ../lib/MailNotify.php:307
 #, fuzzy, php-format
+msgid "Created by: %s"
+msgstr "作成: %s"
+
+#: ../lib/MailNotify.php:309
+#, fuzzy, php-format
 msgid "Summary: %s"
 msgstr "要約"
 
-#: ../lib/MailNotify.php:308
+#: ../lib/MailNotify.php:319
 #, fuzzy, php-format
 msgid "Renamed by: %s"
 msgstr "%s から読込まれました。"
 
-#: ../lib/MailNotify.php:309
+#: ../lib/MailNotify.php:320
 #, fuzzy, php-format
 msgid "Page rename %s to %s"
 msgstr "%s から読込まれました。"
 
-#: ../lib/MailNotify.php:345
+#: ../lib/MailNotify.php:356
 #, fuzzy, php-format
 msgid "User %s removed page %s"
 msgstr "ページをロックしました。"
 
-#: ../lib/MailNotify.php:381 ../lib/plugin/WikiAdminUtils.php:113
+#: ../lib/MailNotify.php:392 ../lib/plugin/WikiAdminUtils.php:113
 #: ../lib/WikiUserNew.php:1782
 msgid "E-mail address confirmation"
 msgstr ""
 
-#: ../lib/MailNotify.php:384
+#: ../lib/MailNotify.php:395
 #, php-format
 msgid ""
 "Someone, probably you from IP address %s, has registered an\n"

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2012-01-27 18:03:50 UTC (rev 8237)
+++ trunk/locale/po/nl.po	2012-01-27 18:04:41 UTC (rev 8238)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-23 16:55+0100\n"
+"POT-Creation-Date: 2012-01-27 19:03+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"
@@ -903,7 +903,7 @@
 msgid "from %s"
 msgstr "van %s"
 
-#: ../lib/loadsave.php:979 ../lib/MailNotify.php:293
+#: ../lib/loadsave.php:979 ../lib/MailNotify.php:304
 #: ../lib/plugin/RecentChanges.php:137
 msgid "New page"
 msgstr "Nieuw pagina"
@@ -1068,51 +1068,61 @@
 msgid "Uploading %s"
 msgstr ""
 
-#: ../lib/MailNotify.php:197
+#: ../lib/MailNotify.php:202
 #, php-format
 msgid "PageChange Notification of %s"
 msgstr ""
 
-#: ../lib/MailNotify.php:236
+#: ../lib/MailNotify.php:243
 #, php-format
 msgid "sent to %s"
 msgstr ""
 
-#: ../lib/MailNotify.php:242
+#: ../lib/MailNotify.php:249
 #, php-format
 msgid "Error: Couldn't send %s to %s"
 msgstr ""
 
-#: ../lib/MailNotify.php:264
+#: ../lib/MailNotify.php:277
 msgid "Page change"
 msgstr ""
 
-#: ../lib/MailNotify.php:298
+#: ../lib/MailNotify.php:300
+#, fuzzy
+msgid "Page creation"
+msgstr "Pagina Versie"
+
+#: ../lib/MailNotify.php:307
+#, fuzzy, php-format
+msgid "Created by: %s"
+msgstr "Verander von: %s"
+
+#: ../lib/MailNotify.php:309
 #, php-format
 msgid "Summary: %s"
 msgstr ""
 
-#: ../lib/MailNotify.php:308
+#: ../lib/MailNotify.php:319
 #, fuzzy, php-format
 msgid "Renamed by: %s"
 msgstr "Verander von: %s"
 
-#: ../lib/MailNotify.php:309
+#: ../lib/MailNotify.php:320
 #, php-format
 msgid "Page rename %s to %s"
 msgstr ""
 
-#: ../lib/MailNotify.php:345
+#: ../lib/MailNotify.php:356
 #, php-format
 msgid "User %s removed page %s"
 msgstr ""
 
-#: ../lib/MailNotify.php:381 ../lib/plugin/WikiAdminUtils.php:113
+#: ../lib/MailNotify.php:392 ../lib/plugin/WikiAdminUtils.php:113
 #: ../lib/WikiUserNew.php:1782
 msgid "E-mail address confirmation"
 msgstr ""
 
-#: ../lib/MailNotify.php:384
+#: ../lib/MailNotify.php:395
 #, php-format
 msgid ""
 "Someone, probably you from IP address %s, has registered an\n"

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2012-01-27 18:03:50 UTC (rev 8237)
+++ trunk/locale/po/phpwiki.pot	2012-01-27 18:04:41 UTC (rev 8238)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-23 16:55+0100\n"
+"POT-Creation-Date: 2012-01-27 19:03+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"
@@ -897,7 +897,7 @@
 msgid "from %s"
 msgstr ""
 
-#: ../lib/loadsave.php:979 ../lib/MailNotify.php:293
+#: ../lib/loadsave.php:979 ../lib/MailNotify.php:304
 #: ../lib/plugin/RecentChanges.php:137
 msgid "New page"
 msgstr ""
@@ -1062,51 +1062,60 @@
 msgid "Uploading %s"
 msgstr ""
 
-#: ../lib/MailNotify.php:197
+#: ../lib/MailNotify.php:202
 #, php-format
 msgid "PageChange Notification of %s"
 msgstr ""
 
-#: ../lib/MailNotify.php:236
+#: ../lib/MailNotify.php:243
 #, php-format
 msgid "sent to %s"
 msgstr ""
 
-#: ../lib/MailNotify.php:242
+#: ../lib/MailNotify.php:249
 #, php-format
 msgid "Error: Couldn't send %s to %s"
 msgstr ""
 
-#: ../lib/MailNotify.php:264
+#: ../lib/MailNotify.php:277
 msgid "Page change"
 msgstr ""
 
-#: ../lib/MailNotify.php:298
+#: ../lib/MailNotify.php:300
+msgid "Page creation"
+msgstr ""
+
+#: ../lib/MailNotify.php:307
 #, php-format
+msgid "Created by: %s"
+msgstr ""
+
+#: ../lib/MailNotify.php:309
+#, php-format
 msgid "Summary: %s"
 msgstr ""
 
-#: ../lib/MailNotify.php:308
+#: ../lib/MailNotify.php:319
 #, php-format
 msgid "Renamed by: %s"
 msgstr ""
 
-#: ../lib/MailNotify.php:309
+#: ../lib/MailNotify.php:320
 #, php-format
 msgid "Page rename %s to %s"
 msgstr ""
 
-#: ../lib/MailNotify.php:345
+#: ../lib/MailNotify.php:356
 #, php-format
 msgid "User %s removed page %s"
 msgstr ""
 
-#: ../lib/MailNotify.php:381 ../lib/plugin/WikiAdminUtils.php:113
+#: ../lib/MailNotify.php:392 ../lib/plugin/WikiAdminUtils.php:113
 #: ../lib/WikiUserNew.php:1782
 msgid "E-mail address confirmation"
 msgstr ""
 
-#: ../lib/MailNotify.php:384
+#: ../lib/MailNotify.php:395
 #, php-format
 msgid ""
 "Someone, probably you from IP address %s, has registered an\n"

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2012-01-27 18:03:50 UTC (rev 8237)
+++ trunk/locale/po/sv.po	2012-01-27 18:04:41 UTC (rev 8238)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-23 16:55+0100\n"
+"POT-Creation-Date: 2012-01-27 19:03+0100\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -898,7 +898,7 @@
 msgid "from %s"
 msgstr "från %s"
 
-#: ../lib/loadsave.php:979 ../lib/MailNotify.php:293
+#: ../lib/loadsave.php:979 ../lib/MailNotify.php:304
 #: ../lib/plugin/RecentChanges.php:137
 msgid "New page"
 msgstr ""
@@ -1063,51 +1063,60 @@
 msgid "Uploading %s"
 msgstr ""
 
-#: ../lib/MailNotify.php:197
+#: ../lib/MailNotify.php:202
 #, php-format
 msgid "PageChange Notification of %s"
 msgstr ""
 
-#: ../lib/MailNotify.php:236
+#: ../lib/MailNotify.php:243
 #, php-format
 msgid "sent to %s"
 msgstr ""
 
-#: ../lib/MailNotify.php:242
+#: ../lib/MailNotify.php:249
 #, php-format
 msgid "Error: Couldn't send %s to %s"
 msgstr ""
 
-#: ../lib/MailNotify.php:264
+#: ../lib/MailNotify.php:277
 msgid "Page change"
 msgstr ""
 
-#: ../lib/MailNotify.php:298
+#: ../lib/MailNotify.php:300
+msgid "Page creation"
+msgstr ""
+
+#: ../lib/MailNotify.php:307
+#, fuzzy, php-format
+msgid "Created by: %s"
+msgstr "Kopia är [%s]"
+
+#: ../lib/MailNotify.php:309
 #, php-format
 msgid "Summary: %s"
 msgstr "Kommentar: %s"
 
-#: ../lib/MailNotify.php:308
+#: ../lib/MailNotify.php:319
 #, fuzzy, php-format
 msgid "Renamed by: %s"
 msgstr "Kopia är [%s]"
 
-#: ../lib/MailNotify.php:309
+#: ../lib/MailNotify.php:320
 #, php-format
 msgid "Page rename %s to %s"
 msgstr ""
 
-#: ../lib/MailNotify.php:345
+#: ../lib/MailNotify.php:356
 #, php-format
 msgid "User %s removed page %s"
 msgstr ""
 
-#: ../lib/MailNotify.php:381 ../lib/plugin/WikiAdminUtils.php:113
+#: ../lib/MailNotify.php:392 ../lib/plugin/WikiAdminUtils.php:113
 #: ../lib/WikiUserNew.php:1782
 msgid "E-mail address confirmation"
 msgstr ""
 
-#: ../lib/MailNotify.php:384
+#: ../lib/MailNotify.php:395
 #, php-format
 msgid ""
 "Someone, probably you from IP address %s, has registered an\n"

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2012-01-27 18:03:50 UTC (rev 8237)
+++ trunk/locale/po/zh.po	2012-01-27 18:04:41 UTC (rev 8238)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-23 16:55+0100\n"
+"POT-Creation-Date: 2012-01-27 19:03+0100\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -940,7 +940,7 @@
 msgid "from %s"
 msgstr "從 %s"
 
-#: ../lib/loadsave.php:979 ../lib/MailNotify.php:293
+#: ../lib/loadsave.php:979 ../lib/MailNotify.php:304
 #: ../lib/plugin/RecentChanges.php:137
 #, fuzzy
 msgid "New page"
@@ -1109,53 +1109,63 @@
 msgid "Uploading %s"
 msgstr "上傳中 %s"
 
-#: ../lib/MailNotify.php:197
+#: ../lib/MailNotify.php:202
 #, fuzzy, php-format
 msgid "PageChange Notification of %s"
 msgstr "PageChange 通知 %s"
 
-#: ../lib/MailNotify.php:236
+#: ../lib/MailNotify.php:243
 #, fuzzy, php-format
 msgid "sent to %s"
 msgstr "回到 %s"
 
-#: ../lib/MailNotify.php:242
+#: ../lib/MailNotify.php:249
 #, fuzzy, php-format
 msgid "Error: Couldn't send %s to %s"
 msgstr "無法為頁面 '%s' 變更權限為 '%s'."
 
-#: ../lib/MailNotify.php:264
+#: ../lib/MailNotify.php:277
 #, fuzzy
 msgid "Page change"
 msgstr "沒有頁面被變更."
 
-#: ../lib/MailNotify.php:298
+#: ../lib/MailNotify.php:300
+#, fuzzy
+msgid "Page creation"
+msgstr "頁面版本"
+
+#: ../lib/MailNotify.php:307
 #, fuzzy, php-format
+msgid "Created by: %s"
+msgstr "建立: %s"
+
+#: ../lib/MailNotify.php:309
+#, fuzzy, php-format
 msgid "Summary: %s"
 msgstr "摘要:"
 
-#: ../lib/MailNotify.php:308
+#: ../lib/MailNotify.php:319
 #, fuzzy, php-format
 msgid "Renamed by: %s"
 msgstr "從 %s 更名"
 
-#: ../lib/MailNotify.php:309
+#: ../lib/MailNotify.php:320
 #, fuzzy, php-format
 msgid "Page rename %s to %s"
 msgstr "頁面名稱以 '%s' 開頭的"
 
-#: ../lib/MailNotify.php:345
+#: ../lib/MailNotify.php:356
 #, fuzzy, php-format
 msgid "User %s removed page %s"
 msgstr "頁面已被鎖定"
 
-#: ../lib/MailNotify.php:381 ../lib/plugin/WikiAdminUtils.php:113
+#: ../lib/MailNotify.php:392 ../lib/plugin/WikiAdminUtils.php:113
 #: ../lib/WikiUserNew.php:1782
 #, fuzzy
 msgid "E-mail address confirmation"
 msgstr "Email 驗證."
 
-#: ../lib/MailNotify.php:384
+#: ../lib/MailNotify.php:395
 #, php-format
 msgid ""
 "Someone, probably you from IP address %s, has registered an\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:[8237] trunk/locale/po/fr.po

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

Revision: 8237
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8237&view=rev
Author:   vargenau
Date:     2012-01-27 18:03:50 +0000 (Fri, 27 Jan 2012)
Log Message:
-----------
Update French translation

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

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2012-01-27 17:45:54 UTC (rev 8236)
+++ trunk/locale/po/fr.po	2012-01-27 18:03:50 UTC (rev 8237)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-23 16:55+0100\n"
+"POT-Creation-Date: 2012-01-27 19:03+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."
@@ -63,7 +63,8 @@
 #: ../lib/DbSession.php:41
 #, php-format
 msgid "Your WikiDB DB backend '%s' cannot be used for DbSession."
-msgstr "Votre choix '%s' de WikiDB DB ne peut pas être utilisé pour DbSession."
+msgstr ""
+"Votre choix « %s » de WikiDB DB ne peut pas être utilisé pour DbSession."
 
 #: ../lib/DbSession.php:42
 #, php-format
@@ -738,7 +739,7 @@
 #: ../lib/InlineParser.php:399 ../lib/main.php:774
 #, php-format
 msgid "Illegal character '%s' in page name."
-msgstr "Caractère '%s' interdit dans le nom de la page."
+msgstr "Caractère « %s » interdit dans le nom de la page."
 
 #: ../lib/InlineParser.php:923
 #, php-format
@@ -869,7 +870,7 @@
 #: ../lib/plugin/text2png.php:222
 #, php-format
 msgid "couldn't open file '%s' for writing"
-msgstr "Impossible d'ouvrir le fichier '%s' en écriture"
+msgstr "Impossible d'ouvrir le fichier « %s » en écriture"
 
 #: ../lib/loadsave.php:391 ../lib/loadsave.php:710
 #, php-format
@@ -903,7 +904,7 @@
 #: ../lib/loadsave.php:907 ../lib/WikiTheme.php:688
 #, php-format
 msgid "'%s': Bad page name"
-msgstr "'%s' : nom de page non valide"
+msgstr "« %s » : nom de page non valide"
 
 #: ../lib/loadsave.php:913 ../lib/loadsave.php:1555 ../lib/PageType.php:136
 #: ../lib/plugin/InterWikiSearch.php:52 ../lib/plugin/WantedPagesOld.php:73
@@ -919,7 +920,7 @@
 msgid "from %s"
 msgstr "du %s"
 
-#: ../lib/loadsave.php:979 ../lib/MailNotify.php:293
+#: ../lib/loadsave.php:979 ../lib/MailNotify.php:304
 #: ../lib/plugin/RecentChanges.php:137
 msgid "New page"
 msgstr "Nouvelle page"
@@ -1085,51 +1086,60 @@
 msgid "Uploading %s"
 msgstr "Téléchargement de %s"
 
-#: ../lib/MailNotify.php:197
+#: ../lib/MailNotify.php:202
 #, php-format
 msgid "PageChange Notification of %s"
 msgstr "Notification de changement de la page %s"
 
-#: ../lib/MailNotify.php:236
+#: ../lib/MailNotify.php:243
 #, php-format
 msgid "sent to %s"
 msgstr "envoyé à %s"
 
-#: ../lib/MailNotify.php:242
+#: ../lib/MailNotify.php:249
 #, php-format
 msgid "Error: Couldn't send %s to %s"
 msgstr "Erreur : impossible d'envoyer %s à %s"
 
-#: ../lib/MailNotify.php:264
+#: ../lib/MailNotify.php:277
 msgid "Page change"
 msgstr "Modification de la page"
 
-#: ../lib/MailNotify.php:298
+#: ../lib/MailNotify.php:300
+msgid "Page creation"
+msgstr "Création de la page"
+
+#: ../lib/MailNotify.php:307
 #, php-format
+msgid "Created by: %s"
+msgstr "Créée par : %s"
+
+#: ../lib/MailNotify.php:309
+#, php-format
 msgid "Summary: %s"
 msgstr "Résumé : %s"
 
-#: ../lib/MailNotify.php:308
+#: ../lib/MailNotify.php:319
 #, php-format
 msgid "Renamed by: %s"
 msgstr "Renommée par : %s"
 
-#: ../lib/MailNotify.php:309
+#: ../lib/MailNotify.php:320
 #, php-format
 msgid "Page rename %s to %s"
 msgstr "Page renommée de %s à %s"
 
-#: ../lib/MailNotify.php:345
+#: ../lib/MailNotify.php:356
 #, php-format
 msgid "User %s removed page %s"
 msgstr "L'utilisateur %s a supprimé la page %s"
 
-#: ../lib/MailNotify.php:381 ../lib/plugin/WikiAdminUtils.php:113
+#: ../lib/MailNotify.php:392 ../lib/plugin/WikiAdminUtils.php:113
 #: ../lib/WikiUserNew.php:1782
 msgid "E-mail address confirmation"
 msgstr "Vérification de l'adresse électronique"
 
-#: ../lib/MailNotify.php:384
+#: ../lib/MailNotify.php:395
 #, php-format
 msgid ""
 "Someone, probably you from IP address %s, has registered an\n"
@@ -1462,12 +1472,12 @@
 #: ../lib/main.php:1315
 #, php-format
 msgid "the session.save_path directory '%s'"
-msgstr "le répertoire 'session.save_path' '%s'"
+msgstr "le répertoire 'session.save_path' « %s »"
 
 #: ../lib/main.php:1319
 #, php-format
 msgid "Attempting to use the directory '%s' instead."
-msgstr "Tentative d'utilisation du répertoire '%s' à la place."
+msgstr "Tentative d'utilisation du répertoire « %s » à la place."
 
 #: ../lib/main.php:1326
 msgid "Users will not be able to sign in."
@@ -2025,7 +2035,7 @@
 #: ../lib/plugin/_AuthInfo.php:95
 #, php-format
 msgid "Personal Auth Settings for '%s'"
-msgstr "Préférences personnelles pour '%s'"
+msgstr "Préférences personnelles pour « %s »"
 
 #: ../lib/plugin/_AuthInfo.php:97
 msgid "No userid"
@@ -2299,7 +2309,7 @@
 #: ../lib/plugin/CreatePage.php:72 ../lib/plugin/CreatePage.php:74
 #, php-format
 msgid "Do you really want to create the page '%s'?"
-msgstr "Voulez-vous réellement créer la page '%s' ?"
+msgstr "Voulez-vous réellement créer la page « %s » ?"
 
 #: ../lib/plugin/CreatePage.php:79 ../lib/plugin/CreatePage.php:83
 msgid "The new page you want to create will be a subpage."
@@ -2707,7 +2717,7 @@
 #: ../lib/plugin/SpellCheck.php:139 ../lib/plugin/SyntaxHighlighter.php:144
 #, php-format
 msgid "Couldn't start commandline '%s'"
-msgstr "Impossible de lancer la ligne de commande '%s'"
+msgstr "Impossible de lancer la ligne de commande « %s »"
 
 #: ../lib/plugin/GraphViz.php:290 ../lib/plugin/Ploticus.php:244
 #, php-format
@@ -2769,7 +2779,7 @@
 #: ../lib/plugin/IncludePage.php:91
 #, php-format
 msgid "Page '%s' does not exist"
-msgstr "La page '%s' n'existe pas"
+msgstr "La page « %s » n'existe pas"
 
 #: ../lib/plugin/IncludePage.php:96 ../lib/plugin/UnfoldSubpages.php:107
 #: ../lib/plugin/UnfoldSubpages.php:138
@@ -3509,7 +3519,7 @@
 #: ../lib/plugin/PhpWeather.php:110
 #, php-format
 msgid "%s does not know about the language '%s', using 'en' instead."
-msgstr "%s ne connait pas le langage '%s', utilisation de 'en' a la place."
+msgstr "%s ne connait pas le langage « %s » utilisation de 'en' a la place."
 
 #: ../lib/plugin/PhpWeather.php:165
 msgid "Submit country"
@@ -4704,13 +4714,14 @@
 #: ../lib/plugin/TitleSearch.php:92
 #, php-format
 msgid "Title search results for '%s' (%d total)"
-msgstr "Résultat de recherche sur les titres de pages pour '%s' (%d au total)"
+msgstr ""
+"Résultat de recherche sur les titres de pages pour « %s » (%d au total)"
 
 # lib/fullsearch.php:48
 #: ../lib/plugin/TitleSearch.php:94
 #, php-format
 msgid "Title search results for '%s'"
-msgstr "Résultat de recherche sur les titres de pages pour '%s'"
+msgstr "Résultat de recherche sur les titres de pages pour « %s »"
 
 #: ../lib/plugin/Transclude.php:51
 msgid "Transclude"
@@ -4853,7 +4864,7 @@
 #: ../lib/plugin/UpLoad.php:212
 #, php-format
 msgid "ERROR uploading '%s'"
-msgstr "ERREUR en déposant '%s' : "
+msgstr "ERREUR en déposant « %s » : "
 
 #: ../lib/plugin/UpLoad.php:217
 #, php-format
@@ -4874,7 +4885,7 @@
 #: ../lib/plugin/UpLoad.php:235
 #, php-format
 msgid "There is already a file with name %s uploaded."
-msgstr "Un fichier portant le nom '%s' existe déjà."
+msgstr "Un fichier portant le nom « %s » existe déjà."
 
 #: ../lib/plugin/UpLoad.php:240
 msgid "Sorry but this file is too big."
@@ -5259,7 +5270,7 @@
 #: ../lib/plugin/WikiAdminSetExternal.php:66
 #, php-format
 msgid "Access denied to change page '%s'."
-msgstr "Accès refusé pour changer la page '%s'."
+msgstr "Accès refusé pour changer la page « %s »."
 
 #: ../lib/plugin/WikiAdminChown.php:77
 #, php-format
@@ -5367,12 +5378,12 @@
 #: ../lib/plugin/WikiAdminPurge.php:67 ../lib/purgepage.php:56
 #, php-format
 msgid "Purged page '%s' successfully."
-msgstr "Page '%s' purgée avec succès"
+msgstr "Page « %s » purgée avec succès"
 
 #: ../lib/plugin/WikiAdminPurge.php:70
 #, php-format
 msgid "Didn't purge page '%s'. Access denied."
-msgstr "Page '%s' non purgée. Accès refusé."
+msgstr "Page « %s » non purgée. Accès refusé."
 
 #: ../lib/plugin/WikiAdminPurge.php:77
 msgid "One page has been permanently purged:"
@@ -5418,12 +5429,12 @@
 #: ../lib/plugin/WikiAdminRemove.php:111 ../lib/removepage.php:56
 #, php-format
 msgid "Removed page '%s' successfully."
-msgstr "Page '%s' supprimée avec succès"
+msgstr "Page « %s » supprimée avec succès"
 
 #: ../lib/plugin/WikiAdminRemove.php:114
 #, php-format
 msgid "Didn't remove page '%s'. Access denied."
-msgstr "Page '%s' non supprimée. Accès refusé."
+msgstr "Page « %s » non supprimée. Accès refusé."
 
 #: ../lib/plugin/WikiAdminRemove.php:121
 msgid "One page has been removed:"
@@ -5490,22 +5501,22 @@
 #: ../lib/plugin/WikiAdminRename.php:83
 #, php-format
 msgid "Access denied to rename page '%s'."
-msgstr "Accès refusé pour renommer la page '%s'."
+msgstr "Accès refusé pour renommer la page « %s »."
 
 #: ../lib/plugin/WikiAdminRename.php:92 ../lib/plugin/WikiAdminRename.php:107
 #, php-format
 msgid "Renamed page from '%s' to '%s'."
-msgstr "Page renommée de '%s' à '%s'."
+msgstr "Page renommée de « %s » à « %s »."
 
 #: ../lib/plugin/WikiAdminRename.php:101
 #, php-format
 msgid "Renaming created redirect page from '%s' to '%s'"
-msgstr ""
+msgstr "Le renommage a créé une redirection de « %s » à « %s »"
 
 #: ../lib/plugin/WikiAdminRename.php:111 ../lib/plugin/WikiAdminRename.php:115
 #, php-format
 msgid "Couldn't rename page '%s' to '%s'."
-msgstr "Impossible de renommer la page '%s' en '%s'."
+msgstr "Impossible de renommer la page « %s » en « %s »."
 
 #: ../lib/plugin/WikiAdminRename.php:124
 msgid "One page has been renamed:"
@@ -5945,7 +5956,7 @@
 #: ../lib/plugin/WikiPoll.php:110
 #, php-format
 msgid "argument '%s' not declared by plugin"
-msgstr "argument '%s' non déclaré par le plugin"
+msgstr "argument « %s » non déclaré par le plugin"
 
 #: ../lib/plugin/WikiPoll.php:158 ../lib/plugin/WikiPoll.php:227
 msgid "Sorry! You must wait at least 20 minutes until you can vote again!"
@@ -6279,7 +6290,7 @@
 #: ../lib/removepage.php:28
 #, php-format
 msgid "You are about to remove '%s'!"
-msgstr "Vous êtes sur le point de supprimer '%s' !"
+msgstr "Vous êtes sur le point de supprimer « %s » !"
 
 #: ../lib/removepage.php:48
 #, php-format
@@ -6442,7 +6453,7 @@
 #: ../lib/stdlib.php:1623
 #, php-format
 msgid "Unable to open directory '%s' for reading"
-msgstr "Impossible d'ouvrir le répertoire '%s' en lecture"
+msgstr "Impossible d'ouvrir le répertoire « %s » en lecture"
 
 #: ../lib/stdlib.php:2139 ../lib/stdlib.php:2152
 #, php-format
@@ -6784,7 +6795,7 @@
 #: ../lib/WikiGroup.php:373 ../lib/WikiGroup.php:389
 #, php-format
 msgid "Method '%s' not implemented in this GROUP_METHOD %s"
-msgstr "La méthode '%s' n'est pas implémentée dans ce GROUP_METHOD (%s)"
+msgstr "La méthode « %s » n'est pas implémentée dans ce GROUP_METHOD (%s)"
 
 #: ../lib/WikiGroup.php:217
 #, php-format
@@ -6876,7 +6887,7 @@
 #: ../lib/WikiPlugin.php:229
 #, php-format
 msgid "trailing cruft in plugin args: '%s'"
-msgstr "cochonneries terminant les arguments du plugin : '%s'"
+msgstr "cochonneries terminant les arguments du plugin : « %s »"
 
 #: ../lib/WikiPlugin.php:237
 #, php-format
@@ -7095,7 +7106,7 @@
 #: ../lib/WikiUser/LDAP.php:225
 #, php-format
 msgid "Invalid username '%s' for LDAP Auth"
-msgstr "Utilisateur non valide '%s' dans l'annuaire LDAP"
+msgstr "Utilisateur non valide « %s » dans l'annuaire LDAP"
 
 #: ../lib/WikiUserNew.php:437
 msgid ""
@@ -7168,12 +7179,12 @@
 #: ../lib/WikiUserNew.php:1843
 #, php-format
 msgid "E-mail address '%s' is not properly formatted"
-msgstr "L'adresse électronique '%s' ne semble pas être bien formée."
+msgstr "L'adresse électronique « %s » ne semble pas être bien formée."
 
 #: ../lib/WikiUserNew.php:1847
 #, php-format
 msgid "E-mail address '%s' is properly formatted"
-msgstr "L'adresse électronique '%s' semble être bien formée."
+msgstr "L'adresse électronique « %s » semble être bien formée."
 
 #: ../lib/WikiUser/PersonalPage.php:55 ../lib/WikiUser/PersonalPage.php:64
 #, php-format
@@ -7305,7 +7316,7 @@
 #: ../lib/ziplib.php:408
 #, php-format
 msgid "Can't open zip file '%s' for reading"
-msgstr "Impossible d'ouvrir le fichier zip '%s' en lecture"
+msgstr "Impossible d'ouvrir le fichier zip « %s » en lecture"
 
 #: ../lib/ziplib.php:418 ../lib/ziplib.php:422
 msgid "Unexpected EOF in zip file"

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8236] trunk/lib/MailNotify.php

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

Revision: 8236
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8236&view=rev
Author:   vargenau
Date:     2012-01-27 17:45:54 +0000 (Fri, 27 Jan 2012)
Log Message:
-----------
Improve messages

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

Modified: trunk/lib/MailNotify.php
===================================================================
--- trunk/lib/MailNotify.php	2012-01-27 17:31:31 UTC (rev 8235)
+++ trunk/lib/MailNotify.php	2012-01-27 17:45:54 UTC (rev 8236)
@@ -70,6 +70,11 @@
         }
     }
 
+    function fromEmail() {
+        global $request;
+        return $this->userEmail($request->_user->getId(), false);
+    }
+
     function userEmail($userid, $doverify = true) {
         global $request;
 
@@ -189,12 +194,14 @@
         // Encode $subject if needed
         $encoded_subject = $this->subject_encode($subject);
         $emails = $this->emails;
-        $from = $this->from;
         // Do not send if modification is from FusionForge admin
-        if (FUSIONFORGE and $from == ADMIN_USER) {
+        if (FUSIONFORGE and ($this->fromId() == ADMIN_USER)) {
             return;
         }
-        if (!$notice) $notice = _("PageChange Notification of %s");
+        if (!$notice) {
+            $notice = _("PageChange Notification of %s");
+        }
+        $from = $this->fromEmail();
         $headers = "From: $from\r\n" .
                    "Bcc: ".join(',', $emails)."\r\n" .
                    "MIME-Version: 1.0\r\n" .
@@ -261,12 +268,13 @@
             return;
         }
         $backend = &$request->_dbi->_backend;
-        $subject = _("Page change").' '.($this->pagename);
         $previous = $backend->get_previous_version($this->pagename, $version);
         if (!isset($meta['mtime'])) {
             $meta['mtime'] = time();
         }
         if ($previous) {
+            // Page existed, and was modified
+            $subject = _("Page change").' '.($this->pagename);
             $difflink = WikiURL($this->pagename, array('action'=>'diff'), true);
             $cache = &$request->_dbi->_cache;
             $this_content = explode("\n", $wikitext);
@@ -286,16 +294,18 @@
             $content .= $this->pagename . " " . $version . " " .
                 Iso8601DateTime($meta['mtime']) . "\n";
             $content .= $fmt->format($diff2);
-
+            $editedby = sprintf(_("Edited by: %s"), $this->fromId());
         } else {
+            // Page did not exist, and was created
+            $subject = _("Page creation").' '.($this->pagename);
             $difflink = WikiURL($this->pagename,array(),true);
             $content = $this->pagename . " " . $version . " " .
                 Iso8601DateTime($meta['mtime']) . "\n";
             $content .= _("New page");
             $content .= "\n\n";
             $content .= $wikitext;
+            $editedby = sprintf(_("Created by: %s"), $this->fromId());
         }
-        $editedby = sprintf(_("Edited by: %s"), $this->from);
         $summary = sprintf(_("Summary: %s"), $meta['summary']);
         $this->sendMail($subject,
                         $editedby."\n".$summary."\n".$difflink."\n\n".$content);
@@ -343,7 +353,7 @@
                 //TODO: deferr it (quite a massive load if you remove some pages).
                 $this->getPageChangeEmails($notify);
                 if (!empty($this->emails)) {
-                    $subject = sprintf(_("User %s removed page %s"), $this->from, $pagename);
+                    $subject = sprintf(_("User %s removed page %s"), $this->fromId(), $pagename);
                     $result = $this->sendMail($subject, $subject."\n\n");
                 }
             }

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8235] trunk/lib/MailNotify.php

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

Revision: 8235
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8235&view=rev
Author:   vargenau
Date:     2012-01-27 17:31:31 +0000 (Fri, 27 Jan 2012)
Log Message:
-----------
Whitespace only

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

Modified: trunk/lib/MailNotify.php
===================================================================
--- trunk/lib/MailNotify.php	2012-01-23 15:57:15 UTC (rev 8234)
+++ trunk/lib/MailNotify.php	2012-01-27 17:31:31 UTC (rev 8235)
@@ -206,29 +206,29 @@
            $subject."\n".$content,
            $headers
            );
-    if (MAILER_LOG and is_writable(MAILER_LOG)) {
-        global $ErrorManager;
+        if (MAILER_LOG and is_writable(MAILER_LOG)) {
+            global $ErrorManager;
 
-        $f = fopen(MAILER_LOG, "a");
-        fwrite($f, "\n\nX-MailSentOK: " . $ok ? 'OK' : 'FAILED');
+            $f = fopen(MAILER_LOG, "a");
+            fwrite($f, "\n\nX-MailSentOK: " . $ok ? 'OK' : 'FAILED');
 
-        if (!$ok && isset($ErrorManager->_postponed_errors[count($ErrorManager->_postponed_errors)-1])) {
-            // get last error message
-            $last_err = $ErrorManager->_postponed_errors[count($ErrorManager->_postponed_errors)-1];
-            fwrite($f, "\nX-MailFailure: " .
-                       "errno: " . $last_err->errno . ", " .
-                       "errstr: " . $last_err->errstr . ", " .
-                       "errfile: " . $last_err->errfile . ", " .
-                       "errline: " . $last_err->errline);
+            if (!$ok && isset($ErrorManager->_postponed_errors[count($ErrorManager->_postponed_errors)-1])) {
+                // get last error message
+                $last_err = $ErrorManager->_postponed_errors[count($ErrorManager->_postponed_errors)-1];
+                fwrite($f, "\nX-MailFailure: " .
+                           "errno: " . $last_err->errno . ", " .
+                           "errstr: " . $last_err->errstr . ", " .
+                           "errfile: " . $last_err->errfile . ", " .
+                           "errline: " . $last_err->errline);
+            }
+            fwrite($f, "\nDate: " . CTime());
+            fwrite($f, "\nSubject: $encoded_subject");
+            fwrite($f, "\nFrom: $from");
+            fwrite($f, "\nTo: $to");
+            fwrite($f, "\nBcc: ".join(',', $emails));
+            fwrite($f, "\n\n". $content);
+            fclose($f);
         }
-        fwrite($f, "\nDate: " . CTime());
-        fwrite($f, "\nSubject: $encoded_subject");
-        fwrite($f, "\nFrom: $from");
-        fwrite($f, "\nTo: $to");
-        fwrite($f, "\nBcc: ".join(',', $emails));
-        fwrite($f, "\n\n". $content);
-        fclose($f);
-    }
         if ($ok) {
             if (!$silent)
                 trigger_error(sprintf($notice, $this->pagename)
@@ -271,8 +271,9 @@
             $cache = &$request->_dbi->_cache;
             $this_content = explode("\n", $wikitext);
             $prevdata = $cache->get_versiondata($this->pagename, $previous, true);
-            if (empty($prevdata['%content']))
+            if (empty($prevdata['%content'])) {
                 $prevdata = $backend->get_versiondata($this->pagename, $previous, true);
+            }
             $other_content = explode("\n", $prevdata['%content']);
 
             include_once("lib/difflib.php");
@@ -328,10 +329,10 @@
                 if (!empty($this->emails)) {
                     $result = $this->sendPageChangeNotification($wikitext, $version, $meta);
                 }
+            }
         }
+        return $result;
     }
-    return $result;
-    }
 
     function onDeletePage (&$wikidb, $pagename) {
         $result = true;
@@ -352,20 +353,20 @@
 
     function onRenamePage (&$wikidb, $oldpage, $new_pagename) {
         $result = true;
-    if (!isa($GLOBALS['request'], 'MockRequest')) {
-        $notify = $wikidb->get('notify');
-        if (!empty($notify) and is_array($notify)) {
-        $this->getPageChangeEmails($notify);
-        if (!empty($this->emails)) {
-            $newpage = $wikidb->getPage($new_pagename);
-            $current = $newpage->getCurrentRevision();
-            $meta = $current->_data;
+        if (!isa($GLOBALS['request'], 'MockRequest')) {
+            $notify = $wikidb->get('notify');
+            if (!empty($notify) and is_array($notify)) {
+                $this->getPageChangeEmails($notify);
+                if (!empty($this->emails)) {
+                    $newpage = $wikidb->getPage($new_pagename);
+                    $current = $newpage->getCurrentRevision();
+                    $meta = $current->_data;
                     $this->pagename = $oldpage;
-            $result = $this->sendPageRenameNotification($new_pagename, $meta);
+                    $result = $this->sendPageRenameNotification($new_pagename, $meta);
+                }
+            }
         }
-        }
     }
-    }
 
     /**
      * Send mail to user and store the cookie in the db

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

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

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

Revision: 8234
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8234&view=rev
Author:   vargenau
Date:     2012-01-23 15:57:15 +0000 (Mon, 23 Jan 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-01-23 15:55:42 UTC (rev 8233)
+++ trunk/locale/fr/LC_MESSAGES/phpwiki.php	2012-01-23 15:57:15 UTC (rev 8234)
@@ -39,7 +39,7 @@
 $locale["%d pages have been permanently purged:"] = "%d pages ont été définitivement purgées :";
 $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 interdite sur ce wiki pour %s l'utilisateur « %s » (niveau : %s).";
+$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 bytes)"] = "%s Kio (%s octets)";
 $locale["%s already exists"] = "%s existe déjà";
 $locale["%s at %s"] = "%s à %s";
@@ -922,6 +922,7 @@
 $locale["Rename Page"] = "Renommer la page";
 $locale["Rename selected pages"] = "Renommer les pages sélectionnées";
 $locale["Rename to"] = "Renommer en";
+$locale["Renamed by: %s"] = "Renommée par : %s";
 $locale["Renamed page from '%s' to '%s'."] = "Page renommée de '%s' à '%s'.";
 $locale["Replace"] = "Remplacer";
 $locale["Replace with"] = "Remplacer par";

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-01-23 15:55:42 UTC (rev 8233)
+++ trunk/locale/po/de.po	2012-01-23 15:57:15 UTC (rev 8234)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-11 14:03+0100\n"
+"POT-Creation-Date: 2012-01-23 16:55+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."
@@ -784,8 +784,8 @@
 # must also be renamed to match what is here.
 #: ../lib/loadsave.php:85 ../lib/loadsave.php:475 ../lib/loadsave.php:1037
 #: ../lib/loadsave.php:1043 ../lib/loadsave.php:1051 ../lib/main.php:1069
-#: ../lib/main.php:1191 ../lib/main.php:1203 ../lib/PagePerm.php:190
-#: ../lib/PagePerm.php:191 ../lib/plugin/WikiAdminRename.php:142
+#: ../lib/main.php:1191 ../lib/main.php:1203 ../lib/PagePerm.php:185
+#: ../lib/PagePerm.php:186 ../lib/plugin/WikiAdminRename.php:142
 #: ../lib/plugin/WikiAdminSelect.php:218
 #: ../themes/blog/templates/navbar.tmpl:14
 #: ../themes/Crao/templates/head.tmpl:73 ../themes/Crao/templates/head.tmpl:74
@@ -1432,7 +1432,7 @@
 msgid "SetAclSimple"
 msgstr ""
 
-#: ../lib/main.php:1102 ../lib/PagePerm.php:190
+#: ../lib/main.php:1102 ../lib/PagePerm.php:185
 #: ../lib/plugin/WikiAdminRename.php:142 ../lib/plugin/WikiAdminRename.php:268
 #: ../themes/fusionforge/templates/actionbar.tmpl:120
 msgid "Rename"
@@ -1671,86 +1671,86 @@
 msgid "Columns: %s."
 msgstr "Spalten: %s."
 
-#: ../lib/PagePerm.php:191
+#: ../lib/PagePerm.php:186
 msgid "SearchReplace"
 msgstr "Suchen & Ersetzen"
 
-#: ../lib/PagePerm.php:321
+#: ../lib/PagePerm.php:316
 msgid "List this page and all subpages"
 msgstr "Auflistung aller Seiten und Unterseiten"
 
-#: ../lib/PagePerm.php:322
+#: ../lib/PagePerm.php:317
 msgid "View this page and all subpages"
 msgstr "Anzeige aller Seiten und Unterseiten"
 
-#: ../lib/PagePerm.php:323
+#: ../lib/PagePerm.php:318
 msgid "Edit this page and all subpages"
 msgstr "Bearbeiten aller Seiten und Unterseiten"
 
 # Erzeugen??
-#: ../lib/PagePerm.php:324
+#: ../lib/PagePerm.php:319
 msgid "Create a new (sub)page"
 msgstr "Erzeuge eine neue (Unter)Seite"
 
-#: ../lib/PagePerm.php:325
+#: ../lib/PagePerm.php:320
 msgid "Download page contents"
 msgstr "Runterladen der Seite"
 
-#: ../lib/PagePerm.php:326
+#: ../lib/PagePerm.php:321
 msgid "Change page attributes"
 msgstr "Ändern von Eigenschaften"
 
-#: ../lib/PagePerm.php:327
+#: ../lib/PagePerm.php:322
 msgid "Remove this page"
 msgstr "Löschen der Seite"
 
-#: ../lib/PagePerm.php:328
+#: ../lib/PagePerm.php:323
 msgid "Purge this page"
 msgstr "Lösche diese Seite endgültig"
 
-#: ../lib/PagePerm.php:358
+#: ../lib/PagePerm.php:353
 #, php-format
 msgid "Unsupported ACL access type %s ignored."
 msgstr "Nicht unterstützter ACL Zugiffsmodus %s ignoriert."
 
-#: ../lib/PagePerm.php:583
+#: ../lib/PagePerm.php:578
 msgid "Access"
 msgstr "Zugriff"
 
-#: ../lib/PagePerm.php:585
+#: ../lib/PagePerm.php:580
 msgid "Group/User"
 msgstr "Gruppe/Benutzer"
 
-#: ../lib/PagePerm.php:586
+#: ../lib/PagePerm.php:581
 msgid "Grant"
 msgstr "Erlaube"
 
-#: ../lib/PagePerm.php:587
+#: ../lib/PagePerm.php:582
 msgid "Del/+"
 msgstr "Lö/+"
 
-#: ../lib/PagePerm.php:588 ../lib/plugin/PluginManager.php:71
+#: ../lib/PagePerm.php:583 ../lib/plugin/PluginManager.php:71
 #: ../lib/plugin/WikiAdminSetAcl.php:250
 msgid "Description"
 msgstr "Beschreibung"
 
-#: ../lib/PagePerm.php:609
+#: ../lib/PagePerm.php:604
 msgid "Add this ACL"
 msgstr "Füge diese ACL hinzu"
 
-#: ../lib/PagePerm.php:633
+#: ../lib/PagePerm.php:628
 msgid "Allow / Deny"
 msgstr "Erlaube / Sperre"
 
-#: ../lib/PagePerm.php:645
+#: ../lib/PagePerm.php:640
 msgid "Delete this ACL"
 msgstr "Lösche diese ACL"
 
-#: ../lib/PagePerm.php:671
+#: ../lib/PagePerm.php:666
 msgid "add "
 msgstr "hinzufügen "
 
-#: ../lib/PagePerm.php:675
+#: ../lib/PagePerm.php:670
 msgid "Check to add this ACL"
 msgstr "Anklicken um diese ACL hinzuzufügen"
 

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2012-01-23 15:55:42 UTC (rev 8233)
+++ trunk/locale/po/es.po	2012-01-23 15:57:15 UTC (rev 8234)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-11 14:03+0100\n"
+"POT-Creation-Date: 2012-01-23 16:55+0100\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -775,8 +775,8 @@
 
 #: ../lib/loadsave.php:85 ../lib/loadsave.php:475 ../lib/loadsave.php:1037
 #: ../lib/loadsave.php:1043 ../lib/loadsave.php:1051 ../lib/main.php:1069
-#: ../lib/main.php:1191 ../lib/main.php:1203 ../lib/PagePerm.php:190
-#: ../lib/PagePerm.php:191 ../lib/plugin/WikiAdminRename.php:142
+#: ../lib/main.php:1191 ../lib/main.php:1203 ../lib/PagePerm.php:185
+#: ../lib/PagePerm.php:186 ../lib/plugin/WikiAdminRename.php:142
 #: ../lib/plugin/WikiAdminSelect.php:218
 #: ../themes/blog/templates/navbar.tmpl:14
 #: ../themes/Crao/templates/head.tmpl:73 ../themes/Crao/templates/head.tmpl:74
@@ -1410,7 +1410,7 @@
 msgid "SetAclSimple"
 msgstr ""
 
-#: ../lib/main.php:1102 ../lib/PagePerm.php:190
+#: ../lib/main.php:1102 ../lib/PagePerm.php:185
 #: ../lib/plugin/WikiAdminRename.php:142 ../lib/plugin/WikiAdminRename.php:268
 #: ../themes/fusionforge/templates/actionbar.tmpl:120
 msgid "Rename"
@@ -1649,85 +1649,85 @@
 msgid "Columns: %s."
 msgstr "Columnas: %s."
 
-#: ../lib/PagePerm.php:191
+#: ../lib/PagePerm.php:186
 msgid "SearchReplace"
 msgstr "Busque Y Substituya"
 
-#: ../lib/PagePerm.php:321
+#: ../lib/PagePerm.php:316
 msgid "List this page and all subpages"
 msgstr "Enumere esta página y todas las páginas secundaria"
 
-#: ../lib/PagePerm.php:322
+#: ../lib/PagePerm.php:317
 msgid "View this page and all subpages"
 msgstr "Opinión esta página y todas las páginas secundaria"
 
-#: ../lib/PagePerm.php:323
+#: ../lib/PagePerm.php:318
 msgid "Edit this page and all subpages"
 msgstr "Corrija esta página y todas las páginas secundaria"
 
-#: ../lib/PagePerm.php:324
+#: ../lib/PagePerm.php:319
 msgid "Create a new (sub)page"
 msgstr "Cree una página (secundaria) nueva"
 
-#: ../lib/PagePerm.php:325
+#: ../lib/PagePerm.php:320
 msgid "Download page contents"
 msgstr "Descargue el contenido de la página"
 
-#: ../lib/PagePerm.php:326
+#: ../lib/PagePerm.php:321
 msgid "Change page attributes"
 msgstr "Cambie las cualidades de la página"
 
-#: ../lib/PagePerm.php:327
+#: ../lib/PagePerm.php:322
 msgid "Remove this page"
 msgstr "Quite esta página"
 
-#: ../lib/PagePerm.php:328
+#: ../lib/PagePerm.php:323
 msgid "Purge this page"
 msgstr ""
 
-#: ../lib/PagePerm.php:358
+#: ../lib/PagePerm.php:353
 #, php-format
 msgid "Unsupported ACL access type %s ignored."
 msgstr "Tipo sin apoyo %s del acceso del ACL no hecho caso."
 
-#: ../lib/PagePerm.php:583
+#: ../lib/PagePerm.php:578
 msgid "Access"
 msgstr "Acceso"
 
-#: ../lib/PagePerm.php:585
+#: ../lib/PagePerm.php:580
 msgid "Group/User"
 msgstr "Grupo/Usuario"
 
-#: ../lib/PagePerm.php:586
+#: ../lib/PagePerm.php:581
 msgid "Grant"
 msgstr "Concesión"
 
-#: ../lib/PagePerm.php:587
+#: ../lib/PagePerm.php:582
 msgid "Del/+"
 msgstr "-/+"
 
-#: ../lib/PagePerm.php:588 ../lib/plugin/PluginManager.php:71
+#: ../lib/PagePerm.php:583 ../lib/plugin/PluginManager.php:71
 #: ../lib/plugin/WikiAdminSetAcl.php:250
 msgid "Description"
 msgstr "Descripción"
 
-#: ../lib/PagePerm.php:609
+#: ../lib/PagePerm.php:604
 msgid "Add this ACL"
 msgstr "Agregue este ACL"
 
-#: ../lib/PagePerm.php:633
+#: ../lib/PagePerm.php:628
 msgid "Allow / Deny"
 msgstr "Permita/Niegue"
 
-#: ../lib/PagePerm.php:645
+#: ../lib/PagePerm.php:640
 msgid "Delete this ACL"
 msgstr "Suprima este ACL"
 
-#: ../lib/PagePerm.php:671
+#: ../lib/PagePerm.php:666
 msgid "add "
 msgstr "agregue "
 
-#: ../lib/PagePerm.php:675
+#: ../lib/PagePerm.php:670
 msgid "Check to add this ACL"
 msgstr "Compruebe para agregar este ACL"
 

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2012-01-23 15:55:42 UTC (rev 8233)
+++ trunk/locale/po/fr.po	2012-01-23 15:57:15 UTC (rev 8234)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-11 14:03+0100\n"
+"POT-Creation-Date: 2012-01-23 16:55+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."
@@ -773,8 +773,8 @@
 
 #: ../lib/loadsave.php:85 ../lib/loadsave.php:475 ../lib/loadsave.php:1037
 #: ../lib/loadsave.php:1043 ../lib/loadsave.php:1051 ../lib/main.php:1069
-#: ../lib/main.php:1191 ../lib/main.php:1203 ../lib/PagePerm.php:190
-#: ../lib/PagePerm.php:191 ../lib/plugin/WikiAdminRename.php:142
+#: ../lib/main.php:1191 ../lib/main.php:1203 ../lib/PagePerm.php:185
+#: ../lib/PagePerm.php:186 ../lib/plugin/WikiAdminRename.php:142
 #: ../lib/plugin/WikiAdminSelect.php:218
 #: ../themes/blog/templates/navbar.tmpl:14
 #: ../themes/Crao/templates/head.tmpl:73 ../themes/Crao/templates/head.tmpl:74
@@ -1193,8 +1193,7 @@
 #, php-format
 msgid "%s %s %s is disallowed on this wiki for %s user '%s' (level: %s)."
 msgstr ""
-"%s %s %s est interdit sur ce wiki pour l'utilisateur %s « %s » (niveau : "
-"%s)."
+"%s %s %s est interdit sur ce wiki pour l'utilisateur %s « %s » (niveau : %s)."
 
 #: ../lib/main.php:531
 #, php-format
@@ -1406,7 +1405,7 @@
 msgid "SetAclSimple"
 msgstr "DéfinirAclSimple"
 
-#: ../lib/main.php:1102 ../lib/PagePerm.php:190
+#: ../lib/main.php:1102 ../lib/PagePerm.php:185
 #: ../lib/plugin/WikiAdminRename.php:142 ../lib/plugin/WikiAdminRename.php:268
 #: ../themes/fusionforge/templates/actionbar.tmpl:120
 msgid "Rename"
@@ -1646,85 +1645,85 @@
 msgid "Columns: %s."
 msgstr "Colonnes : %s."
 
-#: ../lib/PagePerm.php:191
+#: ../lib/PagePerm.php:186
 msgid "SearchReplace"
 msgstr "Rechercher & Remplacer"
 
-#: ../lib/PagePerm.php:321
+#: ../lib/PagePerm.php:316
 msgid "List this page and all subpages"
 msgstr "Lister cette page et ses sous-pages"
 
-#: ../lib/PagePerm.php:322
+#: ../lib/PagePerm.php:317
 msgid "View this page and all subpages"
 msgstr "Voir cette page et ses sous-pages"
 
-#: ../lib/PagePerm.php:323
+#: ../lib/PagePerm.php:318
 msgid "Edit this page and all subpages"
 msgstr "Modifier cette page et toutes ses sous-pages"
 
-#: ../lib/PagePerm.php:324
+#: ../lib/PagePerm.php:319
 msgid "Create a new (sub)page"
 msgstr "Créer une nouvelle (sous-)page"
 
-#: ../lib/PagePerm.php:325
+#: ../lib/PagePerm.php:320
 msgid "Download page contents"
 msgstr "Télécharger le contenu de la page"
 
-#: ../lib/PagePerm.php:326
+#: ../lib/PagePerm.php:321
 msgid "Change page attributes"
 msgstr "Modifier les attributs de la page"
 
-#: ../lib/PagePerm.php:327
+#: ../lib/PagePerm.php:322
 msgid "Remove this page"
 msgstr "Supprimer cette page"
 
-#: ../lib/PagePerm.php:328
+#: ../lib/PagePerm.php:323
 msgid "Purge this page"
 msgstr "Purger cette page"
 
-#: ../lib/PagePerm.php:358
+#: ../lib/PagePerm.php:353
 #, php-format
 msgid "Unsupported ACL access type %s ignored."
 msgstr "Le type d'accès ACL %s n'est pas supporté. -- Ignoré."
 
-#: ../lib/PagePerm.php:583
+#: ../lib/PagePerm.php:578
 msgid "Access"
 msgstr "Accès"
 
-#: ../lib/PagePerm.php:585
+#: ../lib/PagePerm.php:580
 msgid "Group/User"
 msgstr "Groupe/utilisateur"
 
-#: ../lib/PagePerm.php:586
+#: ../lib/PagePerm.php:581
 msgid "Grant"
 msgstr "Accorder"
 
-#: ../lib/PagePerm.php:587
+#: ../lib/PagePerm.php:582
 msgid "Del/+"
 msgstr "Suppr/+"
 
-#: ../lib/PagePerm.php:588 ../lib/plugin/PluginManager.php:71
+#: ../lib/PagePerm.php:583 ../lib/plugin/PluginManager.php:71
 #: ../lib/plugin/WikiAdminSetAcl.php:250
 msgid "Description"
 msgstr "Description"
 
-#: ../lib/PagePerm.php:609
+#: ../lib/PagePerm.php:604
 msgid "Add this ACL"
 msgstr "Ajouter cette ACL"
 
-#: ../lib/PagePerm.php:633
+#: ../lib/PagePerm.php:628
 msgid "Allow / Deny"
 msgstr "Autoriser / Refuser"
 
-#: ../lib/PagePerm.php:645
+#: ../lib/PagePerm.php:640
 msgid "Delete this ACL"
 msgstr "Supprimer cette ACL"
 
-#: ../lib/PagePerm.php:671
+#: ../lib/PagePerm.php:666
 msgid "add "
 msgstr "ajouter"
 
-#: ../lib/PagePerm.php:675
+#: ../lib/PagePerm.php:670
 msgid "Check to add this ACL"
 msgstr "Cocher pour ajouter cette ACL"
 

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2012-01-23 15:55:42 UTC (rev 8233)
+++ trunk/locale/po/it.po	2012-01-23 15:57:15 UTC (rev 8234)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-11 14:03+0100\n"
+"POT-Creation-Date: 2012-01-23 16:55+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"
@@ -765,8 +765,8 @@
 
 #: ../lib/loadsave.php:85 ../lib/loadsave.php:475 ../lib/loadsave.php:1037
 #: ../lib/loadsave.php:1043 ../lib/loadsave.php:1051 ../lib/main.php:1069
-#: ../lib/main.php:1191 ../lib/main.php:1203 ../lib/PagePerm.php:190
-#: ../lib/PagePerm.php:191 ../lib/plugin/WikiAdminRename.php:142
+#: ../lib/main.php:1191 ../lib/main.php:1203 ../lib/PagePerm.php:185
+#: ../lib/PagePerm.php:186 ../lib/plugin/WikiAdminRename.php:142
 #: ../lib/plugin/WikiAdminSelect.php:218
 #: ../themes/blog/templates/navbar.tmpl:14
 #: ../themes/Crao/templates/head.tmpl:73 ../themes/Crao/templates/head.tmpl:74
@@ -1394,7 +1394,7 @@
 msgid "SetAclSimple"
 msgstr ""
 
-#: ../lib/main.php:1102 ../lib/PagePerm.php:190
+#: ../lib/main.php:1102 ../lib/PagePerm.php:185
 #: ../lib/plugin/WikiAdminRename.php:142 ../lib/plugin/WikiAdminRename.php:268
 #: ../themes/fusionforge/templates/actionbar.tmpl:120
 msgid "Rename"
@@ -1631,85 +1631,85 @@
 msgid "Columns: %s."
 msgstr "Caratteri: %s."
 
-#: ../lib/PagePerm.php:191
+#: ../lib/PagePerm.php:186
 msgid "SearchReplace"
 msgstr ""
 
-#: ../lib/PagePerm.php:321
+#: ../lib/PagePerm.php:316
 msgid "List this page and all subpages"
 msgstr ""
 
-#: ../lib/PagePerm.php:322
+#: ../lib/PagePerm.php:317
 msgid "View this page and all subpages"
 msgstr ""
 
-#: ../lib/PagePerm.php:323
+#: ../lib/PagePerm.php:318
 msgid "Edit this page and all subpages"
 msgstr ""
 
-#: ../lib/PagePerm.php:324
+#: ../lib/PagePerm.php:319
 msgid "Create a new (sub)page"
 msgstr ""
 
-#: ../lib/PagePerm.php:325
+#: ../lib/PagePerm.php:320
 msgid "Download page contents"
 msgstr ""
 
-#: ../lib/PagePerm.php:326
+#: ../lib/PagePerm.php:321
 msgid "Change page attributes"
 msgstr ""
 
-#: ../lib/PagePerm.php:327
+#: ../lib/PagePerm.php:322
 msgid "Remove this page"
 msgstr "Rimuovi la pagina"
 
-#: ../lib/PagePerm.php:328
+#: ../lib/PagePerm.php:323
 msgid "Purge this page"
 msgstr "Rimuovi la pagina"
 
-#: ../lib/PagePerm.php:358
+#: ../lib/PagePerm.php:353
 #, php-format
 msgid "Unsupported ACL access type %s ignored."
 msgstr ""
 
-#: ../lib/PagePerm.php:583
+#: ../lib/PagePerm.php:578
 msgid "Access"
 msgstr ""
 
-#: ../lib/PagePerm.php:585
+#: ../lib/PagePerm.php:580
 msgid "Group/User"
 msgstr ""
 
-#: ../lib/PagePerm.php:586
+#: ../lib/PagePerm.php:581
 msgid "Grant"
 msgstr ""
 
-#: ../lib/PagePerm.php:587
+#: ../lib/PagePerm.php:582
 msgid "Del/+"
 msgstr ""
 
-#: ../lib/PagePerm.php:588 ../lib/plugin/PluginManager.php:71
+#: ../lib/PagePerm.php:583 ../lib/plugin/PluginManager.php:71
 #: ../lib/plugin/WikiAdminSetAcl.php:250
 msgid "Description"
 msgstr ""
 
-#: ../lib/PagePerm.php:609
+#: ../lib/PagePerm.php:604
 msgid "Add this ACL"
 msgstr ""
 
-#: ../lib/PagePerm.php:633
+#: ../lib/PagePerm.php:628
 msgid "Allow / Deny"
 msgstr ""
 
-#: ../lib/PagePerm.php:645
+#: ../lib/PagePerm.php:640
 msgid "Delete this ACL"
 msgstr ""
 
-#: ../lib/PagePerm.php:671
+#: ../lib/PagePerm.php:666
 msgid "add "
 msgstr ""
 
-#: ../lib/PagePerm.php:675
+#: ../lib/PagePerm.php:670
 msgid "Check to add this ACL"
 msgstr ""
 

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2012-01-23 15:55:42 UTC (rev 8233)
+++ trunk/locale/po/ja.po	2012-01-23 15:57:15 UTC (rev 8234)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-11 14:03+0100\n"
+"POT-Creation-Date: 2012-01-23 16:55+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"
@@ -754,8 +754,8 @@
 
 #: ../lib/loadsave.php:85 ../lib/loadsave.php:475 ../lib/loadsave.php:1037
 #: ../lib/loadsave.php:1043 ../lib/loadsave.php:1051 ../lib/main.php:1069
-#: ../lib/main.php:1191 ../lib/main.php:1203 ../lib/PagePerm.php:190
-#: ../lib/PagePerm.php:191 ../lib/plugin/WikiAdminRename.php:142
+#: ../lib/main.php:1191 ../lib/main.php:1203 ../lib/PagePerm.php:185
+#: ../lib/PagePerm.php:186 ../lib/plugin/WikiAdminRename.php:142
 #: ../lib/plugin/WikiAdminSelect.php:218
 #: ../themes/blog/templates/navbar.tmpl:14
 #: ../themes/Crao/templates/head.tmpl:73 ../themes/Crao/templates/head.tmpl:74
@@ -1394,7 +1394,7 @@
 msgid "SetAclSimple"
 msgstr ""
 
-#: ../lib/main.php:1102 ../lib/PagePerm.php:190
+#: ../lib/main.php:1102 ../lib/PagePerm.php:185
 #: ../lib/plugin/WikiAdminRename.php:142 ../lib/plugin/WikiAdminRename.php:268
 #: ../themes/fusionforge/templates/actionbar.tmpl:120
 #, fuzzy
@@ -1634,88 +1634,88 @@
 msgid "Columns: %s."
 msgstr ""
 
-#: ../lib/PagePerm.php:191
+#: ../lib/PagePerm.php:186
 msgid "SearchReplace"
 msgstr ""
 
-#: ../lib/PagePerm.php:321
+#: ../lib/PagePerm.php:316
 #, fuzzy
 msgid "List this page and all subpages"
 msgstr "全ページ一覧"
 
-#: ../lib/PagePerm.php:322
+#: ../lib/PagePerm.php:317
 msgid "View this page and all subpages"
 msgstr ""
 
-#: ../lib/PagePerm.php:323
+#: ../lib/PagePerm.php:318
 msgid "Edit this page and all subpages"
 msgstr ""
 
-#: ../lib/PagePerm.php:324
+#: ../lib/PagePerm.php:319
 msgid "Create a new (sub)page"
 msgstr ""
 
-#: ../lib/PagePerm.php:325
+#: ../lib/PagePerm.php:320
 msgid "Download page contents"
 msgstr ""
 
-#: ../lib/PagePerm.php:326
+#: ../lib/PagePerm.php:321
 msgid "Change page attributes"
 msgstr ""
 
-#: ../lib/PagePerm.php:327
+#: ../lib/PagePerm.php:322
 #, fuzzy
 msgid "Remove this page"
 msgstr "ページ削除"
 
-#: ../lib/PagePerm.php:328
+#: ../lib/PagePerm.php:323
 #, fuzzy
 msgid "Purge this page"
 msgstr "ページを作成しています。"
 
-#: ../lib/PagePerm.php:358
+#: ../lib/PagePerm.php:353
 #, php-format
 msgid "Unsupported ACL access type %s ignored."
 msgstr ""
 
-#: ../lib/PagePerm.php:583
+#: ../lib/PagePerm.php:578
 msgid "Access"
 msgstr ""
 
-#: ../lib/PagePerm.php:585
+#: ../lib/PagePerm.php:580
 msgid "Group/User"
 msgstr ""
 
-#: ../lib/PagePerm.php:586
+#: ../lib/PagePerm.php:581
 msgid "Grant"
 msgstr ""
 
-#: ../lib/PagePerm.php:587
+#: ../lib/PagePerm.php:582
 msgid "Del/+"
 msgstr ""
 
-#: ../lib/PagePerm.php:588 ../lib/plugin/PluginManager.php:71
+#: ../lib/PagePerm.php:583 ../lib/plugin/PluginManager.php:71
 #: ../lib/plugin/WikiAdminSetAcl.php:250
 msgid "Description"
 msgstr "説明"
 
-#: ../lib/PagePerm.php:609
+#: ../lib/PagePerm.php:604
 msgid "Add this ACL"
 msgstr ""
 
-#: ../lib/PagePerm.php:633
+#: ../lib/PagePerm.php:628
 msgid "Allow / Deny"
 msgstr ""
 
-#: ../lib/PagePerm.php:645
+#: ../lib/PagePerm.php:640
 msgid "Delete this ACL"
 msgstr ""
 
-#: ../lib/PagePerm.php:671
+#: ../lib/PagePerm.php:666
 msgid "add "
 msgstr ""
 
-#: ../lib/PagePerm.php:675
+#: ../lib/PagePerm.php:670
 msgid "Check to add this ACL"
 msgstr ""
 

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2012-01-23 15:55:42 UTC (rev 8233)
+++ trunk/locale/po/nl.po	2012-01-23 15:57:15 UTC (rev 8234)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-11 14:03+0100\n"
+"POT-Creation-Date: 2012-01-23 16:55+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"
@@ -759,8 +759,8 @@
 
 #: ../lib/loadsave.php:85 ../lib/loadsave.php:475 ../lib/loadsave.php:1037
 #: ../lib/loadsave.php:1043 ../lib/loadsave.php:1051 ../lib/main.php:1069
-#: ../lib/main.php:1191 ../lib/main.php:1203 ../lib/PagePerm.php:190
-#: ../lib/PagePerm.php:191 ../lib/plugin/WikiAdminRename.php:142
+#: ../lib/main.php:1191 ../lib/main.php:1203 ../lib/PagePerm.php:185
+#: ../lib/PagePerm.php:186 ../lib/plugin/WikiAdminRename.php:142
 #: ../lib/plugin/WikiAdminSelect.php:218
 #: ../themes/blog/templates/navbar.tmpl:14
 #: ../themes/Crao/templates/head.tmpl:73 ../themes/Crao/templates/head.tmpl:74
@@ -1386,7 +1386,7 @@
 msgid "SetAclSimple"
 msgstr ""
 
-#: ../lib/main.php:1102 ../lib/PagePerm.php:190
+#: ../lib/main.php:1102 ../lib/PagePerm.php:185
 #: ../lib/plugin/WikiAdminRename.php:142 ../lib/plugin/WikiAdminRename.php:268
 #: ../themes/fusionforge/templates/actionbar.tmpl:120
 msgid "Rename"
@@ -1623,85 +1623,85 @@
 msgid "Columns: %s."
 msgstr ""
 
-#: ../lib/PagePerm.php:191
+#: ../lib/PagePerm.php:186
 msgid "SearchReplace"
 msgstr "ZoekVervangt"
 
-#: ../lib/PagePerm.php:321
+#: ../lib/PagePerm.php:316
 msgid "List this page and all subpages"
 msgstr ""
 
-#: ../lib/PagePerm.php:322
+#: ../lib/PagePerm.php:317
 msgid "View this page and all subpages"
 msgstr ""
 
-#: ../lib/PagePerm.php:323
+#: ../lib/PagePerm.php:318
 msgid "Edit this page and all subpages"
 msgstr ""
 
-#: ../lib/PagePerm.php:324
+#: ../lib/PagePerm.php:319
 msgid "Create a new (sub)page"
 msgstr ""
 
-#: ../lib/PagePerm.php:325
+#: ../lib/PagePerm.php:320
 msgid "Download page contents"
 msgstr ""
 
-#: ../lib/PagePerm.php:326
+#: ../lib/PagePerm.php:321
 msgid "Change page attributes"
 msgstr ""
 
-#: ../lib/PagePerm.php:327
+#: ../lib/PagePerm.php:322
 msgid "Remove this page"
 msgstr ""
 
-#: ../lib/PagePerm.php:328
+#: ../lib/PagePerm.php:323
 msgid "Purge this page"
 msgstr "Verwijder pagina"
 
-#: ../lib/PagePerm.php:358
+#: ../lib/PagePerm.php:353
 #, php-format
 msgid "Unsupported ACL access type %s ignored."
 msgstr ""
 
-#: ../lib/PagePerm.php:583
+#: ../lib/PagePerm.php:578
 msgid "Access"
 msgstr ""
 
-#: ../lib/PagePerm.php:585
+#: ../lib/PagePerm.php:580
 msgid "Group/User"
 msgstr ""
 
-#: ../lib/PagePerm.php:586
+#: ../lib/PagePerm.php:581
 msgid "Grant"
 msgstr ""
 
-#: ../lib/PagePerm.php:587
+#: ../lib/PagePerm.php:582
 msgid "Del/+"
 msgstr ""
 
-#: ../lib/PagePerm.php:588 ../lib/plugin/PluginManager.php:71
+#: ../lib/PagePerm.php:583 ../lib/plugin/PluginManager.php:71
 #: ../lib/plugin/WikiAdminSetAcl.php:250
 msgid "Description"
 msgstr ""
 
-#: ../lib/PagePerm.php:609
+#: ../lib/PagePerm.php:604
 msgid "Add this ACL"
 msgstr ""
 
-#: ../lib/PagePerm.php:633
+#: ../lib/PagePerm.php:628
 msgid "Allow / Deny"
 msgstr ""
 
-#: ../lib/PagePerm.php:645
+#: ../lib/PagePerm.php:640
 msgid "Delete this ACL"
 msgstr ""
 
-#: ../lib/PagePerm.php:671
+#: ../lib/PagePerm.php:666
 msgid "add "
 msgstr ""
 
-#: ../lib/PagePerm.php:675
+#: ../lib/PagePerm.php:670
 msgid "Check to add this ACL"
 msgstr ""
 

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2012-01-23 15:55:42 UTC (rev 8233)
+++ trunk/locale/po/phpwiki.pot	2012-01-23 15:57:15 UTC (rev 8234)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-11 14:03+0100\n"
+"POT-Creation-Date: 2012-01-23 16:55+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"
@@ -753,8 +753,8 @@
 
 #: ../lib/loadsave.php:85 ../lib/loadsave.php:475 ../lib/loadsave.php:1037
 #: ../lib/loadsave.php:1043 ../lib/loadsave.php:1051 ../lib/main.php:1069
-#: ../lib/main.php:1191 ../lib/main.php:1203 ../lib/PagePerm.php:190
-#: ../lib/PagePerm.php:191 ../lib/plugin/WikiAdminRename.php:142
+#: ../lib/main.php:1191 ../lib/main.php:1203 ../lib/PagePerm.php:185
+#: ../lib/PagePerm.php:186 ../lib/plugin/WikiAdminRename.php:142
 #: ../lib/plugin/WikiAdminSelect.php:218
 #: ../themes/blog/templates/navbar.tmpl:14
 #: ../themes/Crao/templates/head.tmpl:73 ../themes/Crao/templates/head.tmpl:74
@@ -1380,7 +1380,7 @@
 msgid "SetAclSimple"
 msgstr ""
 
-#: ../lib/main.php:1102 ../lib/PagePerm.php:190
+#: ../lib/main.php:1102 ../lib/PagePerm.php:185
 #: ../lib/plugin/WikiAdminRename.php:142 ../lib/plugin/WikiAdminRename.php:268
 #: ../themes/fusionforge/templates/actionbar.tmpl:120
 msgid "Rename"
@@ -1617,85 +1617,85 @@
 msgid "Columns: %s."
 msgstr ""
 
-#: ../lib/PagePerm.php:191
+#: ../lib/PagePerm.php:186
 msgid "SearchReplace"
 msgstr ""
 
-#: ../lib/PagePerm.php:321
+#: ../lib/PagePerm.php:316
 msgid "List this page and all subpages"
 msgstr ""
 
-#: ../lib/PagePerm.php:322
+#: ../lib/PagePerm.php:317
 msgid "View this page and all subpages"
 msgstr ""
 
-#: ../lib/PagePerm.php:323
+#: ../lib/PagePerm.php:318
 msgid "Edit this page and all subpages"
 msgstr ""
 
-#: ../lib/PagePerm.php:324
+#: ../lib/PagePerm.php:319
 msgid "Create a new (sub)page"
 msgstr ""
 
-#: ../lib/PagePerm.php:325
+#: ../lib/PagePerm.php:320
 msgid "Download page contents"
 msgstr ""
 
-#: ../lib/PagePerm.php:326
+#: ../lib/PagePerm.php:321
 msgid "Change page attributes"
 msgstr ""
 
-#: ../lib/PagePerm.php:327
+#: ../lib/PagePerm.php:322
 msgid "Remove this page"
 msgstr ""
 
-#: ../lib/PagePerm.php:328
+#: ../lib/PagePerm.php:323
 msgid "Purge this page"
 msgstr ""
 
-#: ../lib/PagePerm.php:358
+#: ../lib/PagePerm.php:353
 #, php-format
 msgid "Unsupported ACL access type %s ignored."
 msgstr ""
 
-#: ../lib/PagePerm.php:583
+#: ../lib/PagePerm.php:578
 msgid "Access"
 msgstr ""
 
-#: ../lib/PagePerm.php:585
+#: ../lib/PagePerm.php:580
 msgid "Group/User"
 msgstr ""
 
-#: ../lib/PagePerm.php:586
+#: ../lib/PagePerm.php:581
 msgid "Grant"
 msgstr ""
 
-#: ../lib/PagePerm.php:587
+#: ../lib/PagePerm.php:582
 msgid "Del/+"
 msgstr ""
 
-#: ../lib/PagePerm.php:588 ../lib/plugin/PluginManager.php:71
+#: ../lib/PagePerm.php:583 ../lib/plugin/PluginManager.php:71
 #: ../lib/plugin/WikiAdminSetAcl.php:250
 msgid "Description"
 msgstr ""
 
-#: ../lib/PagePerm.php:609
+#: ../lib/PagePerm.php:604
 msgid "Add this ACL"
 msgstr ""
 
-#: ../lib/PagePerm.php:633
+#: ../lib/PagePerm.php:628
 msgid "Allow / Deny"
 msgstr ""
 
-#: ../lib/PagePerm.php:645
+#: ../lib/PagePerm.php:640
 msgid "Delete this ACL"
 msgstr ""
 
-#: ../lib/PagePerm.php:671
+#: ../lib/PagePerm.php:666
 msgid "add "
 msgstr ""
 
-#: ../lib/PagePerm.php:675
+#: ../lib/PagePerm.php:670
 msgid "Check to add this ACL"
 msgstr ""
 

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2012-01-23 15:55:42 UTC (rev 8233)
+++ trunk/locale/po/sv.po	2012-01-23 15:57:15 UTC (rev 8234)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-11 14:03+0100\n"
+"POT-Creation-Date: 2012-01-23 16:55+0100\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -754,8 +754,8 @@
 
 #: ../lib/loadsave.php:85 ../lib/loadsave.php:475 ../lib/loadsave.php:1037
 #: ../lib/loadsave.php:1043 ../lib/loadsave.php:1051 ../lib/main.php:1069
-#: ../lib/main.php:1191 ../lib/main.php:1203 ../lib/PagePerm.php:190
-#: ../lib/PagePerm.php:191 ../lib/plugin/WikiAdminRename.php:142
+#: ../lib/main.php:1191 ../lib/main.php:1203 ../lib/PagePerm.php:185
+#: ../lib/PagePerm.php:186 ../lib/plugin/WikiAdminRename.php:142
 #: ../lib/plugin/WikiAdminSelect.php:218
 #: ../themes/blog/templates/navbar.tmpl:14
 #: ../themes/Crao/templates/head.tmpl:73 ../themes/Crao/templates/head.tmpl:74
@@ -1381,7 +1381,7 @@
 msgid "SetAclSimple"
 msgstr ""
 
-#: ../lib/main.php:1102 ../lib/PagePerm.php:190
+#: ../lib/main.php:1102 ../lib/PagePerm.php:185
 #: ../lib/plugin/WikiAdminRename.php:142 ../lib/plugin/WikiAdminRename.php:268
 #: ../themes/fusionforge/templates/actionbar.tmpl:120
 msgid "Rename"
@@ -1618,85 +1618,85 @@
 msgid "Columns: %s."
 msgstr ""
 
-#: ../lib/PagePerm.php:191
+#: ../lib/PagePerm.php:186
 msgid "SearchReplace"
 msgstr ""
 
-#: ../lib/PagePerm.php:321
+#: ../lib/PagePerm.php:316
 msgid "List this page and all subpages"
 msgstr ""
 
-#: ../lib/PagePerm.php:322
+#: ../lib/PagePerm.php:317
 msgid "View this page and all subpages"
 msgstr ""
 
-#: ../lib/PagePerm.php:323
+#: ../lib/PagePerm.php:318
 msgid "Edit this page and all subpages"
 msgstr ""
 
-#: ../lib/PagePerm.php:324
+#: ../lib/PagePerm.php:319
 msgid "Create a new (sub)page"
 msgstr ""
 
-#: ../lib/PagePerm.php:325
+#: ../lib/PagePerm.php:320
 msgid "Download page contents"
 msgstr ""
 
-#: ../lib/PagePerm.php:326
+#: ../lib/PagePerm.php:321
 msgid "Change page attributes"
 msgstr ""
 
-#: ../lib/PagePerm.php:327
+#: ../lib/PagePerm.php:322
 msgid "Remove this page"
 msgstr ""
 
-#: ../lib/PagePerm.php:328
+#: ../lib/PagePerm.php:323
 msgid "Purge this page"
 msgstr ""
 
-#: ../lib/PagePerm.php:358
+#: ../lib/PagePerm.php:353
 #, php-format
 msgid "Unsupported ACL access type %s ignored."
 msgstr ""
 
-#: ../lib/PagePerm.php:583
+#: ../lib/PagePerm.php:578
 msgid "Access"
 msgstr ""
 
-#: ../lib/PagePerm.php:585
+#: ../lib/PagePerm.php:580
 msgid "Group/User"
 msgstr ""
 
-#: ../lib/PagePerm.php:586
+#: ../lib/PagePerm.php:581
 msgid "Grant"
 msgstr ""
 
-#: ../lib/PagePerm.php:587
+#: ../lib/PagePerm.php:582
 msgid "Del/+"
 msgstr ""
 
-#: ../lib/PagePerm.php:588 ../lib/plugin/PluginManager.php:71
+#: ../lib/PagePerm.php:583 ../lib/plugin/PluginManager.php:71
 #: ../lib/plugin/WikiAdminSetAcl.php:250
 msgid "Description"
 msgstr ""
 
-#: ../lib/PagePerm.php:609
+#: ../lib/PagePerm.php:604
 msgid "Add this ACL"
 msgstr ""
 
-#: ../lib/PagePerm.php:633
+#: ../lib/PagePerm.php:628
 msgid "Allow / Deny"
 msgstr ""
 
-#: ../lib/PagePerm.php:645
+#: ../lib/PagePerm.php:640
 msgid "Delete this ACL"
 msgstr ""
 
-#: ../lib/PagePerm.php:671
+#: ../lib/PagePerm.php:666
 msgid "add "
 msgstr ""
 
-#: ../lib/PagePerm.php:675
+#: ../lib/PagePerm.php:670
 msgid "Check to add this ACL"
 msgstr ""
 

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2012-01-23 15:55:42 UTC (rev 8233)
+++ trunk/locale/po/zh.po	2012-01-23 15:57:15 UTC (rev 8234)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-11 14:03+0100\n"
+"POT-Creation-Date: 2012-01-23 16:55+0100\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -793,8 +793,8 @@
 
 #: ../lib/loadsave.php:85 ../lib/loadsave.php:475 ../lib/loadsave.php:1037
 #: ../lib/loadsave.php:1043 ../lib/loadsave.php:1051 ../lib/main.php:1069
-#: ../lib/main.php:1191 ../lib/main.php:1203 ../lib/PagePerm.php:190
-#: ../lib/PagePerm.php:191 ../lib/plugin/WikiAdminRename.php:142
+#: ../lib/main.php:1191 ../lib/main.php:1203 ../lib/PagePerm.php:185
+#: ../lib/PagePerm.php:186 ../lib/plugin/WikiAdminRename.php:142
 #: ../lib/plugin/WikiAdminSelect.php:218
 #: ../themes/blog/templates/navbar.tmpl:14
 #: ../themes/Crao/templates/head.tmpl:73 ../themes/Crao/templates/head.tmpl:74
@@ -1443,7 +1443,7 @@
 msgid "SetAclSimple"
 msgstr "SetAcl"
 
-#: ../lib/main.php:1102 ../lib/PagePerm.php:190
+#: ../lib/main.php:1102 ../lib/PagePerm.php:185
 #: ../lib/plugin/WikiAdminRename.php:142 ../lib/plugin/WikiAdminRename.php:268
 #: ../themes/fusionforge/templates/actionbar.tmpl:120
 msgid "Rename"
@@ -1684,89 +1684,89 @@
 msgid "Columns: %s."
 msgstr "行: %s."
 
-#: ../lib/PagePerm.php:191
+#: ../lib/PagePerm.php:186
 #, fuzzy
 msgid "SearchReplace"
 msgstr "搜尋與取代"
 
-#: ../lib/PagePerm.php:321
+#: ../lib/PagePerm.php:316
 msgid "List this page and all subpages"
 msgstr "列出所有頁面以及子頁面"
 
-#: ../lib/PagePerm.php:322
+#: ../lib/PagePerm.php:317
 msgid "View this page and all subpages"
 msgstr "查看此頁面以及所有子頁面"
 
-#: ../lib/PagePerm.php:323
+#: ../lib/PagePerm.php:318
 msgid "Edit this page and all subpages"
 msgstr "編輯此頁面以及所有子頁面"
 
-#: ../lib/PagePerm.php:324
+#: ../lib/PagePerm.php:319
 msgid "Create a new (sub)page"
 msgstr "建立新(子)頁面"
 
-#: ../lib/PagePerm.php:325
+#: ../lib/PagePerm.php:320
 #, fuzzy
 msgid "Download page contents"
 msgstr "下載頁面內容"
 
-#: ../lib/PagePerm.php:326
+#: ../lib/PagePerm.php:321
 msgid "Change page attributes"
 msgstr "變更頁面屬性"
 
-#: ../lib/PagePerm.php:327
+#: ../lib/PagePerm.php:322
 msgid "Remove this page"
 msgstr "移除此頁面"
 
-#: ../lib/PagePerm.php:328
+#: ../lib/PagePerm.php:323
 #, fuzzy
 msgid "Purge this page"
 msgstr "建立此頁面"
 
-#: ../lib/PagePerm.php:358
+#: ../lib/PagePerm.php:353
 #, php-format
 msgid "Unsupported ACL access type %s ignored."
 msgstr "忽略不支援的 ACL 存取型態 %s."
 
-#: ../lib/PagePerm.php:583
+#: ../lib/PagePerm.php:578
 msgid "Access"
 msgstr ""
 
-#: ../lib/PagePerm.php:585
+#: ../lib/PagePerm.php:580
 #, fuzzy
 msgid "Group/User"
 msgstr "群組"
 
-#: ../lib/PagePerm.php:586
+#: ../lib/PagePerm.php:581
 msgid "Grant"
 msgstr ""
 
-#: ../lib/PagePerm.php:587
+#: ../lib/PagePerm.php:582
 msgid "Del/+"
 msgstr ""
 
-#: ../lib/PagePerm.php:588 ../lib/plugin/PluginManager.php:71
+#: ../lib/PagePerm.php:583 ../lib/plugin/PluginManager.php:71
 #: ../lib/plugin/WikiAdminSetAcl.php:250
 msgid "Description"
 msgstr "描述"
 
-#: ../lib/PagePerm.php:609
+#: ../lib/PagePerm.php:604
 msgid "Add this ACL"
 msgstr ""
 
-#: ../lib/PagePerm.php:633
+#: ../lib/PagePerm.php:628
 msgid "Allow / Deny"
 msgstr ""
 
-#: ../lib/PagePerm.php:645
+#: ../lib/PagePerm.php:640
 msgid "Delete this ACL"
 msgstr ""
 
-#: ../lib/PagePerm.php:671
+#: ../lib/PagePerm.php:666
 msgid "add "
 msgstr ""
 
-#: ../lib/PagePerm.php:675
+#: ../lib/PagePerm.php:670
 msgid "Check to add this ACL"
 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:[8233] trunk/locale/po/fr.po

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

Revision: 8233
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8233&view=rev
Author:   vargenau
Date:     2012-01-23 15:55:42 +0000 (Mon, 23 Jan 2012)
Log Message:
-----------
Add French translation

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

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2012-01-16 20:17:33 UTC (rev 8232)
+++ trunk/locale/po/fr.po	2012-01-23 15:55:42 UTC (rev 8233)
@@ -1110,9 +1110,9 @@
 msgstr "Résumé : %s"
 
 #: ../lib/MailNotify.php:308
-#, fuzzy, php-format
+#, php-format
 msgid "Renamed by: %s"
-msgstr "renommée à partir de %s"
+msgstr "Renommée par : %s"
 
 #: ../lib/MailNotify.php:309
 #, 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:[8232] trunk/wikilist.php

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

Revision: 8232
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8232&view=rev
Author:   vargenau
Date:     2012-01-16 20:17:33 +0000 (Mon, 16 Jan 2012)
Log Message:
-----------
FSF moved

Modified Paths:
--------------
    trunk/wikilist.php

Modified: trunk/wikilist.php
===================================================================
--- trunk/wikilist.php	2012-01-16 20:05:30 UTC (rev 8231)
+++ trunk/wikilist.php	2012-01-16 20:17:33 UTC (rev 8232)
@@ -17,8 +17,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with FusionForge; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with FusionForge; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 require_once dirname(__FILE__)."/../../env.inc.php";

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8231] trunk/lib/WikiDB.php

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

Revision: 8231
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8231&view=rev
Author:   vargenau
Date:     2012-01-16 20:05:30 +0000 (Mon, 16 Jan 2012)
Log Message:
-----------
Whitespace only

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

Modified: trunk/lib/WikiDB.php
===================================================================
--- trunk/lib/WikiDB.php	2012-01-11 14:16:33 UTC (rev 8230)
+++ trunk/lib/WikiDB.php	2012-01-16 20:05:30 UTC (rev 8231)
@@ -127,7 +127,7 @@
         // devel checking.
         if ((int)DEBUG & _DEBUG_SQL) {
             $this->_backend->check();
-    }
+        }
         // might be changed when opening the database fails
         $this->readonly = defined("READONLY") ? READONLY : false;
     }
@@ -476,24 +476,24 @@
     function listRelations($also_attributes=false, $only_attributes=false, $sorted=true) {
         if (method_exists($this->_backend, "list_relations"))
             return $this->_backend->list_relations($also_attributes, $only_attributes, $sorted);
-    // dumb, slow fallback. no iter, so simply define it here.
+        // dumb, slow fallback. no iter, so simply define it here.
         $relations = array();
         $iter = $this->getAllPages();
         while ($page = $iter->next()) {
             $reliter = $page->getRelations();
             $names = array();
             while ($rel = $reliter->next()) {
-        // if there's no pagename it's an attribute
+            // if there's no pagename it's an attribute
                 $names[] = $rel->getName();
             }
             $relations = array_merge($relations, $names);
             $reliter->free();
         }
         $iter->free();
-    if ($sorted) {
-        sort($relations);
-        reset($relations);
-    }
+        if ($sorted) {
+            sort($relations);
+            reset($relations);
+        }
         return $relations;
     }
 
@@ -517,16 +517,16 @@
             //update all WikiLinks in existing pages
             //non-atomic! i.e. if rename fails the links are not undone
             if ($updateWikiLinks) {
-        $lookbehind = "/(?<=[\W:])\Q";
-        $lookahead = "\E(?=[\W:])/";
+                $lookbehind = "/(?<=[\W:])\Q";
+                $lookahead = "\E(?=[\W:])/";
                 require_once('lib/plugin/WikiAdminSearchReplace.php');
                 $links = $oldpage->getBackLinks();
                 while ($linked_page = $links->next()) {
                     WikiPlugin_WikiAdminSearchReplace::replaceHelper
-            ($this,
-             $linked_page->getName(),
-             $lookbehind.$from.$lookahead, $to,
-             true, true);
+                        ($this,
+                         $linked_page->getName(),
+                         $lookbehind.$from.$lookahead, $to,
+                         true, true);
                 }
                 // FIXME: Disabled to avoid recursive modification when renaming
                 // a page like 'PageFoo to 'PageFooTwo'
@@ -549,7 +549,7 @@
                     $meta = $current->_data;
                     $version = $current->getVersion();
                     $meta['summary'] = sprintf(_("renamed from %s"), $from);
-            unset($meta['mtime']); // force new date
+                    unset($meta['mtime']); // force new date
                     $page->save($current->getPackedContent(), $version + 1, $meta);
                 }
             } elseif (!$oldpage->getCurrentRevision(false) and !$newpage->exists()) {
@@ -937,8 +937,8 @@
                 $data['mtime'] = $pdata['mtime'];
             }
 
-        // FIXME: use (possibly user specified) 'mtime' time or
-        // time()?
+            // FIXME: use (possibly user specified) 'mtime' time or
+            // time()?
             $cache->update_versiondata($pagename, $latestversion,
                                        array('_supplanted' => $data['mtime']));
         }
@@ -975,11 +975,11 @@
      */
     function save($wikitext, $version, $meta, $formatted = null) {
         if ($this->_wikidb->readonly) { trigger_error("readonly database", E_USER_WARNING); return; }
-    if (is_null($formatted))
-        $formatted = new TransformedText($this, $wikitext, $meta);
+        if (is_null($formatted))
+            $formatted = new TransformedText($this, $wikitext, $meta);
         $type = $formatted->getType();
-    $meta['pagetype'] = $type->getName();
-    $links = $formatted->getWikiPageLinks(); // linkto => relation
+        $meta['pagetype'] = $type->getName();
+        $links = $formatted->getWikiPageLinks(); // linkto => relation
         $attributes = array();
         foreach ($links as $link) {
             if ($link['linkto'] === "" and !empty($link['relation'])) {
@@ -988,13 +988,13 @@
         }
         $meta['attribute'] = $attributes;
 
-    $backend = &$this->_wikidb->_backend;
-    $newrevision = $this->createRevision($version, $wikitext, $meta, $links);
-    if ($newrevision and !WIKIDB_NOCACHE_MARKUP)
+        $backend = &$this->_wikidb->_backend;
+        $newrevision = $this->createRevision($version, $wikitext, $meta, $links);
+        if ($newrevision and !WIKIDB_NOCACHE_MARKUP)
             $this->set('_cached_html', $formatted->pack());
 
-    // FIXME: probably should have some global state information
-    // in the backend to control when to optimize.
+        // FIXME: probably should have some global state information
+        // in the backend to control when to optimize.
         //
         // We're doing this here rather than in createRevision because
         // postgresql can't optimize while locked.
@@ -1012,12 +1012,12 @@
             // Save didn't fail because of concurrent updates.
             $notify = $this->_wikidb->get('notify');
             if (!empty($notify)
-        and is_array($notify)
-        and !isa($GLOBALS['request'],'MockRequest'))
-        {
+                and is_array($notify)
+                and !isa($GLOBALS['request'],'MockRequest'))
+            {
                 include_once("lib/MailNotify.php");
                 $MailNotify = new MailNotify($newrevision->getName());
-        $MailNotify->onChangePage ($this->_wikidb, $wikitext, $version, $meta);
+                $MailNotify->onChangePage ($this->_wikidb, $wikitext, $version, $meta);
             }
             $newrevision->_transformedContent = $formatted;
         }
@@ -1032,7 +1032,7 @@
             $p = $w->getPlugin("RecentChangesCached", false);
             $p->box_update(false, $GLOBALS['request'], $this->_pagename);
         }
-    return $newrevision;
+        return $newrevision;
     }
 
     /**
@@ -1567,18 +1567,18 @@
      * contents.
      */
     function getTransformedContent($pagetype_override=false) {
-    $backend = &$this->_wikidb->_backend;
+        $backend = &$this->_wikidb->_backend;
 
-    if ($pagetype_override) {
-        // Figure out the normal page-type for this page.
+        if ($pagetype_override) {
+            // Figure out the normal page-type for this page.
             $type = PageType::GetPageType($this->get('pagetype'));
-        if ($type->getName() == $pagetype_override)
-        $pagetype_override = false; // Not really an override...
-    }
+            if ($type->getName() == $pagetype_override)
+                $pagetype_override = false; // Not really an override...
+        }
 
         if ($pagetype_override) {
             // Overriden page type, don't cache (or check cache).
-        return new TransformedText($this->getPage(),
+            return new TransformedText($this->getPage(),
                                        $this->getPackedContent(),
                                        $this->getMetaData(),
                                        $pagetype_override);
@@ -1604,7 +1604,7 @@
                 $possibly_cache_results = false;
             }
             //$backend->unlock();
-    }
+        }
 
         if (!$this->_transformedContent) {
             $this->_transformedContent
@@ -1650,15 +1650,15 @@
             {
                 include_once("lib/fortune.php");
                 $fortune = new Fortune();
-        $quote = $fortune->quoteFromDir(FORTUNE_DIR);
-        if ($quote != -1)
-            $quote = "<verbatim>\n"
-            . str_replace("\n<br>","\n", $quote)
-            . "</verbatim>\n\n";
-        else
-            $quote = "";
+                $quote = $fortune->quoteFromDir(FORTUNE_DIR);
+                if ($quote != -1)
+                    $quote = "<verbatim>\n"
+                    . str_replace("\n<br>","\n", $quote)
+                    . "</verbatim>\n\n";
+                else
+                    $quote = "";
                 return $quote
-            . sprintf(_("Describe %s here."),
+                    . sprintf(_("Describe %s here."),
                   "[" . WikiEscape($this->_pagename) . "]");
             }
             // Replace empty content with default value.
@@ -2165,7 +2165,7 @@
     function get_versiondata($pagename, $version, $need_content = false) {
         //  FIXME: Seriously ugly hackage
         $readdata = false;
-    if (USECACHE) {   //temporary - for debugging
+        if (USECACHE) {   //temporary - for debugging
             assert(is_string($pagename) && $pagename != '');
             // There is a bug here somewhere which results in an assertion failure at line 105
             // of ArchiveCleaner.php  It goes away if we use the next line.
@@ -2186,10 +2186,10 @@
                 }
             }
             $vdata = $cache[$pagename][$version][$nc];
-    } else {
+        } else {
             $vdata = $this->_backend->get_versiondata($pagename, $version, $need_content);
             $readdata = true;
-    }
+        }
         if ($readdata && is_array($vdata) && !empty($vdata['%pagedata'])) {
             if (empty($this->_pagedata_cache))
                 $this->_pagedata_cache = array();

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8230] trunk/lib/PagePerm.php

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

Revision: 8230
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8230&view=rev
Author:   vargenau
Date:     2012-01-11 14:16:33 +0000 (Wed, 11 Jan 2012)
Log Message:
-----------
zip and dumpserial are dump, not view

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

Modified: trunk/lib/PagePerm.php
===================================================================
--- trunk/lib/PagePerm.php	2012-01-11 13:05:44 UTC (rev 8229)
+++ trunk/lib/PagePerm.php	2012-01-11 14:16:33 UTC (rev 8230)
@@ -170,20 +170,15 @@
     case 'search':
     case 'pdf':
     case 'captcha':
-    case 'zip':
         return 'view';
 
-    case 'dumpserial':
-    if (INSECURE_ACTIONS_LOCALHOST_ONLY and is_localhost())
-        return 'dump';
-    else
-        return 'view';
-
     // performance and security relevant
     case 'xmlrpc':
     case 'soap':
+    case 'zip':
     case 'ziphtml':
     case 'dumphtml':
+    case 'dumpserial':
         return 'dump';
 
     // invent a new access-perm massedit? or switch back to change, or keep it at edit?

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

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

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

Revision: 8229
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8229&view=rev
Author:   vargenau
Date:     2012-01-11 13:05:44 +0000 (Wed, 11 Jan 2012)
Log Message:
-----------
Improve French translation

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

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2012-01-11 13:03:49 UTC (rev 8228)
+++ trunk/locale/po/fr.po	2012-01-11 13:05:44 UTC (rev 8229)
@@ -1193,7 +1193,7 @@
 #, php-format
 msgid "%s %s %s is disallowed on this wiki for %s user '%s' (level: %s)."
 msgstr ""
-"%s %s %s est interdite sur ce wiki pour %s l'utilisateur « %s » (niveau : "
+"%s %s %s est interdit sur ce wiki pour l'utilisateur %s « %s » (niveau : "
 "%s)."
 
 #: ../lib/main.php:531

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

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

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

Revision: 8228
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8228&view=rev
Author:   vargenau
Date:     2012-01-11 13:03:49 +0000 (Wed, 11 Jan 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/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-01-11 12:40:50 UTC (rev 8227)
+++ trunk/locale/po/de.po	2012-01-11 13:03:49 UTC (rev 8228)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-20 19:53+0100\n"
+"POT-Creation-Date: 2012-01-11 14:03+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."
@@ -44,7 +44,7 @@
 msgid "Typed in verification word mismatch ... are you a bot?"
 msgstr ""
 
-#: ../lib/Captcha.php:68
+#: ../lib/Captcha.php:69
 msgid "Type word above:"
 msgstr ""
 
@@ -364,8 +364,8 @@
 "(Kopieren Sie Ihre Veränderungen in die Zwischenablage. Sie können versuchen "
 "eine andere Seite zu edieren oder Ihr Text in einem Texteditor speichern.)"
 
-#: ../lib/editpage.php:568 ../lib/editpage.php:569 ../lib/main.php:808
-#: ../lib/main.php:1175 ../lib/plugin/ModeratedPage.php:42
+#: ../lib/editpage.php:568 ../lib/editpage.php:569 ../lib/main.php:806
+#: ../lib/main.php:1173 ../lib/plugin/ModeratedPage.php:42
 #: ../lib/plugin/ModeratedPage.php:147 ../lib/plugin/ModeratedPage.php:217
 #: ../lib/plugin/ModeratedPage.php:257 ../lib/plugin/ModeratedPage.php:260
 #: ../lib/plugin/ModeratedPage.php:262 ../lib/plugin/ModeratedPage.php:264
@@ -740,11 +740,11 @@
 msgid ": "
 msgstr ": "
 
-#: ../lib/InlineParser.php:394 ../lib/main.php:769 ../lib/stdlib.php:970
+#: ../lib/InlineParser.php:394 ../lib/main.php:767 ../lib/stdlib.php:970
 msgid "Page name too long"
 msgstr "Seite Name zu lang"
 
-#: ../lib/InlineParser.php:399 ../lib/main.php:776
+#: ../lib/InlineParser.php:399 ../lib/main.php:774
 #, php-format
 msgid "Illegal character '%s' in page name."
 msgstr "Ungültiges Zeichen '%s' in Seitenname."
@@ -783,8 +783,8 @@
 # Any better translation? The locale/de/pgsrc/PhpWikiSystemverwalten
 # must also be renamed to match what is here.
 #: ../lib/loadsave.php:85 ../lib/loadsave.php:475 ../lib/loadsave.php:1037
-#: ../lib/loadsave.php:1043 ../lib/loadsave.php:1051 ../lib/main.php:1071
-#: ../lib/main.php:1193 ../lib/main.php:1205 ../lib/PagePerm.php:190
+#: ../lib/loadsave.php:1043 ../lib/loadsave.php:1051 ../lib/main.php:1069
+#: ../lib/main.php:1191 ../lib/main.php:1203 ../lib/PagePerm.php:190
 #: ../lib/PagePerm.php:191 ../lib/plugin/WikiAdminRename.php:142
 #: ../lib/plugin/WikiAdminSelect.php:218
 #: ../themes/blog/templates/navbar.tmpl:14
@@ -808,7 +808,7 @@
 
 # (Wrong Translation; sorry, but the German term for edit is NOT
 # editieren, but  e d i e r e n).
-#: ../lib/loadsave.php:96 ../lib/MailNotify.php:292 ../lib/MailNotify.php:309
+#: ../lib/loadsave.php:96 ../lib/MailNotify.php:297
 #, php-format
 msgid "Edited by: %s"
 msgstr "Bearbeitet von: %s"
@@ -934,7 +934,7 @@
 msgid "from %s"
 msgstr "von %s"
 
-#: ../lib/loadsave.php:979 ../lib/MailNotify.php:288
+#: ../lib/loadsave.php:979 ../lib/MailNotify.php:293
 #: ../lib/plugin/RecentChanges.php:137
 msgid "New page"
 msgstr "Neue Seite"
@@ -1109,46 +1109,51 @@
 msgid "Uploading %s"
 msgstr "%s wird hochgeladen"
 
-#: ../lib/MailNotify.php:194
+#: ../lib/MailNotify.php:197
 #, php-format
 msgid "PageChange Notification of %s"
 msgstr "SeitenÄnderung Benachrichtigung von %s"
 
-#: ../lib/MailNotify.php:233
+#: ../lib/MailNotify.php:236
 #, php-format
 msgid "sent to %s"
 msgstr "an %s gesendet"
 
-#: ../lib/MailNotify.php:239
+#: ../lib/MailNotify.php:242
 #, php-format
 msgid "Error: Couldn't send %s to %s"
 msgstr "Fehler: Konnte nicht %s an %s senden"
 
-#: ../lib/MailNotify.php:261
+#: ../lib/MailNotify.php:264
 msgid "Page change"
 msgstr "Seiten Änderung"
 
-#: ../lib/MailNotify.php:293
+#: ../lib/MailNotify.php:298
 #, php-format
 msgid "Summary: %s"
 msgstr "Zusammenfassung: %s"
 
-#: ../lib/MailNotify.php:310
+#: ../lib/MailNotify.php:308
+#, fuzzy, php-format
+msgid "Renamed by: %s"
+msgstr "umbenannt von %s"
+
+#: ../lib/MailNotify.php:309
 #, php-format
 msgid "Page rename %s to %s"
 msgstr "Seite »%s« nach umbenennen »%s«"
 
-#: ../lib/MailNotify.php:347
+#: ../lib/MailNotify.php:345
 #, php-format
 msgid "User %s removed page %s"
 msgstr "Seite gelöscht %s von Benutzer %s"
 
-#: ../lib/MailNotify.php:383 ../lib/plugin/WikiAdminUtils.php:113
+#: ../lib/MailNotify.php:381 ../lib/plugin/WikiAdminUtils.php:113
 #: ../lib/WikiUserNew.php:1782
 msgid "E-mail address confirmation"
 msgstr "E-Mail Bestätigung"
 
-#: ../lib/MailNotify.php:386
+#: ../lib/MailNotify.php:384
 #, php-format
 msgid ""
 "Someone, probably you from IP address %s, has registered an\n"
@@ -1167,273 +1172,273 @@
 msgid "Optimizing database"
 msgstr "Datenbank wird optimiert"
 
-#: ../lib/main.php:473
+#: ../lib/main.php:471
 msgid "FORBIDDEN"
 msgstr "VERBOTEN"
 
-#: ../lib/main.php:474 ../lib/main.php:484
+#: ../lib/main.php:472 ../lib/main.php:482
 msgid "ANON"
 msgstr "ANON"
 
-#: ../lib/main.php:475
+#: ../lib/main.php:473
 msgid "BOGO"
 msgstr "BOGO"
 
-#: ../lib/main.php:476
+#: ../lib/main.php:474
 msgid "USER"
 msgstr "BENUTZER"
 
-#: ../lib/main.php:477
+#: ../lib/main.php:475
 msgid "ADMIN"
 msgstr "ADMIN"
 
-#: ../lib/main.php:478
+#: ../lib/main.php:476
 msgid "UNOBTAINABLE"
 msgstr "UNERREICHBAR"
 
-#: ../lib/main.php:506 ../lib/main.php:525
+#: ../lib/main.php:504 ../lib/main.php:523
 #, php-format
 msgid "%s is disallowed on this wiki."
 msgstr "»%s« ist auf diesem Wiki nicht zugelassen."
 
-#: ../lib/main.php:514
+#: ../lib/main.php:512
 msgid "authenticated"
 msgstr "authentifizierten"
 
-#: ../lib/main.php:514
+#: ../lib/main.php:512
 msgid "not authenticated"
 msgstr "nicht authentifizierten"
 
-#: ../lib/main.php:516
+#: ../lib/main.php:514
 msgid "Missing PagePermission:"
 msgstr "Fehlende Zugriffsberechtigung:"
 
 # Missing PagePermission:| access | pagename
-#: ../lib/main.php:515
+#: ../lib/main.php:513
 #, php-format
 msgid "%s %s %s is disallowed on this wiki for %s user '%s' (level: %s)."
 msgstr ""
 "%s %s »%s« ist auf diesem Wiki für %s Benutzer »%s« (Level: %s) nicht "
 "zugelassen."
 
-#: ../lib/main.php:533
+#: ../lib/main.php:531
 #, php-format
 msgid "You must sign in to %s."
 msgstr "Sie müssen sich anmelden %s."
 
-#: ../lib/main.php:543
+#: ../lib/main.php:541
 #, php-format
 msgid "Access for you is forbidden to %s."
 msgstr ""
 
-#: ../lib/main.php:545 ../lib/plugin/PluginManager.php:58
+#: ../lib/main.php:543 ../lib/plugin/PluginManager.php:58
 #, php-format
 msgid "You must be an administrator to %s."
 msgstr "Sie müssen Administratorrechte haben %s."
 
-#: ../lib/main.php:559
+#: ../lib/main.php:557
 msgid "view this page"
 msgstr "um diese Seite anzuzeigen"
 
-#: ../lib/main.php:560
+#: ../lib/main.php:558
 msgid "diff this page"
 msgstr "um von dieser Seite die Änderungen anzuzeigen"
 
-#: ../lib/main.php:561
+#: ../lib/main.php:559
 msgid "dump html pages"
 msgstr "um von diesem Wiki HTML-Dateien lokal abzuspeichern"
 
-#: ../lib/main.php:562
+#: ../lib/main.php:560
 msgid "dump serial pages"
 msgstr "um von diesem Wiki die Seiten lokal abzuspeichern"
 
-#: ../lib/main.php:563
+#: ../lib/main.php:561
 msgid "edit this page"
 msgstr "um diese Seite zu bearbeiten"
 
-#: ../lib/main.php:564
+#: ../lib/main.php:562
 msgid "rename this page"
 msgstr "um diese Seite umzubennen"
 
-#: ../lib/main.php:565
+#: ../lib/main.php:563
 msgid "revert to a previous version of this page"
 msgstr "Zurückspeichern einer älteren Version dieser Seite."
 
-#: ../lib/main.php:566
+#: ../lib/main.php:564
 msgid "create this page"
 msgstr "um diese Seite zu erzeugen"
 
-#: ../lib/main.php:567
+#: ../lib/main.php:565
 msgid "load files into this wiki"
 msgstr "um Seiten in dieses Wiki zu laden"
 
-#: ../lib/main.php:568
+#: ../lib/main.php:566
 msgid "lock this page"
 msgstr "um diese Seite zu sperren"
 
-#: ../lib/main.php:569
+#: ../lib/main.php:567
 msgid "purge this page"
 msgstr "um diese Seite endgültig zu löschen"
 
-#: ../lib/main.php:570
+#: ../lib/main.php:568
 msgid "remove this page"
 msgstr "um diese Seite zu löschen"
 
-#: ../lib/main.php:571
+#: ../lib/main.php:569
 msgid "unlock this page"
 msgstr "um diese Seite zu entsperren"
 
-#: ../lib/main.php:572
+#: ../lib/main.php:570
 msgid "upload a zip dump"
 msgstr "um einen ZIP-Speicherauszug in dieses Wiki zu laden"
 
 # (verify=verwirklichen, in die Tat umsetzen, durch- oder ausführen)
-#: ../lib/main.php:573
+#: ../lib/main.php:571
 msgid "verify the current action"
 msgstr "um die gegenwärtige Aktion durchzuführen"
 
-#: ../lib/main.php:574
+#: ../lib/main.php:572
 msgid "view the source of this page"
 msgstr "um den Quelltext dieser Seiten anzusehen"
 
-#: ../lib/main.php:575
+#: ../lib/main.php:573
 msgid "access this wiki via XML-RPC"
 msgstr "um via XML-RPC auf dieses Wiki zuzugreifen"
 
-#: ../lib/main.php:576
+#: ../lib/main.php:574
 msgid "access this wiki via SOAP"
 msgstr "um via SOAP auf dieses Wiki zuzugreifen"
 
-#: ../lib/main.php:577
+#: ../lib/main.php:575
 msgid "download a zip dump from this wiki"
 msgstr "um eine gezippte Sicherung von allen Wiki Seiten herunterzuladen"
 
-#: ../lib/main.php:578
+#: ../lib/main.php:576
 msgid "download a html zip dump from this wiki"
 msgstr "um alle HTML Seiten als Zipdatei von diesem Wiki herunterzuladen"
 
-#: ../lib/main.php:584
+#: ../lib/main.php:582
 msgid "use"
 msgstr "benutze"
 
-#: ../lib/main.php:602
+#: ../lib/main.php:600
 msgid "Browsing pages"
 msgstr "Das Durchblättern der Seiten dieses Wikis"
 
-#: ../lib/main.php:603
+#: ../lib/main.php:601
 msgid "Diffing pages"
 msgstr "Die Inhalts-Differenz-Seiten dieses Wikis"
 
-#: ../lib/main.php:604
+#: ../lib/main.php:602
 msgid "Dumping html pages"
 msgstr "Die Speicherung von Wiki Seiten als HTML-Dateien"
 
-#: ../lib/main.php:605
+#: ../lib/main.php:603
 msgid "Dumping serial pages"
 msgstr "Die Speicherung von Wiki Seiten als Dateien"
 
-#: ../lib/main.php:606
+#: ../lib/main.php:604
 msgid "Editing pages"
 msgstr "Ändern in diesem Wiki"
 
-#: ../lib/main.php:607
+#: ../lib/main.php:605
 msgid "Reverting to a previous version of pages"
 msgstr "Zurückspeichern einer älteren Version"
 
-#: ../lib/main.php:608
+#: ../lib/main.php:606
 msgid "Creating pages"
 msgstr "Neue Seiten erzeugen"
 
-#: ../lib/main.php:609
+#: ../lib/main.php:607
 msgid "Loading files"
 msgstr "Dateien hinaufladen"
 
-#: ../lib/main.php:610
+#: ../lib/main.php:608
 msgid "Locking pages"
 msgstr "Seiten sperren"
 
-#: ../lib/main.php:611
+#: ../lib/main.php:609
 msgid "Purging pages"
 msgstr "Das Durchblättern der Seiten dieses Wikis"
 
-#: ../lib/main.php:612
+#: ../lib/main.php:610
 msgid "Removing pages"
 msgstr "Die Seitenlöschung in diesem Wiki"
 
-#: ../lib/main.php:613
+#: ../lib/main.php:611
 msgid "Unlocking pages"
 msgstr "Die Seitenfreigabe in diesem Wiki"
 
-#: ../lib/main.php:614
+#: ../lib/main.php:612
 msgid "Uploading zip dumps"
 msgstr "Das Hochladen von ZIP-Dumps in diesem Wiki"
 
-#: ../lib/main.php:615
+#: ../lib/main.php:613
 msgid "Verify the current action"
 msgstr "Bestätigen Sie die gegenwärtige Aktion"
 
-#: ../lib/main.php:616
+#: ../lib/main.php:614
 msgid "Viewing the source of pages"
 msgstr "Die Quelltextansicht der Seiten in diesem Wiki"
 
-#: ../lib/main.php:617
+#: ../lib/main.php:615
 msgid "XML-RPC access"
 msgstr "XML-RPC Zugriff"
 
-#: ../lib/main.php:618
+#: ../lib/main.php:616
 msgid "SOAP access"
 msgstr "SOAP-Zugriff"
 
-#: ../lib/main.php:619
+#: ../lib/main.php:617
 msgid "Downloading zip dumps"
 msgstr "Das Herunterladen aller Wiki-Seiten als gezippte Datei"
 
-#: ../lib/main.php:620
+#: ../lib/main.php:618
 msgid "Downloading html zip dumps"
 msgstr ""
 "Das Herunterladen aller Wiki-Seiten als HTML-Dateien in einer Zip-Datei"
 
-#: ../lib/main.php:796
+#: ../lib/main.php:794
 #, php-format
 msgid "%s: action forwarded to a moderator."
 msgstr ""
 
-#: ../lib/main.php:799
+#: ../lib/main.php:797
 msgid "This action requires moderator approval. Please be patient."
 msgstr ""
 
-#: ../lib/main.php:804
+#: ../lib/main.php:802
 msgid "You must wait for moderator approval."
 msgstr "Sie müssen auf die Zustimmung des Moderators warten."
 
-#: ../lib/main.php:824 ../lib/plugin/ModeratedPage.php:309
+#: ../lib/main.php:822 ../lib/plugin/ModeratedPage.php:309
 #, php-format
 msgid "%s: Bad action"
 msgstr "%s: Ungültige Aktion"
 
-#: ../lib/main.php:841
+#: ../lib/main.php:839
 msgid "Fatal PhpWiki Error"
 msgstr "Fataler PhpWiki-Fehler"
 
-#: ../lib/main.php:1092
+#: ../lib/main.php:1090
 msgid "Chown"
 msgstr "Chown"
 
-#: ../lib/main.php:1096
+#: ../lib/main.php:1094
 msgid "SetAcl"
 msgstr "AclSetzen"
 
-#: ../lib/main.php:1100
+#: ../lib/main.php:1098
 msgid "SetAclSimple"
 msgstr ""
 
-#: ../lib/main.php:1104 ../lib/PagePerm.php:190
+#: ../lib/main.php:1102 ../lib/PagePerm.php:190
 #: ../lib/plugin/WikiAdminRename.php:142 ../lib/plugin/WikiAdminRename.php:268
 #: ../themes/fusionforge/templates/actionbar.tmpl:120
 msgid "Rename"
 msgstr "Umbenennen"
 
-#: ../lib/main.php:1108 ../lib/main.php:1113 ../lib/plugin/PageDump.php:56
+#: ../lib/main.php:1106 ../lib/main.php:1111 ../lib/plugin/PageDump.php:56
 #: ../themes/Crao/templates/actionbar.tmpl:32
 #: ../themes/default/templates/actionbar.tmpl:40
 #: ../themes/MonoBook/templates/actionbar.tmpl:80
@@ -1445,12 +1450,12 @@
 msgid "PageDump"
 msgstr "SeiteSpeichern"
 
-#: ../lib/main.php:1131 ../lib/plugin/FullTextSearch.php:46
+#: ../lib/main.php:1129 ../lib/plugin/FullTextSearch.php:46
 #: ../lib/plugin/WantedPagesOld.php:126
 msgid "FullTextSearch"
 msgstr "VolltextSuche"
 
-#: ../lib/main.php:1139 ../lib/plugin/RecentChanges.php:808
+#: ../lib/main.php:1137 ../lib/plugin/RecentChanges.php:808
 #: ../lib/plugin/TitleSearch.php:44 ../lib/WikiTheme.php:1472
 #: ../themes/Crao/templates/navbar.tmpl:5
 #: ../themes/Crao/templates/navbar.tmpl:9
@@ -1465,37 +1470,37 @@
 msgid "TitleSearch"
 msgstr "TitelSuche"
 
-#: ../lib/main.php:1313 ../lib/main.php:1326 ../lib/Request.php:821
+#: ../lib/main.php:1311 ../lib/main.php:1324 ../lib/Request.php:821
 #, php-format
 msgid "%s is not writable."
 msgstr "%s is nicht änderbar."
 
-#: ../lib/main.php:1314
+#: ../lib/main.php:1312
 msgid "The session.save_path directory"
 msgstr "Das session.save_path Verzeichnis"
 
-#: ../lib/main.php:1316 ../lib/Request.php:823
+#: ../lib/main.php:1314 ../lib/Request.php:823
 #, php-format
 msgid "Please ensure that %s is writable, or redefine %s in config/config.ini."
 msgstr ""
 "Bitte überprüfen Sie, dass %s änderbar ist, oder ändern Sie %s in config/"
 "config.ini."
 
-#: ../lib/main.php:1317
+#: ../lib/main.php:1315
 #, php-format
 msgid "the session.save_path directory '%s'"
 msgstr "das session.save_path Verzeichnis »%s«"
 
-#: ../lib/main.php:1321
+#: ../lib/main.php:1319
 #, php-format
 msgid "Attempting to use the directory '%s' instead."
 msgstr "Versuche stattdessen das Verzeichnis »%s« zu verwenden."
 
-#: ../lib/main.php:1328
+#: ../lib/main.php:1326
 msgid "Users will not be able to sign in."
 msgstr "Benutzer werden sich nicht anmelden können."
 
-#: ../lib/main.php:1340
+#: ../lib/main.php:1338
 msgid "Your PHP version is too old. You must have at least PHP 4.3.9"
 msgstr ""
 

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2012-01-11 12:40:50 UTC (rev 8227)
+++ trunk/locale/po/es.po	2012-01-11 13:03:49 UTC (rev 8228)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-20 19:53+0100\n"
+"POT-Creation-Date: 2012-01-11 14:03+0100\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -51,7 +51,7 @@
 "¿Mecanografían en la unión mal hecha de la palabra de la verificación... le "
 "un BOT?"
 
-#: ../lib/Captcha.php:68
+#: ../lib/Captcha.php:69
 msgid "Type word above:"
 msgstr "Mecanografíe la palabra arriba:"
 
@@ -362,8 +362,8 @@
 "Copie sus cambios al portapapeles o a otro sitio temporal (p.ej. editor de "
 "textos)."
 
-#: ../lib/editpage.php:568 ../lib/editpage.php:569 ../lib/main.php:808
-#: ../lib/main.php:1175 ../lib/plugin/ModeratedPage.php:42
+#: ../lib/editpage.php:568 ../lib/editpage.php:569 ../lib/main.php:806
+#: ../lib/main.php:1173 ../lib/plugin/ModeratedPage.php:42
 #: ../lib/plugin/ModeratedPage.php:147 ../lib/plugin/ModeratedPage.php:217
 #: ../lib/plugin/ModeratedPage.php:257 ../lib/plugin/ModeratedPage.php:260
 #: ../lib/plugin/ModeratedPage.php:262 ../lib/plugin/ModeratedPage.php:264
@@ -733,11 +733,11 @@
 msgid ": "
 msgstr ": "
 
-#: ../lib/InlineParser.php:394 ../lib/main.php:769 ../lib/stdlib.php:970
+#: ../lib/InlineParser.php:394 ../lib/main.php:767 ../lib/stdlib.php:970
 msgid "Page name too long"
 msgstr "La nombre de página demasiado de largo"
 
-#: ../lib/InlineParser.php:399 ../lib/main.php:776
+#: ../lib/InlineParser.php:399 ../lib/main.php:774
 #, fuzzy, php-format
 msgid "Illegal character '%s' in page name."
 msgstr "Los carbones ilegales %s quitaron"
@@ -774,8 +774,8 @@
 msgstr "Páginas de la descarga como XHTML"
 
 #: ../lib/loadsave.php:85 ../lib/loadsave.php:475 ../lib/loadsave.php:1037
-#: ../lib/loadsave.php:1043 ../lib/loadsave.php:1051 ../lib/main.php:1071
-#: ../lib/main.php:1193 ../lib/main.php:1205 ../lib/PagePerm.php:190
+#: ../lib/loadsave.php:1043 ../lib/loadsave.php:1051 ../lib/main.php:1069
+#: ../lib/main.php:1191 ../lib/main.php:1203 ../lib/PagePerm.php:190
 #: ../lib/PagePerm.php:191 ../lib/plugin/WikiAdminRename.php:142
 #: ../lib/plugin/WikiAdminSelect.php:218
 #: ../themes/blog/templates/navbar.tmpl:14
@@ -797,7 +797,7 @@
 msgid "PhpWikiAdministration"
 msgstr "AdministraciónDePhpWiki"
 
-#: ../lib/loadsave.php:96 ../lib/MailNotify.php:292 ../lib/MailNotify.php:309
+#: ../lib/loadsave.php:96 ../lib/MailNotify.php:297
 #, php-format
 msgid "Edited by: %s"
 msgstr "Editar: %s"
@@ -920,7 +920,7 @@
 msgid "from %s"
 msgstr "de %s"
 
-#: ../lib/loadsave.php:979 ../lib/MailNotify.php:288
+#: ../lib/loadsave.php:979 ../lib/MailNotify.php:293
 #: ../lib/plugin/RecentChanges.php:137
 msgid "New page"
 msgstr "Página nueva"
@@ -1090,46 +1090,51 @@
 msgid "Uploading %s"
 msgstr "%s uploading"
 
-#: ../lib/MailNotify.php:194
+#: ../lib/MailNotify.php:197
 #, php-format
 msgid "PageChange Notification of %s"
 msgstr "Pagine la notificación del cambio de %s"
 
-#: ../lib/MailNotify.php:233
+#: ../lib/MailNotify.php:236
 #, php-format
 msgid "sent to %s"
 msgstr ""
 
-#: ../lib/MailNotify.php:239
+#: ../lib/MailNotify.php:242
 #, php-format
 msgid "Error: Couldn't send %s to %s"
 msgstr ""
 
-#: ../lib/MailNotify.php:261
+#: ../lib/MailNotify.php:264
 msgid "Page change"
 msgstr "Cambio de la página"
 
-#: ../lib/MailNotify.php:293
+#: ../lib/MailNotify.php:298
 #, php-format
 msgid "Summary: %s"
 msgstr ""
 
-#: ../lib/MailNotify.php:310
+#: ../lib/MailNotify.php:308
+#, fuzzy, php-format
+msgid "Renamed by: %s"
+msgstr "retitulado de %s"
+
+#: ../lib/MailNotify.php:309
 #, php-format
 msgid "Page rename %s to %s"
 msgstr "La página retitula %s a %s"
 
-#: ../lib/MailNotify.php:347
+#: ../lib/MailNotify.php:345
 #, php-format
 msgid "User %s removed page %s"
 msgstr "El usuarios %s eliminado página %s"
 
-#: ../lib/MailNotify.php:383 ../lib/plugin/WikiAdminUtils.php:113
+#: ../lib/MailNotify.php:381 ../lib/plugin/WikiAdminUtils.php:113
 #: ../lib/WikiUserNew.php:1782
 msgid "E-mail address confirmation"
 msgstr "Verificación Del Email"
 
-#: ../lib/MailNotify.php:386
+#: ../lib/MailNotify.php:384
 #, php-format
 msgid ""
 "Someone, probably you from IP address %s, has registered an\n"
@@ -1148,270 +1153,270 @@
 msgid "Optimizing database"
 msgstr "Base de datos óptima"
 
-#: ../lib/main.php:473
+#: ../lib/main.php:471
 msgid "FORBIDDEN"
 msgstr "PROHIBIDO"
 
-#: ../lib/main.php:474 ../lib/main.php:484
+#: ../lib/main.php:472 ../lib/main.php:482
 msgid "ANON"
 msgstr "ANÓN"
 
-#: ../lib/main.php:475
+#: ../lib/main.php:473
 msgid "BOGO"
 msgstr "BOGO"
 
-#: ../lib/main.php:476
+#: ../lib/main.php:474
 msgid "USER"
 msgstr "USUARIO"
 
-#: ../lib/main.php:477
+#: ../lib/main.php:475
 msgid "ADMIN"
 msgstr "ADMIN"
 
-#: ../lib/main.php:478
+#: ../lib/main.php:476
 msgid "UNOBTAINABLE"
 msgstr "INALCANZABLE"
 
-#: ../lib/main.php:506 ../lib/main.php:525
+#: ../lib/main.php:504 ../lib/main.php:523
 #, php-format
 msgid "%s is disallowed on this wiki."
 msgstr "%s se rechaza en este wiki."
 
-#: ../lib/main.php:514
+#: ../lib/main.php:512
 msgid "authenticated"
 msgstr "authenticado"
 
-#: ../lib/main.php:514
+#: ../lib/main.php:512
 msgid "not authenticated"
 msgstr "non authenticado"
 
-#: ../lib/main.php:516
+#: ../lib/main.php:514
 msgid "Missing PagePermission:"
 msgstr "Permiso que falta de la página:"
 
-#: ../lib/main.php:515
+#: ../lib/main.php:513
 #, php-format
 msgid "%s %s %s is disallowed on this wiki for %s user '%s' (level: %s)."
 msgstr ""
 "%s %s %s se rechaza en este wiki para el usuario '%s' de %s (llano:  %s)."
 
-#: ../lib/main.php:533
+#: ../lib/main.php:531
 #, php-format
 msgid "You must sign in to %s."
 msgstr "Usted debe firmar adentro %s."
 
-#: ../lib/main.php:543
+#: ../lib/main.php:541
 #, php-format
 msgid "Access for you is forbidden to %s."
 msgstr "Tenga acceso para usted se prohíbe %s."
 
-#: ../lib/main.php:545 ../lib/plugin/PluginManager.php:58
+#: ../lib/main.php:543 ../lib/plugin/PluginManager.php:58
 #, php-format
 msgid "You must be an administrator to %s."
 msgstr "Usted debe ser administrador %s."
 
-#: ../lib/main.php:559
+#: ../lib/main.php:557
 msgid "view this page"
 msgstr "para visión esta página"
 
-#: ../lib/main.php:560
+#: ../lib/main.php:558
 msgid "diff this page"
 msgstr "para diff esta página"
 
-#: ../lib/main.php:561
+#: ../lib/main.php:559
 msgid "dump html pages"
 msgstr "para las páginas del HTML de la descarga"
 
-#: ../lib/main.php:562
+#: ../lib/main.php:560
 msgid "dump serial pages"
 msgstr "para las páginas del cuento por entregas de la descarga"
 
-#: ../lib/main.php:563
+#: ../lib/main.php:561
 msgid "edit this page"
 msgstr "para corregir esta página"
 
-#: ../lib/main.php:564
+#: ../lib/main.php:562
 msgid "rename this page"
 msgstr ""
 
-#: ../lib/main.php:565
+#: ../lib/main.php:563
 msgid "revert to a previous version of this page"
 msgstr "para invertir a una versión anterior de esta página"
 
-#: ../lib/main.php:566
+#: ../lib/main.php:564
 msgid "create this page"
 msgstr "para crear esta página"
 
-#: ../lib/main.php:567
+#: ../lib/main.php:565
 msgid "load files into this wiki"
 msgstr "para cargue los archivos en este wiki"
 
-#: ../lib/main.php:568
+#: ../lib/main.php:566
 msgid "lock this page"
 msgstr "para trabar esta página"
 
-#: ../lib/main.php:569
+#: ../lib/main.php:567
 msgid "purge this page"
 msgstr ""
 
-#: ../lib/main.php:570
+#: ../lib/main.php:568
 msgid "remove this page"
 msgstr "para quitar esta página"
 
-#: ../lib/main.php:571
+#: ../lib/main.php:569
 msgid "unlock this page"
 msgstr "para desbloquear página"
 
-#: ../lib/main.php:572
+#: ../lib/main.php:570
 msgid "upload a zip dump"
 msgstr "para upload una descarga del cierre relámpago"
 
-#: ../lib/main.php:573
+#: ../lib/main.php:571
 msgid "verify the current action"
 msgstr "para verificar la acción actual"
 
-#: ../lib/main.php:574
+#: ../lib/main.php:572
 msgid "view the source of this page"
 msgstr "para visión la fuente de esta página"
 
-#: ../lib/main.php:575
+#: ../lib/main.php:573
 msgid "access this wiki via XML-RPC"
 msgstr "para tener acceso a este wiki vía Xml-RPC"
 
-#: ../lib/main.php:576
+#: ../lib/main.php:574
 msgid "access this wiki via SOAP"
 msgstr "para tener acceso a este wiki vía SOAP"
 
-#: ../lib/main.php:577
+#: ../lib/main.php:575
 msgid "download a zip dump from this wiki"
 msgstr "para descargar un cierre relámpago descargue de este wiki"
 
-#: ../lib/main.php:578
+#: ../lib/main.php:576
 msgid "download a html zip dump from this wiki"
 msgstr "para descargar un HTML relampague la descarga de este wiki"
 
-#: ../lib/main.php:584
+#: ../lib/main.php:582
 msgid "use"
 msgstr ""
 
-#: ../lib/main.php:602
+#: ../lib/main.php:600
 msgid "Browsing pages"
 msgstr "Páginas el hojear"
 
-#: ../lib/main.php:603
+#: ../lib/main.php:601
 msgid "Diffing pages"
 msgstr ""
 
-#: ../lib/main.php:604
+#: ../lib/main.php:602
 msgid "Dumping html pages"
 msgstr ""
 
-#: ../lib/main.php:605
+#: ../lib/main.php:603
 msgid "Dumping serial pages"
 msgstr ""
 
-#: ../lib/main.php:606
+#: ../lib/main.php:604
 msgid "Editing pages"
 msgstr ""
 
-#: ../lib/main.php:607
+#: ../lib/main.php:605
 msgid "Reverting to a previous version of pages"
 msgstr ""
 
-#: ../lib/main.php:608
+#: ../lib/main.php:606
 msgid "Creating pages"
 msgstr ""
 
-#: ../lib/main.php:609
+#: ../lib/main.php:607
 msgid "Loading files"
 msgstr ""
 
-#: ../lib/main.php:610
+#: ../lib/main.php:608
 msgid "Locking pages"
 msgstr "Bloquear páginas"
 
-#: ../lib/main.php:611
+#: ../lib/main.php:609
 msgid "Purging pages"
 msgstr ""
 
-#: ../lib/main.php:612
+#: ../lib/main.php:610
 msgid "Removing pages"
 msgstr "Borrar páginas"
 
-#: ../lib/main.php:613
+#: ../lib/main.php:611
 msgid "Unlocking pages"
 msgstr "Desbloquear páginas"
 
-#: ../lib/main.php:614
+#: ../lib/main.php:612
 msgid "Uploading zip dumps"
 msgstr ""
 
-#: ../lib/main.php:615
+#: ../lib/main.php:613
 msgid "Verify the current action"
 msgstr ""
 
-#: ../lib/main.php:616
+#: ../lib/main.php:614
 msgid "Viewing the source of pages"
 msgstr ""
 
-#: ../lib/main.php:617
+#: ../lib/main.php:615
 msgid "XML-RPC access"
 msgstr ""
 
-#: ../lib/main.php:618
+#: ../lib/main.php:616
 msgid "SOAP access"
 msgstr ""
 
-#: ../lib/main.php:619
+#: ../lib/main.php:617
 msgid "Downloading zip dumps"
 msgstr ""
 
-#: ../lib/main.php:620
+#: ../lib/main.php:618
 msgid "Downloading html zip dumps"
 msgstr ""
 
-#: ../lib/main.php:796
+#: ../lib/main.php:794
 #, php-format
 msgid "%s: action forwarded to a moderator."
 msgstr "%s: acción remitida a un asesor."
 
-#: ../lib/main.php:799
+#: ../lib/main.php:797
 msgid "This action requires moderator approval. Please be patient."
 msgstr ""
 "Esta acción requiere la aprobación del asesor.  Sea por favor paciente."
 
-#: ../lib/main.php:804
+#: ../lib/main.php:802
 msgid "You must wait for moderator approval."
 msgstr "Usted debe esperar la aprobación del asesor."
 
-#: ../lib/main.php:824 ../lib/plugin/ModeratedPage.php:309
+#: ../lib/main.php:822 ../lib/plugin/ModeratedPage.php:309
 #, php-format
 msgid "%s: Bad action"
 msgstr "%s: Mala acción"
 
-#: ../lib/main.php:841
+#: ../lib/main.php:839
 msgid "Fatal PhpWiki Error"
 msgstr "Error Fatal De PhpWiki"
 
-#: ../lib/main.php:1092
+#: ../lib/main.php:1090
 msgid "Chown"
 msgstr "Cambie a dueño"
 
-#: ../lib/main.php:1096
+#: ../lib/main.php:1094
 msgid "SetAcl"
 msgstr "Fije El Acl"
 
-#: ../lib/main.php:1100
+#: ../lib/main.php:1098
 msgid "SetAclSimple"
 msgstr ""
 
-#: ../lib/main.php:1104 ../lib/PagePerm.php:190
+#: ../lib/main.php:1102 ../lib/PagePerm.php:190
 #: ../lib/plugin/WikiAdminRename.php:142 ../lib/plugin/WikiAdminRename.php:268
 #: ../themes/fusionforge/templates/actionbar.tmpl:120
 msgid "Rename"
 msgstr "Retitule"
 
-#: ../lib/main.php:1108 ../lib/main.php:1113 ../lib/plugin/PageDump.php:56
+#: ../lib/main.php:1106 ../lib/main.php:1111 ../lib/plugin/PageDump.php:56
 #: ../themes/Crao/templates/actionbar.tmpl:32
 #: ../themes/default/templates/actionbar.tmpl:40
 #: ../themes/MonoBook/templates/actionbar.tmpl:80
@@ -1423,12 +1428,12 @@
 msgid "PageDump"
 msgstr "DescargeDeLaPágina"
 
-#: ../lib/main.php:1131 ../lib/plugin/FullTextSearch.php:46
+#: ../lib/main.php:1129 ../lib/plugin/FullTextSearch.php:46
 #: ../lib/plugin/WantedPagesOld.php:126
 msgid "FullTextSearch"
 msgstr "BúsquedaDelTexto"
 
-#: ../lib/main.php:1139 ../lib/plugin/RecentChanges.php:808
+#: ../lib/main.php:1137 ../lib/plugin/RecentChanges.php:808
 #: ../lib/plugin/TitleSearch.php:44 ../lib/WikiTheme.php:1472
 #: ../themes/Crao/templates/navbar.tmpl:5
 #: ../themes/Crao/templates/navbar.tmpl:9
@@ -1443,37 +1448,37 @@
 msgid "TitleSearch"
 msgstr "BúsquedaDeTítulos"
 
-#: ../lib/main.php:1313 ../lib/main.php:1326 ../lib/Request.php:821
+#: ../lib/main.php:1311 ../lib/main.php:1324 ../lib/Request.php:821
 #, php-format
 msgid "%s is not writable."
 msgstr "%s no es escribible."
 
-#: ../lib/main.php:1314
+#: ../lib/main.php:1312
 msgid "The session.save_path directory"
 msgstr "El directorio de session.save_path"
 
-#: ../lib/main.php:1316 ../lib/Request.php:823
+#: ../lib/main.php:1314 ../lib/Request.php:823
 #, php-format
 msgid "Please ensure that %s is writable, or redefine %s in config/config.ini."
 msgstr ""
 "Asegúrese por favor de que %s sea escribible, o redefina %s en config/config."
 "ini."
 
-#: ../lib/main.php:1317
+#: ../lib/main.php:1315
 #, php-format
 msgid "the session.save_path directory '%s'"
 msgstr "el directorio '%s' de session.save_path"
 
-#: ../lib/main.php:1321
+#: ../lib/main.php:1319
 #, php-format
 msgid "Attempting to use the directory '%s' instead."
 msgstr "El procurar utilizar el directorio '%s' en lugar de otro."
 
-#: ../lib/main.php:1328
+#: ../lib/main.php:1326
 msgid "Users will not be able to sign in."
 msgstr "Los usuarios no podrán firmar adentro."
 
-#: ../lib/main.php:1340
+#: ../lib/main.php:1338
 msgid "Your PHP version is too old. You must have at least PHP 4.3.9"
 msgstr ""
 

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2012-01-11 12:40:50 UTC (rev 8227)
+++ trunk/locale/po/fr.po	2012-01-11 13:03:49 UTC (rev 8228)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-20 19:53+0100\n"
+"POT-Creation-Date: 2012-01-11 14:03+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."
@@ -46,7 +46,7 @@
 msgid "Typed in verification word mismatch ... are you a bot?"
 msgstr ""
 
-#: ../lib/Captcha.php:68
+#: ../lib/Captcha.php:69
 msgid "Type word above:"
 msgstr ""
 
@@ -359,8 +359,8 @@
 "modifier une page différente ou enregistrer votre texte à l'aide d'un "
 "éditeur)."
 
-#: ../lib/editpage.php:568 ../lib/editpage.php:569 ../lib/main.php:808
-#: ../lib/main.php:1175 ../lib/plugin/ModeratedPage.php:42
+#: ../lib/editpage.php:568 ../lib/editpage.php:569 ../lib/main.php:806
+#: ../lib/main.php:1173 ../lib/plugin/ModeratedPage.php:42
 #: ../lib/plugin/ModeratedPage.php:147 ../lib/plugin/ModeratedPage.php:217
 #: ../lib/plugin/ModeratedPage.php:257 ../lib/plugin/ModeratedPage.php:260
 #: ../lib/plugin/ModeratedPage.php:262 ../lib/plugin/ModeratedPage.php:264
@@ -731,11 +731,11 @@
 msgid ": "
 msgstr " : "
 
-#: ../lib/InlineParser.php:394 ../lib/main.php:769 ../lib/stdlib.php:970
+#: ../lib/InlineParser.php:394 ../lib/main.php:767 ../lib/stdlib.php:970
 msgid "Page name too long"
 msgstr "Le nom de la page est trop long"
 
-#: ../lib/InlineParser.php:399 ../lib/main.php:776
+#: ../lib/InlineParser.php:399 ../lib/main.php:774
 #, php-format
 msgid "Illegal character '%s' in page name."
 msgstr "Caractère '%s' interdit dans le nom de la page."
@@ -772,8 +772,8 @@
 msgstr "Exporter les pages en XHTML"
 
 #: ../lib/loadsave.php:85 ../lib/loadsave.php:475 ../lib/loadsave.php:1037
-#: ../lib/loadsave.php:1043 ../lib/loadsave.php:1051 ../lib/main.php:1071
-#: ../lib/main.php:1193 ../lib/main.php:1205 ../lib/PagePerm.php:190
+#: ../lib/loadsave.php:1043 ../lib/loadsave.php:1051 ../lib/main.php:1069
+#: ../lib/main.php:1191 ../lib/main.php:1203 ../lib/PagePerm.php:190
 #: ../lib/PagePerm.php:191 ../lib/plugin/WikiAdminRename.php:142
 #: ../lib/plugin/WikiAdminSelect.php:218
 #: ../themes/blog/templates/navbar.tmpl:14
@@ -795,7 +795,7 @@
 msgid "PhpWikiAdministration"
 msgstr "AdministrationDePhpWiki"
 
-#: ../lib/loadsave.php:96 ../lib/MailNotify.php:292 ../lib/MailNotify.php:309
+#: ../lib/loadsave.php:96 ../lib/MailNotify.php:297
 #, php-format
 msgid "Edited by: %s"
 msgstr "Modifié par : %s"
@@ -919,7 +919,7 @@
 msgid "from %s"
 msgstr "du %s"
 
-#: ../lib/loadsave.php:979 ../lib/MailNotify.php:288
+#: ../lib/loadsave.php:979 ../lib/MailNotify.php:293
 #: ../lib/plugin/RecentChanges.php:137
 msgid "New page"
 msgstr "Nouvelle page"
@@ -1085,46 +1085,51 @@
 msgid "Uploading %s"
 msgstr "Téléchargement de %s"
 
-#: ../lib/MailNotify.php:194
+#: ../lib/MailNotify.php:197
 #, php-format
 msgid "PageChange Notification of %s"
 msgstr "Notification de changement de la page %s"
 
-#: ../lib/MailNotify.php:233
+#: ../lib/MailNotify.php:236
 #, php-format
 msgid "sent to %s"
 msgstr "envoyé à %s"
 
-#: ../lib/MailNotify.php:239
+#: ../lib/MailNotify.php:242
 #, php-format
 msgid "Error: Couldn't send %s to %s"
 msgstr "Erreur : impossible d'envoyer %s à %s"
 
-#: ../lib/MailNotify.php:261
+#: ../lib/MailNotify.php:264
 msgid "Page change"
 msgstr "Modification de la page"
 
-#: ../lib/MailNotify.php:293
+#: ../lib/MailNotify.php:298
 #, php-format
 msgid "Summary: %s"
 msgstr "Résumé : %s"
 
-#: ../lib/MailNotify.php:310
+#: ../lib/MailNotify.php:308
+#, fuzzy, php-format
+msgid "Renamed by: %s"
+msgstr "renommée à partir de %s"
+
+#: ../lib/MailNotify.php:309
 #, php-format
 msgid "Page rename %s to %s"
 msgstr "Page renommée de %s à %s"
 
-#: ../lib/MailNotify.php:347
+#: ../lib/MailNotify.php:345
 #, php-format
 msgid "User %s removed page %s"
 msgstr "L'utilisateur %s a supprimé la page %s"
 
-#: ../lib/MailNotify.php:383 ../lib/plugin/WikiAdminUtils.php:113
+#: ../lib/MailNotify.php:381 ../lib/plugin/WikiAdminUtils.php:113
 #: ../lib/WikiUserNew.php:1782
 msgid "E-mail address confirmation"
 msgstr "Vérification de l'adresse électronique"
 
-#: ../lib/MailNotify.php:386
+#: ../lib/MailNotify.php:384
 #, php-format
 msgid ""
 "Someone, probably you from IP address %s, has registered an\n"
@@ -1143,271 +1148,271 @@
 msgid "Optimizing database"
 msgstr "Optimisation de la base de données"
 
-#: ../lib/main.php:473
+#: ../lib/main.php:471
 msgid "FORBIDDEN"
 msgstr "INTERDIT"
 
-#: ../lib/main.php:474 ../lib/main.php:484
+#: ../lib/main.php:472 ../lib/main.php:482
 msgid "ANON"
 msgstr "ANONYME"
 
-#: ../lib/main.php:475
+#: ../lib/main.php:473
 msgid "BOGO"
 msgstr "BOGO"
 
-#: ../lib/main.php:476
+#: ../lib/main.php:474
 msgid "USER"
 msgstr "UTILISATEUR"
 
-#: ../lib/main.php:477
+#: ../lib/main.php:475
 msgid "ADMIN"
 msgstr "ADMIN"
 
-#: ../lib/main.php:478
+#: ../lib/main.php:476
 msgid "UNOBTAINABLE"
 msgstr "INACCESSIBLE"
 
-#: ../lib/main.php:506 ../lib/main.php:525
+#: ../lib/main.php:504 ../lib/main.php:523
 #, php-format
 msgid "%s is disallowed on this wiki."
 msgstr "L'action %s est interdite sur ce wiki."
 
-#: ../lib/main.php:514
+#: ../lib/main.php:512
 msgid "authenticated"
 msgstr "authentifié"
 
-#: ../lib/main.php:514
+#: ../lib/main.php:512
 msgid "not authenticated"
 msgstr "non authentifié"
 
-#: ../lib/main.php:516
+#: ../lib/main.php:514
 msgid "Missing PagePermission:"
 msgstr "Permission de page individuelle absente :"
 
-#: ../lib/main.php:515
+#: ../lib/main.php:513
 #, php-format
 msgid "%s %s %s is disallowed on this wiki for %s user '%s' (level: %s)."
 msgstr ""
 "%s %s %s est interdite sur ce wiki pour %s l'utilisateur « %s » (niveau : "
 "%s)."
 
-#: ../lib/main.php:533
+#: ../lib/main.php:531
 #, php-format
 msgid "You must sign in to %s."
 msgstr "Vous devez vous inscrire pour %s."
 
-#: ../lib/main.php:543
+#: ../lib/main.php:541
 #, php-format
 msgid "Access for you is forbidden to %s."
 msgstr "L'accès à %s vous est interdit."
 
-#: ../lib/main.php:545 ../lib/plugin/PluginManager.php:58
+#: ../lib/main.php:543 ../lib/plugin/PluginManager.php:58
 #, php-format
 msgid "You must be an administrator to %s."
 msgstr "Vous devez être un administrateur pour %s."
 
-#: ../lib/main.php:559
+#: ../lib/main.php:557
 msgid "view this page"
 msgstr "voir cette page"
 
-#: ../lib/main.php:560
+#: ../lib/main.php:558
 msgid "diff this page"
 msgstr "diff de cette page"
 
-#: ../lib/main.php:561
+#: ../lib/main.php:559
 msgid "dump html pages"
 msgstr "récupération des pages en HTML"
 
-#: ../lib/main.php:562
+#: ../lib/main.php:560
 msgid "dump serial pages"
 msgstr "récupération des pages sérialisées"
 
-#: ../lib/main.php:563
+#: ../lib/main.php:561
 msgid "edit this page"
 msgstr "modifier cette page"
 
-#: ../lib/main.php:564
+#: ../lib/main.php:562
 msgid "rename this page"
 msgstr "renommer cette page"
 
-#: ../lib/main.php:565
+#: ../lib/main.php:563
 msgid "revert to a previous version of this page"
 msgstr "revenir à une version précédente de la page"
 
-#: ../lib/main.php:566
+#: ../lib/main.php:564
 msgid "create this page"
 msgstr "créer cette page"
 
-#: ../lib/main.php:567
+#: ../lib/main.php:565
 msgid "load files into this wiki"
 msgstr "importer des fichiers dans ce wiki"
 
-#: ../lib/main.php:568
+#: ../lib/main.php:566
 msgid "lock this page"
 msgstr "verrouiller cette page"
 
-#: ../lib/main.php:569
+#: ../lib/main.php:567
 msgid "purge this page"
 msgstr "purger cette page"
 
-#: ../lib/main.php:570
+#: ../lib/main.php:568
 msgid "remove this page"
 msgstr "supprimer cette page"
 
-#: ../lib/main.php:571
+#: ../lib/main.php:569
 msgid "unlock this page"
 msgstr "déverrouiller cette page"
 
-#: ../lib/main.php:572
+#: ../lib/main.php:570
 msgid "upload a zip dump"
 msgstr "déposer un fichier zip"
 
 # lib/pageinfo.php:64
-#: ../lib/main.php:573
+#: ../lib/main.php:571
 msgid "verify the current action"
 msgstr "vérifier l'action actuelle"
 
-#: ../lib/main.php:574
+#: ../lib/main.php:572
 msgid "view the source of this page"
 msgstr "voir la source de cette page"
 
-#: ../lib/main.php:575
+#: ../lib/main.php:573
 msgid "access this wiki via XML-RPC"
 msgstr "accéder à ce wiki via XML-RPC"
 
-#: ../lib/main.php:576
+#: ../lib/main.php:574
 msgid "access this wiki via SOAP"
 msgstr "accéder à ce wiki via SOAP"
 
-#: ../lib/main.php:577
+#: ../lib/main.php:575
 msgid "download a zip dump from this wiki"
 msgstr "télécharger une sauvegarde ZIP de ce wiki"
 
-#: ../lib/main.php:578
+#: ../lib/main.php:576
 msgid "download a html zip dump from this wiki"
 msgstr "télécharger une sauvegarde HTML ZIP de ce wiki"
 
-#: ../lib/main.php:584
+#: ../lib/main.php:582
 msgid "use"
 msgstr ""
 
-#: ../lib/main.php:602
+#: ../lib/main.php:600
 msgid "Browsing pages"
 msgstr "Navigation en cours"
 
-#: ../lib/main.php:603
+#: ../lib/main.php:601
 msgid "Diffing pages"
 msgstr "Comparaison des pages"
 
-#: ../lib/main.php:604
+#: ../lib/main.php:602
 msgid "Dumping html pages"
 msgstr "Récupération des pages HTML"
 
-#: ../lib/main.php:605
+#: ../lib/main.php:603
 msgid "Dumping serial pages"
 msgstr "Récupération des pages sérialisées"
 
-#: ../lib/main.php:606
+#: ../lib/main.php:604
 msgid "Editing pages"
 msgstr "Modifier des pages"
 
-#: ../lib/main.php:607
+#: ../lib/main.php:605
 msgid "Reverting to a previous version of pages"
 msgstr ""
 
-#: ../lib/main.php:608
+#: ../lib/main.php:606
 msgid "Creating pages"
 msgstr "Créer des pages"
 
-#: ../lib/main.php:609
+#: ../lib/main.php:607
 msgid "Loading files"
 msgstr "Chargement des fichiers"
 
-#: ../lib/main.php:610
+#: ../lib/main.php:608
 msgid "Locking pages"
 msgstr "Verrouiller des pages"
 
-#: ../lib/main.php:611
+#: ../lib/main.php:609
 msgid "Purging pages"
 msgstr "Purger des pages"
 
-#: ../lib/main.php:612
+#: ../lib/main.php:610
 msgid "Removing pages"
 msgstr "Supprimer les pages"
 
-#: ../lib/main.php:613
+#: ../lib/main.php:611
 msgid "Unlocking pages"
 msgstr "Déverrouiller des pages"
 
-#: ../lib/main.php:614
+#: ../lib/main.php:612
 msgid "Uploading zip dumps"
 msgstr "Déposer la sauvegarde compressée"
 
-#: ../lib/main.php:615
+#: ../lib/main.php:613
 msgid "Verify the current action"
 msgstr "Vérifier l'action actuelle"
 
-#: ../lib/main.php:616
+#: ../lib/main.php:614
 msgid "Viewing the source of pages"
 msgstr "Visualisation de la source des pages"
 
-#: ../lib/main.php:617
+#: ../lib/main.php:615
 msgid "XML-RPC access"
 msgstr "Accès XML-RPC"
 
-#: ../lib/main.php:618
+#: ../lib/main.php:616
 msgid "SOAP access"
 msgstr "Accès SOAP"
 
-#: ../lib/main.php:619
+#: ../lib/main.php:617
 msgid "Downloading zip dumps"
 msgstr "Téléchargement des sauvegardes compressées"
 
-#: ../lib/main.php:620
+#: ../lib/main.php:618
 msgid "Downloading html zip dumps"
 msgstr "Téléchargement des sauvegardes HTML compressées"
 
-#: ../lib/main.php:796
+#: ../lib/main.php:794
 #, php-format
 msgid "%s: action forwarded to a moderator."
 msgstr ""
 
-#: ../lib/main.php:799
+#: ../lib/main.php:797
 msgid "This action requires moderator approval. Please be patient."
 msgstr ""
 
-#: ../lib/main.php:804
+#: ../lib/main.php:802
 msgid "You must wait for moderator approval."
 msgstr ""
 
-#: ../lib/main.php:824 ../lib/plugin/ModeratedPage.php:309
+#: ../lib/main.php:822 ../lib/plugin/ModeratedPage.php:309
 #, php-format
 msgid "%s: Bad action"
 msgstr "%s : Mauvaise action"
 
-#: ../lib/main.php:841
+#: ../lib/main.php:839
 msgid "Fatal PhpWiki Error"
 msgstr "Erreur fatale de PhpWiki"
 
-#: ../lib/main.php:1092
+#: ../lib/main.php:1090
 msgid "Chown"
 msgstr "Chown"
 
-#: ../lib/main.php:1096
+#: ../lib/main.php:1094
 msgid "SetAcl"
 msgstr "DéfinirAcl"
 
-#: ../lib/main.php:1100
+#: ../lib/main.php:1098
 msgid "SetAclSimple"
 msgstr "DéfinirAclSimple"
 
-#: ../lib/main.php:1104 ../lib/PagePerm.php:190
+#: ../lib/main.php:1102 ../lib/PagePerm.php:190
 #: ../lib/plugin/WikiAdminRename.php:142 ../lib/plugin/WikiAdminRename.php:268
 #: ../themes/fusionforge/templates/actionbar.tmpl:120
 msgid "Rename"
 msgstr "Renommer"
 
-#: ../lib/main.php:1108 ../lib/main.php:1113 ../lib/plugin/PageDump.php:56
+#: ../lib/main.php:1106 ../lib/main.php:1111 ../lib/plugin/PageDump.php:56
 #: ../themes/Crao/templates/actionbar.tmpl:32
 #: ../themes/default/templates/actionbar.tmpl:40
 #: ../themes/MonoBook/templates/actionbar.tmpl:80
@@ -1419,12 +1424,12 @@
 msgid "PageDump"
 msgstr "RécupérationDeLaPage"
 
-#: ../lib/main.php:1131 ../lib/plugin/FullTextSearch.php:46
+#: ../lib/main.php:1129 ../lib/plugin/FullTextSearch.php:46
 #: ../lib/plugin/WantedPagesOld.php:126
 msgid "FullTextSearch"
 msgstr "RechercheEnTexteIntégral"
 
-#: ../lib/main.php:1139 ../lib/plugin/RecentChanges.php:808
+#: ../lib/main.php:1137 ../lib/plugin/RecentChanges.php:808
 #: ../lib/plugin/TitleSearch.php:44 ../lib/WikiTheme.php:1472
 #: ../themes/Crao/templates/navbar.tmpl:5
 #: ../themes/Crao/templates/navbar.tmpl:9
@@ -1439,37 +1444,37 @@
 msgid "TitleSearch"
 msgstr "RechercheParTitre"
 
-#: ../lib/main.php:1313 ../lib/main.php:1326 ../lib/Request.php:821
+#: ../lib/main.php:1311 ../lib/main.php:1324 ../lib/Request.php:821
 #, php-format
 msgid "%s is not writable."
 msgstr "%s n'est pas modifiable."
 
-#: ../lib/main.php:1314
+#: ../lib/main.php:1312
 msgid "The session.save_path directory"
 msgstr "Le répertoire 'session.save_path'"
 
-#: ../lib/main.php:1316 ../lib/Request.php:823
+#: ../lib/main.php:1314 ../lib/Request.php:823
 #, php-format
 msgid "Please ensure that %s is writable, or redefine %s in config/config.ini."
 msgstr ""
 "Veuillez vous assurer que %s est modifiable, ou redéfinissez %s dans config/"
 "config.ini."
 
-#: ../lib/main.php:1317
+#: ../lib/main.php:1315
 #, php-format
 msgid "the session.save_path directory '%s'"
 msgstr "le répertoire 'session.save_path' '%s'"
 
-#: ../lib/main.php:1321
+#: ../lib/main.php:1319
 #, php-format
 msgid "Attempting to use the directory '%s' instead."
 msgstr "Tentative d'utilisation du répertoire '%s' à la place."
 
-#: ../lib/main.php:1328
+#: ../lib/main.php:1326
 msgid "Users will not be able to sign in."
 msgstr "Les utilisateurs ne pourront pas s'inscrire."
 
-#: ../lib/main.php:1340
+#: ../lib/main.php:1338
 msgid "Your PHP version is too old. You must have at least PHP 4.3.9"
 msgstr ""
 "Votre version de PHP est trop ancienne. Il faut avoir au moins PHP 4.3.9"

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2012-01-11 12:40:50 UTC (rev 8227)
+++ trunk/locale/po/it.po	2012-01-11 13:03:49 UTC (rev 8228)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-20 19:53+0100\n"
+"POT-Creation-Date: 2012-01-11 14:03+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"
@@ -43,7 +43,7 @@
 msgid "Typed in verification word mismatch ... are you a bot?"
 msgstr ""
 
-#: ../lib/Captcha.php:68
+#: ../lib/Captcha.php:69
 msgid "Type word above:"
 msgstr ""
 
@@ -351,8 +351,8 @@
 "(Copia le tue modifiche nella clipboard. Potete provare a modificare "
 "un'altra pagina o registra il vostro testo in un editor di testo.)"
 
-#: ../lib/editpage.php:568 ../lib/editpage.php:569 ../lib/main.php:808
-#: ../lib/main.php:1175 ../lib/plugin/ModeratedPage.php:42
+#: ../lib/editpage.php:568 ../lib/editpage.php:569 ../lib/main.php:806
+#: ../lib/main.php:1173 ../lib/plugin/ModeratedPage.php:42
 #: ../lib/plugin/ModeratedPage.php:147 ../lib/plugin/ModeratedPage.php:217
 #: ../lib/plugin/ModeratedPage.php:257 ../lib/plugin/ModeratedPage.php:260
 #: ../lib/plugin/ModeratedPage.php:262 ../lib/plugin/ModeratedPage.php:264
@@ -723,11 +723,11 @@
 msgid ": "
 msgstr ""
 
-#: ../lib/InlineParser.php:394 ../lib/main.php:769 ../lib/stdlib.php:970
+#: ../lib/InlineParser.php:394 ../lib/main.php:767 ../lib/stdlib.php:970
 msgid "Page name too long"
 msgstr ""
 
-#: ../lib/InlineParser.php:399 ../lib/main.php:776
+#: ../lib/InlineParser.php:399 ../lib/main.php:774
 #, php-format
 msgid "Illegal character '%s' in page name."
 msgstr ""
@@ -764,8 +764,8 @@
 msgstr ""
 
 #: ../lib/loadsave.php:85 ../lib/loadsave.php:475 ../lib/loadsave.php:1037
-#: ../lib/loadsave.php:1043 ../lib/loadsave.php:1051 ../lib/main.php:1071
-#: ../lib/main.php:1193 ../lib/main.php:1205 ../lib/PagePerm.php:190
+#: ../lib/loadsave.php:1043 ../lib/loadsave.php:1051 ../lib/main.php:1069
+#: ../lib/main.php:1191 ../lib/main.php:1203 ../lib/PagePerm.php:190
 #: ../lib/PagePerm.php:191 ../lib/plugin/WikiAdminRename.php:142
 #: ../lib/plugin/WikiAdminSelect.php:218
 #: ../themes/blog/templates/navbar.tmpl:14
@@ -787,7 +787,7 @@
 msgid "PhpWikiAdministration"
 msgstr ""
 
-#: ../lib/loadsave.php:96 ../lib/MailNotify.php:292 ../lib/MailNotify.php:309
+#: ../lib/loadsave.php:96 ../lib/MailNotify.php:297
 #, php-format
 msgid "Edited by: %s"
 msgstr "Modifica: %s"
@@ -911,7 +911,7 @@
 msgid "from %s"
 msgstr "dalla %s"
 
-#: ../lib/loadsave.php:979 ../lib/MailNotify.php:288
+#: ../lib/loadsave.php:979 ../lib/MailNotify.php:293
 #: ../lib/plugin/RecentChanges.php:137
 msgid "New page"
 msgstr "Nuova pagina"
@@ -1076,46 +1076,51 @@
 msgid "Uploading %s"
 msgstr ""
 
-#: ../lib/MailNotify.php:194
+#: ../lib/MailNotify.php:197
 #, php-format
 msgid "PageChange Notification of %s"
 msgstr "Pagini la notifica del cambiamento di %s"
 
-#: ../lib/MailNotify.php:233
+#: ../lib/MailNotify.php:236
 #, php-format
 msgid "sent to %s"
 msgstr ""
 
-#: ../lib/MailNotify.php:239
+#: ../lib/MailNotify.php:242
 #, php-format
 msgid "Error: Couldn't send %s to %s"
 msgstr ""
 
-#: ../lib/MailNotify.php:261
+#: ../lib/MailNotify.php:264
 msgid "Page change"
 msgstr "Cambiamento della pagina"
 
-#: ../lib/MailNotify.php:293
+#: ../lib/MailNotify.php:298
 #, php-format
 msgid "Summary: %s"
 msgstr "Commenti: %s"
 
-#: ../lib/MailNotify.php:310
+#: ../lib/MailNotify.php:308
+#, fuzzy, php-format
+msgid "Renamed by: %s"
+msgstr "Modifica: %s"
+
+#: ../lib/MailNotify.php:309
 #, php-format
 msgid "Page rename %s to %s"
 msgstr "La pagina cambia titolo %s a %s"
 
-#: ../lib/MailNotify.php:347
+#: ../lib/MailNotify.php:345
 #, php-format
 msgid "User %s removed page %s"
 msgstr "Utente %s pagina %s rimossa"
 
-#: ../lib/MailNotify.php:383 ../lib/plugin/WikiAdminUtils.php:113
+#: ../lib/MailNotify.php:381 ../lib/plugin/WikiAdminUtils.php:113
 #: ../lib/WikiUserNew.php:1782
 msgid "E-mail address confirmation"
 msgstr ""
 
-#: ../lib/MailNotify.php:386
+#: ../lib/MailNotify.php:384
 #, php-format
 msgid ""
 "Someone, probably you from IP address %s, has registered an\n"
@@ -1134,268 +1139,268 @@
 msgid "Optimizing database"
 msgstr "Base di dati d'ottimizzazione"
 
-#: ../lib/main.php:473
+#: ../lib/main.php:471
 msgid "FORBIDDEN"
 msgstr ""
 
-#: ../lib/main.php:474 ../lib/main.php:484
+#: ../lib/main.php:472 ../lib/main.php:482
 msgid "ANON"
 msgstr ""
 
-#: ../lib/main.php:475
+#: ../lib/main.php:473
 msgid "BOGO"
 msgstr ""
 
-#: ../lib/main.php:476
+#: ../lib/main.php:474
 msgid "USER"
 msgstr ""
 
-#: ../lib/main.php:477
+#: ../lib/main.php:475
 msgid "ADMIN"
 msgstr ""
 
-#: ../lib/main.php:478
+#: ../lib/main.php:476
 msgid "UNOBTAINABLE"
 msgstr ""
 
-#: ../lib/main.php:506 ../lib/main.php:525
+#: ../lib/main.php:504 ../lib/main.php:523
 #, php-format
 msgid "%s is disallowed on this wiki."
 msgstr ""
 
-#: ../lib/main.php:514
+#: ../lib/main.php:512
 msgid "authenticated"
 msgstr "autenticato"
 
-#: ../lib/main.php:514
+#: ../lib/main.php:512
 msgid "not authenticated"
 msgstr "non autenticato"
 
-#: ../lib/main.php:516
+#: ../lib/main.php:514
 msgid "Missing PagePermission:"
 msgstr ""
 
-#: ../lib/main.php:515
+#: ../lib/main.php:513
 #, php-format
 msgid "%s %s %s is disallowed on this wiki for %s user '%s' (level: %s)."
 msgstr ""
 
-#: ../lib/main.php:533
+#: ../lib/main.php:531
 #, php-format
 msgid "You must sign in to %s."
 msgstr ""
 
-#: ../lib/main.php:543
+#: ../lib/main.php:541
 #, php-format
 msgid "Access for you is forbidden to %s."
 msgstr ""
 
-#: ../lib/main.php:545 ../lib/plugin/PluginManager.php:58
+#: ../lib/main.php:543 ../lib/plugin/PluginManager.php:58
 #, php-format
 msgid "You must be an administrator to %s."
 msgstr ""
 
-#: ../lib/main.php:559
+#: ../lib/main.php:557
 msgid "view this page"
 msgstr ""
 
-#: ../lib/main.php:560
+#: ../lib/main.php:558
 msgid "diff this page"
 msgstr ""
 
-#: ../lib/main.php:561
+#: ../lib/main.php:559
 msgid "dump html pages"
 msgstr ""
 
-#: ../lib/main.php:562
+#: ../lib/main.php:560
 msgid "dump serial pages"
 msgstr ""
 
-#: ../lib/main.php:563
+#: ../lib/main.php:561
 msgid "edit this page"
 msgstr ""
 
-#: ../lib/main.php:564
+#: ../lib/main.php:562
 msgid "rename this page"
 msgstr "rinominare questa pagina"
 
-#: ../lib/main.php:565
+#: ../lib/main.php:563
 msgid "revert to a previous version of this page"
 msgstr ""
 
-#: ../lib/main.php:566
+#: ../lib/main.php:564
 msgid "create this page"
 msgstr ""
 
-#: ../lib/main.php:567
+#: ../lib/main.php:565
 msgid "load files into this wiki"
 msgstr ""
 
-#: ../lib/main.php:568
+#: ../lib/main.php:566
 msgid "lock this page"
 msgstr ""
 
-#: ../lib/main.php:569
+#: ../lib/main.php:567
 msgid "purge this page"
 msgstr "rimuovi la pagina"
 
-#: ../lib/main.php:570
+#: ../lib/main.php:568
 msgid "remove this page"
 msgstr ""
 
-#: ../lib/main.php:571
+#: ../lib/main.php:569
 msgid "unlock this page"
 msgstr ""
 
-#: ../lib/main.php:572
+#: ../lib/main.php:570
 msgid "upload a zip dump"
 msgstr ""
 
-#: ../lib/main.php:573
+#: ../lib/main.php:571
 msgid "verify the current action"
 msgstr ""
 
-#: ../lib/main.php:574
+#: ../lib/main.php:572
 msgid "view the source of this page"
 msgstr ""
 
-#: ../lib/main.php:575
+#: ../lib/main.php:573
 msgid "access this wiki via XML-RPC"
 msgstr ""
 
-#: ../lib/main.php:576
+#: ../lib/main.php:574
 msgid "access this wiki via SOAP"
 msgstr ""
 
-#: ../lib/main.php:577
+#: ../lib/main.php:575
 msgid "download a zip dump from this wiki"
 msgstr ""
 
-#: ../lib/main.php:578
+#: ../lib/main.php:576
 msgid "download a html zip dump from this wiki"
 msgstr ""
 
-#: ../lib/main.php:584
+#: ../lib/main.php:582
 msgid "use"
 msgstr ""
 
-#: ../lib/main.php:602
+#: ../lib/main.php:600
 msgid "Browsing pages"
 msgstr ""
 
-#: ../lib/main.php:603
+#: ../lib/main.php:601
 msgid "Diffing pages"
 msgstr ""
 
-#: ../lib/main.php:604
+#: ../lib/main.php:602
 msgid "Dumping html pages"
 msgstr ""
 
-#: ../lib/main.php:605
+#: ../lib/main.php:603
 msgid "Dumping serial pages"
 msgstr ""
 
-#: ../lib/main.php:606
+#: ../lib/main.php:604
 msgid "Editing pages"
 msgstr ""
 
-#: ../lib/main.php:607
+#: ../lib/main.php:605
 msgid "Reverting to a previous version of pages"
 msgstr ""
 
-#: ../lib/main.php:608
+#: ../lib/main.php:606
 msgid "Creating pages"
 msgstr ""
 
-#: ../lib/main.php:609
+#: ../lib/main.php:607
 msgid "Loading files"
 msgstr ""
 
-#: ../lib/main.php:610
+#: ../lib/main.php:608
 msgid "Locking pages"
 msgstr "Blocca la Pagina"
 
-#: ../lib/main.php:611
+#: ../lib/main.php:609
 msgid "Purging pages"
 msgstr ""
 
-#: ../lib/main.php:612
+#: ../lib/main.php:610
 msgid "Removing pages"
 msgstr "Rimuovi la pagina"
 
-#: ../lib/main.php:613
+#: ../lib/main.php:611
 msgid "Unlocking pages"
 msgstr "Sblocca la Pagina"
 
-#: ../lib/main.php:614
+#: ../lib/main.php:612
 msgid "Uploading zip dumps"
 msgstr ""
 
-#: ../lib/main.php:615
+#: ../lib/main.php:613
 msgid "Verify the current action"
 msgstr ""
 
-#: ../lib/main.php:616
+#: ../lib/main.php:614
 msgid "Viewing the source of pages"
 msgstr ""
 
-#: ../lib/main.php:617
+#: ../lib/main.php:615
 msgid "XML-RPC access"
 msgstr ""
 
-#: ../lib/main.php:618
+#: ../lib/main.php:616
 msgid "SOAP access"
 msgstr ""
 
-#: ../lib/main.php:619
+#: ../lib/main.php:617
 msgid "Downloading zip dumps"
 msgstr ""
 
-#: ../lib/main.php:620
+#: ../lib/main.php:618
 msgid "Downloading html zip dumps"
 msgstr ""
 
-#: ../lib/main.php:796
+#: ../lib/main.php:794
 #, php-format
 msgid "%s: action forwarded to a moderator."
 msgstr ""
 
-#: ../lib/main.php:799
+#: ../lib/main.php:797
 msgid "This action requires moderator approval. Please be patient."
 msgstr ""
 
-#: ../lib/main.php:804
+#: ../lib/main.php:802
 msgid "You must wait for moderator approval."
 msgstr ""
 
-#: ../lib/main.php:824 ../lib/plugin/ModeratedPage.php:309
+#: ../lib/main.php:822 ../lib/plugin/ModeratedPage.php:309
 #, php-format
 msgid "%s: Bad action"
 msgstr ""
 
-#: ../lib/main.php:841
+#: ../lib/main.php:839
 msgid "Fatal PhpWiki Error"
 msgstr "Errore Fatale Di PhpWiki"
 
-#: ../lib/main.php:1092
+#: ../lib/main.php:1090
 msgid "Chown"
 msgstr ""
 
-#: ../lib/main.php:1096
+#: ../lib/main.php:1094
 msgid "SetAcl"
 msgstr ""
 
-#: ../lib/main.php:1100
+#: ../lib/main.php:1098
 msgid "SetAclSimple"
 msgstr ""
 
-#: ../lib/main.php:1104 ../lib/PagePerm.php:190
+#: ../lib/main.php:1102 ../lib/PagePerm.php:190
 #: ../lib/plugin/WikiAdminRename.php:142 ../lib/plugin/WikiAdminRename.php:268
 #: ../themes/fusionforge/templates/actionbar.tmpl:120
 msgid "Rename"
 msgstr ""
 
-#: ../lib/main.php:1108 ../lib/main.php:1113 ../lib/plugin/PageDump.php:56
+#: ../lib/main.php:1106 ../lib/main.php:1111 ../lib/plugin/PageDump.php:56
 #: ../themes/Crao/templates/actionbar.tmpl:32
 #: ../themes/default/templates/actionbar.tmpl:40
 #: ../themes/MonoBook/templates/actionbar.tmpl:80
@@ -1407,12 +1412,12 @@
 msgid "PageDump"
 msgstr ""
 
-#: ../lib/main.php:1131 ../lib/plugin/FullTextSearch.php:46
+#: ../lib/main.php:1129 ../lib/plugin/FullTextSearch.php:46
 #: ../lib/plugin/WantedPagesOld.php:126
 msgid "FullTextSearch"
 msgstr "RicercaDelTesto"
 
-#: ../lib/main.php:1139 ../lib/plugin/RecentChanges.php:808
+#: ../lib/main.php:1137 ../lib/plugin/RecentChanges.php:808
 #: ../lib/plugin/TitleSearch.php:44 ../lib/WikiTheme.php:1472
 #: ../themes/Crao/templates/navbar.tmpl:5
 #: ../themes/Crao/templates/navbar.tmpl:9
@@ -1427,35 +1432,35 @@
 msgid "TitleSearch"
 msgstr "RicercaPerTitolo"
 
-#: ../lib/main.php:1313 ../lib/main.php:1326 ../lib/Request.php:821
+#: ../lib/main.php:1311 ../lib/main.php:1324 ../lib/Request.php:821
 #, php-format
 msgid "%s is not writable."
 msgstr ""
 
-#: ../lib/main.php:1314
+#: ../lib/main.php:1312
 msgid "The session.save_path directory"
 msgstr ""
 
-#: ../lib/main.php:1316 ../lib/Request.php:823
+#: ../lib/main.php:1314 ../lib/Request.php:823
 #, php-format
 msgid "Please ensure that %s is writable, or redefine %s in config/config.ini."
 msgstr ""
 
-#: ../lib/main.php:1317
+#: ../lib/main.php:1315
 #, php-format
 msgid "the session.save_path directory '%s'"
 msgstr ""
 
-#: ../lib/main.php:1321
+#: ../lib/main.php:1319
 #, php-format
 msgid "Attempting to use the directory '%s' instead."
 msgstr ""
 
-#: ../lib/main.php:1328
+#: ../lib/main.php:1326
 msgid "Users will not be able to sign in."
 msgstr ""
 
-#: ../lib/main.php:1340
+#: ../lib/main.php:1338
 msgid "Your PHP version is too old. You must have at least PHP 4.3.9"
 msgstr ""
 

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2012-01-11 12:40:50 UTC (rev 8227)
+++ trunk/locale/po/ja.po	2012-01-11 13:03:49 UTC (rev 8228)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-20 19:53+0100\n"
+"POT-Creation-Date: 2012-01-11 14:03+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"
@@ -42,7 +42,7 @@
 msgid "Typed in verification word mismatch ... are you a bot?"
 msgstr ""
 
-#: ../lib/Captcha.php:68
+#: ../lib/Captcha.php:69
 msgid "Type word above:"
 msgstr ""
 
@@ -348,8 +348,8 @@
 "save your text in a text editor.)"
 msgstr ""
 
-#: ../lib/editpage.php:568 ../lib/editpage.php:569 ../lib/main.php:808
-#: ../lib/main.php:1175 ../lib/plugin/ModeratedPage.php:42
+#: ../lib/editpage.php:568 ../lib/editpage.php:569 ../lib/main.php:806
+#: ../lib/main.php:1173 ../lib/plugin/ModeratedPage.php:42
 #: ../lib/plugin/ModeratedPage.php:147 ../lib/plugin/ModeratedPage.php:217
 #: ../lib/plugin/ModeratedPage.php:257 ../lib/plugin/ModeratedPage.php:260
 #: ../lib/plugin/ModeratedPage.php:262 ../lib/plugin/ModeratedPage.php:264
@@ -711,12 +711,12 @@
 msgid ": "
 msgstr ""
 
-#: ../lib/InlineParser.php:394 ../lib/main.php:769 ../lib/stdlib.php:970
+#: ../lib/InlineParser.php:394 ../lib/main.php:767 ../lib/stdlib.php:970
 #, fuzzy
 msgid "Page name too long"
 msgstr "%s から読込まれました。"
 
-#: ../lib/InlineParser.php:399 ../lib/main.php:776
+#: ../lib/InlineParser.php:399 ../lib/main.php:774
 #, fuzzy, php-format
 msgid "Illegal character '%s' in page name."
 msgstr "ページ名が正しくありません。"
@@ -753,8 +753,8 @@
 msgstr "XHTMLで出力"
 
 #: ../lib/loadsave.php:85 ../lib/loadsave.php:475 ../lib/loadsave.php:1037
-#: ../lib/loadsave.php:1043 ../lib/loadsave.php:1051 ../lib/main.php:1071
-#: ../lib/main.php:1193 ../lib/main.php:1205 ../lib/PagePerm.php:190
+#: ../lib/loadsave.php:1043 ../lib/loadsave.php:1051 ../lib/main.php:1069
+#: ../lib/main.php:1191 ../lib/main.php:1203 ../lib/PagePerm.php:190
 #: ../lib/PagePerm.php:191 ../li...
 
[truncated message content]

[phpwiki-checkins] SF.net SVN: phpwiki:[8227] trunk/lib/main.php

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

Revision: 8227
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8227&view=rev
Author:   vargenau
Date:     2012-01-11 12:40:50 +0000 (Wed, 11 Jan 2012)
Log Message:
-----------
Whitespace only

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

Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php	2012-01-10 17:10:50 UTC (rev 8226)
+++ trunk/lib/main.php	2012-01-11 12:40:50 UTC (rev 8227)
@@ -170,11 +170,11 @@
 
     function initializeTheme ($when = 'default') {
         global $WikiTheme;
-    // if when = 'default', then first time init (default theme, ...)
-    // if when = 'login', then check some callbacks
-    //                    and maybe the theme changed (other theme defined in pref)
-    // if when = 'logout', then check other callbacks
-    //                    and maybe the theme changed (back to default theme)
+        // if when = 'default', then first time init (default theme, ...)
+        // if when = 'login', then check some callbacks
+        //                    and maybe the theme changed (other theme defined in pref)
+        // if when = 'logout', then check other callbacks
+        //                    and maybe the theme changed (back to default theme)
 
         // Load non-default theme (when = login)
         if (!empty($this->_prefs->_prefs['theme'])) {
@@ -215,28 +215,26 @@
             include_once("themes/default/themeinfo.php");
         assert(!empty($WikiTheme));
 
-    // Do not execute global init code anymore
+        // Do not execute global init code anymore
 
-    // WikiTheme callbacks
-    if ($when == 'login') {
-        $WikiTheme->CbUserLogin($this, $this->_user->_userid);
-        if (!$this->_user->hasHomePage()) { // NewUser
-        $WikiTheme->CbNewUserLogin($this, $this->_user->_userid);
-        if (in_array($this->getArg('action'), array('edit','create')))
-            $WikiTheme->CbNewUserEdit($this, $this->_user->_userid);
+        // WikiTheme callbacks
+        if ($when == 'login') {
+            $WikiTheme->CbUserLogin($this, $this->_user->_userid);
+            if (!$this->_user->hasHomePage()) { // NewUser
+                $WikiTheme->CbNewUserLogin($this, $this->_user->_userid);
+                if (in_array($this->getArg('action'), array('edit','create')))
+                    $WikiTheme->CbNewUserEdit($this, $this->_user->_userid);
+            }
+        } elseif ($when == 'logout') {
+            $WikiTheme->CbUserLogout($this, $this->_user->_userid);
+        } elseif ($when == 'default') {
+            $WikiTheme->load();
+            if ($this->_user->_level > 0 and !$this->_user->hasHomePage()) { // NewUser
+                if (in_array($this->getArg('action'), array('edit','create')))
+                    $WikiTheme->CbNewUserEdit($this, $this->_user->_userid);
+            }
         }
     }
-    elseif ($when == 'logout') {
-        $WikiTheme->CbUserLogout($this, $this->_user->_userid);
-    }
-    elseif ($when == 'default') {
-        $WikiTheme->load();
-        if ($this->_user->_level > 0 and !$this->_user->hasHomePage()) { // NewUser
-        if (in_array($this->getArg('action'), array('edit','create')))
-            $WikiTheme->CbNewUserEdit($this, $this->_user->_userid);
-        }
-    }
-    }
 
     // This really maybe should be part of the constructor, but since it
     // may involve HTML/template output, the global $request really needs
@@ -278,13 +276,13 @@
         // Ensure user has permissions for action
         // HACK ALERT: We may not set the request arg to create,
         // since the pageeditor has an ugly logic for action == create.
-      if ($action == 'edit' or $action == 'create') {
+        if ($action == 'edit' or $action == 'create') {
             $page = $this->getPage();
             if (! $page->exists() )
                 $action = 'create';
             else
                 $action = 'edit';
-      }
+        }
         if (! ENABLE_PAGEPERM) { // Bug #1438392 by Matt Brown
             $require_level = $this->requiredAuthority($action);
             if (! $this->_user->hasAuthority($require_level))
@@ -442,10 +440,10 @@
         if (defined('MAIN_setUser')) return; // don't set cookies twice
         $this->setCookieVar(getCookieName(), $user->getAuthenticatedId(),
                             COOKIE_EXPIRATION_DAYS, COOKIE_DOMAIN);
-    $isSignedIn = $user->isSignedIn();
+        $isSignedIn = $user->isSignedIn();
         if ($isSignedIn) {
             $user->_authhow = 'signin';
-    }
+        }
 
         // Save userid to prefs..
         if ( empty($this->_user->_prefs)) {
@@ -502,13 +500,13 @@
         $pass_required = ($require_level >= WIKIAUTH_USER);
         if ($require_level == WIKIAUTH_UNOBTAINABLE) {
             global $DisabledActions;
-        if ($DisabledActions and in_array($action, $DisabledActions)) {
+            if ($DisabledActions and in_array($action, $DisabledActions)) {
                 $msg = fmt("%s is disallowed on this wiki.",
                            $this->getDisallowedActionDescription($this->getArg('action')));
-        $this->finish();
-        return;
-        }
-        // Is the reason a missing ACL or just wrong user or password?
+                $this->finish();
+                return;
+            }
+            // Is the reason a missing ACL or just wrong user or password?
             if (class_exists('PagePermission')) {
                 $user =& $this->_user;
                 $status = $user->isAuthenticated() ? _("authenticated") : _("not authenticated");
@@ -520,25 +518,25 @@
                 // TODO: add link to action=setacl
                 $user->PrintLoginForm($this, compact('pass_required'), $msg);
                 $this->finish();
-        return;
+                return;
             } else {
                 $msg = fmt("%s is disallowed on this wiki.",
                            $this->getDisallowedActionDescription($this->getArg('action')));
                 $this->_user->PrintLoginForm($this, compact('require_level','pass_required'), $msg);
-        $this->finish();
-        return;
+                $this->finish();
+                return;
             }
         }
         elseif ($require_level == WIKIAUTH_BOGO)
             $msg = fmt("You must sign in to %s.", $what);
         elseif ($require_level == WIKIAUTH_USER) {
-        // LoginForm should display the relevant messages...
-        $msg = "";
-        /*if (!ALLOW_ANON_USER)
-        $msg = fmt("You must log in first to %s", $what);
-        else
+            // LoginForm should display the relevant messages...
+            $msg = "";
+            /*if (!ALLOW_ANON_USER)
+                $msg = fmt("You must log in first to %s", $what);
+            else
                 $msg = fmt("You must log in to %s.", $what);
-        */
+            */
         } elseif ($require_level == WIKIAUTH_ANON)
             $msg = fmt("Access for you is forbidden to %s.", $what);
         else
@@ -546,8 +544,8 @@
 
         $this->_user->PrintLoginForm($this, compact('require_level','pass_required'),
                      $msg);
-    if (!$GLOBALS['WikiTheme']->DUMP_MODE)
-        $this->finish();    // NORETURN
+        if (!$GLOBALS['WikiTheme']->DUMP_MODE)
+            $this->finish();    // NORETURN
     }
 
     // Fixme: for PagePermissions we'll need other strings,
@@ -673,20 +671,20 @@
             case 'soap':
             case 'dumphtml':
                 if (INSECURE_ACTIONS_LOCALHOST_ONLY and !is_localhost())
-            return WIKIAUTH_ADMIN;
-        return WIKIAUTH_ANON;
+                    return WIKIAUTH_ADMIN;
+                return WIKIAUTH_ANON;
 
             case 'ziphtml':
                 if (ZIPDUMP_AUTH)
                     return WIKIAUTH_ADMIN;
                 if (INSECURE_ACTIONS_LOCALHOST_ONLY and !is_localhost())
-            return WIKIAUTH_ADMIN;
-        return WIKIAUTH_ANON;
+                    return WIKIAUTH_ADMIN;
+                return WIKIAUTH_ANON;
 
             case 'dumpserial':
                 if (INSECURE_ACTIONS_LOCALHOST_ONLY and is_localhost())
-            return WIKIAUTH_ANON;
-        return WIKIAUTH_ADMIN;
+                    return WIKIAUTH_ANON;
+                return WIKIAUTH_ADMIN;
 
             case 'zip':
                 if (ZIPDUMP_AUTH)
@@ -850,7 +848,7 @@
             unset($this->_user->_auth_dbi);
             unset($this->_user->_dbi);
             unset($this->_user->_request);
-    }
+        }
         Request::finish();
         exit;
     }
@@ -973,7 +971,7 @@
             }
         }
 
-    // Sessions override http auth
+        // Sessions override http auth
         if (!empty($HTTP_SERVER_VARS['PHP_AUTH_USER']))
             return $HTTP_SERVER_VARS['PHP_AUTH_USER'];
         // pubcookie et al
@@ -1123,8 +1121,8 @@
     function action_search () {
         // Decide between title or fulltextsearch (e.g. both buttons available).
         // Reformulate URL and redirect.
-    $searchtype = $this->getArg('searchtype');
-    $args = array('s' => $this->getArg('searchterm')
+        $searchtype = $this->getArg('searchtype');
+        $args = array('s' => $this->getArg('searchterm')
                            ? $this->getArg('searchterm')
                            : $this->getArg('s'));
         if ($searchtype == 'full' or $searchtype == 'fulltext') {
@@ -1132,12 +1130,12 @@
         }
         elseif ($searchtype == 'external') {
             $s = $args['s'];
-        $link = new WikiPageName("Search:$s"); // Expand interwiki url. I use xapian-omega
+            $link = new WikiPageName("Search:$s"); // Expand interwiki url. I use xapian-omega
             $this->redirect($link->url);
         }
         else {
             $search_page = _("TitleSearch");
-        $args['auto_redirect'] = 1;
+            $args['auto_redirect'] = 1;
         }
         $this->redirect(WikiURL($search_page, $args, 'absolute_url'));
     }
@@ -1217,12 +1215,12 @@
     }
 
     function action_soap () {
-    if (defined("WIKI_SOAP") and WIKI_SOAP) // already loaded
-        return;
-    /*
-      allow VIRTUAL_PATH or action=soap SOAP access
-     */
-    include_once("SOAP.php");
+        if (defined("WIKI_SOAP") and WIKI_SOAP) // already loaded
+            return;
+        /*
+          allow VIRTUAL_PATH or action=soap SOAP access
+         */
+        include_once("SOAP.php");
     }
 
     function action_revert () {
@@ -1287,11 +1285,11 @@
     }
 
     function action_setpref () {
-    $what = $this->getArg('pref');
-    $value = $this->getArg('value');
-    $prefs =& $this->_user->_prefs;
-    $prefs->set($what, $value);
-    $num = $this->_user->setPreferences($prefs);
+        $what = $this->getArg('pref');
+        $value = $this->getArg('value');
+        $prefs =& $this->_user->_prefs;
+        $prefs->set($what, $value);
+        $num = $this->_user->setPreferences($prefs);
     }
 }
 

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8226] trunk/lib/PagePerm.php

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

Revision: 8226
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8226&view=rev
Author:   vargenau
Date:     2012-01-10 17:10:50 +0000 (Tue, 10 Jan 2012)
Log Message:
-----------
Whitespace only

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

Modified: trunk/lib/PagePerm.php
===================================================================
--- trunk/lib/PagePerm.php	2012-01-05 13:38:54 UTC (rev 8225)
+++ trunk/lib/PagePerm.php	2012-01-10 17:10:50 UTC (rev 8226)
@@ -456,13 +456,13 @@
             $perm['dump'] = array(ACL_ADMIN => true,
                                   ACL_OWNER => true);
         elseif (INSECURE_ACTIONS_LOCALHOST_ONLY) {
-        if (is_localhost())
-        $perm['dump'] = array(ACL_EVERY => true);
+            if (is_localhost())
+                $perm['dump'] = array(ACL_EVERY => true);
+            else
+                $perm['dump'] = array(ACL_ADMIN => true);
+        }
         else
-        $perm['dump'] = array(ACL_ADMIN => true);
-    }
-    else
-        $perm['dump'] = array(ACL_EVERY => true);
+            $perm['dump'] = array(ACL_EVERY => true);
         if (defined('REQUIRE_SIGNIN_BEFORE_EDIT') && REQUIRE_SIGNIN_BEFORE_EDIT)
             $perm['edit'] = array(ACL_SIGNED => true);
         // view:

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8225] trunk/themes

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

Revision: 8225
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8225&view=rev
Author:   vargenau
Date:     2012-01-05 13:38:54 +0000 (Thu, 05 Jan 2012)
Log Message:
-----------
Fix regression introduced by 8216 (was no longer a link)

Modified Paths:
--------------
    trunk/themes/MonoBook/templates/navbar.tmpl
    trunk/themes/Sidebar/templates/navbar.tmpl

Modified: trunk/themes/MonoBook/templates/navbar.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/navbar.tmpl	2012-01-03 14:23:29 UTC (rev 8224)
+++ trunk/themes/MonoBook/templates/navbar.tmpl	2012-01-05 13:38:54 UTC (rev 8225)
@@ -13,7 +13,7 @@
   <div class="pBody">
     <ul>
       <li id="n-mainpage"><?php echo WikiLink(HOME_PAGE, "",_("Home Page")) ?></li>
-      <li><?php $link = WikiLink(_("RecentChanges"), "",_("Recent changes")); $link->setAttr("accesskey","r"); $link->addTooltip(_("The list of recent changes in the wiki.")." [$p-r]"); echo $link ?></li>
+      <li><?php $link = WikiLink(_("RecentChanges"), "",_("Recent changes")); $link->setAttr("accesskey","r"); $link->addTooltip(_("The list of recent changes in the wiki.")." [$p-r]"); ?><?php echo $link ?></li>
       <li id="n-recentcomments"><?php echo WikiLink(_("RecentComments"), "",_("Recent comments")) ?></li>
       <li id="n-recentnewpages"><?php echo WikiLink(_("RecentNewPages"), "",_("Recent new pages")) ?></li>
       <li id="n-likepages"><?php echo Button(array('action'=>_("LikePages")),_("Like pages"), $page->getName()) ?></li>
@@ -58,7 +58,7 @@
       <li><?php echo WikiLink(_("PhpWikiAdministration"), "", _("Administration")) ?></li>
     <?php } ?>
     <?php if ($user->isSignedIn()) { ?>
-      <li><?php $link = WikiLink(_("UpLoad"),"",_("Upload File")); $link->setAttr("accesskey","u"); $link->addTooltip(_("Upload images or media files")." [$p-u]"); echo $link ?></li>
+      <li><?php $link = WikiLink(_("UpLoad"),"",_("Upload File")); $link->setAttr("accesskey","u"); $link->addTooltip(_("Upload images or media files")." [$p-u]"); ?><?php echo $link ?></li>
     <?php } ?>
     <li>
       <?php $PrintableLink = $WikiTheme->makeButton(_("Printable version"), "javascript:PrinterStylesheet();", 'wikiaction'); ?>

Modified: trunk/themes/Sidebar/templates/navbar.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/navbar.tmpl	2012-01-03 14:23:29 UTC (rev 8224)
+++ trunk/themes/Sidebar/templates/navbar.tmpl	2012-01-05 13:38:54 UTC (rev 8225)
@@ -42,13 +42,13 @@
       <h5><?php echo _("Toolbox") ?><?php echo $WikiTheme->folderArrow('p-tb', 'Open') ?></h5>
   <div class="pBody" id="p-tb-body">
     <ul>
-    <li><?php $link = WikiLink(_("RecentChanges"), "",_("RecentChanges")); $link->setAttr("accesskey","r"); $link->addTooltip(_("The list of recent changes in the wiki.")." [$p-r]"); echo $link ?> </li>
+    <li><?php $link = WikiLink(_("RecentChanges"), "",_("RecentChanges")); $link->setAttr("accesskey","r"); $link->addTooltip(_("The list of recent changes in the wiki.")." [$p-r]"); ?><?php echo $link ?> </li>
     <li><?php echo WikiLink(_("RecentNewPages"), "",_("RecentNewPages")) ?></li>
     <?php if (!empty($revision)) { ?>
       <li id="t-whatlinkshere"><?php echo Button(array('action'=>_("BackLinks")), _("What links here"), $page->getName()) ?></li>
     <?php } ?>
     <?php if (!empty($user) && $user->isSignedIn()) { ?>
-      <li><?php $link = WikiLink(_("UpLoad"),"",_("Upload File")); $link->setAttr("accesskey","u"); $link->addTooltip(_("Upload images or media files")." [$p-u]"); echo $link ?></li>
+      <li><?php $link = WikiLink(_("UpLoad"),"",_("Upload File")); $link->setAttr("accesskey","u"); $link->addTooltip(_("Upload images or media files")." [$p-u]"); ?><?php echo $link ?></li>
       <li><?php echo WikiLink(_("UserPreferences"), "",_("Preferences")) ?></li>
     <?php } ?>
     <li>

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8224] trunk/lib/MailNotify.php

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

Revision: 8224
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8224&view=rev
Author:   vargenau
Date:     2012-01-03 14:23:29 +0000 (Tue, 03 Jan 2012)
Log Message:
-----------
Avoid warning due to mass rename not yet supported; "Edited by:" --> "Renamed by:"

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

Modified: trunk/lib/MailNotify.php
===================================================================
--- trunk/lib/MailNotify.php	2012-01-03 14:13:07 UTC (rev 8223)
+++ trunk/lib/MailNotify.php	2012-01-03 14:23:29 UTC (rev 8224)
@@ -301,22 +301,15 @@
     }
 
     /**
-     * Support mass rename / remove (not yet tested)
+     * Support mass rename / remove (TBD)
      */
     function sendPageRenameNotification ($to, &$meta) {
-        global $request;
-
-        if (@is_array($request->_deferredPageRenameNotification)) {
-            $request->_deferredPageRenameNotification[] =
-                array($this->pagename, $to, $meta, $this->emails, $this->userids);
-        } else {
-            $pagename = $this->pagename;
-            $editedby = sprintf(_("Edited by: %s"), $this->from);
-            $subject = sprintf(_("Page rename %s to %s"), $pagename, $to);
-            $link = WikiURL($to, true);
-            $this->sendMail($subject,
-                            $editedby."\n".$link."\n\n"."Renamed $pagename to $to");
-        }
+        $pagename = $this->pagename;
+        $editedby = sprintf(_("Renamed by: %s"), $this->fromId());
+        $subject = sprintf(_("Page rename %s to %s"), $pagename, $to);
+        $link = WikiURL($to, true);
+        $this->sendMail($subject,
+                        $editedby."\n".$link."\n\n"."Renamed $pagename to $to");
     }
 
     /**

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8223] trunk/lib/MailNotify.php

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

Revision: 8223
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8223&view=rev
Author:   vargenau
Date:     2012-01-03 14:13:07 +0000 (Tue, 03 Jan 2012)
Log Message:
-----------
Add braces

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

Modified: trunk/lib/MailNotify.php
===================================================================
--- trunk/lib/MailNotify.php	2012-01-03 14:09:23 UTC (rev 8222)
+++ trunk/lib/MailNotify.php	2012-01-03 14:13:07 UTC (rev 8223)
@@ -263,7 +263,9 @@
         $backend = &$request->_dbi->_backend;
         $subject = _("Page change").' '.($this->pagename);
         $previous = $backend->get_previous_version($this->pagename, $version);
-        if (!isset($meta['mtime'])) $meta['mtime'] = time();
+        if (!isset($meta['mtime'])) {
+            $meta['mtime'] = time();
+        }
         if ($previous) {
             $difflink = WikiURL($this->pagename, array('action'=>'diff'), true);
             $cache = &$request->_dbi->_cache;
@@ -322,13 +324,13 @@
      */
     function onChangePage (&$wikidb, &$wikitext, $version, &$meta) {
         $result = true;
-    if (!isa($GLOBALS['request'],'MockRequest')) {
-        $notify = $wikidb->get('notify');
+        if (!isa($GLOBALS['request'],'MockRequest')) {
+            $notify = $wikidb->get('notify');
             /* Generate notification emails? */
-        if (!empty($notify) and is_array($notify)) {
+            if (!empty($notify) and is_array($notify)) {
                 if (empty($this->pagename))
                     $this->pagename = $meta['pagename'];
-        // TODO: Should be used for ModeratePage and RSS2 Cloud xml-rpc also.
+                // TODO: Should be used for ModeratePage and RSS2 Cloud xml-rpc also.
                 $this->getPageChangeEmails($notify);
                 if (!empty($this->emails)) {
                     $result = $this->sendPageChangeNotification($wikitext, $version, $meta);

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8222] trunk/lib/MailNotify.php

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

Revision: 8222
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8222&view=rev
Author:   vargenau
Date:     2012-01-03 14:09:23 +0000 (Tue, 03 Jan 2012)
Log Message:
-----------
Add braces

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

Modified: trunk/lib/MailNotify.php
===================================================================
--- trunk/lib/MailNotify.php	2012-01-03 13:46:55 UTC (rev 8221)
+++ trunk/lib/MailNotify.php	2012-01-03 14:09:23 UTC (rev 8222)
@@ -42,16 +42,18 @@
  * @author  Reini Urban
  */
 
-if (!defined("MAILER_LOG"))
-    if (isWindows())
+if (!defined("MAILER_LOG")) {
+    if (isWindows()) {
         define("MAILER_LOG", 'c:/wikimail.log');
-    else
+    } else {
         define("MAILER_LOG", '/var/log/wikimail.log');
+    }
+}
 
 class MailNotify {
 
     function MailNotify($pagename) {
-    $this->pagename = $pagename; /* which page */
+        $this->pagename = $pagename; /* which page */
         $this->emails  = array();    /* to which addresses */
         $this->userids = array();    /* corresponding array of displayed names,
                                         don't display the email addresses */
@@ -81,8 +83,9 @@
             $prefs = $u->getPreferences();
             $email = $prefs->get('email');
             // do a dynamic emailVerified check update
-            if ($doverify and !$request->_prefs->get('emailVerified'))
+            if ($doverify and !$request->_prefs->get('emailVerified')) {
                 $email = '';
+            }
         } else {  // not current user
             if (ENABLE_USER_NEW) {
                 $u = WikiUser($userid);

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8221] trunk/themes/Sidebar/sidebar-min.css

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

Revision: 8221
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8221&view=rev
Author:   vargenau
Date:     2012-01-03 13:46:55 +0000 (Tue, 03 Jan 2012)
Log Message:
-----------
Minimize CSS

Modified Paths:
--------------
    trunk/themes/Sidebar/sidebar-min.css

Modified: trunk/themes/Sidebar/sidebar-min.css
===================================================================
--- trunk/themes/Sidebar/sidebar-min.css	2012-01-03 13:44:10 UTC (rev 8220)
+++ trunk/themes/Sidebar/sidebar-min.css	2012-01-03 13:46:55 UTC (rev 8221)
@@ -1 +1 @@
-#column-content{width:100%;float:right;margin:0 0 .6em -12.2em;padding:0}#content{margin:61px 0 0 12.2em;padding:1em 1em 1.5em 1em;background-color:white;border:1px solid #aaa;border-right:0;line-height:1.5em;position:relative;z-index:2}#column-one{padding-top:50px}body{font:small sans-serif;background-color:#fff;color:black;margin:0;padding:0}#globalWrapper{font-size:127%;width:100%;margin:0;padding:0}.visualClear{clear:both}table{font-size:100%;color:black}a{text-decoration:none;color:#004ba6;background-image:none}a:visited{color:#5a3696}a:active{color:#faa700}a:hover{text-decoration:underline}a.stub{color:#723}a.new,#p-personal a.new{color:#ba0000}a.new:visited,#p-personal a.new:visited{color:#a55858}img{border:0}p{margin:.4em 0 .5em 0;line-height:1.5em}p img{margin:0}img.inlineimage{border:0;display:inline}hr{height:1px;color:#aaa;background-color:#aaa;border:0;margin:.2em 0 .2em 0}h1,h2,h3,h4,h5,h6{color:black;background-image:none;font-weight:bold;font-family:Tahoma,Verdana,Arial,Helvetica,sans-serif;margin:0;padding-top:.5em;padding-bottom:.17em;border-bottom:1px solid #aaa}h1{font-size:188%}h2{font-size:150%}h3,h4,h5,h6{border-bottom:0;font-weight:bold}h3{font-size:132%}h4{font-size:116%}h5{font-size:100%}h6{font-size:80%}ul{line-height:1.5em;list-style-type:square;margin:.3em 0 0 1.5em;padding:0;list-style-image:url("images/bullet.png")}ul.clicked{line-height:1.5em;list-style-type:square;margin:.3em 0 0 1.5em;padding:0;list-style-image:url("images/bulletLoading.gif")}ol{line-height:1.5em;margin:.3em 0 0 3.2em;padding:0;list-style-image:none}li{margin-bottom:.1em}dt{font-size:115%;margin-bottom:.5em}dl{margin-top:.2em;margin-bottom:.5em}dd{line-height:1.5em;margin-left:2em;margin-bottom:.1em}fieldset{border:1px solid #2f6fab;margin:1em 0 1em 0;padding:0 1em 1em 1em;line-height:1.5em}legend{padding:.5em;font-size:95%}form{border:0;margin:0}textarea{width:100%;padding:.1em}input.historysubmit{padding:0 .3em .3em .3em!important;font-size:94%;cursor:pointer;height:1.7em!important;margin-left:1.6em}select{vertical-align:top}abbr,acronym,.explain{border-bottom:1px dotted black;color:black;background-image:none;cursor:help}q{font-family:Times,"Times New Roman",serif;font-style:italic}code{background-color:#f9f9f9}pre{padding:1em;border:1px dashed #2f6fab;color:black;background-color:#f9f9f9;line-height:1.1em}.align-left{text-align:left}.align-right{text-align:right}.align-center{text-align:center}.top{vertical-align:top}.nowrap{white-space:nowrap}.fullwidth{width:100%}#siteSub{display:none}#jump-to-nav{display:none}#contentSub{font-size:84%;line-height:1.2em;margin:0 0 1.4em 1em;color:#7d7d7d;width:auto}span.subpages{display:block}h1.firstHeading-rating{margin-right:220px;line-height:1.2em}h1.firstHeading{margin-right:40px;line-height:1.2em}#edit-public,h1.firstHeading-public,h1.firstHeading-rating-public{background-color:#ffce7b;border:1px solid #ffa500}#bodyContent h1,#bodyContent h2{margin-bottom:.6em}#bodyContent h3,#bodyContent h4,#bodyContent h5{margin-bottom:.3em}.firstHeading{margin-bottom:.1em}.usermessage{background-color:#ffce7b;border:1px solid #ffa500;color:black;font-weight:bold;margin:2em 0 1em;padding:.5em 1em;vertical-align:middle}#siteNotice{text-align:center;font-size:95%;padding:0 .9em}#siteNotice p{margin:0;padding:0}.errorbox,.successbox{font-size:larger;border:2px solid;padding:.5em 1em;float:left;margin-bottom:2em;color:#000}.errorbox{border-color:red;background-color:#fff2f2}.successbox{border-color:green;background-color:#dfd}.errorbox h2,.successbox h2{font-size:1em;font-weight:bold;display:inline;margin:0 .5em 0 0;border:0}#catlinks{border:1px solid #aaa;background-color:#f9f9f9;padding:5px;margin-top:1em;clear:both}.documentDescription{font-weight:bold;display:block;margin:1em 0;line-height:1.5em}.documentByLine{text-align:right;font-size:90%;clear:both;font-weight:normal;color:#76797c}.center{width:100%;text-align:center}*.center *{margin-left:auto;margin-right:auto}.small,.small *{font-size:94%}table.small{font-size:100%}.pageinfo-majoredit{font-weight:normal}.wiki-summary{font-size:94%;font-style:italic}.mw-warning{border:1px solid #aaa;background-color:#f9f9f9;padding:5px;margin-bottom:8px;font-size:95%}#toc,.toc{width:200px;border:1px solid #aaa;background-color:#f9f9f9;padding:5px;font-size:95%;float:right;clear:right}#toc h2,.toc h2{display:inline;border:0;padding:0;font-size:100%;font-weight:bold}.toc #toclist{width:auto;border:0}#toc #toctitle,.toc #toctitle,#toc .toctitle,.toc .toctitle{text-align:center}#toc ul,.toc ul{list-style-type:none;list-style-image:none;margin-left:0;padding-left:0;text-align:left}#toc ul ul,.toc ul ul{margin:0 0 0 2em}#toc .toctoggle,.toc .toctoggle{font-size:94%}.mw-warning{margin-left:50px;margin-right:50px;text-align:center}div.floatright,table.floatright{clear:right;float:right;position:relative;margin:0 0 .5em .5em;border:0}div.floatright p{font-style:italic}div.floatleft,table.floatleft{float:left;position:relative;margin:0 .5em .5em 0;border:0}div.floatleft p{font-style:italic}div.thumb{margin-bottom:.5em;border-style:solid;border-color:white;width:auto}div.thumb div{border:1px solid #ccc;padding:3px!important;background-color:#f9f9f9;font-size:94%;text-align:center;overflow:hidden}div.thumb div a img{border:1px solid #ccc}div.thumb div div.thumbcaption{border:0;text-align:left;line-height:1.4em;padding:.3em 0 .1em 0}div.magnify{float:right;border-style:none!important;background-image:none!important}div.magnify a,div.magnify img{display:block;border-style:none!important;background-image:none!important}div.tright{clear:right;float:right;border-width:.5em 0 .8em 1.4em}div.tleft{float:left;margin-right:.5em;border-width:.5em 1.4em .8em 0}.hiddenStructure{display:none;speak:none}img.tex{vertical-align:middle}span.texhtml{font-family:serif}table.rimage{float:right;position:relative;margin-left:1em;margin-bottom:1em;text-align:center}.toccolours{border:1px solid #aaa;background-color:#f9f9f9;padding:5px;font-size:95%}div.townBox{position:relative;float:right;background-color:white;margin-left:1em;border:1px solid gray;padding:.3em;width:200px;overflow:hidden;clear:right}div.townBox dl{padding:0;margin:0 0 .3em;font-size:96%}div.townBox dl dt{background-image:none;margin:.4em 0 0}div.townBox dl dd{margin:.1em 0 0 1.1em;background-color:#f3f3f3}.special li{line-height:1.4em;margin:0;padding:0}.autocomment{color:gray}#pagehistory span.user{margin-left:1.4em;margin-right:.4em}#pagehistory span.minor{font-weight:bold}#pagehistory li{border:1px solid white}#pagehistory li.selected{background-color:#f9f9f9;border:1px dashed #aaa}table.diff,td.diff-otitle,td.diff-ntitle{background-color:white}td.diff-addedline{background-color:#cfc;font-size:smaller}td.diff-deletedline{background-color:#ffa;font-size:smaller}td.diff-context{background-color:#eee;font-size:smaller}span.diffchange{color:red;font-weight:bold}.diff{margin-top:1ex;margin-bottom:.5ex;background-color:white;color:black;border-top:1px solid #494f5d;border-left:1px solid #494f5d;border-bottom:1px solid #c6d2de;border-right:1px solid #c6d2de;padding-top:1px;padding-bottom:1px;padding-left:.125em;padding-right:.125em;padding:0;clear:both}.diff .block{background-color:#ddd;padding-left:1em}.diff .context{background-color:white;border:0}.difftext{margin-top:0;margin-bottom:0;background-color:white;border-top:1px #e8e6df solid;border-left:1px #e8e6df solid;border-bottom:1px #d2d2d2 solid;border-right:1px #b2b2b2 solid;padding-left:0;padding-right:0;padding-top:0;padding-bottom:0;clear:both}.diff .block tt{font-weight:normal;font-family:monospace;color:black;margin-left:0;border:0}.diff del,.diff ins{font-weight:bold;text-decoration:none}.diff .original,.diff .deleted,.diff .final,.diff .added{background-color:white}.diff .original,.diff .deleted{background-color:#fcc;border:0}.diff .final,.diff .added{background-color:#cfc;border:0}.diff del{background-color:#f99}.diff ins{background-color:#9f9}td.pageinfo{font-weight:bold}.pageinfo-minoredit,.pageinfo-authorid{font-size:smaller;font-style:oblique}table.cal{border:1px outset gray;background-color:white;margin:.5ex .5em;padding:1px;empty-cells:hide}table.cal td{background-color:white;text-align:right}table.cal-header{font-size:larger}table.cal-header tr,table.cal-header td{text-align:center}.cal-arrow{font-weight:bold;text-decoration:none}.cal-dayname td{text-align:center;font-size:smaller;text-decoration:underline}a.cal-hide{text-decoration:none}table.cal td.cal-today{margin:1px;border:1px solid gray}#bodyContent a.external,#bodyContent a[href ^="gopher://"]{background-image:url("images/url.png");background-position:center right;background-repeat:no-repeat;padding-right:13px}#bodyContent a[href ^="https://"],.link-https{background-image:url("images/lock_icon.png");background-position:center right;background-repeat:no-repeat;padding-right:16px}#bodyContent a[href ^="mailto:"],.link-mailto{background-image:url("images/mail_icon.png");background-position:center right;background-repeat:no-repeat;padding-right:18px}#bodyContent a[href ^="news://"]{background-image:url("images/news_icon.png");background-position:center right;background-repeat:no-repeat;padding-right:18px}#bodyContent a[href ^="ftp://"],.link-ftp{background-image:url("images/file_icon.png");background-position:center right;background-repeat:no-repeat;padding-right:18px}#bodyContent a[href ^="irc://"],.link-irc{background-image:url("images/discussionitem_icon.png");background-position:center right;background-repeat:no-repeat;padding-right:18px}#bodyContent a.extiw,#bodyContent a.extiw:active{color:#36b;background-image:none;padding:0}#bodyContent a.external{color:#36b}#bodyContent .plainlinks a{background-image:none!important;padding:0!important}.portlet{border:0;margin:0 0 .5em;padding:0;float:none;width:11.6em;overflow:hidden}.portlet h4{font-size:95%;font-weight:normal;white-space:nowrap}.portlet h5{background-color:transparent;padding:0 1em 0 .5em;display:inline;font-size:91%;height:16px;width:11.6em;font-weight:bold;white-space:nowrap}.portlet h5 img{padding:0;margin:0;top:0;right:0;height:15px;width:15px;border:0}.portlet h6{background-color:#ffae2e;border:1px solid #2f6fab;border-style:solid solid none solid;padding:0 1em 0 1em;display:block;font-size:1em;height:1.2em;font-weight:normal;white-space:nowrap}.pBody{font-size:95%;background-color:white;color:black;border-collapse:collapse;border:1px solid #aaa;padding:0 .8em .3em .5em}.portlet h1,.portlet h2,.portlet h3,.portlet h4{margin:0;padding:0}.portlet ul{line-height:1.5em;list-style-type:square;list-style-image:url("images/bullet.png");font-size:95%}.portlet li{padding:0;margin:0;margin-bottom:0}#p-logo{z-index:1;position:absolute;top:0;left:0;height:42px;width:100%;overflow:visible;background-color:#005a99}#p-logo h5{display:none}#p-logo a,#p-logo a:hover{display:block;height:42px;background-repeat:no-repeat;background-position:35% 50%!important}span.logo{z-index:1;position:absolute;white-space:nowrap;left:18px;top:3px;color:#fff;font-family:Tahoma,Verdana,Arial,Helvetica,sans-serif;font-size:24pt;font-weight:bolder;text-decoration:none;vertical-align:middle}#img-logo-right{position:absolute;z-index:3;top:0;right:40px}#img-logo-band{position:absolute;z-index:3;top:0;right:40px;height:45px}#p-navigation{position:relative;z-index:3}#p-navigation .pBody{padding-right:0}#p-nav1{position:relative;z-index:3}#p-navigation a{display:block}#p-navigation li.active a,#p-navigation li.active a:hover{text-decoration:none;display:inline;font-weight:bold}#logo-search{position:absolute;z-index:4;top:5px;left:340px;height:25px;overflow:visible}#p-search{position:relative;z-index:3}div.pBody>button,#searchButton{margin:0;padding:0}#p-search .pBody{margin:0;padding:.5em 0 .4em .4em}#searchholder form.searchform{margin:0;padding:0;display:inline}button.searchButton{margin:0;padding:0;cursor:pointer;width:18px;height:18px;border:1px solid ButtonShadow}input.searchButton{margin-top:1px;font-size:8pt;cursor:pointer;width:64px;padding-left:1px;background-color:White;border:1px solid #2f6fab;text-transform:capitalize}#searchInput{width:120px;height:18px;margin:0;font-size:95%;border-width:1px;border-style:solid;border-color:#aaa #eee #eee #aaa;-moz-box-sizing:border-box}#p-personal{width:100%;white-space:nowrap;padding:0;margin:0;position:absolute;right:140px;top:15px;z-index:4;border:0;overflow:visible;color:black;line-height:1.2em}#p-personal h5{display:none}#p-personal .portlet,#p-personal .pBody{padding:0;margin:0;border:0;z-index:0;overflow:visible;background-image:none}#p-personal ul{border:0;line-height:1.5em;color:#2f6fab;padding:0 1.5em 0 2em;margin:0;text-align:right;list-style:none;z-index:0;background-image:none;cursor:default}#p-personal li{z-index:0;border:0;padding:0;display:inline;color:#2f6fab;margin-left:.8em;line-height:1.2em;background-image:none}#p-personal li a{text-decoration:none;color:white;padding-left:.5em;padding-bottom:.2em}#p-personal li a:hover{color:white;background-color:#005a99;padding-bottom:.2em;font-weight:bold;text-decoration:none}li#pt-mypages,li#pt-mychanges,li#pt-userpage,li#pt-anonuserpage,li#pt-login{background-image:url('images/wikiuser.png');background-position:top left;background-repeat:no-repeat;padding-left:10px;text-transform:none}#p-personal a.new{color:#ba0000}#p-cactions{position:absolute;top:40px;left:13.2em;margin:0;white-space:nowrap;width:76%;line-height:1.1em;overflow:visible;background-image:none;border-collapse:collapse;padding-left:1em;list-style:none;font-size:95%}#p-cactions .hiddenStructure{display:none}#p-cactions ul{list-style:none}#p-cactions li{display:inline;border:1px solid #aaa;border-bottom:0;padding:0 0 .1em 0;margin:0 .3em 0 0;overflow:visible;background-color:white}#p-cactions li.selected{border-color:#fabd23;padding:0 0 .2em 0}#p-cactions li a{background-color:#fbfbfb;color:#002bb8;border:0;padding:0 .8em .3em;text-decoration:none;position:relative;z-index:0;margin:0}#p-cactions li.selected a{z-index:3;background-color:#fff;padding:0 1em .2em}#p-cactions .new a{color:#ba0000}#p-cactions li a:hover{z-index:3;text-decoration:none;background-color:#fff;padding-bottom:.3em}#p-cactions li a#btn-edit{background-image:url('images/UEB16.png');background-position:top left;background-repeat:no-repeat;padding-left:20px!important;text-transform:none}#p-cactions li a#btn-edit:hover{z-index:3;text-decoration:none;background-color:#fff}#p-cactions h5{display:none}#p-cactions li.istalk{margin-right:0}#p-cactions li.istalk a{padding-right:.5em}#p-cactions #ca-addsection a{padding-left:.4em;padding-right:.4em}li#ca-talk{margin-right:1.6em}li#ca-watch,li#ca-unwatch,li#ca-varlang-0,li#ca-print{margin-left:1.6em}#p-tbx,#p-lang{position:relative;z-index:3}#footer,#bottom{background-color:white;border:1px solid #fabd23;margin:.6em .5em 1em 13.6em;padding:.4em 0 1.2em 0;text-align:center;font-size:90%}#footer li{display:inline;margin:0 1.3em}#bottom{border:0;text-align:left}head:first-child+body #footer li{white-space:nowrap}#f-poweredbyico,#f-copyrightico{margin:0 8px;height:31px;position:relative;top:-31px}#f-poweredbyico{float:right}#f-copyrightico{float:left}#preftoc{float:left;margin:1em 1em 1em 1em;width:13em}#preftoc li{border:1px solid White}#preftoc li.selected{background-color:#f9f9f9;border:1px dashed #aaa}#preftoc a,#preftoc a:active{display:block;color:#0014a6}#prefcontrol{clear:both;float:left;margin-top:1em}div.prefsectiontip{font-size:95%;margin-top:1em}fieldset.operaprefsection{margin-left:15em}* html #footer{margin-top:0}* html #column-content{display:inline;margin-bottom:0}* html div.editsection{font-size:smaller}#pagehistory li.selected{position:relative}.redirectText{font-size:150%;margin:5px}.printfooter{display:none}.not-patrolled{background-color:#ffa}div.patrollink{font-size:75%;text-align:right}span.newpage,span.minor,span.searchmatch,span.bot{font-weight:bold}span.unpatrolled{font-weight:bold;color:red}span.searchmatch{color:red}.sharedUploadNotice{font-style:italic}span.updatedmarker{color:black;background-color:#0f0}span.newpageletter{font-weight:bold;color:black;background-color:yellow}span.minoreditletter{color:black;background-color:#c5ffe6}table.gallery{border:1px solid #ccc;margin:2px;padding:2px;background-color:white}table.gallery tr{vertical-align:top}table.gallery td{vertical-align:top;background-color:#f9f9f9;border:solid 2px white}table.gallery td.galleryheader{text-align:center;font-weight:bold}div.gallerybox{margin:2px;width:150px}div.gallerybox div.thumb{text-align:center;border:1px solid #ccc;margin:2px}div.gallerytext{font-size:94%;padding:2px 4px}span.comment{font-style:italic}span.changedby{font-size:95%}.previewnote{text-indent:3em;color:#c00;border-bottom:1px solid #aaa;padding-bottom:1em;margin-bottom:1em}.previewnote p{margin:0;padding:0}.editExternally{border:1px solid gray;background-color:#fff;padding:3px;margin-top:.5em;float:left;font-size:small;text-align:center}.editExternallyHelp{font-style:italic;color:gray}li span.deleted,span.history-deleted{text-decoration:line-through;color:#888;font-style:italic}.toggle{margin-left:2em;text-indent:-2em}table.mw_metadata{font-size:.8em;margin-left:.5em;margin-bottom:.5em;width:300px}table.mw_metadata caption{font-weight:bold}table.mw_metadata th{font-weight:normal}table.mw_metadata td{padding:.1em}table.mw_metadata{border:0;border-collapse:collapse}table.mw_metadata td,table.mw_metadata th{text-align:center;border:1px solid #aaa;padding-left:.1em;padding-right:.1em}table.mw_metadata th{background-color:#f9f9f9}table.mw_metadata td{background-color:#fcfcfc}table.collapsed tr.collapsable{display:none}ul#filetoc{text-align:center;border:1px solid #aaa;background-color:#f9f9f9;padding:5px;font-size:95%;margin-bottom:.5em;margin-left:0;margin-right:0}#filetoc li{display:inline;list-style-type:none;padding-right:2em}input#wpSave,input#wpDiff{margin-right:.33em}#editform .editOptions{display:inline}#wpSave{font-weight:bold}table.revisionform_default{border:1px solid #000}table.revisionform_focus{border:1px solid #000;background-color:#0bf}tr.revision_tr_default{background-color:#eee}tr.revision_tr_first{background-color:#ddd}p.revision_saved{color:green;font-weight:bold}#mw_trackbacks{border:solid 1px #bbf;background-color:#eef;padding:.2em}#allmessagestable th{background-color:#b2b2ff}#allmessagestable tr.orig{background-color:#ffe2e2}#allmessagestable tr.new{background-color:#e2ffe2}#allmessagestable tr.def{background-color:#f0f0ff}div.noarticletext{border:1px solid #ccc;background-color:#fff;padding:.2em 1em;color:#000}div#searchTargetContainer{left:10px;top:10px;width:90%;background-color:white}div#searchTarget{padding:3px;margin:5px;background-color:#f0f0f0;border:solid 1px blue}div#searchTarget ul li{list-style:none}div#searchTarget ul li:before{color:orange;content:"\00BB \0020"}div.multipageimagenavbox{border:solid 1px silver;padding:4px;margin:1em;-moz-border-radius:6px;background-color:#f0f0f0}div.multipageimagenavbox div.thumb{border:0;margin-left:2em;margin-right:2em}div.multipageimagenavbox hr{margin:6px}table.multipageimage td{text-align:center}.TablePager_nav a{text-decoration:none}.TablePager{border-collapse:collapse}.TablePager,.TablePager td,.TablePager th{border:.15em solid #777;padding:0 .15em 0 .15em}.TablePager th{background-color:#eef}.TablePager td{background-color:#fff}.TablePager tr:hover td{background-color:#eef}.imagelist td,.imagelist th{white-space:nowrap}.imagelist .TablePager_col_links{background-color:#eef}.imagelist .TablePager_col_img_description{white-space:normal}.imagelist th.TablePager_sort{background-color:#ccf}.pagelist thead td{background-color:#e8e8e8;text-decoration:none;font-weight:bold;font-size:smaller}.pagelist thead td u{text-decoration:none}.pagelist tr.evenrow{background-color:#eee}.pagelist tr.oddrow{background-color:white}th.gridbutton{background-color:ThreeDLightShadow;color:black;font-family:Tahoma,Verdana,Arial,Helvetica,sans-serif;font-size:small;font-weight:normal;white-space:nowrap;margin:5px 0;max-height:24px;padding:5px 0 5px 0;border-width:1px;border-style:solid;border-color:ThreeDHighlight ThreeDDarkShadow ThreeDDarkShadow ThreeDHighlight}input.gridbutton,a.gridbutton,a:hover.gridbutton,a:visited.gridbutton{text-decoration:none;font-size:small;font-weight:normal;font-family:Tahoma,Verdana,Arial,Helvetica,sans-serif;background-color:ThreeDLightShadow;color:black}.wikipaging{font-size:80%}.wikipaging-disabled{color:#999}div.boxright{width:200px;right:10px;float:right;border:thin solid #888;padding:.5em .5em .5em .5em;margin:0}div.boxright>blockquote{padding:.5em;margin:0}.error{color:black;background-color:#f99;margin-top:1em;margin-bottom:1em;padding-left:.8em;padding-right:.8em;padding-top:.8ex;padding-bottom:0;border:medium solid red;clear:both}.warning{color:black;background-color:#fcc;margin-top:1em;margin-bottom:1em;padding-left:.8em;padding-right:.8em;padding-top:.8ex;padding-bottom:0;border:1px solid #aaa;clear:both}.debug{color:black;background-color:white;font-size:smaller;margin:1ex 0;padding:.5ex .5em;border:medium solid #fff8dc}.hint{color:black;background-color:#eee;font-style:italic;margin-left:3em;padding:.5ex .5em;border:thin solid #aaa}span.hint{padding:0}.disabled-plugin{clear:both;margin:1ex 0;padding:0}.disabled-plugin .title{color:#400;background-color:inherit;font-size:x-small;text-align:right;padding:0 .5em}.disabled-plugin pre{color:black;background-color:#ddd;margin:0;padding:.3ex .5em}span.redirectfrom{font-size:small;font-style:oblique;font-weight:normal;padding-left:1em}.search-context{background-color:white;font-style:oblique}.search-term{background-color:yellow;font-weight:normal}a.spell-wrong{color:#ba0000;background-color:yellow}span.spell-wrong{color:#ba0000}.wiki,.named-wiki{text-decoration:none;font-weight:normal}.wiki relation,.named-wiki relation,.wiki attribute,.named-wiki attribute{font-style:oblique;font-weight:bold}span.relation-symbol{font-weight:bold;font-family:monospace;letter-spacing:.1em}a.wikiaction,a.wikiadmin,a.wiki-rc-action,a.wikiunsafe,input.wikiaction,input.button,input.wikiadmin{text-decoration:none;font-family:Tahoma,Verdana,Arial,Helvetica,sans-serif;white-space:nowrap}.wikiunsafe{background-color:#fcc}.wikiunknown,.named-wikiunknown{font-weight:normal;font-size:100%}.wikiunknown a,.named-wikiunknown a{color:#447;background-color:#eee;text-decoration:none;font-weight:normal;font-size:smaller}.backlinks{text-decoration:underline;color:#006}h1 .backlinks{text-decoration:underline}.wikipage{font-weight:normal}.interwiki{text-decoration:none}.interwiki,i.interwiki .wikipage,em .interwiki .wikipage{font-style:oblique}.interwiki .wikipage,i .interwiki,em .interwiki{font-style:normal}#p-rc-body div div.box-title{display:none}div.rss{margin:1em;padding:1em;font-size:.9em;background-color:#eee;border:thin dashed #aaa}div.feed{color:#333;margin:-0.5em;margin-bottom:0;padding:.3em;font-weight:bold;background-color:#f2f2f2;font-size:1.2em}div.itemdesc{padding-left:1em}div.rssitem{border-top:thin dashed #aaa}a.rssicon{font-weight:normal;font-size:small;vertical-align:middle}div#rateit-widget-top-1{width:120px;height:29px;top:5px;right:75px;z-index:1;position:absolute}div#rateit-widget-top{padding-top:0;position:absolute;z-index:1;width:120px;height:29px;top:0;right:110px}span.rateit{text-decoration:none;font-family:Tahoma,Verdana,Arial,Helvetica,sans-serif;font-size:10px}div.public,span.public{background-color:#ffce7b}.transclusion-title{font-weight:bold;text-decoration:underline;margin-bottom:.25ex;margin-right:.25em}.transclusion,.wiki-edithelp{font-size:97%}.transclusion{border:1px solid gray;padding-left:.8em;padding-right:.8em;padding-top:0;padding-bottom:0;margin-left:.25em;margin-right:.25em;margin-bottom:.1ex}.wiki-edithelp{background-color:white;border:medium solid #fff8dc;padding-left:.5em;padding-right:.5em;padding-top:.75ex;padding-bottom:.75ex;margin-left:0;margin-right:0;margin-top:1ex;margin-bottom:1ex}.wiki-edithelp p{font-family:Tahoma,Verdana,Arial,Helvetica,sans-serif;padding-left:.5em;padding-right:.5em;padding-top:.5ex;padding-bottom:.5ex;margin:0}table.boxed,table.bordered,table.bordered th,table.bordered td{border-width:1px;border-style:solid;border-collapse:collapse;vertical-align:top}table.boxed td,table.bordered td,table.boxed th,table.bordered th{padding-left:5px;padding-right:5px;padding-top:0;padding-bottom:0}table.boxed caption,table.bordered caption{text-align:center;font-weight:bold;caption-side:bottom;padding-top:.8em}table.boxed th,table.bordered th{font-weight:bold;background-color:#d8d8d8}td.tdselected,td.tdunselected{text-align:center;font-weight:bold;padding-left:5px;padding-right:5px}td.tdselected{color:white;background-color:#554295}td.tdunselected{color:black;background-color:#e9e8de}.feedback{font-weight:bold;border-width:2px;border-style:solid;background-color:#DFD;border-color:green;padding:.5em}
\ No newline at end of file
+#column-content{width:100%;float:right;margin:0 0 .6em -12.2em;padding:0}#content{margin:61px 0 0 12.2em;padding:1em 1em 1.5em 1em;background-color:white;border:1px solid #aaa;border-right:0;line-height:1.5em;position:relative;z-index:2}#column-one{padding-top:50px}body{font:small sans-serif;background-color:#fff;color:black;margin:0;padding:0}#globalWrapper{font-size:127%;width:100%;margin:0;padding:0}.visualClear{clear:both}table{font-size:100%;color:black}a{text-decoration:none;color:#004ba6;background-image:none}a:visited{color:#5a3696}a:active{color:#faa700}a:hover{text-decoration:underline}a.stub{color:#723}a.new,#p-personal a.new{color:#ba0000}a.new:visited,#p-personal a.new:visited{color:#a55858}img{border:0}p{margin:.4em 0 .5em 0;line-height:1.5em}p img{margin:0}img.inlineimage{border:0;display:inline}hr{height:1px;color:#aaa;background-color:#aaa;border:0;margin:.2em 0 .2em 0}h1,h2,h3,h4,h5,h6{color:black;background-image:none;font-weight:bold;font-family:Tahoma,Verdana,Arial,Helvetica,sans-serif;margin:0;padding-top:.5em;padding-bottom:.17em;border-bottom:1px solid #aaa}h1{font-size:188%}h2{font-size:150%}h3,h4,h5,h6{border-bottom:0;font-weight:bold}h3{font-size:132%}h4{font-size:116%}h5{font-size:100%}h6{font-size:80%}ul{line-height:1.5em;list-style-type:square;margin:.3em 0 0 1.5em;padding:0;list-style-image:url("images/bullet.png")}ul.clicked{line-height:1.5em;list-style-type:square;margin:.3em 0 0 1.5em;padding:0;list-style-image:url("images/bulletLoading.gif")}ol{line-height:1.5em;margin:.3em 0 0 3.2em;padding:0;list-style-image:none}li{margin-bottom:.1em}dt{font-size:115%;margin-bottom:.5em}dl{margin-top:.2em;margin-bottom:.5em}dd{line-height:1.5em;margin-left:2em;margin-bottom:.1em}fieldset{border:1px solid #2f6fab;margin:1em 0 1em 0;padding:0 1em 1em 1em;line-height:1.5em}legend{padding:.5em;font-size:95%}form{border:0;margin:0}textarea{width:100%;padding:.1em}input.historysubmit{padding:0 .3em .3em .3em!important;font-size:94%;cursor:pointer;height:1.7em!important;margin-left:1.6em}select{vertical-align:top}abbr,acronym,.explain{border-bottom:1px dotted black;color:black;background-image:none;cursor:help}q{font-family:Times,"Times New Roman",serif;font-style:italic}code{background-color:#f9f9f9}pre{padding:1em;border:1px dashed #2f6fab;color:black;background-color:#f9f9f9;line-height:1.1em}.align-left{text-align:left}.align-right{text-align:right}.align-center{text-align:center}.top{vertical-align:top}.nowrap{white-space:nowrap}.fullwidth{width:100%}#siteSub{display:none}#jump-to-nav{display:none}#contentSub{font-size:84%;line-height:1.2em;margin:0 0 1.4em 1em;color:#7d7d7d;width:auto}span.subpages{display:block}h1.firstHeading-rating{margin-right:220px;line-height:1.2em}h1.firstHeading{margin-right:40px;line-height:1.2em}#edit-public,h1.firstHeading-public,h1.firstHeading-rating-public{background-color:#ffce7b;border:1px solid #ffa500}#bodyContent h1,#bodyContent h2{margin-bottom:.6em}#bodyContent h3,#bodyContent h4,#bodyContent h5{margin-bottom:.3em}.firstHeading{margin-bottom:.1em}.usermessage{background-color:#ffce7b;border:1px solid #ffa500;color:black;font-weight:bold;margin:2em 0 1em;padding:.5em 1em;vertical-align:middle}#siteNotice{text-align:center;font-size:95%;padding:0 .9em}#siteNotice p{margin:0;padding:0}.errorbox,.successbox{font-size:larger;border:2px solid;padding:.5em 1em;float:left;margin-bottom:2em;color:#000}.errorbox{border-color:red;background-color:#fff2f2}.successbox{border-color:green;background-color:#dfd}.errorbox h2,.successbox h2{font-size:1em;font-weight:bold;display:inline;margin:0 .5em 0 0;border:0}#catlinks{border:1px solid #aaa;background-color:#f9f9f9;padding:5px;margin-top:1em;clear:both}.documentDescription{font-weight:bold;display:block;margin:1em 0;line-height:1.5em}.documentByLine{text-align:right;font-size:90%;clear:both;font-weight:normal;color:#76797c}.center{width:100%;text-align:center}*.center *{margin-left:auto;margin-right:auto}.small,.small *{font-size:94%}table.small{font-size:100%}.pageinfo-majoredit{font-weight:normal}.wiki-summary{font-size:94%;font-style:italic}.mw-warning{border:1px solid #aaa;background-color:#f9f9f9;padding:5px;margin-bottom:8px;font-size:95%}#toc,.toc{width:200px;border:1px solid #aaa;background-color:#f9f9f9;padding:5px;font-size:95%;float:right;clear:right}#toc h2,.toc h2{display:inline;border:0;padding:0;font-size:100%;font-weight:bold}.toc #toclist{width:auto;border:0}#toc #toctitle,.toc #toctitle,#toc .toctitle,.toc .toctitle{text-align:center}#toc ul,.toc ul{list-style-type:none;list-style-image:none;margin-left:0;padding-left:0;text-align:left}#toc ul ul,.toc ul ul{margin:0 0 0 2em}#toc .toctoggle,.toc .toctoggle{font-size:94%}.mw-warning{margin-left:50px;margin-right:50px;text-align:center}div.floatright,table.floatright{clear:right;float:right;position:relative;margin:0 0 .5em .5em;border:0}div.floatright p{font-style:italic}div.floatleft,table.floatleft{float:left;position:relative;margin:0 .5em .5em 0;border:0}div.floatleft p{font-style:italic}div.thumb{margin-bottom:.5em;border-style:solid;border-color:white;width:auto}div.thumb div{border:1px solid #ccc;padding:3px!important;background-color:#f9f9f9;font-size:94%;text-align:center;overflow:hidden}div.thumb div a img{border:1px solid #ccc}div.thumb div div.thumbcaption{border:0;text-align:left;line-height:1.4em;padding:.3em 0 .1em 0}div.magnify{float:right;border-style:none!important;background-image:none!important}div.magnify a,div.magnify img{display:block;border-style:none!important;background-image:none!important}div.tright{clear:right;float:right;border-width:.5em 0 .8em 1.4em}div.tleft{float:left;margin-right:.5em;border-width:.5em 1.4em .8em 0}.hiddenStructure{display:none;speak:none}img.tex{vertical-align:middle}span.texhtml{font-family:serif}table.rimage{float:right;position:relative;margin-left:1em;margin-bottom:1em;text-align:center}.toccolours{border:1px solid #aaa;background-color:#f9f9f9;padding:5px;font-size:95%}div.townBox{position:relative;float:right;background-color:white;margin-left:1em;border:1px solid gray;padding:.3em;width:200px;overflow:hidden;clear:right}div.townBox dl{padding:0;margin:0 0 .3em;font-size:96%}div.townBox dl dt{background-image:none;margin:.4em 0 0}div.townBox dl dd{margin:.1em 0 0 1.1em;background-color:#f3f3f3}.special li{line-height:1.4em;margin:0;padding:0}.autocomment{color:gray}#pagehistory span.user{margin-left:1.4em;margin-right:.4em}#pagehistory span.minor{font-weight:bold}#pagehistory li{border:1px solid white}#pagehistory li.selected{background-color:#f9f9f9;border:1px dashed #aaa}table.diff,td.diff-otitle,td.diff-ntitle{background-color:white}td.diff-addedline{background-color:#cfc;font-size:smaller}td.diff-deletedline{background-color:#ffa;font-size:smaller}td.diff-context{background-color:#eee;font-size:smaller}span.diffchange{color:red;font-weight:bold}.diff{margin-top:1ex;margin-bottom:.5ex;background-color:white;color:black;border-top:1px solid #494f5d;border-left:1px solid #494f5d;border-bottom:1px solid #c6d2de;border-right:1px solid #c6d2de;padding-top:1px;padding-bottom:1px;padding-left:.125em;padding-right:.125em;padding:0;clear:both}.diff .block{background-color:#ddd;padding-left:1em}.diff .context{background-color:white;border:0}.difftext{margin-top:0;margin-bottom:0;background-color:white;border-top:1px #e8e6df solid;border-left:1px #e8e6df solid;border-bottom:1px #d2d2d2 solid;border-right:1px #b2b2b2 solid;padding-left:0;padding-right:0;padding-top:0;padding-bottom:0;clear:both}.diff .block tt{font-weight:normal;font-family:monospace;color:black;margin-left:0;border:0}.diff del,.diff ins{font-weight:bold;text-decoration:none}.diff .original,.diff .deleted,.diff .final,.diff .added{background-color:white}.diff .original,.diff .deleted{background-color:#fcc;border:0}.diff .final,.diff .added{background-color:#cfc;border:0}.diff del{background-color:#f99}.diff ins{background-color:#9f9}td.pageinfo{font-weight:bold}.pageinfo-minoredit,.pageinfo-authorid{font-size:smaller;font-style:oblique}table.cal{border:1px outset gray;background-color:white;margin:.5ex .5em;padding:1px;empty-cells:hide}table.cal td{background-color:white;text-align:right}table.cal-header{font-size:larger}table.cal-header tr,table.cal-header td{text-align:center}.cal-arrow{font-weight:bold;text-decoration:none}.cal-dayname td{text-align:center;font-size:smaller;text-decoration:underline}a.cal-hide{text-decoration:none}table.cal td.cal-today{margin:1px;border:1px solid gray}#bodyContent a.external,#bodyContent a[href ^="gopher://"]{background-image:url("images/url.png");background-position:center right;background-repeat:no-repeat;padding-right:13px}#bodyContent a[href ^="https://"],.link-https{background-image:url("images/lock_icon.png");background-position:center right;background-repeat:no-repeat;padding-right:16px}#bodyContent a[href ^="mailto:"],.link-mailto{background-image:url("images/mail_icon.png");background-position:center right;background-repeat:no-repeat;padding-right:18px}#bodyContent a[href ^="news://"]{background-image:url("images/news_icon.png");background-position:center right;background-repeat:no-repeat;padding-right:18px}#bodyContent a[href ^="ftp://"],.link-ftp{background-image:url("images/file_icon.png");background-position:center right;background-repeat:no-repeat;padding-right:18px}#bodyContent a[href ^="irc://"],.link-irc{background-image:url("images/discussionitem_icon.png");background-position:center right;background-repeat:no-repeat;padding-right:18px}#bodyContent a.extiw,#bodyContent a.extiw:active{color:#36b;background-image:none;padding:0}#bodyContent a.external{color:#36b}#bodyContent .plainlinks a{background-image:none!important;padding:0!important}.portlet{border:0;margin:0 0 .5em;padding:0;float:none;width:11.6em;overflow:hidden}.portlet h4{font-size:95%;font-weight:normal;white-space:nowrap}.portlet h5{background-color:transparent;padding:0 1em 0 .5em;display:inline;font-size:91%;height:16px;width:11.6em;font-weight:bold;white-space:nowrap}.portlet h5 img{padding:0;margin:0;top:0;right:0;height:15px;width:15px;border:0}.portlet h6{background-color:#ffae2e;border:1px solid #2f6fab;border-style:solid solid none solid;padding:0 1em 0 1em;display:block;font-size:1em;height:1.2em;font-weight:normal;white-space:nowrap}.pBody{font-size:95%;border-collapse:collapse;border:1px solid #aaa;padding:0 .8em .3em .5em}.portlet h1,.portlet h2,.portlet h3,.portlet h4{margin:0;padding:0}.portlet ul{line-height:1.5em;list-style-type:square;list-style-image:url("images/bullet.png");font-size:95%}.portlet li{padding:0;margin:0;margin-bottom:0}#p-logo{z-index:1;position:absolute;top:0;left:0;height:42px;width:100%;overflow:visible;background-color:#005a99}#p-logo h5{display:none}#p-logo a,#p-logo a:hover{display:block;height:42px;background-repeat:no-repeat;background-position:35% 50%!important}span.logo{z-index:1;position:absolute;white-space:nowrap;left:18px;top:3px;color:#fff;font-family:Tahoma,Verdana,Arial,Helvetica,sans-serif;font-size:24pt;font-weight:bolder;text-decoration:none;vertical-align:middle}#img-logo-right{position:absolute;z-index:3;top:0;right:40px}#img-logo-band{position:absolute;z-index:3;top:0;right:40px;height:45px}#p-navigation{position:relative;z-index:3}#p-navigation .pBody{padding-right:0}#p-nav1{position:relative;z-index:3}#p-navigation a{display:block}#p-navigation li.active a,#p-navigation li.active a:hover{text-decoration:none;display:inline;font-weight:bold}#logo-search{position:absolute;z-index:4;top:5px;left:340px;height:25px;overflow:visible}#p-search{position:relative;z-index:3}div.pBody>button,#searchButton{margin:0;padding:0}#p-search .pBody{margin:0;padding:.5em 0 .4em .4em}#searchholder form.searchform{margin:0;padding:0;display:inline}button.searchButton{margin:0;padding:0;cursor:pointer;width:18px;height:18px;border:1px solid ButtonShadow}input.searchButton{margin-top:1px;font-size:8pt;cursor:pointer;width:64px;padding-left:1px;background-color:White;border:1px solid #2f6fab;text-transform:capitalize}#searchInput{width:120px;height:18px;margin:0;font-size:95%;border-width:1px;border-style:solid;border-color:#aaa #eee #eee #aaa;-moz-box-sizing:border-box}#p-personal{width:100%;white-space:nowrap;padding:0;margin:0;position:absolute;right:140px;top:15px;z-index:4;border:0;overflow:visible;color:black;line-height:1.2em}#p-personal h5{display:none}#p-personal .portlet,#p-personal .pBody{padding:0;margin:0;border:0;z-index:0;overflow:visible;background-image:none}#p-personal ul{border:0;line-height:1.5em;color:#2f6fab;padding:0 1.5em 0 2em;margin:0;text-align:right;list-style:none;z-index:0;background-image:none;cursor:default}#p-personal li{z-index:0;border:0;padding:0;display:inline;color:#2f6fab;margin-left:.8em;line-height:1.2em;background-image:none}#p-personal li a{text-decoration:none;color:white;padding-left:.5em;padding-bottom:.2em}#p-personal li a:hover{color:white;background-color:#005a99;padding-bottom:.2em;font-weight:bold;text-decoration:none}li#pt-mypages,li#pt-mychanges,li#pt-userpage,li#pt-anonuserpage,li#pt-login{background-image:url('images/wikiuser.png');background-position:top left;background-repeat:no-repeat;padding-left:10px;text-transform:none}#p-personal a.new{color:#ba0000}#p-cactions{position:absolute;top:40px;left:13.2em;margin:0;white-space:nowrap;width:76%;line-height:1.1em;overflow:visible;background-image:none;border-collapse:collapse;padding-left:1em;list-style:none;font-size:95%}#p-cactions .hiddenStructure{display:none}#p-cactions ul{list-style:none}#p-cactions li{display:inline;border:1px solid #aaa;border-bottom:0;padding:0 0 .1em 0;margin:0 .3em 0 0;overflow:visible;background-color:white}#p-cactions li.selected{border-color:#fabd23;padding:0 0 .2em 0}#p-cactions li a{background-color:#fbfbfb;color:#002bb8;border:0;padding:0 .8em .3em;text-decoration:none;position:relative;z-index:0;margin:0}#p-cactions li.selected a{z-index:3;background-color:#fff;padding:0 1em .2em}#p-cactions .new a{color:#ba0000}#p-cactions li a:hover{z-index:3;text-decoration:none;background-color:#fff;padding-bottom:.3em}#p-cactions li a#btn-edit{background-image:url('images/UEB16.png');background-position:top left;background-repeat:no-repeat;padding-left:20px!important;text-transform:none}#p-cactions li a#btn-edit:hover{z-index:3;text-decoration:none;background-color:#fff}#p-cactions h5{display:none}#p-cactions li.istalk{margin-right:0}#p-cactions li.istalk a{padding-right:.5em}#p-cactions #ca-addsection a{padding-left:.4em;padding-right:.4em}li#ca-talk{margin-right:1.6em}li#ca-watch,li#ca-unwatch,li#ca-varlang-0,li#ca-print{margin-left:1.6em}#p-tbx,#p-lang{position:relative;z-index:3}#footer,#bottom{background-color:white;border:1px solid #fabd23;margin:.6em .5em 1em 13.6em;padding:.4em 0 1.2em 0;text-align:center;font-size:90%}#footer li{display:inline;margin:0 1.3em}#bottom{border:0;text-align:left}head:first-child+body #footer li{white-space:nowrap}#f-poweredbyico,#f-copyrightico{margin:0 8px;height:31px;position:relative;top:-31px}#f-poweredbyico{float:right}#f-copyrightico{float:left}#preftoc{float:left;margin:1em 1em 1em 1em;width:13em}#preftoc li{border:1px solid White}#preftoc li.selected{background-color:#f9f9f9;border:1px dashed #aaa}#preftoc a,#preftoc a:active{display:block;color:#0014a6}#prefcontrol{clear:both;float:left;margin-top:1em}div.prefsectiontip{font-size:95%;margin-top:1em}fieldset.operaprefsection{margin-left:15em}* html #footer{margin-top:0}* html #column-content{display:inline;margin-bottom:0}* html div.editsection{font-size:smaller}#pagehistory li.selected{position:relative}.redirectText{font-size:150%;margin:5px}.printfooter{display:none}.not-patrolled{background-color:#ffa}div.patrollink{font-size:75%;text-align:right}span.newpage,span.minor,span.searchmatch,span.bot{font-weight:bold}span.unpatrolled{font-weight:bold;color:red}span.searchmatch{color:red}.sharedUploadNotice{font-style:italic}span.updatedmarker{color:black;background-color:#0f0}span.newpageletter{font-weight:bold;color:black;background-color:yellow}span.minoreditletter{color:black;background-color:#c5ffe6}table.gallery{border:1px solid #ccc;margin:2px;padding:2px;background-color:white}table.gallery tr{vertical-align:top}table.gallery td{vertical-align:top;background-color:#f9f9f9;border:solid 2px white}table.gallery td.galleryheader{text-align:center;font-weight:bold}div.gallerybox{margin:2px;width:150px}div.gallerybox div.thumb{text-align:center;border:1px solid #ccc;margin:2px}div.gallerytext{font-size:94%;padding:2px 4px}span.comment{font-style:italic}span.changedby{font-size:95%}.previewnote{text-indent:3em;color:#c00;border-bottom:1px solid #aaa;padding-bottom:1em;margin-bottom:1em}.previewnote p{margin:0;padding:0}.editExternally{border:1px solid gray;background-color:#fff;padding:3px;margin-top:.5em;float:left;font-size:small;text-align:center}.editExternallyHelp{font-style:italic;color:gray}li span.deleted,span.history-deleted{text-decoration:line-through;color:#888;font-style:italic}.toggle{margin-left:2em;text-indent:-2em}table.mw_metadata{font-size:.8em;margin-left:.5em;margin-bottom:.5em;width:300px}table.mw_metadata caption{font-weight:bold}table.mw_metadata th{font-weight:normal}table.mw_metadata td{padding:.1em}table.mw_metadata{border:0;border-collapse:collapse}table.mw_metadata td,table.mw_metadata th{text-align:center;border:1px solid #aaa;padding-left:.1em;padding-right:.1em}table.mw_metadata th{background-color:#f9f9f9}table.mw_metadata td{background-color:#fcfcfc}table.collapsed tr.collapsable{display:none}ul#filetoc{text-align:center;border:1px solid #aaa;background-color:#f9f9f9;padding:5px;font-size:95%;margin-bottom:.5em;margin-left:0;margin-right:0}#filetoc li{display:inline;list-style-type:none;padding-right:2em}input#wpSave,input#wpDiff{margin-right:.33em}#editform .editOptions{display:inline}#wpSave{font-weight:bold}table.revisionform_default{border:1px solid #000}table.revisionform_focus{border:1px solid #000;background-color:#0bf}tr.revision_tr_default{background-color:#eee}tr.revision_tr_first{background-color:#ddd}p.revision_saved{color:green;font-weight:bold}#mw_trackbacks{border:solid 1px #bbf;background-color:#eef;padding:.2em}#allmessagestable th{background-color:#b2b2ff}#allmessagestable tr.orig{background-color:#ffe2e2}#allmessagestable tr.new{background-color:#e2ffe2}#allmessagestable tr.def{background-color:#f0f0ff}div.noarticletext{border:1px solid #ccc;background-color:#fff;padding:.2em 1em;color:#000}div#searchTargetContainer{left:10px;top:10px;width:90%;background-color:white}div#searchTarget{padding:3px;margin:5px;background-color:#f0f0f0;border:solid 1px blue}div#searchTarget ul li{list-style:none}div#searchTarget ul li:before{color:orange;content:"\00BB \0020"}div.multipageimagenavbox{border:solid 1px silver;padding:4px;margin:1em;-moz-border-radius:6px;background-color:#f0f0f0}div.multipageimagenavbox div.thumb{border:0;margin-left:2em;margin-right:2em}div.multipageimagenavbox hr{margin:6px}table.multipageimage td{text-align:center}.TablePager_nav a{text-decoration:none}.TablePager{border-collapse:collapse}.TablePager,.TablePager td,.TablePager th{border:.15em solid #777;padding:0 .15em 0 .15em}.TablePager th{background-color:#eef}.TablePager td{background-color:#fff}.TablePager tr:hover td{background-color:#eef}.imagelist td,.imagelist th{white-space:nowrap}.imagelist .TablePager_col_links{background-color:#eef}.imagelist .TablePager_col_img_description{white-space:normal}.imagelist th.TablePager_sort{background-color:#ccf}.pagelist thead td{background-color:#e8e8e8;text-decoration:none;font-weight:bold;font-size:smaller}.pagelist thead td u{text-decoration:none}.pagelist tr.evenrow{background-color:#eee}.pagelist tr.oddrow{background-color:white}th.gridbutton{background-color:ThreeDLightShadow;color:black;font-family:Tahoma,Verdana,Arial,Helvetica,sans-serif;font-size:small;font-weight:normal;white-space:nowrap;margin:5px 0;max-height:24px;padding:5px 0 5px 0;border-width:1px;border-style:solid;border-color:ThreeDHighlight ThreeDDarkShadow ThreeDDarkShadow ThreeDHighlight}input.gridbutton,a.gridbutton,a:hover.gridbutton,a:visited.gridbutton{text-decoration:none;font-size:small;font-weight:normal;font-family:Tahoma,Verdana,Arial,Helvetica,sans-serif;background-color:ThreeDLightShadow;color:black}.wikipaging{font-size:80%}.wikipaging-disabled{color:#999}div.boxright{width:200px;right:10px;float:right;border:thin solid #888;padding:.5em .5em .5em .5em;margin:0}div.boxright>blockquote{padding:.5em;margin:0}.error{color:black;background-color:#f99;margin-top:1em;margin-bottom:1em;padding-left:.8em;padding-right:.8em;padding-top:.8ex;padding-bottom:0;border:medium solid red;clear:both}.warning{color:black;background-color:#fcc;margin-top:1em;margin-bottom:1em;padding-left:.8em;padding-right:.8em;padding-top:.8ex;padding-bottom:0;border:1px solid #aaa;clear:both}.debug{color:black;background-color:white;font-size:smaller;margin:1ex 0;padding:.5ex .5em;border:medium solid #fff8dc}.hint{color:black;background-color:#eee;font-style:italic;margin-left:3em;padding:.5ex .5em;border:thin solid #aaa}span.hint{padding:0}.disabled-plugin{clear:both;margin:1ex 0;padding:0}.disabled-plugin .title{color:#400;background-color:inherit;font-size:x-small;text-align:right;padding:0 .5em}.disabled-plugin pre{color:black;background-color:#ddd;margin:0;padding:.3ex .5em}span.redirectfrom{font-size:small;font-style:oblique;font-weight:normal;padding-left:1em}.search-context{background-color:white;font-style:oblique}.search-term{background-color:yellow;font-weight:normal}a.spell-wrong{color:#ba0000;background-color:yellow}span.spell-wrong{color:#ba0000}.wiki,.named-wiki{text-decoration:none;font-weight:normal}.wiki relation,.named-wiki relation,.wiki attribute,.named-wiki attribute{font-style:oblique;font-weight:bold}span.relation-symbol{font-weight:bold;font-family:monospace;letter-spacing:.1em}a.wikiaction,a.wikiadmin,a.wiki-rc-action,a.wikiunsafe,input.wikiaction,input.button,input.wikiadmin{text-decoration:none;font-family:Tahoma,Verdana,Arial,Helvetica,sans-serif;white-space:nowrap}.wikiunsafe{background-color:#fcc}.wikiunknown,.named-wikiunknown{font-weight:normal;font-size:100%}.wikiunknown a,.named-wikiunknown a{color:#447;background-color:#eee;text-decoration:none;font-weight:normal;font-size:smaller}.backlinks{text-decoration:underline;color:#006}h1 .backlinks{text-decoration:underline}.wikipage{font-weight:normal}.interwiki{text-decoration:none}.interwiki,i.interwiki .wikipage,em .interwiki .wikipage{font-style:oblique}.interwiki .wikipage,i .interwiki,em .interwiki{font-style:normal}#p-rc-body div div.box-title{display:none}div.rss{margin:1em;padding:1em;font-size:.9em;background-color:#eee;border:thin dashed #aaa}div.feed{color:#333;margin:-0.5em;margin-bottom:0;padding:.3em;font-weight:bold;background-color:#f2f2f2;font-size:1.2em}div.itemdesc{padding-left:1em}div.rssitem{border-top:thin dashed #aaa}a.rssicon{font-weight:normal;font-size:small;vertical-align:middle}div#rateit-widget-top-1{width:120px;height:29px;top:5px;right:75px;z-index:1;position:absolute}div#rateit-widget-top{padding-top:0;position:absolute;z-index:1;width:120px;height:29px;top:0;right:110px}span.rateit{text-decoration:none;font-family:Tahoma,Verdana,Arial,Helvetica,sans-serif;font-size:10px}div.public,span.public{background-color:#ffce7b}.transclusion-title{font-weight:bold;text-decoration:underline;margin-bottom:.25ex;margin-right:.25em}.transclusion,.wiki-edithelp{font-size:97%}.transclusion{border:1px solid gray;padding-left:.8em;padding-right:.8em;padding-top:0;padding-bottom:0;margin-left:.25em;margin-right:.25em;margin-bottom:.1ex}.wiki-edithelp{background-color:white;border:medium solid #fff8dc;padding-left:.5em;padding-right:.5em;padding-top:.75ex;padding-bottom:.75ex;margin-left:0;margin-right:0;margin-top:1ex;margin-bottom:1ex}.wiki-edithelp p{font-family:Tahoma,Verdana,Arial,Helvetica,sans-serif;padding-left:.5em;padding-right:.5em;padding-top:.5ex;padding-bottom:.5ex;margin:0}table.boxed,table.bordered,table.bordered th,table.bordered td{border-width:1px;border-style:solid;border-collapse:collapse;vertical-align:top}table.boxed td,table.bordered td,table.boxed th,table.bordered th{padding-left:5px;padding-right:5px;padding-top:0;padding-bottom:0}table.boxed caption,table.bordered caption{text-align:center;font-weight:bold;caption-side:bottom;padding-top:.8em}table.boxed th,table.bordered th{font-weight:bold;background-color:#d8d8d8}td.tdselected,td.tdunselected{text-align:center;font-weight:bold;padding-left:5px;padding-right:5px}td.tdselected{color:white;background-color:#554295}td.tdunselected{color:black;background-color:#e9e8de}.feedback{font-weight:bold;border-width:2px;border-style:solid;background-color:#DFD;border-color:green;padding:.5em}
\ No newline at end of file

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8220] trunk/themes/Sidebar/sidebar.css

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

Revision: 8220
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8220&view=rev
Author:   vargenau
Date:     2012-01-03 13:44:10 +0000 (Tue, 03 Jan 2012)
Log Message:
-----------
Fix color problem in Sidebar

Modified Paths:
--------------
    trunk/themes/Sidebar/sidebar.css

Modified: trunk/themes/Sidebar/sidebar.css
===================================================================
--- trunk/themes/Sidebar/sidebar.css	2012-01-03 13:08:57 UTC (rev 8219)
+++ trunk/themes/Sidebar/sidebar.css	2012-01-03 13:44:10 UTC (rev 8220)
@@ -847,8 +847,6 @@
 }
 .pBody {
     font-size: 95%;
-    background-color: white;
-    color: black;
     border-collapse: collapse;
     border: 1px solid #aaa;
     padding: 0 .8em .3em .5em;

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8219] trunk/INSTALL

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

Revision: 8219
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8219&view=rev
Author:   vargenau
Date:     2012-01-03 13:08:57 +0000 (Tue, 03 Jan 2012)
Log Message:
-----------
PHP 5.3.8

Modified Paths:
--------------
    trunk/INSTALL

Modified: trunk/INSTALL
===================================================================
--- trunk/INSTALL	2012-01-03 11:46:12 UTC (rev 8218)
+++ trunk/INSTALL	2012-01-03 13:08:57 UTC (rev 8219)
@@ -3,12 +3,15 @@
 PhpWiki requires a web server with at least PHP version 4.3.9 
 (Red Hat Enterprise Linux ES release 4).
 PhpWiki was tested with 4.4.7 (centos4), 4.3.9, 4.3.10, 4.4.9, 5.0.3,
-5.1.6 (centos5), 5.2.10, 5.3.2, 5.3.3.
+5.1.6 (centos5), 5.2.10, 5.2.17, 5.3.2, 5.3.3, 5.3.6, 5.3.8.
 
-All users of PHP are strongly encouraged to upgrade to PHP 5.2.17
-or PHP 5.3.6 that are the supported versions.
-Visit <http://www.php.net> for downloads and information.
+All users of PHP are strongly encouraged to upgrade to
+PHP 5.3.8 (Current stable) this is the supported version
+or if not possible to PHP 5.2.17 (Old stable).
 
+Visit <http://www.php.net> and <http://php.net/downloads.php> 
+for downloads and information.
+
 You need the Perl regular expressions package compiled in; this is the
 default for PHP, so you probably have it. If you don't you'll see an
 error like "function preg_replace() not defined."

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

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

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

Revision: 8218
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8218&view=rev
Author:   vargenau
Date:     2012-01-03 11:46:12 +0000 (Tue, 03 Jan 2012)
Log Message:
-----------
Add entry for 1.4.0

Modified Paths:
--------------
    trunk/pgsrc/ReleaseNotes

Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2012-01-03 11:38:06 UTC (rev 8217)
+++ trunk/pgsrc/ReleaseNotes	2012-01-03 11:46:12 UTC (rev 8218)
@@ -10,6 +10,11 @@
 
 <<CreateToc with_toclink||=1 headers||=1,2,3>>
 
+== 1.4.0 2011-??-?? Reini Urban, Marc-Etienne Vargenau, Sabri Labbenes, Sébastien Le Callonnec ==
+
+* Fix bad display in Toolbox menu (Sidebar and Monobook themes) reported by Harold Hallikainen
+* Fix Captcha problem reported by Harold Hallikainen
+
 == 1.4.0RC1 2010-09-17 Reini Urban, Marc-Etienne Vargenau, Sabri Labbenes, Sébastien Le Callonnec ==
 
 This is a new major release, where everything changed from 1.2, and lots of changes since 13.4.

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8217] trunk/lib/Captcha.php

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

Revision: 8217
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8217&view=rev
Author:   vargenau
Date:     2012-01-03 11:38:06 +0000 (Tue, 03 Jan 2012)
Log Message:
-----------
Fix Captcha problem reported by Harold Hallikainen

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

Modified: trunk/lib/Captcha.php
===================================================================
--- trunk/lib/Captcha.php	2012-01-03 10:58:12 UTC (rev 8216)
+++ trunk/lib/Captcha.php	2012-01-03 11:38:06 UTC (rev 8217)
@@ -35,8 +35,8 @@
 
     function captchaword() {
         if ( ! $this->request->getSessionVar('captchaword')) {
-        $this->request->setSessionVar('captchaword', $this->get_word());
-    }
+            $this->request->setSessionVar('captchaword', $this->get_word());
+        }
         return $this->request->getSessionVar('captchaword');
     }
 
@@ -64,8 +64,9 @@
                                     'size'  => $this->length + 2,
                                     'maxlength' => 256));
             $url = WikiURL("", array("action"=>"captcha","id"=>time()), false);
-            $el['CAPTCHA_IMAGE'] = "<img src=\"$url\" alt=\"captcha\" />";
-            $el['CAPTCHA_LABEL'] = '<label for="edit-captcha_input">'._("Type word above:").' </label>';
+            $el['CAPTCHA_IMAGE'] = HTML::img(array('src' => $url, 'alt' => 'captcha'));
+            $el['CAPTCHA_LABEL'] = HTML::label(array('for' => 'edit-captcha_input'),
+                                               _("Type word above:"));
         }
         return $el;
     }

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8216] trunk/themes

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

Revision: 8216
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8216&view=rev
Author:   vargenau
Date:     2012-01-03 10:58:12 +0000 (Tue, 03 Jan 2012)
Log Message:
-----------
Avoid old PHP syntax "<?"

Modified Paths:
--------------
    trunk/themes/MonoBook/templates/navbar.tmpl
    trunk/themes/Sidebar/templates/navbar.tmpl

Modified: trunk/themes/MonoBook/templates/navbar.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/navbar.tmpl	2011-12-20 18:54:32 UTC (rev 8215)
+++ trunk/themes/MonoBook/templates/navbar.tmpl	2012-01-03 10:58:12 UTC (rev 8216)
@@ -13,7 +13,7 @@
   <div class="pBody">
     <ul>
       <li id="n-mainpage"><?php echo WikiLink(HOME_PAGE, "",_("Home Page")) ?></li>
-      <li><? $link = WikiLink(_("RecentChanges"), "",_("Recent changes")); $link->setAttr("accesskey","r"); $link->addTooltip(_("The list of recent changes in the wiki.")." [$p-r]"); ?><?php echo $link ?></li>
+      <li><?php $link = WikiLink(_("RecentChanges"), "",_("Recent changes")); $link->setAttr("accesskey","r"); $link->addTooltip(_("The list of recent changes in the wiki.")." [$p-r]"); echo $link ?></li>
       <li id="n-recentcomments"><?php echo WikiLink(_("RecentComments"), "",_("Recent comments")) ?></li>
       <li id="n-recentnewpages"><?php echo WikiLink(_("RecentNewPages"), "",_("Recent new pages")) ?></li>
       <li id="n-likepages"><?php echo Button(array('action'=>_("LikePages")),_("Like pages"), $page->getName()) ?></li>
@@ -58,7 +58,7 @@
       <li><?php echo WikiLink(_("PhpWikiAdministration"), "", _("Administration")) ?></li>
     <?php } ?>
     <?php if ($user->isSignedIn()) { ?>
-      <li><? $link = WikiLink(_("UpLoad"),"",_("Upload File")); $link->setAttr("accesskey","u"); $link->addTooltip(_("Upload images or media files")." [$p-u]"); ?><?php echo $link ?></li>
+      <li><?php $link = WikiLink(_("UpLoad"),"",_("Upload File")); $link->setAttr("accesskey","u"); $link->addTooltip(_("Upload images or media files")." [$p-u]"); echo $link ?></li>
     <?php } ?>
     <li>
       <?php $PrintableLink = $WikiTheme->makeButton(_("Printable version"), "javascript:PrinterStylesheet();", 'wikiaction'); ?>

Modified: trunk/themes/Sidebar/templates/navbar.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/navbar.tmpl	2011-12-20 18:54:32 UTC (rev 8215)
+++ trunk/themes/Sidebar/templates/navbar.tmpl	2012-01-03 10:58:12 UTC (rev 8216)
@@ -42,13 +42,13 @@
       <h5><?php echo _("Toolbox") ?><?php echo $WikiTheme->folderArrow('p-tb', 'Open') ?></h5>
   <div class="pBody" id="p-tb-body">
     <ul>
-    <li><? $link = WikiLink(_("RecentChanges"), "",_("RecentChanges")); $link->setAttr("accesskey","r"); $link->addTooltip(_("The list of recent changes in the wiki.")." [$p-r]"); ?><?php echo $link ?> </li>
+    <li><?php $link = WikiLink(_("RecentChanges"), "",_("RecentChanges")); $link->setAttr("accesskey","r"); $link->addTooltip(_("The list of recent changes in the wiki.")." [$p-r]"); echo $link ?> </li>
     <li><?php echo WikiLink(_("RecentNewPages"), "",_("RecentNewPages")) ?></li>
     <?php if (!empty($revision)) { ?>
       <li id="t-whatlinkshere"><?php echo Button(array('action'=>_("BackLinks")), _("What links here"), $page->getName()) ?></li>
     <?php } ?>
     <?php if (!empty($user) && $user->isSignedIn()) { ?>
-      <li><? $link = WikiLink(_("UpLoad"),"",_("Upload File")); $link->setAttr("accesskey","u"); $link->addTooltip(_("Upload images or media files")." [$p-u]"); ?><?php echo $link ?></li>
+      <li><?php $link = WikiLink(_("UpLoad"),"",_("Upload File")); $link->setAttr("accesskey","u"); $link->addTooltip(_("Upload images or media files")." [$p-u]"); echo $link ?></li>
       <li><?php echo WikiLink(_("UserPreferences"), "",_("Preferences")) ?></li>
     <?php } ?>
     <li>

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

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

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

Revision: 8215
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8215&view=rev
Author:   vargenau
Date:     2011-12-20 18:54:32 +0000 (Tue, 20 Dec 2011)
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	2011-12-20 18:53:14 UTC (rev 8214)
+++ trunk/locale/fr/LC_MESSAGES/phpwiki.php	2011-12-20 18:54:32 UTC (rev 8215)
@@ -304,8 +304,8 @@
 $locale["Couldn't rename page '%s' to '%s'."] = "Impossible de renommer la page '%s' en '%s'.";
 $locale["Couldn't start commandline '%s'"] = "Impossible de lancer la ligne de commande '%s'";
 $locale["Count"] = "Nombre";
-$locale["Create Page"] = "Créer une page";
-$locale["Create a Wiki page by the provided name."] = "Créer une PageWiki avec le nom demandé.";
+$locale["Create Page"] = "Créer la page";
+$locale["Create a Wiki page by the provided name."] = "Créer une page wiki avec le nom demandé.";
 $locale["Create a Wiki page."] = "Créer une page wiki";
 $locale["Create a new (sub)page"] = "Créer une nouvelle (sous-)page";
 $locale["Create redirect from old to new name?"] = "Créer une redirection de l'ancien nom vers le nouveau ?";
@@ -359,7 +359,7 @@
 $locale["Do not send minor modifications"] = "Ne pas envoyer les modifications mineures";
 $locale["Do not send my own modifications"] = "Ne pas envoyer mes propres modifications";
 $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 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["Don't cache this page."] = "Ne pas mettre en cache cette page.";
@@ -377,7 +377,7 @@
 $locale["Dumping Pages"] = "Récupération des pages";
 $locale["Dumping html pages"] = "Récupération des pages HTML";
 $locale["Dumping serial pages"] = "Récupération des pages sérialisées";
-$locale["Dynamically include the content from another wiki page."] = "Inclure dynamiquement le texte d'une autre PageWiki.";
+$locale["Dynamically include the content from another wiki page."] = "Inclure dynamiquement le texte d'une autre page wiki.";
 $locale["E-mail"] = "Adresse électronique";
 $locale["E-mail Notification"] = "Courriel de notification";
 $locale["E-mail address '%s' is not properly formatted"] = "L'adresse électronique '%s' ne semble pas être bien formée.";
@@ -403,7 +403,7 @@
 $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 PageWiki.";
+$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";
 $locale["Empty pagename!"] = "Nom de page vide !";
@@ -539,7 +539,7 @@
 $locale["In total there are %d user sessions online. :: Unique %d Registered and %d Guests"] = "Au total: %d utilisateurs en ligne. :: %d enregistré(s) et %d invité(s)";
 $locale["Include an external web page within the body of a wiki page."] = "Inclure une page externe dans le corps de la WikiPage.";
 $locale["Include recursively all linked pages starting at %s"] = "Créer une carte du site commençant à %s";
-$locale["Include text from another wiki page."] = "Inclure le texte d'une autre PageWiki.";
+$locale["Include text from another wiki page."] = "Inclure le texte d'une autre page wiki.";
 $locale["IncludePage"] = "InclureUnePage";
 $locale["IncludePages"] = "InclurePages";
 $locale["IncludeSiteMap"] = "CarteDuSite";
@@ -608,7 +608,7 @@
 $locale["List all pages which link to %s."] = "Liste des pages liées à %s.";
 $locale["List all recent changes in this wiki."] = "Montrer tous les changements récents de ce wiki.";
 $locale["List all recent edits in this wiki."] = "Afficher les dernières modifications de ce wiki.";
-$locale["List of pages created by [%s] (%d total):"] = "Liste des pages créé près [%s] (%d au total) :";
+$locale["List of pages created by [%s] (%d total):"] = "Liste des pages créées par [%s] (%d au total) :";
 $locale["List of pages last edited by [%s] (%d total):"] = "Liste des pages modifiées en dernier par [%s] (%d au total) :";
 $locale["List of pages owned by [%s] (%d total):"] = "Liste des pages possédées par [%s] (%d au total) :";
 $locale["List of plugins on this wiki"] = "Liste des greffons de ce wiki";

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	2011-12-20 18:53:14 UTC (rev 8214)
+++ trunk/locale/po/de.po	2011-12-20 18:54:32 UTC (rev 8215)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-16 14:29+0100\n"
+"POT-Creation-Date: 2011-12-20 19:53+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	2011-12-20 18:53:14 UTC (rev 8214)
+++ trunk/locale/po/es.po	2011-12-20 18:54:32 UTC (rev 8215)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-16 14:29+0100\n"
+"POT-Creation-Date: 2011-12-20 19:53+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	2011-12-20 18:53:14 UTC (rev 8214)
+++ trunk/locale/po/fr.po	2011-12-20 18:54:32 UTC (rev 8215)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-16 14:29+0100\n"
+"POT-Creation-Date: 2011-12-20 19:53+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	2011-12-20 18:53:14 UTC (rev 8214)
+++ trunk/locale/po/it.po	2011-12-20 18:54:32 UTC (rev 8215)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-16 14:29+0100\n"
+"POT-Creation-Date: 2011-12-20 19:53+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	2011-12-20 18:53:14 UTC (rev 8214)
+++ trunk/locale/po/ja.po	2011-12-20 18:54:32 UTC (rev 8215)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-16 14:29+0100\n"
+"POT-Creation-Date: 2011-12-20 19:53+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	2011-12-20 18:53:14 UTC (rev 8214)
+++ trunk/locale/po/nl.po	2011-12-20 18:54:32 UTC (rev 8215)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-16 14:29+0100\n"
+"POT-Creation-Date: 2011-12-20 19:53+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	2011-12-20 18:53:14 UTC (rev 8214)
+++ trunk/locale/po/phpwiki.pot	2011-12-20 18:54:32 UTC (rev 8215)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-16 14:29+0100\n"
+"POT-Creation-Date: 2011-12-20 19:53+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	2011-12-20 18:53:14 UTC (rev 8214)
+++ trunk/locale/po/sv.po	2011-12-20 18:54:32 UTC (rev 8215)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-16 14:29+0100\n"
+"POT-Creation-Date: 2011-12-20 19:53+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	2011-12-20 18:53:14 UTC (rev 8214)
+++ trunk/locale/po/zh.po	2011-12-20 18:54:32 UTC (rev 8215)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0RC1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-16 14:29+0100\n"
+"POT-Creation-Date: 2011-12-20 19:53+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.