phpwiki-checkins Mailing List for PhpWiki (Page 104)

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

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

You can subscribe to this list here.

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

Flat | Threaded

<< < 1 .. 102 103 104 105 106 .. 538 > >> (Page 104 of 538)

[phpwiki-checkins] SF.net SVN: phpwiki:[8614] trunk/themes/smaller/phpwiki.css

From: <var...@us...> - 2012-12-06 16:34:11

Revision: 8614
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8614&view=rev
Author:   vargenau
Date:     2012-12-06 16:34:05 +0000 (Thu, 06 Dec 2012)
Log Message:
-----------
ns4 is dead

Modified Paths:
--------------
    trunk/themes/smaller/phpwiki.css

Modified: trunk/themes/smaller/phpwiki.css
===================================================================
--- trunk/themes/smaller/phpwiki.css	2012-12-06 16:24:14 UTC (rev 8613)
+++ trunk/themes/smaller/phpwiki.css	2012-12-06 16:34:05 UTC (rev 8614)
@@ -1,9 +1,3 @@
-/**
- * We have two possibilities to override the default:
- * 1. import is ns4 incompatible
- * 2. add a 2nd css in themeinfo.php
- */
-
 @import url(../default/phpwiki.css);
 
 /**

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

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

From: <var...@us...> - 2012-12-06 16:24:26

Revision: 8613
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8613&view=rev
Author:   vargenau
Date:     2012-12-06 16:24:14 +0000 (Thu, 06 Dec 2012)
Log Message:
-----------
ns4 is dead

Modified Paths:
--------------
    trunk/themes/MonoBook/monobook.css
    trunk/themes/wikilens/wikilens.css

Modified: trunk/themes/MonoBook/monobook.css
===================================================================
--- trunk/themes/MonoBook/monobook.css	2012-12-06 09:47:10 UTC (rev 8612)
+++ trunk/themes/MonoBook/monobook.css	2012-12-06 16:24:14 UTC (rev 8613)
@@ -1,11 +1,3 @@
-/**
- * We have two possibilities to override the default:
- * 1. import is ns4 incompatible
- * 2. add a 2nd css in themeinfo.php
- */
-
-/* @import url(../default/phpwiki.css); */
-
 @import url(main.css);
 
 /* For emacs users

Modified: trunk/themes/wikilens/wikilens.css
===================================================================
--- trunk/themes/wikilens/wikilens.css	2012-12-06 09:47:10 UTC (rev 8612)
+++ trunk/themes/wikilens/wikilens.css	2012-12-06 16:24:14 UTC (rev 8613)
@@ -1,9 +1,3 @@
-/**
- * We have two possibilities to override the default:
- * 1. import is ns4 incompatible
- * 2. add a 2nd css in themeinfo.php
- */
-
 @import url(../default/phpwiki.css);
 
 /**

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

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

From: <var...@us...> - 2012-12-06 09:47:21

Revision: 8612
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8612&view=rev
Author:   vargenau
Date:     2012-12-06 09:47:10 +0000 (Thu, 06 Dec 2012)
Log Message:
-----------
Update translations

Modified Paths:
--------------
    trunk/locale/de/LC_MESSAGES/phpwiki.mo
    trunk/locale/de/LC_MESSAGES/phpwiki.php
    trunk/locale/es/LC_MESSAGES/phpwiki.mo
    trunk/locale/fr/LC_MESSAGES/phpwiki.mo
    trunk/locale/it/LC_MESSAGES/phpwiki.mo
    trunk/locale/ja/LC_MESSAGES/phpwiki.mo
    trunk/locale/nl/LC_MESSAGES/phpwiki.mo
    trunk/locale/po/de.po
    trunk/locale/po/es.po
    trunk/locale/po/fr.po
    trunk/locale/po/it.po
    trunk/locale/po/ja.po
    trunk/locale/po/nl.po
    trunk/locale/po/phpwiki.pot
    trunk/locale/po/sv.po
    trunk/locale/po/zh.po
    trunk/locale/sv/LC_MESSAGES/phpwiki.mo
    trunk/locale/zh/LC_MESSAGES/phpwiki.mo

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

Modified: trunk/locale/de/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/de/LC_MESSAGES/phpwiki.php	2012-12-06 09:29:28 UTC (rev 8611)
+++ trunk/locale/de/LC_MESSAGES/phpwiki.php	2012-12-06 09:47:10 UTC (rev 8612)
@@ -110,16 +110,16 @@
 $locale["A required argument “%s” is missing."] = "Erforderliches Argument »%s« fehlt.";
 $locale["ACCESS DENIED: You must log in to upload files."] = "ZUGRIFF VERWEIGERT: Bitte melden Sie sich erst an, um Dateien hochzuladen.";
 $locale["ACL"] = "ACL";
-$locale["ACL changed for page “%s”"] = "ACL für Seite “%s” geändert.";
-$locale["ACL changed for page “%s” from “%s” to “%s”."] = "ACL für Seite “%s” geändert von “%s” zu “%s”.";
-$locale["ACL deleted for page “%s”"] = "ACL für Seite “%s” gelöscht.";
-$locale["ACL not changed for page “%s”."] = "ACL für Seite “%s” nicht geändert.";
+$locale["ACL changed for page “%s”"] = "ACL für Seite »%s« geändert.";
+$locale["ACL changed for page “%s” from “%s” to “%s”."] = "ACL für Seite »%s« geändert von »%s« zu »%s«.";
+$locale["ACL deleted for page “%s”"] = "ACL für Seite »%s« gelöscht.";
+$locale["ACL not changed for page “%s”."] = "ACL für Seite »%s« nicht geändert.";
 $locale["ADDING"] = "HINZU";
 $locale["ADMIN"] = "ADMIN";
 $locale["ANON"] = "ANON";
 $locale["About"] = "Über";
 $locale["Access"] = "Zugriff";
-$locale["Access denied to change page “%s”."] = "Zugang verweigert um Seite “%s” zu ändern.";
+$locale["Access denied to change page “%s”."] = "Zugang verweigert um Seite »%s« zu ändern.";
 $locale["Access denied to rename page “%s”."] = "Zugang verweigert um Seite “%s” zu ändern.";
 $locale["Action Page"] = "Aktion Seite";
 $locale["ActionPage"] = "Aktion Seite";
@@ -237,7 +237,7 @@
 $locale["Change markup to: "] = "Ändere Formatierung zu:";
 $locale["Change markup type"] = "Ändere Formatierungs-Typ";
 $locale["Change markup type from %s to %s"] = "Ändere Formatierungs-Typ von %s zu %s";
-$locale["Change owner of page “%s” to “%s”."] = "Besitzer der Seite “%s” auf “%s” geändert.";
+$locale["Change owner of page “%s” to “%s”."] = "Besitzer der Seite »%s« auf »%s« geändert.";
 $locale["Change owner of selected pages"] = "Den Besitzer der ausgewählte Seiten ändern";
 $locale["Change owner of selected pages."] = "Den Besitzer ausgewählte Seiten ändern.";
 $locale["Change owner to: "] = "Besitzer ändern zu:";
@@ -289,12 +289,12 @@
 $locale["Converted successfully %d pages"] = "%d Seiten erfolgreich konvertiert";
 $locale["Converts TeX to an image. May be used to embed formulas in PhpWiki."] = "(La)TeX-Dokument nach ein Bild erstellen. Dadurch konnte eine Formel in PhpWiki eingebettet worden.";
 $locale["Copyrights"] = "Urheberrechte";
-$locale["Could not change owner of page “%s” to “%s”."] = "Konnte den Besitzer der Seite “%s” nicht in “%s” ändern.";
+$locale["Could not change owner of page “%s” to “%s”."] = "Konnte den Besitzer der Seite »%s« nicht in »%s« ändern.";
 $locale["Could not connect to LDAP host %s"] = "Kann nicht zu LDAP host »%s« verbinden";
-$locale["Couldn't change page “%s” to markup type “%s”."] = "Konnte die Formatierung der Seite “%s” nicht auf “%s” ändern.";
-$locale["Couldn't chmod page “%s” to “%s”."] = "Konnte die Berechtigung der Seite “%s” nicht auf “%s” ändern.";
+$locale["Couldn't change page “%s” to markup type “%s”."] = "Konnte die Formatierung der Seite »%s« nicht auf »%s« ändern.";
+$locale["Couldn't chmod page “%s” to “%s”."] = "Konnte die Berechtigung der Seite »%s« nicht auf »%s« ändern.";
 $locale["Couldn't connect to %s"] = "Kann nicht zu »%s« verbinden";
-$locale["Couldn't rename page “%s” to “%s”."] = "Konnte Seite “%s” nicht in “%s” umbenennen.";
+$locale["Couldn't rename page “%s” to “%s”."] = "Konnte Seite »%s« nicht in »%s« umbenennen.";
 $locale["Couldn't start commandline “%s”"] = "Konnte Programm »%s« nicht starten";
 $locale["Count"] = "Anzahl";
 $locale["Create Page"] = "Neue Seite";
@@ -409,7 +409,7 @@
 $locale["Failed to connect to LDAP host"] = "LDAP Server nicht gefunden";
 $locale["Fatal PhpWiki Error"] = "Fataler PhpWiki-Fehler";
 $locale["File successfully uploaded."] = "Datei erfolgreich hochgeladen.";
-$locale["File “%s” not found."] = "Datei “%s” nicht gefunden";
+$locale["File “%s” not found."] = "Datei »%s« nicht gefunden";
 $locale["FileInfo"] = "DateiInfo";
 $locale["Files with extension %s are not allowed."] = "Dateien mit der Endung %s sind nicht erlaubt.";
 $locale["Find page"] = "Seite finden";
@@ -499,7 +499,7 @@
 $locale["I'm sorry, there is no such page as %s."] = "Leider gibt es keine solche Seite %s.";
 $locale["I'm sorry.  Version %d of %s is not in the database."] = "Leider ist keine Version %d von %s in der Datenbank.";
 $locale["Ignore wiki formatting"] = "Keine Wiki Formatierung";
-$locale["Illegal character “%s” in page name."] = "Ungültiges Zeichen “%s” in Seitenname.";
+$locale["Illegal character “%s” in page name."] = "Ungültiges Zeichen »%s« in Seitenname.";
 $locale["Illegal chars %s removed"] = "Ungültiges Zeichen %s entfernt";
 $locale["Illegal inclusion of page %s: no read access."] = "Fehler beim Einfügen der Seite %s: kein Lesezugriff.";
 $locale["Image loaded from cache file: %s"] = "Bild geladen von Cachedatei: %s";
@@ -875,11 +875,11 @@
 $locale["Rename Page"] = "Seite Umbenennen";
 $locale["Rename selected pages"] = "Ausgewählte Seiten umbenennen";
 $locale["Rename to"] = "Umbennen zu";
-$locale["Renamed page from “%s” to “%s”."] = "Seite “%s” auf “%s” umbenannt.";
+$locale["Renamed page from “%s” to “%s”."] = "Seite »%s« auf »%s« umbenannt.";
 $locale["Replace"] = "Ersetze";
 $locale["Replace all occurences of the given string in the content of all pages."] = "Ersetze alle Wörter in den angegebenen Seiten.";
 $locale["Replace with"] = "Ersetze mit";
-$locale["Replaced “%s” with “%s” in page “%s”."] = "“%s” mit “%s” in Seite “%s” ersetzt.";
+$locale["Replaced “%s” with “%s” in page “%s”."] = "»%s« mit »%s« in Seite »%s« ersetzt.";
 $locale["Reply"] = "Antwort";
 $locale["Required argument %s missing"] = "Erforderliches Argument »%s« fehlt";
 $locale["Requires WikiAdmin privileges to edit."] = "Verlangt Administratorenrechte zur Bearbeitung.";
@@ -1070,8 +1070,8 @@
 $locale["Transcluded from %s"] = "Eingebetteter Text von %s";
 $locale["Transcluded page"] = "Eingebettete Seite";
 $locale["Translate"] = "Übersetzen";
-$locale["Translate %s to %s in %s"] = "Übersetze “%s” nach “%s” in %s";
-$locale["Translate “%s” to “%s” in *%s*"] = "Übersetze “%s” nach “%s” in *%s*";
+$locale["Translate %s to %s in %s"] = "Übersetze »%s« nach »%s« in %s";
+$locale["Translate “%s” to “%s” in *%s*"] = "Übersetze »%s« nach »%s« in *%s*";
 $locale["TranslateText"] = "ÜbersetzeText";
 $locale["Translation Error!"] = "Übersetzungsfehler!";
 $locale["Type"] = "Typ";
@@ -1081,9 +1081,9 @@
 $locale["Unable to bind LDAP server %s using %s %s"] = "Konnte nicht mit LDAP Server %s verbinden mit %s %s";
 $locale["Unable to connect to IMAP server "] = "IMAP Server nicht gefunden ";
 $locale["Unable to connect to LDAP server %s"] = "Konnte LDAP Server %s nicht finden";
-$locale["Unable to find src=“%s”"] = "Konnte src=“%s” nicht lesen";
+$locale["Unable to find src=“%s”"] = "Konnte src=»%s« nicht lesen";
 $locale["Unable to open directory “%s” for reading"] = "Konnte Verzeichnis »%s« nicht zum Lesen öffnen";
-$locale["Unable to read src=“%s”"] = "Konnte src=“%s” nicht lesen";
+$locale["Unable to read src=“%s”"] = "Konnte src=»%s« nicht lesen";
 $locale["Undefined method %s for special group %s"] = "Undefinierte Methode %s für Spezialgruppe %s";
 $locale["Undo"] = "Rückgängig";
 $locale["Undo Search & Replace"] = "Suchen & Ersetzen rückgängig machen";
@@ -1113,7 +1113,7 @@
 $locale["User not found in LDAP"] = "Benutzer in LDAP nicht gefunden";
 $locale["User page"] = "Benutzer Seite";
 $locale["User preferences for this project"] = "Einstellungen für dieses Projekt";
-$locale["User preferences for user %s"] = "Einstellungen für Benutzer “%s”";
+$locale["User preferences for user %s"] = "Einstellungen für Benutzer »%s«";
 $locale["User statistics"] = "Benutzer Statistiken";
 $locale["UserContribs"] = "BenutzerBewertungen";
 $locale["UserId"] = "Benutzername";
@@ -1205,7 +1205,7 @@
 $locale["You need to specify the userid!"] = "Sie müssen den Benutzernamen angeben!";
 $locale["You stored an empty password in your “%s” page."] = "Sie haben ein leeres Passwort in Ihrer HomePage »%s« gespeichert.";
 $locale["Your UserPreferences have been successfully reset to default."] = "Ihre BenutzerEinstellungen wurden erfolgreich gelöscht.";
-$locale["Your WikiDB DB backend “%s” cannot be used for DbSession."] = "Ihr WikiDB DB backend “%s” wird von DbSession nicht unterstützt.";
+$locale["Your WikiDB DB backend “%s” cannot be used for DbSession."] = "Ihr WikiDB DB backend »%s« wird von DbSession nicht unterstützt.";
 $locale["Your access permissions are only for a BogoUser."] = "Ihre Zugriffsberechtigung entspricht lediglich einem BogoUser.";
 $locale["Your are probably trying to edit/create an invalid version of this page."] = "Sie versuchen offenbar eine ungültige Version dieser Seite zu bearbeiten.";
 $locale["Your careful attention to detail is much appreciated."] = "Die besondere Aufmerksamkeit, die Sie soeben der Bearbeitung dieser Seite gewidmet haben, wird von allen Benutzern dieses Wikis gern gesehen und hoch geschätzt.";
@@ -1234,8 +1234,8 @@
 $locale["by %s"] = "von %s";
 $locale["cached pagedata:"] = "Seitendaten in den Cachespeicher aufgenommen:";
 $locale["cached versiondata:"] = "Versionendaten in den Cachespeicher aufgenommen:";
-$locale["change page “%s” to markup type “%s”."] = "Formatierung der Seite “%s” auf “%s” geändert.";
-$locale["chmod page “%s” to “%s”."] = "Berechtigung der Seite “%s” auf “%s” geändert.";
+$locale["change page “%s” to markup type “%s”."] = "Formatierung der Seite »%s« auf »%s« geändert.";
+$locale["chmod page “%s” to “%s”."] = "Berechtigung der Seite »%s« auf »%s« geändert.";
 $locale["comments"] = "Kommentare";
 $locale["compare revisions"] = "Versionen vergleichen";
 $locale["content is identical to current version %d - no new revision created"] = "Inhalt ist identisch mit der aktuellen Version %d - keine neue Version erzeugt";
@@ -1340,7 +1340,7 @@
 $locale["view this page"] = "um diese Seite anzuzeigen";
 $locale["weeks"] = "Wochen";
 $locale["yesterday"] = "gestern";
-$locale["“%s” is no ModeratedPage anymore."] = "“%s” ist keine ModeratierteSeite mehr.";
+$locale["“%s” is no ModeratedPage anymore."] = "»%s« ist keine ModeratierteSeite mehr.";
 $locale["“%s”: Bad page name"] = "»%s«: Ungültiger Seitenname";
 $locale["“%s”: Bad page name: %s"] =
    "»%s«: Ungültiger Seitenname: %s";

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-12-06 09:29:28 UTC (rev 8611)
+++ trunk/locale/po/de.po	2012-12-06 09:47:10 UTC (rev 8612)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-04 17:59+0100\n"
+"POT-Creation-Date: 2012-12-06 10:44+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."
@@ -786,7 +786,7 @@
 
 # (Wrong Translation; sorry, but the German term for edit is NOT
 # editieren, but  e d i e r e n).
-#: ../lib/loadsave.php:107 ../lib/MailNotify.php:306
+#: ../lib/loadsave.php:107 ../lib/MailNotify.php:296
 #, php-format
 msgid "Edited by: %s"
 msgstr "Bearbeitet von: %s"
@@ -905,7 +905,7 @@
 msgid "from %s"
 msgstr "von %s"
 
-#: ../lib/loadsave.php:984 ../lib/MailNotify.php:313
+#: ../lib/loadsave.php:984 ../lib/MailNotify.php:303
 #: ../lib/plugin/RecentChanges.php:149
 msgid "New page"
 msgstr "Neue Seite"
@@ -1076,61 +1076,61 @@
 msgid "Uploading %s"
 msgstr "%s wird hochgeladen"
 
-#: ../lib/MailNotify.php:210
+#: ../lib/MailNotify.php:200
 #, php-format
 msgid "PageChange Notification of %s"
 msgstr "SeitenÄnderung Benachrichtigung von %s"
 
-#: ../lib/MailNotify.php:251
+#: ../lib/MailNotify.php:241
 #, php-format
 msgid "sent to %s"
 msgstr "an %s gesendet"
 
-#: ../lib/MailNotify.php:257
+#: ../lib/MailNotify.php:247
 #, php-format
 msgid "Error: Couldn't send %s to %s"
 msgstr "Fehler: Konnte nicht %s an %s senden"
 
-#: ../lib/MailNotify.php:286
+#: ../lib/MailNotify.php:276
 msgid "Page change"
 msgstr "Seiten Änderung"
 
-#: ../lib/MailNotify.php:309
+#: ../lib/MailNotify.php:299
 #, fuzzy
 msgid "Page creation"
 msgstr "Seiten Version"
 
-#: ../lib/MailNotify.php:316
+#: ../lib/MailNotify.php:306
 #, fuzzy, php-format
 msgid "Created by: %s"
 msgstr "Erzeugen: %s"
 
-#: ../lib/MailNotify.php:318
+#: ../lib/MailNotify.php:308
 #, php-format
 msgid "Summary: %s"
 msgstr "Zusammenfassung: %s"
 
-#: ../lib/MailNotify.php:329
+#: ../lib/MailNotify.php:319
 #, fuzzy, php-format
 msgid "Renamed by: %s"
 msgstr "umbenannt von %s"
 
-#: ../lib/MailNotify.php:330
+#: ../lib/MailNotify.php:320
 #, php-format
 msgid "Page rename %s to %s"
 msgstr "Seite »%s« nach umbenennen »%s«"
 
-#: ../lib/MailNotify.php:368
+#: ../lib/MailNotify.php:356
 #, php-format
 msgid "User %s removed page %s"
 msgstr "Seite gelöscht %s von Benutzer %s"
 
-#: ../lib/MailNotify.php:406 ../lib/plugin/WikiAdminUtils.php:120
+#: ../lib/MailNotify.php:391 ../lib/plugin/WikiAdminUtils.php:120
 #: ../lib/WikiUserNew.php:1818
 msgid "E-mail address confirmation"
 msgstr "E-Mail Bestätigung"
 
-#: ../lib/MailNotify.php:409
+#: ../lib/MailNotify.php:394
 #, php-format
 msgid ""
 "Someone, probably you from IP address %s, has registered an\n"
@@ -1632,7 +1632,7 @@
 
 #: ../lib/PagePerm.php:190 ../lib/plugin/WikiAdminRename.php:147
 #: ../lib/plugin/WikiAdminRename.php:277
-#: ../themes/fusionforge/templates/actionbar.tmpl:104
+#: ../themes/fusionforge/templates/actionbar.tmpl:102
 msgid "Rename"
 msgstr "Umbenennen"
 
@@ -1727,9 +1727,9 @@
 #: ../themes/default/templates/navbar.tmpl:5
 #: ../themes/default/templates/navbar.tmpl:7
 #: ../themes/fusionforge/templates/actionbar.tmpl:13
-#: ../themes/fusionforge/templates/actionbar.tmpl:23
-#: ../themes/fusionforge/templates/actionbar.tmpl:29
-#: ../themes/fusionforge/templates/actionbar.tmpl:39
+#: ../themes/fusionforge/templates/actionbar.tmpl:21
+#: ../themes/fusionforge/templates/actionbar.tmpl:27
+#: ../themes/fusionforge/templates/actionbar.tmpl:37
 #: ../themes/MonoBook/templates/actionbar.tmpl:12
 #: ../themes/MonoBook/templates/actionbar.tmpl:19
 #: ../themes/MonoBook/templates/actionbar.tmpl:23
@@ -5154,7 +5154,7 @@
 #: ../themes/blog/templates/actionbar.tmpl:15 ../themes/blog/themeinfo.php:69
 #: ../themes/Crao/templates/actionbar.tmpl:4
 #: ../themes/default/templates/actionbar.tmpl:12
-#: ../themes/fusionforge/templates/actionbar.tmpl:50
+#: ../themes/fusionforge/templates/actionbar.tmpl:48
 #: ../themes/MonoBook/templates/actionbar.tmpl:32
 #: ../themes/shamino_com/templates/actionbar.tmpl:5
 #: ../themes/Sidebar/templates/actionbar.tmpl:19
@@ -5163,7 +5163,7 @@
 msgstr "Bearbeiten"
 
 #: ../lib/plugin/WatchPage.php:99
-#: ../themes/fusionforge/templates/actionbar.tmpl:115
+#: ../themes/fusionforge/templates/actionbar.tmpl:113
 msgid "Watch Page"
 msgstr "Seite beobarchten"
 
@@ -7450,7 +7450,7 @@
 #: ../themes/Crao/templates/head.tmpl:37
 #: ../themes/default/templates/actionbar.tmpl:17
 #: ../themes/default/templates/head.tmpl:43
-#: ../themes/fusionforge/templates/actionbar.tmpl:56
+#: ../themes/fusionforge/templates/actionbar.tmpl:54
 #: ../themes/MonoBook/templates/actionbar.tmpl:35
 #: ../themes/MonoBook/templates/info.tmpl:178
 #: ../themes/Portland/templates/actionbar.tmpl:6
@@ -7637,13 +7637,13 @@
 msgstr "Kommentar zu %s von %s."
 
 #: ../themes/blog/themeinfo.php:77
-#: ../themes/fusionforge/templates/actionbar.tmpl:88
+#: ../themes/fusionforge/templates/actionbar.tmpl:86
 #: ../themes/fusionforge/templates/userprefs.tmpl:265
 msgid "Lock"
 msgstr "Sperren"
 
 #: ../themes/blog/themeinfo.php:79
-#: ../themes/fusionforge/templates/actionbar.tmpl:86
+#: ../themes/fusionforge/templates/actionbar.tmpl:84
 msgid "Unlock"
 msgstr "Entsperren"
 
@@ -7657,7 +7657,7 @@
 
 #: ../themes/Crao/templates/actionbar.tmpl:4
 #: ../themes/default/templates/actionbar.tmpl:12
-#: ../themes/fusionforge/templates/actionbar.tmpl:52
+#: ../themes/fusionforge/templates/actionbar.tmpl:50
 #: ../themes/MonoBook/templates/actionbar.tmpl:32
 #: ../themes/Portland/templates/actionbar.tmpl:4
 #: ../themes/shamino_com/templates/actionbar.tmpl:5
@@ -7819,7 +7819,7 @@
 msgstr "Tragen Sie bitte für die Anmeldung im Wiki Ihren Benutzernamen ein"
 
 #: ../themes/default/templates/actionbar.tmpl:27
-#: ../themes/fusionforge/templates/actionbar.tmpl:68
+#: ../themes/fusionforge/templates/actionbar.tmpl:66
 #: ../themes/fusionforge/templates/userprefs.tmpl:253
 #: ../themes/MonoBook/templates/actionbar.tmpl:70
 #: ../themes/Sidebar/templates/actionbar.tmpl:46
@@ -8007,8 +8007,8 @@
 msgstr "Benutzer Seite"
 
 #: ../themes/default/templates/info.tmpl:149
-#: ../themes/fusionforge/templates/actionbar.tmpl:17
-#: ../themes/fusionforge/templates/actionbar.tmpl:36
+#: ../themes/fusionforge/templates/actionbar.tmpl:16
+#: ../themes/fusionforge/templates/actionbar.tmpl:34
 #: ../themes/MonoBook/templates/info.tmpl:156
 msgid "Action Page"
 msgstr "Aktion Seite"
@@ -8489,52 +8489,52 @@
 msgid "Posted: %s"
 msgstr "Gepostet: %s"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:17
-#: ../themes/fusionforge/templates/actionbar.tmpl:36
+#: ../themes/fusionforge/templates/actionbar.tmpl:16
+#: ../themes/fusionforge/templates/actionbar.tmpl:34
 msgid "Page"
 msgstr "Seite"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:28
+#: ../themes/fusionforge/templates/actionbar.tmpl:26
 #: ../themes/MonoBook/templates/actionbar.tmpl:22
 msgid "Template/Talk"
 msgstr ""
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:48
+#: ../themes/fusionforge/templates/actionbar.tmpl:46
 #: ../themes/MonoBook/templates/actionbar.tmpl:32
 #: ../themes/Sidebar/templates/actionbar.tmpl:19
 msgid "Create Page"
 msgstr "Neue Seite"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:61
+#: ../themes/fusionforge/templates/actionbar.tmpl:59
 #: ../themes/MonoBook/templates/actionbar.tmpl:40
 #: ../themes/Sidebar/templates/actionbar.tmpl:26
 msgid "History"
 msgstr ""
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:64
+#: ../themes/fusionforge/templates/actionbar.tmpl:62
 #: ../themes/fusionforge/templates/userprefs.tmpl:248
 msgid "Last Difference"
 msgstr ""
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:71
+#: ../themes/fusionforge/templates/actionbar.tmpl:69
 msgid "Page Info"
 msgstr "Seiten Info"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:73
+#: ../themes/fusionforge/templates/actionbar.tmpl:71
 msgid "Back Links"
 msgstr "Back Links"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:94
+#: ../themes/fusionforge/templates/actionbar.tmpl:92
 #: ../themes/fusionforge/templates/userprefs.tmpl:270
 msgid "Change Owner"
 msgstr ""
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:98
+#: ../themes/fusionforge/templates/actionbar.tmpl:96
 #: ../themes/fusionforge/templates/userprefs.tmpl:275
 msgid "Access Rights"
 msgstr ""
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:108
+#: ../themes/fusionforge/templates/actionbar.tmpl:106
 msgid "Purge"
 msgstr ""
 

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2012-12-06 09:29:28 UTC (rev 8611)
+++ trunk/locale/po/es.po	2012-12-06 09:47:10 UTC (rev 8612)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-04 17:59+0100\n"
+"POT-Creation-Date: 2012-12-06 10:44+0100\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -775,7 +775,7 @@
 msgid "PhpWikiAdministration"
 msgstr "AdministraciónDePhpWiki"
 
-#: ../lib/loadsave.php:107 ../lib/MailNotify.php:306
+#: ../lib/loadsave.php:107 ../lib/MailNotify.php:296
 #, php-format
 msgid "Edited by: %s"
 msgstr "Editar: %s"
@@ -891,7 +891,7 @@
 msgid "from %s"
 msgstr "de %s"
 
-#: ../lib/loadsave.php:984 ../lib/MailNotify.php:313
+#: ../lib/loadsave.php:984 ../lib/MailNotify.php:303
 #: ../lib/plugin/RecentChanges.php:149
 msgid "New page"
 msgstr "Página nueva"
@@ -1061,61 +1061,61 @@
 msgid "Uploading %s"
 msgstr "%s uploading"
 
-#: ../lib/MailNotify.php:210
+#: ../lib/MailNotify.php:200
 #, php-format
 msgid "PageChange Notification of %s"
 msgstr "Pagine la notificación del cambio de %s"
 
-#: ../lib/MailNotify.php:251
+#: ../lib/MailNotify.php:241
 #, php-format
 msgid "sent to %s"
 msgstr "vuelva a %s"
 
-#: ../lib/MailNotify.php:257
+#: ../lib/MailNotify.php:247
 #, php-format
 msgid "Error: Couldn't send %s to %s"
 msgstr "Error: No podía enviar %s a %s"
 
-#: ../lib/MailNotify.php:286
+#: ../lib/MailNotify.php:276
 msgid "Page change"
 msgstr "Cambio de la página"
 
-#: ../lib/MailNotify.php:309
+#: ../lib/MailNotify.php:299
 #, fuzzy
 msgid "Page creation"
 msgstr "Versión de la página"
 
-#: ../lib/MailNotify.php:316
+#: ../lib/MailNotify.php:306
 #, fuzzy, php-format
 msgid "Created by: %s"
 msgstr "Cree: %s"
 
-#: ../lib/MailNotify.php:318
+#: ../lib/MailNotify.php:308
 #, php-format
 msgid "Summary: %s"
 msgstr ""
 
-#: ../lib/MailNotify.php:329
+#: ../lib/MailNotify.php:319
 #, fuzzy, php-format
 msgid "Renamed by: %s"
 msgstr "retitulado de %s"
 
-#: ../lib/MailNotify.php:330
+#: ../lib/MailNotify.php:320
 #, php-format
 msgid "Page rename %s to %s"
 msgstr "La página retitula %s a %s"
 
-#: ../lib/MailNotify.php:368
+#: ../lib/MailNotify.php:356
 #, php-format
 msgid "User %s removed page %s"
 msgstr "El usuarios %s eliminado página %s"
 
-#: ../lib/MailNotify.php:406 ../lib/plugin/WikiAdminUtils.php:120
+#: ../lib/MailNotify.php:391 ../lib/plugin/WikiAdminUtils.php:120
 #: ../lib/WikiUserNew.php:1818
 msgid "E-mail address confirmation"
 msgstr "Verificación Del Email"
 
-#: ../lib/MailNotify.php:409
+#: ../lib/MailNotify.php:394
 #, php-format
 msgid ""
 "Someone, probably you from IP address %s, has registered an\n"
@@ -1614,7 +1614,7 @@
 
 #: ../lib/PagePerm.php:190 ../lib/plugin/WikiAdminRename.php:147
 #: ../lib/plugin/WikiAdminRename.php:277
-#: ../themes/fusionforge/templates/actionbar.tmpl:104
+#: ../themes/fusionforge/templates/actionbar.tmpl:102
 msgid "Rename"
 msgstr "Retitule"
 
@@ -1710,9 +1710,9 @@
 #: ../themes/default/templates/navbar.tmpl:5
 #: ../themes/default/templates/navbar.tmpl:7
 #: ../themes/fusionforge/templates/actionbar.tmpl:13
-#: ../themes/fusionforge/templates/actionbar.tmpl:23
-#: ../themes/fusionforge/templates/actionbar.tmpl:29
-#: ../themes/fusionforge/templates/actionbar.tmpl:39
+#: ../themes/fusionforge/templates/actionbar.tmpl:21
+#: ../themes/fusionforge/templates/actionbar.tmpl:27
+#: ../themes/fusionforge/templates/actionbar.tmpl:37
 #: ../themes/MonoBook/templates/actionbar.tmpl:12
 #: ../themes/MonoBook/templates/actionbar.tmpl:19
 #: ../themes/MonoBook/templates/actionbar.tmpl:23
@@ -5038,7 +5038,7 @@
 #: ../themes/blog/templates/actionbar.tmpl:15 ../themes/blog/themeinfo.php:69
 #: ../themes/Crao/templates/actionbar.tmpl:4
 #: ../themes/default/templates/actionbar.tmpl:12
-#: ../themes/fusionforge/templates/actionbar.tmpl:50
+#: ../themes/fusionforge/templates/actionbar.tmpl:48
 #: ../themes/MonoBook/templates/actionbar.tmpl:32
 #: ../themes/shamino_com/templates/actionbar.tmpl:5
 #: ../themes/Sidebar/templates/actionbar.tmpl:19
@@ -5047,7 +5047,7 @@
 msgstr "Editar"
 
 #: ../lib/plugin/WatchPage.php:99
-#: ../themes/fusionforge/templates/actionbar.tmpl:115
+#: ../themes/fusionforge/templates/actionbar.tmpl:113
 msgid "Watch Page"
 msgstr ""
 
@@ -7289,7 +7289,7 @@
 #: ../themes/Crao/templates/head.tmpl:37
 #: ../themes/default/templates/actionbar.tmpl:17
 #: ../themes/default/templates/head.tmpl:43
-#: ../themes/fusionforge/templates/actionbar.tmpl:56
+#: ../themes/fusionforge/templates/actionbar.tmpl:54
 #: ../themes/MonoBook/templates/actionbar.tmpl:35
 #: ../themes/MonoBook/templates/info.tmpl:178
 #: ../themes/Portland/templates/actionbar.tmpl:6
@@ -7476,13 +7476,13 @@
 msgstr "Comentarios sobre %s por %s."
 
 #: ../themes/blog/themeinfo.php:77
-#: ../themes/fusionforge/templates/actionbar.tmpl:88
+#: ../themes/fusionforge/templates/actionbar.tmpl:86
 #: ../themes/fusionforge/templates/userprefs.tmpl:265
 msgid "Lock"
 msgstr "Bloqueada"
 
 #: ../themes/blog/themeinfo.php:79
-#: ../themes/fusionforge/templates/actionbar.tmpl:86
+#: ../themes/fusionforge/templates/actionbar.tmpl:84
 msgid "Unlock"
 msgstr "Desbloquear"
 
@@ -7496,7 +7496,7 @@
 
 #: ../themes/Crao/templates/actionbar.tmpl:4
 #: ../themes/default/templates/actionbar.tmpl:12
-#: ../themes/fusionforge/templates/actionbar.tmpl:52
+#: ../themes/fusionforge/templates/actionbar.tmpl:50
 #: ../themes/MonoBook/templates/actionbar.tmpl:32
 #: ../themes/Portland/templates/actionbar.tmpl:4
 #: ../themes/shamino_com/templates/actionbar.tmpl:5
@@ -7653,7 +7653,7 @@
 msgstr ""
 
 #: ../themes/default/templates/actionbar.tmpl:27
-#: ../themes/fusionforge/templates/actionbar.tmpl:68
+#: ../themes/fusionforge/templates/actionbar.tmpl:66
 #: ../themes/fusionforge/templates/userprefs.tmpl:253
 #: ../themes/MonoBook/templates/actionbar.tmpl:70
 #: ../themes/Sidebar/templates/actionbar.tmpl:46
@@ -7840,8 +7840,8 @@
 msgstr ""
 
 #: ../themes/default/templates/info.tmpl:149
-#: ../themes/fusionforge/templates/actionbar.tmpl:17
-#: ../themes/fusionforge/templates/actionbar.tmpl:36
+#: ../themes/fusionforge/templates/actionbar.tmpl:16
+#: ../themes/fusionforge/templates/actionbar.tmpl:34
 #: ../themes/MonoBook/templates/info.tmpl:156
 msgid "Action Page"
 msgstr ""
@@ -8294,52 +8294,52 @@
 msgid "Posted: %s"
 msgstr ""
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:17
-#: ../themes/fusionforge/templates/actionbar.tmpl:36
+#: ../themes/fusionforge/templates/actionbar.tmpl:16
+#: ../themes/fusionforge/templates/actionbar.tmpl:34
 msgid "Page"
 msgstr "Página"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:28
+#: ../themes/fusionforge/templates/actionbar.tmpl:26
 #: ../themes/MonoBook/templates/actionbar.tmpl:22
 msgid "Template/Talk"
 msgstr ""
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:48
+#: ../themes/fusionforge/templates/actionbar.tmpl:46
 #: ../themes/MonoBook/templates/actionbar.tmpl:32
 #: ../themes/Sidebar/templates/actionbar.tmpl:19
 msgid "Create Page"
 msgstr "Cree la Página"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:61
+#: ../themes/fusionforge/templates/actionbar.tmpl:59
 #: ../themes/MonoBook/templates/actionbar.tmpl:40
 #: ../themes/Sidebar/templates/actionbar.tmpl:26
 msgid "History"
 msgstr ""
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:64
+#: ../themes/fusionforge/templates/actionbar.tmpl:62
 #: ../themes/fusionforge/templates/userprefs.tmpl:248
 msgid "Last Difference"
 msgstr ""
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:71
+#: ../themes/fusionforge/templates/actionbar.tmpl:69
 msgid "Page Info"
 msgstr "Informacion de la Pagina"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:73
+#: ../themes/fusionforge/templates/actionbar.tmpl:71
 msgid "Back Links"
 msgstr "Acoplamientos Traseros"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:94
+#: ../themes/fusionforge/templates/actionbar.tmpl:92
 #: ../themes/fusionforge/templates/userprefs.tmpl:270
 msgid "Change Owner"
 msgstr ""
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:98
+#: ../themes/fusionforge/templates/actionbar.tmpl:96
 #: ../themes/fusionforge/templates/userprefs.tmpl:275
 msgid "Access Rights"
 msgstr ""
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:108
+#: ../themes/fusionforge/templates/actionbar.tmpl:106
 msgid "Purge"
 msgstr ""
 

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2012-12-06 09:29:28 UTC (rev 8611)
+++ trunk/locale/po/fr.po	2012-12-06 09:47:10 UTC (rev 8612)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-04 17:59+0100\n"
+"POT-Creation-Date: 2012-12-06 10:44+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."
@@ -774,7 +774,7 @@
 msgid "PhpWikiAdministration"
 msgstr "AdministrationDePhpWiki"
 
-#: ../lib/loadsave.php:107 ../lib/MailNotify.php:306
+#: ../lib/loadsave.php:107 ../lib/MailNotify.php:296
 #, php-format
 msgid "Edited by: %s"
 msgstr "Modifié par : %s"
@@ -891,7 +891,7 @@
 msgid "from %s"
 msgstr "du %s"
 
-#: ../lib/loadsave.php:984 ../lib/MailNotify.php:313
+#: ../lib/loadsave.php:984 ../lib/MailNotify.php:303
 #: ../lib/plugin/RecentChanges.php:149
 msgid "New page"
 msgstr "Nouvelle page"
@@ -1057,60 +1057,60 @@
 msgid "Uploading %s"
 msgstr "Téléchargement de %s"
 
-#: ../lib/MailNotify.php:210
+#: ../lib/MailNotify.php:200
 #, php-format
 msgid "PageChange Notification of %s"
 msgstr "Notification de changement de la page %s"
 
-#: ../lib/MailNotify.php:251
+#: ../lib/MailNotify.php:241
 #, php-format
 msgid "sent to %s"
 msgstr "envoyé à %s"
 
-#: ../lib/MailNotify.php:257
+#: ../lib/MailNotify.php:247
 #, php-format
 msgid "Error: Couldn't send %s to %s"
 msgstr "Erreur : impossible d'envoyer %s à %s"
 
-#: ../lib/MailNotify.php:286
+#: ../lib/MailNotify.php:276
 msgid "Page change"
 msgstr "Modification de la page"
 
-#: ../lib/MailNotify.php:309
+#: ../lib/MailNotify.php:299
 msgid "Page creation"
 msgstr "Création de la page"
 
-#: ../lib/MailNotify.php:316
+#: ../lib/MailNotify.php:306
 #, php-format
 msgid "Created by: %s"
 msgstr "Créée par : %s"
 
-#: ../lib/MailNotify.php:318
+#: ../lib/MailNotify.php:308
 #, php-format
 msgid "Summary: %s"
 msgstr "Résumé : %s"
 
-#: ../lib/MailNotify.php:329
+#: ../lib/MailNotify.php:319
 #, php-format
 msgid "Renamed by: %s"
 msgstr "Renommée par : %s"
 
-#: ../lib/MailNotify.php:330
+#: ../lib/MailNotify.php:320
 #, php-format
 msgid "Page rename %s to %s"
 msgstr "Page renommée de %s à %s"
 
-#: ../lib/MailNotify.php:368
+#: ../lib/MailNotify.php:356
 #, php-format
 msgid "User %s removed page %s"
 msgstr "L'utilisateur %s a supprimé la page %s"
 
-#: ../lib/MailNotify.php:406 ../lib/plugin/WikiAdminUtils.php:120
+#: ../lib/MailNotify.php:391 ../lib/plugin/WikiAdminUtils.php:120
 #: ../lib/WikiUserNew.php:1818
 msgid "E-mail address confirmation"
 msgstr "Vérification de l'adresse électronique"
 
-#: ../lib/MailNotify.php:409
+#: ../lib/MailNotify.php:394
 #, php-format
 msgid ""
 "Someone, probably you from IP address %s, has registered an\n"
@@ -1610,7 +1610,7 @@
 
 #: ../lib/PagePerm.php:190 ../lib/plugin/WikiAdminRename.php:147
 #: ../lib/plugin/WikiAdminRename.php:277
-#: ../themes/fusionforge/templates/actionbar.tmpl:104
+#: ../themes/fusionforge/templates/actionbar.tmpl:102
 msgid "Rename"
 msgstr "Renommer"
 
@@ -1704,9 +1704,9 @@
 #: ../themes/default/templates/navbar.tmpl:5
 #: ../themes/default/templates/navbar.tmpl:7
 #: ../themes/fusionforge/templates/actionbar.tmpl:13
-#: ../themes/fusionforge/templates/actionbar.tmpl:23
-#: ../themes/fusionforge/templates/actionbar.tmpl:29
-#: ../themes/fusionforge/templates/actionbar.tmpl:39
+#: ../themes/fusionforge/templates/actionbar.tmpl:21
+#: ../themes/fusionforge/templates/actionbar.tmpl:27
+#: ../themes/fusionforge/templates/actionbar.tmpl:37
 #: ../themes/MonoBook/templates/actionbar.tmpl:12
 #: ../themes/MonoBook/templates/actionbar.tmpl:19
 #: ../themes/MonoBook/templates/actionbar.tmpl:23
@@ -5090,7 +5090,7 @@
 #: ../themes/blog/templates/actionbar.tmpl:15 ../themes/blog/themeinfo.php:69
 #: ../themes/Crao/templates/actionbar.tmpl:4
 #: ../themes/default/templates/actionbar.tmpl:12
-#: ../themes/fusionforge/templates/actionbar.tmpl:50
+#: ../themes/fusionforge/templates/actionbar.tmpl:48
 #: ../themes/MonoBook/templates/actionbar.tmpl:32
 #: ../themes/shamino_com/templates/actionbar.tmpl:5
 #: ../themes/Sidebar/templates/actionbar.tmpl:19
@@ -5099,7 +5099,7 @@
 msgstr "Modifier"
 
 #: ../lib/plugin/WatchPage.php:99
-#: ../themes/fusionforge/templates/actionbar.tmpl:115
+#: ../themes/fusionforge/templates/actionbar.tmpl:113
 msgid "Watch Page"
 msgstr "Surveiller"
 
@@ -7353,7 +7353,7 @@
 #: ../themes/Crao/templates/head.tmpl:37
 #: ../themes/default/templates/actionbar.tmpl:17
 #: ../themes/default/templates/head.tmpl:43
-#: ../themes/fusionforge/templates/actionbar.tmpl:56
+#: ../themes/fusionforge/templates/actionbar.tmpl:54
 #: ../themes/MonoBook/templates/actionbar.tmpl:35
 #: ../themes/MonoBook/templates/info.tmpl:178
 #: ../themes/Portland/templates/actionbar.tmpl:6
@@ -7542,13 +7542,13 @@
 msgstr "Commentaire le %s par %s."
 
 #: ../themes/blog/themeinfo.php:77
-#: ../themes/fusionforge/templates/actionbar.tmpl:88
+#: ../themes/fusionforge/templates/actionbar.tmpl:86
 #: ../themes/fusionforge/templates/userprefs.tmpl:265
 msgid "Lock"
 msgstr "Verrouiller"
 
 #: ../themes/blog/themeinfo.php:79
-#: ../themes/fusionforge/templates/actionbar.tmpl:86
+#: ../themes/fusionforge/templates/actionbar.tmpl:84
 msgid "Unlock"
 msgstr "Déverrouiller"
 
@@ -7562,7 +7562,7 @@
 
 #: ../themes/Crao/templates/actionbar.tmpl:4
 #: ../themes/default/templates/actionbar.tmpl:12
-#: ../themes/fusionforge/templates/actionbar.tmpl:52
+#: ../themes/fusionforge/templates/actionbar.tmpl:50
 #: ../themes/MonoBook/templates/actionbar.tmpl:32
 #: ../themes/Portland/templates/actionbar.tmpl:4
 #: ../themes/shamino_com/templates/actionbar.tmpl:5
@@ -7722,7 +7722,7 @@
 msgstr "Entrez votre identifiant utilisateur pour vous connecter"
 
 #: ../themes/default/templates/actionbar.tmpl:27
-#: ../themes/fusionforge/templates/actionbar.tmpl:68
+#: ../themes/fusionforge/templates/actionbar.tmpl:66
 #: ../themes/fusionforge/templates/userprefs.tmpl:253
 #: ../themes/MonoBook/templates/actionbar.tmpl:70
 #: ../themes/Sidebar/templates/actionbar.tmpl:46
@@ -7909,8 +7909,8 @@
 msgstr "Page d'utilisateur"
 
 #: ../themes/default/templates/info.tmpl:149
-#: ../themes/fusionforge/templates/actionbar.tmpl:17
-#: ../themes/fusionforge/templates/actionbar.tmpl:36
+#: ../themes/fusionforge/templates/actionbar.tmpl:16
+#: ../themes/fusionforge/templates/actionbar.tmpl:34
 #: ../themes/MonoBook/templates/info.tmpl:156
 msgid "Action Page"
 msgstr "Page d'action"
@@ -8390,52 +8390,52 @@
 msgid "Posted: %s"
 msgstr "Posté le %s"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:17
-#: ../themes/fusionforge/templates/actionbar.tmpl:36
+#: ../themes/fusionforge/templates/actionbar.tmpl:16
+#: ../themes/fusionforge/templates/actionbar.tmpl:34
 msgid "Page"
 msgstr "Page"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:28
+#: ../themes/fusionforge/templates/actionbar.tmpl:26
 #: ../themes/MonoBook/templates/actionbar.tmpl:22
 msgid "Template/Talk"
 msgstr ""
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:48
+#: ../themes/fusionforge/templates/actionbar.tmpl:46
 #: ../themes/MonoBook/templates/actionbar.tmpl:32
 #: ../themes/Sidebar/templates/actionbar.tmpl:19
 msgid "Create Page"
 msgstr "Créer la page"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:61
+#: ../themes/fusionforge/templates/actionbar.tmpl:59
 #: ../themes/MonoBook/templates/actionbar.tmpl:40
 #: ../themes/Sidebar/templates/actionbar.tmpl:26
 msgid "History"
 msgstr "Historique"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:64
+#: ../themes/fusionforge/templates/actionbar.tmpl:62
 #: ../themes/fusionforge/templates/userprefs.tmpl:248
 msgid "Last Difference"
 msgstr "Dernière différence"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:71
+#: ../themes/fusionforge/templates/actionbar.tmpl:69
 msgid "Page Info"
 msgstr "Infos sur la page"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:73
+#: ../themes/fusionforge/templates/actionbar.tmpl:71
 msgid "Back Links"
 msgstr "Pages liées"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:94
+#: ../themes/fusionforge/templates/actionbar.tmpl:92
 #: ../themes/fusionforge/templates/userprefs.tmpl:270
 msgid "Change Owner"
 msgstr "Changer le propriétaire"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:98
+#: ../themes/fusionforge/templates/actionbar.tmpl:96
 #: ../themes/fusionforge/templates/userprefs.tmpl:275
 msgid "Access Rights"
 msgstr "Droits d'accès"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:108
+#: ../themes/fusionforge/templates/actionbar.tmpl:106
 msgid "Purge"
 msgstr "Purger"
 

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2012-12-06 09:29:28 UTC (rev 8611)
+++ trunk/locale/po/it.po	2012-12-06 09:47:10 UTC (rev 8612)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-04 17:59+0100\n"
+"POT-Creation-Date: 2012-12-06 10:44+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,7 +765,7 @@
 msgid "PhpWikiAdministration"
 msgstr ""
 
-#: ../lib/loadsave.php:107 ../lib/MailNotify.php:306
+#: ../lib/loadsave.php:107 ../lib/MailNotify.php:296
 #, php-format
 msgid "Edited by: %s"
 msgstr "Modifica: %s"
@@ -882,7 +882,7 @@
 msgid "from %s"
 msgstr "dalla %s"
 
-#: ../lib/loadsave.php:984 ../lib/MailNotify.php:313
+#: ../lib/loadsave.php:984 ../lib/MailNotify.php:303
 #: ../lib/plugin/RecentChanges.php:149
 msgid "New page"
 msgstr "Nuova pagina"
@@ -1047,61 +1047,61 @@
 msgid "Uploading %s"
 msgstr ""
 
-#: ../lib/MailNotify.php:210
+#: ../lib/MailNotify.php:200
 #, php-format
 msgid "PageChange Notification of %s"
 msgstr "Pagini la notifica del cambiamento di %s"
 
-#: ../lib/MailNotify.php:251
+#: ../lib/MailNotify.php:241
 #, php-format
 msgid "sent to %s"
 msgstr ""
 
-#: ../lib/MailNotify.php:257
+#: ../lib/MailNotify.php:247
 #, php-format
 msgid "Error: Couldn't send %s to %s"
 msgstr "Errore: Non ha potuto trasmettere %s a %s"
 
-#: ../lib/MailNotify.php:286
+#: ../lib/MailNotify.php:276
 msgid "Page change"
 msgstr "Cambiamento della pagina"
 
-#: ../lib/MailNotify.php:309
+#: ../lib/MailNotify.php:299
 #, fuzzy
 msgid "Page creation"
 msgstr "Versione della Pagina"
 
-#: ../lib/MailNotify.php:316
+#: ../lib/MailNotify.php:306
 #, fuzzy, php-format
 msgid "Created by: %s"
 msgstr "Salvata: %s"
 
-#: ../lib/MailNotify.php:318
+#: ../lib/MailNotify.php:308
 #, php-format
 msgid "Summary: %s"
 msgstr "Commenti: %s"
 
-#: ../lib/MailNotify.php:329
+#: ../lib/MailNotify.php:319
 #, fuzzy, php-format
 msgid "Renamed by: %s"
 msgstr "Modifica: %s"
 
-#: ../lib/MailNotify.php:330
+#: ../lib/MailNotify.php:320
 #, php-format
 msgid "Page rename %s to %s"
 msgstr "La pagina cambia titolo %s a %s"
 
-#: ../lib/MailNotify.php:368
+#: ../lib/MailNotify.php:356
 #, php-format
 msgid "User %s removed page %s"
 msgstr "Utente %s pagina %s rimossa"
 
-#: ../lib/MailNotify.php:406 ../lib/plugin/WikiAdminUtils.php:120
+#: ../lib/MailNotify.php:391 ../lib/plugin/WikiAdminUtils.php:120
 #: ../lib/WikiUserNew.php:1818
 msgid "E-mail address confirmation"
 msgstr ""
 
-#: ../lib/MailNotify.php:409
+#: ../lib/MailNotify.php:394
 #, php-format
 msgid ""
 "Someone, probably you from IP address %s, has registered an\n"
@@ -1596,7 +1596,7 @@
 
 #: ../lib/PagePerm.php:190 ../lib/plugin/WikiAdminRename.php:147
 #: ../lib/plugin/WikiAdminRename.php:277
-#: ../themes/fusionforge/templates/actionbar.tmpl:104
+#: ../themes/fusionforge/templates/actionbar.tmpl:102
 msgid "Rename"
 msgstr ""
 
@@ -1690,9 +1690,9 @@
 #: ../themes/default/templates/navbar.tmpl:5
 #: ../themes/default/templates/navbar.tmpl:7
 #: ../themes/fusionforge/templates/actionbar.tmpl:13
-#: ../themes/fusionforge/templates/actionbar.tmpl:23
-#: ../themes/fusionforge/templates/actionbar.tmpl:29
-#: ../themes/fusionforge/templates/actionbar.tmpl:39
+#: ../themes/fusionforge/templates/actionbar.tmpl:21
+#: ../themes/fusionforge/templates/actionbar.tmpl:27
+#: ../themes/fusionforge/templates/actionbar.tmpl:37
 #: ../themes/MonoBook/templates/actionbar.tmpl:12
 #: ../themes/MonoBook/templates/actionbar.tmpl:19
 #: ../themes/MonoBook/templates/actionbar.tmpl:23
@@ -5014,7 +5014,7 @@
 #: ../themes/blog/templates/actionbar.tmpl:15 ../themes/blog/themeinfo.php:69
 #: ../themes/Crao/templates/actionbar.tmpl:4
 #: ../themes/default/templates/actionbar.tmpl:12
-#: ../themes/fusionforge/templates/actionbar.tmpl:50
+#: ../themes/fusionforge/templates/actionbar.tmpl:48
 #: ../themes/MonoBook/templates/actionbar.tmpl:32
 #: ../themes/shamino_com/templates/actionbar.tmpl:5
 #: ../themes/Sidebar/templates/actionbar.tmpl:19
@@ -5023,7 +5023,7 @@
 msgstr "Modifica"
 
 #: ../lib/plugin/WatchPage.php:99
-#: ../themes/fusionforge/templates/actionbar.tmpl:115
+#: ../themes/fusionforge/templates/actionbar.tmpl:113
 msgid "Watch Page"
 msgstr ""
 
@@ -7235,7 +7235,7 @@
 #: ../themes/Crao/templates/head.tmpl:37
 #: ../themes/default/templates/actionbar.tmpl:17
 #: ../themes/default/templates/head.tmpl:43
-#: ../themes/fusionforge/templates/actionbar.tmpl:56
+#: ../themes/fusionforge/templates/actionbar.tmpl:54
 #: ../themes/MonoBook/templates/actionbar.tmpl:35
 #: ../themes/MonoBook/templates/info.tmpl:178
 #: ../themes/Portland/templates/actionbar.tmpl:6
@@ -7422,13 +7422,13 @@
 msgstr ""
 
 #: ../themes/blog/themeinfo.php:77
-#: ../themes/fusionforge/templates/actionbar.tmpl:88
+#: ../themes/fusionforge/templates/actionbar.tmpl:86
 #: ../themes/fusionforge/templates/userprefs.tmpl:265
 msgid "Lock"
 msgstr "Bloccata"
 
 #: ../themes/blog/themeinfo.php:79
-#: ../themes/fusionforge/templates/actionbar.tmpl:86
+#: ../themes/fusionforge/templates/actionbar.tmpl:84
 msgid "Unlock"
 msgstr "Sblocca"
 
@@ -7442,7 +7442,7 @@
 
 #: ../themes/Crao/templates/actionbar.tmpl:4
 #: ../themes/default/templates/actionbar.tmpl:12
-#: ../themes/fusionforge/templates/actionbar.tmpl:52
+#: ../themes/fusionforge/templates/actionbar.tmpl:50
 #: ../themes/MonoBook/templates/actionbar.tmpl:32
 #: ../themes/Portland/templates/actionbar.tmpl:4
 #: ../themes/shamino_com/templates/actionbar.tmpl:5
@@ -7599,7 +7599,7 @@
 msgstr ""
 
 #: ../themes/default/templates/actionbar.tmpl:27
-#: ../themes/fusionforge/templates/actionbar.tmpl:68
+#: ../themes/fusionforge/templates/actionbar.tmpl:66
 #: ../themes/fusionforge/templates/userprefs.tmpl:253
 #: ../themes/MonoBook/templates/actionbar.tmpl:70
 #: ../themes/Sidebar/templates/actionbar.tmpl:46
@@ -7786,8 +7786,8 @@
 msgstr ""
 
 #: ../themes/default/templates/info.tmpl:149
-#: ../themes/fusionforge/templates/actionbar.tmpl:17
-#: ../themes/fusionforge/templates/actionbar.tmpl:36
+#: ../themes/fusionforge/templates/actionbar.tmpl:16
+#: ../themes/fusionforge/templates/actionbar.tmpl:34
 #: ../themes/MonoBook/templates/info.tmpl:156
 msgid "Action Page"
 msgstr ""
@@ -8240,52 +8240,52 @@
 msgid "Posted: %s"
 msgstr ""
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:17
-#: ../themes/fusionforge/templates/actionbar.tmpl:36
+#: ../themes/fusionforge/templates/actionbar.tmpl:16
+#: ../themes/fusionforge/templates/actionbar.tmpl:34
 msgid "Page"
 msgstr "Pagina"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:28
+#: ../themes/fusionforge/templates/actionbar.tmpl:26
 #: ../themes/MonoBook/templates/actionbar.tmpl:22
 msgid "Template/Talk"
 msgstr ""
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:48
+#: ../themes/fusionforge/templates/actionbar.tmpl:46
 #: ../themes/MonoBook/templates/actionbar.tmpl:32
 #: ../themes/Sidebar/templates/actionbar.tmpl:19
 msgid "Create Page"
 msgstr ""
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:61
+#: ../themes/fusionforge/templates/actionbar.tmpl:59
 #: ../themes/MonoBook/templates/actionbar.tmpl:40
 #: ../themes/Sidebar/templates/actionbar.tmpl:26
 msgid "History"
 msgstr "Storico"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:64
+#: ../themes/fusionforge/templates/actionbar.tmpl:62
 #: ../themes/fusionforge/templates/userprefs.tmpl:248
 msgid "Last Difference"
 msgstr ""
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:71
+#: ../themes/fusionforge/templates/actionbar.tmpl:69
 msgid "Page Info"
 msgstr "Info Pagina"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:73
+#: ../themes/fusionforge/templates/actionbar.tmpl:71
 msgid "Back Links"
 msgstr "Collegamenti Relativi"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:94
+#: ../themes/fusionforge/templates/actionbar.tmpl:92
 #: ../themes/fusionforge/templates/userprefs.tmpl:270
 msgid "Change Owner"
 msgstr ""
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:98
+#: ../themes/fusionforge/templates/actionbar.tmpl:96
 #: ../themes/fusionforge/templates/userprefs.tmpl:275
 msgid "Access Rights"
 msgstr ""
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:108
+#: ../themes/fusionforge/templates/actionbar.tmpl:106
 msgid "Purge"
 msgstr ""
 

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2012-12-06 09:29:28 UTC (rev 8611)
+++ trunk/locale/po/ja.po	2012-12-06 09:47:10 UTC (rev 8612)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-04 17:59+0100\n"
+"POT-Creation-Date: 2012-12-06 10:44+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,7 +754,7 @@
 msgid "PhpWikiAdministration"
 msgstr ""
 
-#: ../lib/loadsave.php:107 ../lib/MailNotify.php:306
+#: ../lib/loadsave.php:107 ../lib/MailNotify.php:296
 #, php-format
 msgid "Edited by: %s"
 msgstr "編集: %s"
@@ -869,7 +869,7 @@
 msgid "from %s"
 msgstr "%s から"
 
-#: ../lib/loadsave.php:984 ../lib/MailNotify.php:313
+#: ../lib/loadsave.php:984 ../lib/MailNotify.php:303
 #: ../lib/plugin/RecentChanges.php:149
 #, fuzzy
 msgid "New page"
@@ -1036,62 +1036,62 @@
 msgid "Uploading %s"
 msgstr "%s をアップロード中です。"
 
-#: ../lib/MailNotify.php:210
+#: ../lib/MailNotify.php:200
 #, fuzzy, php-format
 msgid "PageChange Notification of %s"
 msgstr "メール通知"
 
-#: ../lib/MailNotify.php:251
+#: ../lib/MailNotify.php:241
 #, fuzzy, php-format
 msgid "sent to %s"
 msgstr "%s に戻る"
 
-#: ../lib/MailNotify.php:257
+#: ../lib/MailNotify.php:247
 #, fuzzy, php-format
 msgid "Error: Couldn't send %s to %s"
 msgstr "メール通知"
 
-#: ../lib/MailNotify.php:286
+#: ../lib/MailNotify.php:276
 #, fuzzy
 msgid "Page change"
 msgstr "変更しませんでした。"
 
-#: ../lib/MailNotify.php:309
+#: ../lib/MailNotify.php:299
 #, fuzzy
 msgid "Page creation"
 msgstr "ページバージョン"
 
-#: ../lib/MailNotify.php:316
+#: ../lib/MailNotify.php:306
 #, fuzzy, php-format
 msgid "Created by: %s"
 msgstr "作成: %s"
 
-#: ../lib/MailNotify.php:318
+#: ../lib/MailNotify.php:308
 #, fuzzy, php-format
 msgid "Summary: %s"
 msgstr "要約"
 
-#: ../lib/MailNotify.php:329
+#: ../lib/MailNotify.php:319
 #, fuzzy, php-format
 msgid "Renamed by: %s"
 msgstr "%s から読込まれました。"
 
-#: ../lib/MailNotify.php:330
+#: ../lib/MailNotify.php:320
 #, fuzzy, php-format
 msgid "Page rename %s to %s"
 msgstr "%s から読込まれました。"
 
-#: ../lib/MailNotify.php:368
+#: ../lib/MailNotify.php:356
 #, fuzzy, php-format
 msgid "User %s removed page %s"
 msgstr "ページをロックしました。"
 
-#: ../lib/MailNotify.php:406 ../lib/plugin/WikiAdminUtils.php:120
+#: ../lib/MailNotify.php:391 ../lib/plugin/WikiAdminUtils.php:120
 #: ../lib/WikiUserNew.php:1818
 msgid "E-mail address confirmation"
 msgstr ""
 
-#: ../lib/MailNotify.php:409
+#: ../lib/MailNotify.php:394
 #, php-format
 msgid ""
 "Someone, probably you from IP address %s, has registered an\n"
@@ -1597,7 +1597,7 @@
 
 #: ../lib/PagePerm.php:190 ../lib/plugin/WikiAdminRename.php:147
 #: ../lib/plugin/WikiAdminRename.php:277
-#: ../themes/fusionforge/templates/actionbar.tmpl:104
+#: ../themes/fusionforge/templates/actionbar.tmpl:102
 #, fuzzy
 msgid "Rename"
 msgstr "名称"
@@ -1695,9 +1695,9 @@
 #: ../themes/default/templates/navbar.tmpl:5
 #: ../themes/default/templates/navbar.tmpl:7
 #: ../themes/fusionforge/templates/actionbar.tmpl:13
-#: ../themes/fusionforge/templates/actionbar.tmpl:23
-#: ../themes/fusionforge/templates/actionbar.tmpl:29
-#: ../themes/fusionforge/templates/actionbar.tmpl:39
+#: ../themes/fusionforge/templates/actionbar.tmpl:21
+#: ../themes/fusionforge/templates/actionbar.tmpl:27
+#: ../themes/fusionforge/templates/actionbar.tmpl:37
 #: ../themes/MonoBook/templates/actionbar.tmpl:12
 #: ../themes/MonoBook/templates/actionbar.tmpl:19
 #: ../themes/MonoBook/templates/actionbar.tmpl:23
@@ -5089,7 +5089,7 @@
 #: ../themes/blog/templates/actionbar.tmpl:15 ../themes/blog/themeinfo.php:69
 #: ../themes/Crao/templates/actionbar.tmpl:4
 #: ../themes/default/templates/actionbar.tmpl:12
-#: ../themes/fusionforge/templates/actionbar.tmpl:50
+#: ../themes/fusionforge/templates/actionbar.tmpl:48
 #: ../themes/MonoBook/templates/actionbar.tmpl:32
 #: ../themes/shamino_com/templates/actionbar.tmpl:5
 #: ../themes/Sidebar/templates/actionbar.tmpl:19
@@ -5098,7 +5098,7 @@
 msgstr "編集"
 
 #: ../lib/plugin/WatchPage.php:99
-#: ../themes/fusionforge/templates/actionbar.tmpl:115
+#: ../themes/fusionforge/templates/actionbar.tmpl:113
 #, fuzzy
 msgid "Watch Page"
 msgstr "幅"
@@ -7383,7 +7383,7 @@
 #: ../themes/Crao/templates/head.tmpl:37
 #: ../themes/default/templates/actionbar.tmpl:17
 #: ../themes/default/templates/head.tmpl:43
-#: ../themes/fusionforge/templates/actionbar.tmpl:56
+#: ../themes/fusionforge/templates/actionbar.tmpl:54
 #: ../themes/MonoBook/templates/actionbar.tmpl:35
 #: ../themes/MonoBook/templates/info.tmpl:178
 #: ../themes/Portland/templates/actionbar.tmpl:6
@@ -7574,14 +7574,14 @@
 msgstr ""
 
 #: ../themes/blog/themeinfo.php:77
-#: ../themes/fusionforge/templates/actionbar.tmpl:88
+#: ../themes/fusionforge/templates/actionbar.tmpl:86
 #: ../themes/fusionforge/templates/userprefs.tmpl:265
 #, fuzzy
 msgid "Lock"
 msgstr "ロックしました"
 
 #: ../themes/blog/themeinfo.php:79
-#: ../themes/fusionforge/templates/actionbar.tmpl:86
+#: ../themes/fusionforge/templates/actionbar.tmpl:84
 #, fuzzy
 msgid "Unlock"
 msgstr "ページロック解除"
@@ -7597,7 +7597,7 @@
 
 #: ../themes/Crao/templates/actionbar.tmpl:4
 #: ../themes/default/templates/actionbar.tmpl:12
-#: ../themes/fusionforge/templates/actionbar.tmpl:52
+#: ../themes/fusionforge/templates/actionbar.tmpl:50
 #: ../themes/MonoBook/templates/actionbar.tmpl:32
 #: ../themes/Portland/templates/actionbar.tmpl:4
 #: ../themes/shamino_com/templates/actionbar.tmpl:5
@@ -7756,7 +7756,7 @@
 msgstr "ユーザーIDを入力してサインインしてください。"
 
 #: ../themes/default/templates/actionbar.tmpl:27
-#: ../themes/fusionforge/templates/actionbar.tmpl:68
+#: ../themes/fusionforge/templates/actionbar.tmpl:66
 #: ../themes/fusionforge/templates/userprefs.tmpl:253
 #: ../themes/MonoBook/templates/actionbar.tmpl:70
 #: ../themes/Sidebar/templates/actionbar.tmpl:46
@@ -7948,8 +7948,8 @@
 msgstr "ユーザーページ"
 
 #: ../themes/default/templates/info.tmpl:149
-#: ../themes/fusionforge/templates/actionbar.tmpl:17
-#: ../themes/fusionforge/templates/actionbar.tmpl:36
+#: ../themes/fusionforge/templates/actionbar.tmpl:16
+#: ../themes/fusionforge/templates/actionbar.tmpl:34
 #: ../themes/MonoBook/templates/info.tmpl:156
 #, fuzzy
 msgid "Action Page"
@@ -8411,59 +8411,59 @@
 msgid "Posted: %s"
 msgstr "ユーザーID:"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:17
-#: ../themes/fusionforge/templates/actionbar.tmpl:36
+#: ../themes/fusionforge/templates/actionbar.tmpl:16
+#: ../themes/fusionforge/templates/actionbar.tmpl:34
 #, fuzzy
 msgid "Page"
 msgstr "ホームページ"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:28
+#: ../themes/fusionforge/templates/actionbar.tmpl:26
 #: ../themes/MonoBook/templates/actionbar.tmpl:22
 msgid "Template/Talk"
 msgstr ""
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:48
+#: ../themes/fusionforge/templates/actionbar.tmpl:46
 #: ../themes/MonoBook/templates/actionbar.tmpl:32
 #: ../themes/Sidebar/templates/actionbar.tmpl:19
 #, fuzzy
 msgid "Create Page"
 msgstr "ページを作成しています。"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:61
+#: ../themes/fusionforge/templates/actionbar.tmpl:59
 #: ../themes/MonoBook/templates/actionbar.tmpl:40
 #: ../themes/Sidebar/templates/actionbar.tmpl:26
 #, fuzzy
 msgid "History"
 msgstr "ページ履歴"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:64
+#: ../themes/fusionforge/templates/actionbar.tmpl:62
 #: ../themes/fusionforge/templates/userprefs.tmpl:248
 #, fuzzy
 msgid "Last Difference"
 msgstr "設定を更新しました"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:71
+#: ../themes/fusionforge/templates/actionbar.tmpl:69
 #, fuzzy
 msgid "Page Info"
 msgstr "ページ情報"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:73
+#: ../themes/fusionforge/templates/actionbar.tmpl:71
 #, fuzzy
 msgid "Back Links"
 msgstr "ログイン"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:94
+#: ../themes/fusionforge/templates/actionbar.tmpl:92
 #: ../themes/fusionforge/templates/userprefs.tmpl:270
 #, fuzzy
 msgid "Change Owner"
 msgstr "国名変更"
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:98
+#: ../themes/fusionforge/templates/actionbar.tmpl:96
 #: ../themes/fusionforge/templates/userprefs.tmpl:275
 msgid "Access Rights"
 msgstr ""
 
-#: ../themes/fusionforge/templates/actionbar.tmpl:108
+#: ../themes/fusionforge/templates/actionbar.tmpl:106
 #, fuzzy
 msgid "Purge"
 msgstr "前後"

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2012-12-06 09:29:28 UTC (rev 8611)
+++ trunk/locale/po/nl.po	2012-12-06 09:47:10 UTC (rev 8612)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-04 17:59+0100\n"
+"POT-Creation-Date: 2012-12-06 10:44+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,7 +759,7 @@
 msgid "PhpWikiAdministration"
 msgstr "PhpWikiBeheer"
 
-#: ../lib/loadsave.php:107 ../lib/MailNotify.php:306
+#: ../lib/loadsave.php:107 ../lib/MailNotify.php:296
 #, php-format
 msgid "Edited by: %s"
 msgstr "Verander von: %s"
@@ -874,7 +874,7 @@
 msgid "from %s"
 msgstr "van %s"
 
-#: ../lib/loadsave.php:984 ../lib/MailNotify.php:313
+#: ../lib/loadsave.php:984 ../lib/MailNotify.php:303
 #: ../lib/plugin/RecentChanges.php:149
 msgid "New page"
 msgstr "Nieuw pagina"
@@ -1039,61 +1039,61 @@
 msgid "Uploading %s"
 msgstr ""
 
-#: ../lib/MailNotify.php:210
+#: ../lib/MailNotify.php:200
 #, php-format
 msgid "PageChange Notification of %s"
 msgstr ""
 
-#: ../lib/MailNotify.php:251
+#: ../lib/MailNotify.php:241
 #, php-format
 msgid "sent to %s"
 msgstr ""
 
-#: ../lib/MailNotify.php:257
+#: ../lib/MailNotify.php:247
 #, php-format
 msgid "Error: Couldn't send %s to %s"
 msgstr ""
 
-#: ../lib/MailNotify.php:286
+#: ../lib/MailNotify.php:276
 msgid "Page change"
 msgstr ""
 
-#: ../lib/MailNotify.php:309
+#: ../lib/MailNotify.php:299
 #, fuzzy
 msgid "Page creation"
 msgstr "Pagina Versie"
 
-#: ../lib/MailNotify.php:316
+#: ../lib/MailNotify.php:306
 #, fuzzy, php-format
 msgid "Created by: %s"
 msgstr "Verander von: %s"
 
-#: ../lib/MailNotify.php:318
+#: ../lib/MailNotify.php:308
 #, php-format
 msgid "Summary: %s"
 msgstr ""
 
-#: ../lib/MailNotify.php:329
+#: ../lib/MailNotify.php:319
 #, fuzzy, php-format
 msgid "Renamed by: %s"
 msgstr "Verander von: %s"
 
-#: ../lib/MailNotify.php:330
+#: ../lib/MailNotify.php:320
 #, php-format
 msgid "Page rename %s to %s"
 msgstr ""
 
-#: ../lib/MailNotify.php:368
+#: ../lib/MailNotify.php:356
 #, php-format
 msgid "User %s removed page %s"
 msgstr ""
 
-#: ../lib/MailNotify.php:406 ../lib/plugin/WikiAdminUtils.php:120
+#: ../lib/MailNotify.php:391 ../lib/plugin/WikiAdminUtils.php:120
 #: ../lib/WikiUserNew.php:1818
 msgid "E-mail address confirmation"
 msgstr ""
 
-#: ../lib/MailNotify.php:409
+#: ../lib/MailNotify.php:394
 #, php-format
 msgid ""
 "Someone, probably you from IP address %s, has registered an\n"
@@ -1588,7 +1588,7 @@
 
 #: ../lib/PagePerm.php:190 ../lib/plugin/WikiAdminRename.php:147
 #: ../lib/plugin/WikiAdminRename.php:277
-#: ../themes/fusionforge/templates/actionbar.tmpl:104
+#: ../themes/fusionforge/templates/actionbar.tmpl:102
 msgid "Rename"
 msgstr ""
 
@@ -1682,9 +1682,9 @@
 #: ../themes/default/templates/navbar.tmpl:5
 #: ../themes/default/templates/navbar.tmpl:7
 #: ../themes/fusionforge/templates/actionbar.tmpl:13
-#: ../themes/fusionforge/templates/actionbar.tmpl:23
-#: ../themes/fusionforge/templates/actionbar.tmpl:29
-#: ../themes/fusionforge/templates/actionbar.tmpl:39
+#: ../themes/fusionforge/templates/actionbar.tmpl:21
+#: ../themes/fusionforge/templates/actionbar.tmpl:27
+#: ../themes/fusionforge/templates/actionbar.tmpl:37
 #: ../themes/MonoBook/templates/actionbar.tmpl:12
 #: ../themes/MonoBook/templates/actionbar.tmpl:19
 #: ../themes/MonoBook/templates/actionbar.tmpl:23
@@ -5006,7 +5006,7 @@
 #: ../themes/blog/templates/actionbar.tmpl:15 ../themes/blog/themeinfo.php:69
 #: ../themes/Crao/templates/actionbar.tmpl:4
 #: ../themes/default/templates/actionbar.tmpl:12
-#: ../themes/fusionforge/templates/actionbar.tmpl:50
+#: ../themes/fusionforge/templates/actionbar.tmpl:48
 #: ../themes/MonoBook/templates/actionbar.tmpl:32
 #: ../themes/shamino_com/templates/actionbar.tmpl:5
 #: ../themes/Sidebar/templates/actionbar.tmpl:19
@@ -5015,7 +5015,7 @@
 msgstr "Verander"
 
 #: ../lib/plugin/WatchPage.php:99
-#: ../themes/fusionforge/templates/actionbar.tmpl:115
+#: ../themes/fusionforge/templates/actionbar.tmpl:113
 msgid "Watch Page"
 msgstr ""
 
@@ -7222,7 +7222,7 @@
 #: ../themes/Crao/templates/head.tmpl:37
 #: ../themes/default/templates/actionbar.tmpl:17
 #: ../themes/default/templates/head.tmpl:43
-#: ../themes/fusionforge/templates/actionbar.tmpl:56
+#: ../themes/fusionforge/templates/actionbar.tmpl:54
 #: ../themes/MonoBook/templates/actionbar.tmpl:35
 #: ../themes/MonoBook/templates/info.tmpl:178
 #: ../themes/Portland/templates/actionbar.tmpl:6
@@ -7409,13 +7409,13 @@
 msgstr ""
 
 #: ../themes/blog/themeinfo.php:77
-#: ../themes/fusionforge/templates/actionbar.tmpl:88
+#: ../themes/fusionforge/templates/actionbar.tmpl:86
 #: ../themes/fusionforge/templates/userprefs.tmpl:265
 msgid "Lock"
 msgstr ""
 
 #: ../themes/blog/themeinfo.php:79
-#: ../themes/fusionforge/templates/actionbar.tmpl:86
+#: ../themes/fusionforge/templates/actionbar.tmpl:84
 msgid "Unlock"
 msgstr ""
 
@@ -7429,7 +7429,7 @@
 
 #: ../themes/Crao/templates/actionbar.tmpl:4
 #: ../themes/default/templates/actionbar.tmpl:12
-#: ../themes/fusionforge/templates/actionbar.tmpl:52
+#: ../themes/fusionforge/templates/actionbar.tmpl:50
 #: ../themes/MonoB...
 
[truncated message content]

[phpwiki-checkins] SF.net SVN: phpwiki:[8611] trunk/locale/po/de.po

From: <var...@us...> - 2012-12-06 09:29:35

Revision: 8611
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8611&view=rev
Author:   vargenau
Date:     2012-12-06 09:29:28 +0000 (Thu, 06 Dec 2012)
Log Message:
-----------
?\194?\187%s?\194?\171

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

Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po	2012-12-06 07:13:38 UTC (rev 8610)
+++ trunk/locale/po/de.po	2012-12-06 09:29:28 UTC (rev 8611)
@@ -61,7 +61,7 @@
 #: ../lib/DbSession.php:42
 #, php-format
 msgid "Your WikiDB DB backend “%s” cannot be used for DbSession."
-msgstr "Ihr WikiDB DB backend “%s” wird von DbSession nicht unterstützt."
+msgstr "Ihr WikiDB DB backend »%s« wird von DbSession nicht unterstützt."
 
 #: ../lib/DbSession.php:43
 #, php-format
@@ -727,7 +727,7 @@
 #: ../lib/InlineParser.php:415 ../lib/main.php:801
 #, php-format
 msgid "Illegal character “%s” in page name."
-msgstr "Ungültiges Zeichen “%s” in Seitenname."
+msgstr "Ungültiges Zeichen »%s« in Seitenname."
 
 #: ../lib/InlineParser.php:978
 #, php-format
@@ -2495,7 +2495,7 @@
 #: ../lib/plugin/FileInfo.php:82
 #, php-format
 msgid "File “%s” not found."
-msgstr "Datei “%s” nicht gefunden"
+msgstr "Datei »%s« nicht gefunden"
 
 #: ../lib/plugin/FileInfo.php:96
 msgid ""
@@ -3055,7 +3055,7 @@
 #: ../lib/plugin/ModeratedPage.php:167
 #, php-format
 msgid "“%s” is no ModeratedPage anymore."
-msgstr "“%s” ist keine ModeratierteSeite mehr."
+msgstr "»%s« ist keine ModeratierteSeite mehr."
 
 #: ../lib/plugin/ModeratedPage.php:187
 #, php-format
@@ -3504,12 +3504,12 @@
 #: ../lib/plugin/PhotoAlbum.php:624
 #, php-format
 msgid "Unable to find src=“%s”"
-msgstr "Konnte src=“%s” nicht lesen"
+msgstr "Konnte src=»%s« nicht lesen"
 
 #: ../lib/plugin/PhotoAlbum.php:636
 #, php-format
 msgid "Unable to read src=“%s”"
-msgstr "Konnte src=“%s” nicht lesen"
+msgstr "Konnte src=»%s« nicht lesen"
 
 #: ../lib/plugin/PhpHighlight.php:61
 msgid "PhpHighlight"
@@ -4809,12 +4809,12 @@
 #: ../lib/plugin/TranslateText.php:95
 #, php-format
 msgid "Translate “%s” to “%s” in *%s*"
-msgstr "Übersetze “%s” nach “%s” in *%s*"
+msgstr "Übersetze »%s« nach »%s« in *%s*"
 
 #: ../lib/plugin/TranslateText.php:98
 #, php-format
 msgid "Translate %s to %s in %s"
-msgstr "Übersetze “%s” nach “%s” in %s"
+msgstr "Übersetze »%s« nach »%s« in %s"
 
 #: ../lib/plugin/TranslateText.php:102
 msgid "Thanks for adding this translation!"
@@ -5222,12 +5222,12 @@
 #: ../lib/plugin/WikiAdminChmod.php:77
 #, php-format
 msgid "chmod page “%s” to “%s”."
-msgstr "Berechtigung der Seite “%s” auf “%s” geändert."
+msgstr "Berechtigung der Seite »%s« auf »%s« geändert."
 
 #: ../lib/plugin/WikiAdminChmod.php:80
 #, php-format
 msgid "Couldn't chmod page “%s” to “%s”."
-msgstr "Konnte die Berechtigung der Seite “%s” nicht auf “%s” ändern."
+msgstr "Konnte die Berechtigung der Seite »%s« nicht auf »%s« ändern."
 
 #: ../lib/plugin/WikiAdminChmod.php:84
 msgid "Invalid chmod string"
@@ -5295,17 +5295,17 @@
 #: ../lib/plugin/WikiAdminSetExternal.php:70
 #, php-format
 msgid "Access denied to change page “%s”."
-msgstr "Zugang verweigert um Seite “%s” zu ändern."
+msgstr "Zugang verweigert um Seite »%s« zu ändern."
 
 #: ../lib/plugin/WikiAdminChown.php:82
 #, php-format
 msgid "Change owner of page “%s” to “%s”."
-msgstr "Besitzer der Seite “%s” auf “%s” geändert."
+msgstr "Besitzer der Seite »%s« auf »%s« geändert."
 
 #: ../lib/plugin/WikiAdminChown.php:86
 #, php-format
 msgid "Could not change owner of page “%s” to “%s”."
-msgstr "Konnte den Besitzer der Seite “%s” nicht in “%s” ändern."
+msgstr "Konnte den Besitzer der Seite »%s« nicht in »%s« ändern."
 
 #: ../lib/plugin/WikiAdminChown.php:96 ../lib/plugin/WikiAdminMarkup.php:98
 #: ../lib/plugin/WikiAdminSearchReplace.php:111
@@ -5358,7 +5358,7 @@
 #: ../lib/plugin/WikiAdminDeleteAcl.php:66
 #, php-format
 msgid "ACL deleted for page “%s”"
-msgstr "ACL für Seite “%s” gelöscht."
+msgstr "ACL für Seite »%s« gelöscht."
 
 # Any better translation? The locale/de/pgsrc/PhpWikiSystemverwalten
 # must also be renamed to match what is here.
@@ -5397,12 +5397,12 @@
 #: ../lib/plugin/WikiAdminMarkup.php:84
 #, php-format
 msgid "change page “%s” to markup type “%s”."
-msgstr "Formatierung der Seite “%s” auf “%s” geändert."
+msgstr "Formatierung der Seite »%s« auf »%s« geändert."
 
 #: ../lib/plugin/WikiAdminMarkup.php:88
 #, php-format
 msgid "Couldn't change page “%s” to markup type “%s”."
-msgstr "Konnte die Formatierung der Seite “%s” nicht auf “%s” ändern."
+msgstr "Konnte die Formatierung der Seite »%s« nicht auf »%s« ändern."
 
 # Any better translation? The locale/de/pgsrc/PhpWikiSystemverwalten
 # must also be renamed to match what is here.
@@ -5580,7 +5580,7 @@
 #: ../lib/plugin/WikiAdminRename.php:96 ../lib/plugin/WikiAdminRename.php:111
 #, php-format
 msgid "Renamed page from “%s” to “%s”."
-msgstr "Seite “%s” auf “%s” umbenannt."
+msgstr "Seite »%s« auf »%s« umbenannt."
 
 #: ../lib/plugin/WikiAdminRename.php:105
 #, php-format
@@ -5590,7 +5590,7 @@
 #: ../lib/plugin/WikiAdminRename.php:115 ../lib/plugin/WikiAdminRename.php:119
 #, php-format
 msgid "Couldn't rename page “%s” to “%s”."
-msgstr "Konnte Seite “%s” nicht in “%s” umbenennen."
+msgstr "Konnte Seite »%s« nicht in »%s« umbenennen."
 
 #: ../lib/plugin/WikiAdminRename.php:128
 msgid "One page has been renamed:"
@@ -5668,7 +5668,7 @@
 #: ../lib/plugin/WikiAdminSearchReplace.php:102
 #, php-format
 msgid "Replaced “%s” with “%s” in page “%s”."
-msgstr "“%s” mit “%s” in Seite “%s” ersetzt."
+msgstr "»%s« mit »%s« in Seite »%s« ersetzt."
 
 #: ../lib/plugin/WikiAdminSearchReplace.php:194
 msgid "Warning: The search string cannot be empty!"
@@ -5732,12 +5732,12 @@
 #: ../lib/plugin/WikiAdminSetAcl.php:96
 #, php-format
 msgid "ACL not changed for page “%s”."
-msgstr "ACL für Seite “%s” nicht geändert."
+msgstr "ACL für Seite »%s« nicht geändert."
 
 #: ../lib/plugin/WikiAdminSetAcl.php:100
 #, php-format
 msgid "ACL changed for page “%s”"
-msgstr "ACL für Seite “%s” geändert."
+msgstr "ACL für Seite »%s« geändert."
 
 #: ../lib/plugin/WikiAdminSetAcl.php:102
 #, php-format
@@ -5752,7 +5752,7 @@
 #: ../lib/plugin/WikiAdminSetAcl.php:112
 #, php-format
 msgid "ACL changed for page “%s” from “%s” to “%s”."
-msgstr "ACL für Seite “%s” geändert von “%s” zu “%s”."
+msgstr "ACL für Seite »%s« geändert von »%s« zu »%s«."
 
 #: ../lib/plugin/WikiAdminSetAcl.php:128
 msgid "Invalid ACL"
@@ -8255,7 +8255,7 @@
 #: ../themes/fusionforge/templates/userprefs.tmpl:180
 #, php-format
 msgid "User preferences for user %s"
-msgstr "Einstellungen für Benutzer “%s”"
+msgstr "Einstellungen für Benutzer »%s«"
 
 #: ../themes/default/templates/userprefs.tmpl:124
 msgid "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:[8610] trunk/doc

From: <var...@us...> - 2012-12-06 07:13:45

Revision: 8610
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8610&view=rev
Author:   vargenau
Date:     2012-12-06 07:13:38 +0000 (Thu, 06 Dec 2012)
Log Message:
-----------
charset=utf-8

Modified Paths:
--------------
    trunk/doc/README.foaf
    trunk/doc/README.security

Modified: trunk/doc/README.foaf
===================================================================
--- trunk/doc/README.foaf	2012-12-06 06:52:54 UTC (rev 8609)
+++ trunk/doc/README.foaf	2012-12-06 07:13:38 UTC (rev 8610)
@@ -140,7 +140,7 @@
  		<meta name="Author" content="" />
  		<meta name="Keywords" content="" />
  		<meta name="Description" content="" />
- 		<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+ 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
  		<style type="text/css">
 			table,th,td { border: 1px solid black; }
 		</style>

Modified: trunk/doc/README.security
===================================================================
--- trunk/doc/README.security	2012-12-06 06:52:54 UTC (rev 8609)
+++ trunk/doc/README.security	2012-12-06 07:13:38 UTC (rev 8610)
@@ -162,7 +162,7 @@
   created=1104916186;
   author_id=The%20PhpWiki%20programming%20team;
   markup=2;
-  charset=iso-8859-1
+  charset=utf-8
 Content-Transfer-Encoding: quoted-printable
 
 ~<?plugin ~AppendText ?>
@@ -190,7 +190,7 @@
 create:_ADMIN,_OWNER,Writers,-_SIGNED,-_BOGOUSER,-_AUTHENTICATED;
 list:_EVERY; remove:_ADMIN,_OWNER,-_SIGNED,-_BOGOUSER,-_AUTHENTICATED;
 change:_ADMIN,_OWNER,-_SIGNED,-_BOGOUSER,-_AUTHENTICATED; dump:_EVERY";
-  charset=iso-8859-1
+  charset=utf-8
 Content-Transfer-Encoding: quoted-printable
 
 This page holds the default permissions for all pages

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

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

From: <var...@us...> - 2012-12-06 06:53:00

Revision: 8609
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8609&view=rev
Author:   vargenau
Date:     2012-12-06 06:52:54 +0000 (Thu, 06 Dec 2012)
Log Message:
-----------
Default is utf-8

Modified Paths:
--------------
    trunk/config/config-dist.ini
    trunk/configurator.php

Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini	2012-12-06 06:51:23 UTC (rev 8608)
+++ trunk/config/config-dist.ini	2012-12-06 06:52:54 UTC (rev 8609)
@@ -945,7 +945,7 @@
 ;
 ; If you set DEFAULT_LANGUAGE to the empty string, the users 
 ; preferred language as determined by the browser setting will be used.
-; Japanese requires CHARSET=euc-jp or utf-8, Chinese CHARSET=utf-8
+; Japanese and Chinese require CHARSET=utf-8
 ;DEFAULT_LANGUAGE = en
 
 ; WIKI_PGSRC -- specifies the source for the initial page contents of

Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php	2012-12-06 06:51:23 UTC (rev 8608)
+++ trunk/configurator.php	2012-12-06 06:52:54 UTC (rev 8609)
@@ -1334,7 +1334,7 @@
 </pre>");
 
 $properties["Character Set"] =
-    new _define_optional('CHARSET', 'iso-8859-1');
+    new _define_optional('CHARSET', 'utf-8');
 
 $properties["Ignore Charset Not Supported Warning"] =
     new _define_optional('IGNORE_CHARSET_NOT_SUPPORTED_WARNING');

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8608] trunk/lib/stdlib.php

From: <var...@us...> - 2012-12-06 06:51:29

Revision: 8608
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8608&view=rev
Author:   vargenau
Date:     2012-12-06 06:51:23 +0000 (Thu, 06 Dec 2012)
Log Message:
-----------
Remove commented code

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

Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2012-12-05 19:01:32 UTC (rev 8607)
+++ trunk/lib/stdlib.php	2012-12-06 06:51:23 UTC (rev 8608)
@@ -2296,9 +2296,6 @@
 
 function charset_convert($from, $to, $data)
 {
-    //global $CHARSET;
-    //$wikicharset = strtolower($CHARSET);
-    //$systemcharset = strtolower(get_cfg_var('iconv.internal_encoding')); // 'iso-8859-1';
     if (strtolower($from) == 'utf-8' and strtolower($to) == 'iso-8859-1')
         return utf8_decode($data);
     if (strtolower($to) == 'utf-8' and strtolower($from) == 'iso-8859-1')

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

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

From: <var...@us...> - 2012-12-05 19:01:39

Revision: 8607
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8607&view=rev
Author:   vargenau
Date:     2012-12-05 19:01:32 +0000 (Wed, 05 Dec 2012)
Log Message:
-----------
(defined('FUSIONFORGE') and FUSIONFORGE)

Modified Paths:
--------------
    trunk/lib/EditToolbar.php
    trunk/lib/IniConfig.php
    trunk/lib/MailNotify.php
    trunk/lib/PageList.php
    trunk/lib/PagePerm.php
    trunk/lib/WikiTheme.php
    trunk/lib/WikiUserNew.php
    trunk/lib/loadsave.php
    trunk/lib/main.php

Modified: trunk/lib/EditToolbar.php
===================================================================
--- trunk/lib/EditToolbar.php	2012-12-05 18:19:12 UTC (rev 8606)
+++ trunk/lib/EditToolbar.php	2012-12-05 19:01:32 UTC (rev 8607)
@@ -117,7 +117,7 @@
 
         if (ENABLE_EDIT_TOOLBAR) {
             $username = $request->_user->UserName();
-            if (FUSIONFORGE or DISABLE_MARKUP_WIKIWORD or (!isWikiWord($username))) {
+            if ((defined('FUSIONFORGE') and FUSIONFORGE) or DISABLE_MARKUP_WIKIWORD or (!isWikiWord($username))) {
                 $username = '[[' . $username . ']]';
             }
             $signature = " ––" . $username . " " . CTime();
@@ -305,7 +305,7 @@
             $categories = array();
             while ($p = $pages->next()) {
                 $page = $p->getName();
-                if (FUSIONFORGE) {
+                if ((defined('FUSIONFORGE') and FUSIONFORGE)) {
                     $categories[] = "['$page', '%0A----%0A%5B%5B" . $page . "%5D%5D']";
                 } elseif (DISABLE_MARKUP_WIKIWORD or (!isWikiWord($page))) {
                     $categories[] = "['$page', '%0A%5B" . $page . "%5D']";

Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php	2012-12-05 18:19:12 UTC (rev 8606)
+++ trunk/lib/IniConfig.php	2012-12-05 19:01:32 UTC (rev 8607)
@@ -635,7 +635,7 @@
             . 'WantedPages:WatchPage:WhoIsOnline:WikiAdminSelect');
 
     // The FUSIONFORGE theme omits them
-    if (!FUSIONFORGE) {
+    if (!(defined('FUSIONFORGE') and FUSIONFORGE)) {
         // Add some some action pages depending on configuration
         if (DEBUG) {
             $ActionPages[] = 'DebugInfo';
@@ -726,7 +726,7 @@
     $AllAllowedPlugins[] = 'YouTube';
 
     // The FUSIONFORGE theme omits them
-    if (!FUSIONFORGE) {
+    if (!(defined('FUSIONFORGE') and FUSIONFORGE)) {
         $AllAllowedPlugins[] = 'AnalyseAccessLogSql';
         $AllAllowedPlugins[] = '_AuthInfo';
         $AllAllowedPlugins[] = '_BackendInfo';
@@ -790,7 +790,7 @@
     $AllActionPages[] = 'UserContribs';
 
     // The FUSIONFORGE theme omits them
-    if (!FUSIONFORGE) {
+    if (!(defined('FUSIONFORGE') and FUSIONFORGE)) {
         // Add some some action pages depending on configuration
         if (DEBUG) {
             $AllActionPages[] = 'PhpWikiAdministration/Chmod';
@@ -798,7 +798,7 @@
         $AllActionPages[] = 'PhpWikiAdministration/Markup';
     }
 
-    if (FUSIONFORGE) {
+    if ((defined('FUSIONFORGE') and FUSIONFORGE)) {
         if (ENABLE_EXTERNAL_PAGES) {
             $AllAllowedPlugins[] = 'WikiAdminSetExternal';
             $AllActionPages[] = 'PhpWikiAdministration/SetExternal';
@@ -937,7 +937,7 @@
         define('DEFAULT_LANGUAGE', ''); // detect from client
 
     // FusionForge hack
-    if (!FUSIONFORGE) {
+    if (!(defined('FUSIONFORGE') and FUSIONFORGE)) {
         // Disable update_locale because Zend Debugger crash
         if (!extension_loaded('Zend Debugger')) {
             update_locale(isset($LANG) ? $LANG : DEFAULT_LANGUAGE);

Modified: trunk/lib/MailNotify.php
===================================================================
--- trunk/lib/MailNotify.php	2012-12-05 18:19:12 UTC (rev 8606)
+++ trunk/lib/MailNotify.php	2012-12-05 19:01:32 UTC (rev 8607)
@@ -66,7 +66,7 @@
     function fromId()
     {
         global $request;
-        if (FUSIONFORGE) {
+        if (defined('FUSIONFORGE') and FUSIONFORGE) {
             return $request->_user->getId();
         } else {
             return $request->_user->getId() . '@' . $request->get('REMOTE_HOST');
@@ -84,7 +84,7 @@
         global $request;
 
         // Disable verification of emails for corporate env.
-        if (FUSIONFORGE) {
+        if (defined('FUSIONFORGE') and FUSIONFORGE) {
             $doverify = false;
         }
 
@@ -193,7 +193,7 @@
         $encoded_subject = $this->subject_encode($subject);
         $emails = $this->emails;
         // Do not send if modification is from FusionForge admin
-        if (FUSIONFORGE and ($this->fromId() == ADMIN_USER)) {
+        if ((defined('FUSIONFORGE') and FUSIONFORGE) and ($this->fromId() == ADMIN_USER)) {
             return true;
         }
         if (!$notice) {

Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php	2012-12-05 18:19:12 UTC (rev 8606)
+++ trunk/lib/PageList.php	2012-12-05 19:01:32 UTC (rev 8607)
@@ -1368,7 +1368,7 @@
                 trigger_error(sprintf("%s: Bad column", $column), E_USER_NOTICE);
             return false;
         }
-        if (!FUSIONFORGE) {
+        if (!(defined('FUSIONFORGE') and FUSIONFORGE)) {
             // FIXME: anon users might rate and see ratings also.
             // Defer this logic to the plugin.
             if ($column == 'rating' and !$GLOBALS['request']->_user->isSignedIn()) {

Modified: trunk/lib/PagePerm.php
===================================================================
--- trunk/lib/PagePerm.php	2012-12-05 18:19:12 UTC (rev 8606)
+++ trunk/lib/PagePerm.php	2012-12-05 19:01:32 UTC (rev 8607)
@@ -239,7 +239,7 @@
     $page = $request->getPage($pagename);
 
     // Exceptions:
-    if (FUSIONFORGE) {
+    if (defined('FUSIONFORGE') and FUSIONFORGE) {
         if ($pagename != '.' && isset($request->_user->_is_external) && $request->_user->_is_external && !$page->get('external')) {
             $permcache[$pagename][$access] = 0;
             return 0;

Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php	2012-12-05 18:19:12 UTC (rev 8606)
+++ trunk/lib/WikiTheme.php	2012-12-05 19:01:32 UTC (rev 8607)
@@ -215,7 +215,7 @@
             return;
         }
         $this->addMoreHeaders(JavaScript('', array('src' => $this->_findData("wikicommon.js"))));
-        if (!FUSIONFORGE) {
+        if (!(defined('FUSIONFORGE') and FUSIONFORGE)) {
             // FusionForge already loads this
             $this->addMoreHeaders(JavaScript('', array('src' => $this->_findData("sortable.js"))));
         }

Modified: trunk/lib/WikiUserNew.php
===================================================================
--- trunk/lib/WikiUserNew.php	2012-12-05 18:19:12 UTC (rev 8606)
+++ trunk/lib/WikiUserNew.php	2012-12-05 19:01:32 UTC (rev 8607)
@@ -595,7 +595,7 @@
     {
         if (!$userid) $userid = $this->_userid;
         if (!$userid) return false;
-        if (FUSIONFORGE) {
+        if (defined('FUSIONFORGE') and FUSIONFORGE) {
             return true;
         }
         return preg_match("/^[\-\w\.@ ]+$/U", $userid) and strlen($userid) < 32;
@@ -1764,7 +1764,7 @@
     function get($name)
     {
         // get e-mail address from FusionForge
-        if (FUSIONFORGE && session_loggedin()) {
+        if ((defined('FUSIONFORGE') and FUSIONFORGE) && session_loggedin()) {
             $user = session_get_user();
             return $user->getEmail();
         } else {
@@ -1775,7 +1775,7 @@
     function sanify($value)
     {
         // e-mail address is already checked by FusionForge
-        if (FUSIONFORGE) {
+        if (defined('FUSIONFORGE') and FUSIONFORGE) {
             return $value;
         }
         // check for valid email address
@@ -1802,7 +1802,7 @@
     function update($value)
     {
         // e-mail address is already checked by FusionForge
-        if (FUSIONFORGE) {
+        if (defined('FUSIONFORGE') and FUSIONFORGE) {
             return;
         }
         if (!empty($this->_init)) {
@@ -1985,7 +1985,7 @@
 
         // This should be probably be done with $customUserPreferenceColumns
         // For now, we use FUSIONFORGE define
-        if (FUSIONFORGE) {
+        if (defined('FUSIONFORGE') and FUSIONFORGE) {
             $fusionforgeprefs = array(
                 'pageTrail' => new _UserPreference_bool(),
                 'diffMenuItem' => new _UserPreference_bool(),
@@ -2177,7 +2177,7 @@
             }
         }
 
-        if (FUSIONFORGE) {
+        if (defined('FUSIONFORGE') and FUSIONFORGE) {
             // Merge current notifyPages with notifyPagesAll
             // notifyPages are pages to notify in the current project
             // while $notifyPagesAll is used to store all the monitored pages.
@@ -2227,7 +2227,7 @@
             }
         }
 
-        if (FUSIONFORGE) {
+        if (defined('FUSIONFORGE') and FUSIONFORGE) {
             // Restore notifyPages from notifyPagesAll
             // notifyPages are pages to notify in the current project
             // while $notifyPagesAll is used to store all the monitored pages.

Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php	2012-12-05 18:19:12 UTC (rev 8606)
+++ trunk/lib/loadsave.php	2012-12-05 19:01:32 UTC (rev 8607)
@@ -1527,7 +1527,7 @@
     // Ensure that all mandatory pages are loaded
     $finder = new FileFinder;
 
-    if (!FUSIONFORGE) {
+    if (!(defined('FUSIONFORGE') and FUSIONFORGE)) {
         $mandatory = explode(':', 'SandBox:Template/Category:Template/Talk:SpecialPages:CategoryCategory:CategoryActionPage:Help/OldTextFormattingRules:Help/TextFormattingRules:PhpWikiAdministration');
     } elseif (WIKI_NAME == "help") {
         $mandatory = explode(':', 'SandBox:Template/Category:Template/Talk:SpecialPages:CategoryCategory:CategoryActionPage:Help/TextFormattingRules:PhpWikiAdministration');

Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php	2012-12-05 18:19:12 UTC (rev 8606)
+++ trunk/lib/main.php	2012-12-05 19:01:32 UTC (rev 8607)
@@ -1482,7 +1482,7 @@
     $request->finish();
 }
 
-if ((!FUSIONFORGE) || (forge_get_config('installation_environment') != 'production')) {
+if ((!(defined('FUSIONFORGE') and FUSIONFORGE)) || (forge_get_config('installation_environment') != 'production')) {
     if (defined('E_STRICT') and (E_ALL & E_STRICT)) // strict php5?
         error_reporting(E_ALL & ~E_STRICT); // exclude E_STRICT
     else

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

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

From: <var...@us...> - 2012-12-05 18:19:22

Revision: 8606
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8606&view=rev
Author:   vargenau
Date:     2012-12-05 18:19:12 +0000 (Wed, 05 Dec 2012)
Log Message:
-----------
Remove unused

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

Modified: trunk/lib/MailNotify.php
===================================================================
--- trunk/lib/MailNotify.php	2012-12-05 18:09:33 UTC (rev 8605)
+++ trunk/lib/MailNotify.php	2012-12-05 18:19:12 UTC (rev 8606)
@@ -127,7 +127,6 @@
         foreach ($notify as $page => $users) {
             if (glob_match($page, $this->pagename)) {
                 $curuser = $request->getUser();
-                $curusername = $curuser->UserName();
                 $curuserprefs = $curuser->getPreferences();
                 $curuserprefsemail = $curuserprefs->get('email');
                 $ownModifications = $curuserprefs->get('ownModifications');
@@ -174,13 +173,6 @@
                                 $userids[] = $userid;
                             }
                         }
-                        // ignore verification
-                        /*
-                        if (DEBUG) {
-                            if (!in_array($user['email'], $emails))
-                                $emails[] = $user['email'];
-                        }
-                        */
                     }
                 }
             }
@@ -321,7 +313,7 @@
     /**
      * Support mass rename / remove (TBD)
      */
-    function sendPageRenameNotification($to, &$meta)
+    function sendPageRenameNotification($to)
     {
         $pagename = $this->pagename;
         $editedby = sprintf(_("Renamed by: %s"), $this->fromId());
@@ -376,11 +368,8 @@
             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;
-                    $this->sendPageRenameNotification($new_pagename, $meta);
+                    $this->sendPageRenameNotification($new_pagename);
                 }
             }
         }
@@ -437,20 +426,16 @@
         }
         // upgrade the user
         $userid = $data['userid'];
-        $email = $data['email'];
         $u = $request->getUser();
         if ($u->UserName() == $userid) { // lucky: current user (session)
-            $prefs = $u->getPreferences();
             $request->_user->_level = WIKIAUTH_USER;
             $request->_prefs->set('emailVerified', true);
         } else { // not current user
             if (ENABLE_USER_NEW) {
                 $u = WikiUser($userid);
                 $u->getPreferences();
-                $prefs = &$u->_prefs;
             } else {
                 $u = new WikiUser($request, $userid);
-                $prefs = $u->getPreferences();
             }
             $u->_level = WIKIAUTH_USER;
             $request->setUser($u);

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

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

From: <var...@us...> - 2012-12-05 18:09:44

Revision: 8605
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8605&view=rev
Author:   vargenau
Date:     2012-12-05 18:09:33 +0000 (Wed, 05 Dec 2012)
Log Message:
-----------
Consistent returns

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

Modified: trunk/lib/MailNotify.php
===================================================================
--- trunk/lib/MailNotify.php	2012-12-05 15:36:45 UTC (rev 8604)
+++ trunk/lib/MailNotify.php	2012-12-05 18:09:33 UTC (rev 8605)
@@ -126,8 +126,6 @@
         $userids = array();
         foreach ($notify as $page => $users) {
             if (glob_match($page, $this->pagename)) {
-
-                global $request;
                 $curuser = $request->getUser();
                 $curusername = $curuser->UserName();
                 $curuserprefs = $curuser->getPreferences();
@@ -204,7 +202,7 @@
         $emails = $this->emails;
         // Do not send if modification is from FusionForge admin
         if (FUSIONFORGE and ($this->fromId() == ADMIN_USER)) {
-            return;
+            return true;
         }
         if (!$notice) {
             $notice = _("PageChange Notification of %s");
@@ -338,7 +336,6 @@
      */
     function onChangePage(&$wikidb, &$wikitext, $version, &$meta)
     {
-        $result = true;
         if (!isa($GLOBALS['request'], 'MockRequest')) {
             $notify = $wikidb->get('notify');
             /* Generate notification emails? */
@@ -348,11 +345,10 @@
                 // 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->sendPageChangeNotification($wikitext, $version, $meta);
                 }
             }
         }
-        return $result;
     }
 
     function onDeletePage(&$wikidb, $pagename)
@@ -375,7 +371,6 @@
 
     function onRenamePage(&$wikidb, $oldpage, $new_pagename)
     {
-        $result = true;
         if (!isa($GLOBALS['request'], 'MockRequest')) {
             $notify = $wikidb->get('notify');
             if (!empty($notify) and is_array($notify)) {
@@ -385,7 +380,7 @@
                     $current = $newpage->getCurrentRevision();
                     $meta = $current->_data;
                     $this->pagename = $oldpage;
-                    $result = $this->sendPageRenameNotification($new_pagename, $meta);
+                    $this->sendPageRenameNotification($new_pagename, $meta);
                 }
             }
         }
@@ -397,8 +392,9 @@
      */
     function sendEmailConfirmation($email, $userid)
     {
+        global $request;
         $id = rand_ascii_readable(16);
-        $wikidb = $GLOBALS['request']->getDbh();
+        $wikidb = $request->getDbh();
         $data = $wikidb->get('ConfirmEmail');
         while (!empty($data[$id])) { // id collision
             $id = rand_ascii_readable(16);

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8604] trunk/themes/fusionforge/templates

From: <var...@us...> - 2012-12-05 15:36:54

Revision: 8604
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8604&view=rev
Author:   vargenau
Date:     2012-12-05 15:36:45 +0000 (Wed, 05 Dec 2012)
Log Message:
-----------
Remove title

Modified Paths:
--------------
    trunk/themes/fusionforge/templates/actionbar.tmpl
    trunk/themes/fusionforge/templates/navbar.tmpl

Modified: trunk/themes/fusionforge/templates/actionbar.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/actionbar.tmpl	2012-12-05 14:16:30 UTC (rev 8603)
+++ trunk/themes/fusionforge/templates/actionbar.tmpl	2012-12-05 15:36:45 UTC (rev 8604)
@@ -13,9 +13,7 @@
     <?php if (!string_ends_with($pagename, SUBPAGE_SEPARATOR._("Discussion"))) { ?>
     <?php $talk = new WikiPageName('Talk:'.$pagename); ?>
       <li class="bold">
-      <?php echo Button(array(),
-                       $isActionPage ? _("Action Page") : _("Page"),
-                       $talk->getParent(), array('title' => "Page")) ?>
+      <?php echo Button(array(), $isActionPage ? _("Action Page") : _("Page"), $talk->getParent()) ?>
       </li>
       <?php if (!$isActionPage) { ?>
         <?php if ($dbh->isWikiPage($talk->getName())) { ?>
@@ -33,10 +31,10 @@
     <?php } else {
       $talk = new WikiPageName($pagename); ?>
       <li>
-      <?php echo Button(array(),$isActionPage ? _("Action Page") : _("Page"), $talk->getParent(), array('title' => "View the page")) ?>
+      <?php echo Button(array(), $isActionPage ? _("Action Page") : _("Page"), $talk->getParent()) ?>
       </li>
       <li class="bold">
-      <?php echo Button(array(),_("Discussion"), $talk->getName()) ?>
+      <?php echo Button(array(), _("Discussion"), $talk->getName()) ?>
       </li>
     <?php } ?>
   </ul>

Modified: trunk/themes/fusionforge/templates/navbar.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/navbar.tmpl	2012-12-05 14:16:30 UTC (rev 8603)
+++ trunk/themes/fusionforge/templates/navbar.tmpl	2012-12-05 15:36:45 UTC (rev 8604)
@@ -4,25 +4,25 @@
 $username = $user->UserName();
 ?>
 
-   <li class="submenu"><?php echo WikiLink(__("HomePage"), "", _("Home Page")) ?></li>
-   <li class="submenu"><?php echo WikiLink(__("RecentChanges"), "", _("Recent Changes")) ?></li>
-   <li class="submenu"><?php echo WikiLink(__("SpecialPages"), "", _("Special Pages")) ?></li>
-   <li class="submenu"><?php echo WikiLink(__("FindPage"), "", _("Search")) ?></li>
+   <li class="submenu"><?php echo Button(array(), _("Home Page"), __("HomePage")) ?></li>
+   <li class="submenu"><?php echo Button(array(), _("Recent Changes"), __("RecentChanges")) ?></li>
+   <li class="submenu"><?php echo Button(array(), _("Special Pages"), __("SpecialPages")) ?></li>
+   <li class="submenu"><?php echo Button(array(), _("Search"), __("FindPage")) ?></li>
    <?php if ($curuserprefs->get('randomPageMenuItem')) { ?>
-     <li class="submenu"><?php echo WikiLink(__("RandomPage"), "", _("Random Page")) ?></li>
+     <li class="submenu"><?php echo Button(array(), _("Random Page"), __("RandomPage")) ?></li>
    <?php } ?>
    <?php if ($curuserprefs->get('likePagesMenuItem')) { ?>
-     <li class="submenu"><?php echo Button(array('action'=>__("LikePages")), _("Like Pages"),$page->getName()) ?></li>
+     <li class="submenu"><?php echo Button(array('action'=>__("LikePages")), _("Like Pages"), $page->getName()) ?></li>
    <?php } ?>
    <?php if (!empty($user) && $user->isSignedIn()) { ?>
-     <li class="submenu"><?php echo WikiLink(__("UpLoad"), "", _("Upload File")) ?></li>
+     <li class="submenu"><?php echo Button(array(), _("Upload File"), __("UpLoad")) ?></li>
    <?php } ?>
    <?php if (!empty($user) && $user->isAdmin()) { ?>
-     <li class="submenu"><?php echo WikiLink(__("PhpWikiAdministration"), "", _("Wiki Admin")) ?></li>
+     <li class="submenu"><?php echo Button(array(), _("Wiki Admin"), __("PhpWikiAdministration")) ?></li>
    <?php } ?>
    <?php if (!empty($user) && $user->isSignedIn()) { ?>
      <?php if ($dbh->isWikiPage($username)) { ?>
-       <li class="submenu"><?php echo WikiLink($username, "", _("My User Page")) ?></li>
+       <li class="submenu"><?php echo Button(array(), _("My User Page"), $username) ?></li>
      <?php } ?>
-     <li class="submenu"><?php echo WikiLink(__("UserPreferences"), "", _("User Preferences")) ?></li>
+     <li class="submenu"><?php echo Button(array(), _("User Preferences"), __("UserPreferences")) ?></li>
    <?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:[8603] trunk/lib/plugin/SystemInfo.php

From: <var...@us...> - 2012-12-05 14:16:41

Revision: 8603
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8603&view=rev
Author:   vargenau
Date:     2012-12-05 14:16:30 +0000 (Wed, 05 Dec 2012)
Log Message:
-----------
Revert wrong smart quotes

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

Modified: trunk/lib/plugin/SystemInfo.php
===================================================================
--- trunk/lib/plugin/SystemInfo.php	2012-12-04 18:15:38 UTC (rev 8602)
+++ trunk/lib/plugin/SystemInfo.php	2012-12-05 14:16:30 UTC (rev 8603)
@@ -507,7 +507,7 @@
         $args['seperator'] = ' ';
         $availableargs = // name => callback + 0 args
             array('appname' => create_function('', "return 'PhpWiki';"),
-                'version' => create_function('', "return sprintf(“%s”, PHPWIKI_VERSION);"),
+                'version' => create_function('', "return sprintf('%s', PHPWIKI_VERSION);"),
                 'LANG' => create_function('', 'return $GLOBALS["LANG"];'),
                 'LC_ALL' => create_function('', 'return setlocale(LC_ALL, 0);'),
                 'current_language' => create_function('', 'return $GLOBALS["LANG"];'),

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8602] trunk/pgsrc/Help%2FPhotoAlbumPlugin

From: <var...@us...> - 2012-12-04 18:15:45

Revision: 8602
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8602&view=rev
Author:   vargenau
Date:     2012-12-04 18:15:38 +0000 (Tue, 04 Dec 2012)
Log Message:
-----------
Use Mediawiki table for arguments

Modified Paths:
--------------
    trunk/pgsrc/Help%2FPhotoAlbumPlugin

Modified: trunk/pgsrc/Help%2FPhotoAlbumPlugin
===================================================================
--- trunk/pgsrc/Help%2FPhotoAlbumPlugin	2012-12-04 17:20:40 UTC (rev 8601)
+++ trunk/pgsrc/Help%2FPhotoAlbumPlugin	2012-12-04 18:15:38 UTC (rev 8602)
@@ -1,4 +1,4 @@
-Date: Mon,  3 Dec 2012 18:41:07 +0000
+Date: Tue,  4 Dec 2012 19:11:39 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FPhotoAlbumPlugin;
@@ -29,80 +29,111 @@
 
 //Only the ='src'= parameter is required.//
 
-*src*:
-  Url or local path to a CSV textfile which separates filename and
-  description of each photo. Photos listed in the text file have to be in same
-  directory as the file. Descriptions are optional.
-  If the the local path points to a directory, is relative from PHPWIKI_DIR,
-  and the main script is in PHPWIKI_DIR, weblocation must not be given, and
-  all pictures from this directory are displayed.
+{| class="bordered"
+|-
+! Argument
+! Description
+! Default value
+|-
+| **src**
+|
+Url or local path to a CSV textfile which separates filename and
+description of each photo. Photos listed in the text file have to be in same
+directory as the file. Descriptions are optional.
 
-*url*:
-  defines the the webpath to the srcdir directory (formerly called weblocation)
+If the the local path points to a directory, is relative from PHPWIKI_DIR,
+and the main script is in PHPWIKI_DIR, weblocation must not be given, and
+all pictures from this directory are displayed.
+|
+|-
+| **url**
+| Defines the the webpath to the srcdir directory (formerly called weblocation)
+|
+|-
+| **mode**
+|
+Specifies how the images are arranged.
+* "normal" - Normal table which shows photos full-size
+* "thumbs" - WinXP thumbnail style
+* "tiles"  - WinXP tiles style
+* "list"   - WinXP list style
+* "slide"  - slideshow mode, needs Javascript on client
+|
+|-
+| **showdesc**
+|
+* "none"   - No descriptions next to photos
+* "name"   - Only filename shown
+* "desc"   - Only description (from textfile) shown
+* "both"   - If no description found, then filename will be used
+|
+|-
+| **link**
+|
+true or false
 
-*mode*:
-  Specifies how the images are arranged.
+If true, each image will be hyperlinked to a page where the single
+photo will be shown full-size. Only works when mode != 'normal'
+|
+|-
+| **align**
+| center, right or left
+| center
+|-
+| **desc**
+| Display any descriptions given in the text file
+| true
+|-
+| **sort**
+| Sort images by file name
+| By default the order in the text file is followed
+|-
+| **bgcolor**
+| cell bgcolor
+| #eae8e8 (lightgrey)
+|-
+| **hlcolor**
+| highlight color
+| #c0c0ff (lightblue)
+|-
+| **height**, **width**
+|
+Height and width are calculated compared to original metrics
+retrieved by [php-function:getimagesize] and can be absolute (50px)
+or a percentage (e.g. "50%").
+|
+|-
+| **attrib**
+|
+attrib arg allows multiple attributes: attrib=sort,nowrap,alt
+'sort' sorts alphabetically, 'nowrap' for cells, 'alt' to use
+descs instead of filenames in image ALT-tags
+|
+|-
+| **cellwidth**
+|
+cell (auto|equal|image|75|100%)
 
-  * "normal" - Normal table which shows photos full-size
-  * "thumbs" - WinXP thumbnail style
-  * "tiles"  - WinXP tiles style
-  * "list"   - WinXP list style
-  * "slide"  - slideshow mode, needs javascript on client
+Width of cells in table. Either absolute value in pixels, HTML
+style percentage, "auto" (no special action), "equal" (where
+all columns are equally sized) or "image" (take height and
+width of the photo in that cell).
+|
+|-
+| **tablewidth**
+|
+table (75|100%)
+|
+|-
+| **p**
+| "displaythissinglephoto.jpg" only
+|
+|-
+| **h**
+| "highlightcolorofthisphoto.jpg" only
+|
+|}
 
-*showdesc*:
-  "none"   - No descriptions next to photos %%%
-  "name"   - Only filename shown %%%
-  "desc"   - Only description (from textfile) shown %%%
-  "both"   - If no description found, then filename will be used %%%
-
-*link*:
-  true or false
-  If true, each image will be hyperlinked to a page where the single
-  photo will be shown full-size. Only works when mode != 'normal'
-
-*align*:
-  center|right|left. Default is ='center'=.
-
-*desc*:
-  Display any descriptions given in the text file. Default is true.
-
-*sort*:
-  Sort images by file name. By default the order in the text file is
-  followed.
-
-*bgcolor*:
-  Default: #eae8e8  cell bgcolor (lightgrey)
-
-*hlcolor*:
-  Default: #c0c0ff  highlight color (lightblue)
-
-*height*, *width*:
-  Height and width are calculated compared to original metrics
-  retrieved by [php-function:getimagesize] and can be absolute (50px)
-  or a percentage (e.g. "50%").
-
-*attrib*:
-  attrib arg allows multiple attributes: attrib=sort,nowrap,alt
-  'sort' sorts alphabetically, 'nowrap' for cells, 'alt' to use
-  descs instead of filenames in image ALT-tags
-
-*cellwidth*:
-  cell (auto|equal|image|75|100%)
-
-  Width of cells in table. Either absolute value in pixels, HTML
-  style percentage, "auto" (no special action), "equal" (where
-  all columns are equally sized) or "image" (take height and
-  width of the photo in that cell).
-
-*tablewidth*: (Optional)
-  table (75|100%)
-
-*p*:    (Optional)
-  "displaythissinglephoto.jpg" only
-
-*h*: (Optional)
-  "highlightcolorofthisphoto.jpg" only
-
 == Examples ==
 
 === Text 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:[8601] trunk/themes/default/templates/login.tmpl

From: <var...@us...> - 2012-12-04 17:20:51

Revision: 8601
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8601&view=rev
Author:   vargenau
Date:     2012-12-04 17:20:40 +0000 (Tue, 04 Dec 2012)
Log Message:
-----------
PHP source code is utf-8

Modified Paths:
--------------
    trunk/themes/default/templates/login.tmpl

Modified: trunk/themes/default/templates/login.tmpl
===================================================================
--- trunk/themes/default/templates/login.tmpl	2012-12-04 17:02:12 UTC (rev 8600)
+++ trunk/themes/default/templates/login.tmpl	2012-12-04 17:20:40 UTC (rev 8601)
@@ -36,12 +36,12 @@
 }
 if (ALLOW_BOGO_LOGIN && $require_level <= WIKIAUTH_BOGO) {
   require_once("lib/BlockParser.php");
-  // This iso-8859-1 sample covers French, Spanish, Italian, German, and probably others
+  // This sample covers French, Spanish, Italian, German, and probably others
   $examplechars = htmlentities("ÀñíçéàÖãæôßøü", ENT_QUOTES, $charset);
   // Japanese login requires utf-8 and ALLOW_NONWIKIWORD_LOGINS
   if (($charset == 'utf-8') && defined('ALLOW_NONWIKIWORD_LOGINS') && ALLOW_NONWIKIWORD_LOGINS) {
-    //sample Japanese login name in unicode
-    $examplechars = $examplechars . "&#22825;&#36947;&#12354;&#12363;&#12397;";
+    // sample Japanese login name
+    $examplechars = $examplechars . "天道あかね";
   }
   $t = asXML(TransformText(_("You may sign in using any [[Help:AddingPages|WikiWord]] as a user id. (Any characters in %s etc. may be used too). The user id will be used as a link in RecentChanges to your home page."), 2.0, true));
   if (substr_count($t,"%s") == 1) {

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

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

From: <var...@us...> - 2012-12-04 17:02:21

Revision: 8600
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8600&view=rev
Author:   vargenau
Date:     2012-12-04 17:02:12 +0000 (Tue, 04 Dec 2012)
Log Message:
-----------
Fix link to WikiWord

Modified Paths:
--------------
    trunk/locale/de/LC_MESSAGES/phpwiki.mo
    trunk/locale/de/LC_MESSAGES/phpwiki.php
    trunk/locale/es/LC_MESSAGES/phpwiki.mo
    trunk/locale/fr/LC_MESSAGES/phpwiki.mo
    trunk/locale/fr/LC_MESSAGES/phpwiki.php
    trunk/locale/it/LC_MESSAGES/phpwiki.mo
    trunk/locale/ja/LC_MESSAGES/phpwiki.mo
    trunk/locale/nl/LC_MESSAGES/phpwiki.mo
    trunk/locale/po/de.po
    trunk/locale/po/es.po
    trunk/locale/po/fr.po
    trunk/locale/po/it.po
    trunk/locale/po/ja.po
    trunk/locale/po/nl.po
    trunk/locale/po/phpwiki.pot
    trunk/locale/po/sv.po
    trunk/locale/po/zh.po
    trunk/locale/sv/LC_MESSAGES/phpwiki.mo
    trunk/locale/zh/LC_MESSAGES/phpwiki.mo
    trunk/locale/zh/LC_MESSAGES/phpwiki.php
    trunk/themes/default/templates/login.tmpl

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

Modified: trunk/locale/de/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/de/LC_MESSAGES/phpwiki.php	2012-12-04 16:56:36 UTC (rev 8599)
+++ trunk/locale/de/LC_MESSAGES/phpwiki.php	2012-12-04 17:02:12 UTC (rev 8600)
@@ -1194,7 +1194,7 @@
 $locale["You can personalize various settings in %s."] = "Sie können einige Einstellungen in %s individuell gestalten.";
 $locale["You forgot to set ENCRYPTED_PASSWD to true. Please update your config/config.ini"] = "Sie haben vergessen ENCRYPTED_PASSWD auf true zu stellen. Bitte aktualisieren Sie config/config.ini";
 $locale["You have not made any changes so no new version has been saved."] = "Sie haben keine Änderungen vorgenommen, deshalb konnte keine neue Version gespeichert werden.";
-$locale["You may sign in using any [WikiWord|AddingPages] as a user id. (Any characters in %s etc. may be used too). The user id will be used as a link in RecentChanges to your home page."] = "Sie können sich mit jedem gewünschten [WikiWort|SeitenErzeugen] als Benutzernamen ins Wiki eintragen. (Auch %s u. deutsche Umlaute sind zulässig). Der Benutzername wird in NeuesteÄnderungen als Link auf Ihre Homepage verwendet.";
+$locale["You may sign in using any [[Help:AddingPages|WikiWord]] as a user id. (Any characters in %s etc. may be used too). The user id will be used as a link in RecentChanges to your home page."] = "Sie können sich mit jedem gewünschten [WikiWort|SeitenErzeugen] als Benutzernamen ins Wiki eintragen. (Auch %s u. deutsche Umlaute sind zulässig). Der Benutzername wird in NeuesteÄnderungen als Link auf Ihre Homepage verwendet.";
 $locale["You must be an administrator to %s."] = "Sie müssen Administratorrechte haben %s.";
 $locale["You must be an administrator to use this plugin."] = "Sie müssen Administratorrechte haben, um dieses Zusatzprogramm zu benutzen.";
 $locale["You must be logged in to view ratings."] = "Sie müssen sich anmelden um die Bewertungen zu sehen.";

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-12-04 16:56:36 UTC (rev 8599)
+++ trunk/locale/fr/LC_MESSAGES/phpwiki.php	2012-12-04 17:02:12 UTC (rev 8600)
@@ -1246,7 +1246,7 @@
 $locale["You forgot to set ENCRYPTED_PASSWD to true. Please update your config/config.ini"] = "Vous avez oublié de mettre ENCRYPTED_PASSWD à true. Veuillez éditer votre config/config.ini";
 $locale["You have not made any changes so no new version has been saved."] = "Vous n'avez effectué aucun changement, aucune nouvelle version n'a donc été enregistrée.";
 $locale["You have to define PHPWEATHER_BASE_DIR before use. (config/config.ini)"] = "Vous devez définir PHPWEATHER_BASE_DIR avant de l'utiliser (config/config.ini)";
-$locale["You may sign in using any [WikiWord|AddingPages] as a user id. (Any characters in %s etc. may be used too). The user id will be used as a link in RecentChanges to your home page."] = "Vous pouvez vous inscrire en utilisant n'importe quel WikiMot comme identifiant utilisateur (ÀÖØöøÿßö peuvent être utilisés). L'identifiant sera utilisé comme lien vers votre PagePersonnelle dans DernièresModifs.";
+$locale["You may sign in using any [[Help:AddingPages|WikiWord]] as a user id. (Any characters in %s etc. may be used too). The user id will be used as a link in RecentChanges to your home page."] = "Vous pouvez vous inscrire en utilisant n'importe quel WikiMot comme identifiant utilisateur (ÀÖØöøÿßö peuvent être utilisés). L'identifiant sera utilisé comme lien vers votre PagePersonnelle dans DernièresModifs.";
 $locale["You must be an administrator to %s."] = "Vous devez être un administrateur pour %s.";
 $locale["You must be an administrator to use this plugin."] = "Vous devez être un administrateur pour utiliser ce plugin.";
 $locale["You must be logged in to view ratings."] = "Vous devez vous identifier pour voir les évaluations.";

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-12-04 16:56:36 UTC (rev 8599)
+++ trunk/locale/po/de.po	2012-12-04 17:02:12 UTC (rev 8600)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-04 14:25+0100\n"
+"POT-Creation-Date: 2012-12-04 17:59+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."
@@ -8038,7 +8038,7 @@
 #: ../themes/default/templates/login.tmpl:46
 #, php-format
 msgid ""
-"You may sign in using any [WikiWord|AddingPages] as a user id. (Any "
+"You may sign in using any [[Help:AddingPages|WikiWord]] as a user id. (Any "
 "characters in %s etc. may be used too). The user id will be used as a link "
 "in RecentChanges to your home page."
 msgstr ""

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2012-12-04 16:56:36 UTC (rev 8599)
+++ trunk/locale/po/es.po	2012-12-04 17:02:12 UTC (rev 8600)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-04 14:25+0100\n"
+"POT-Creation-Date: 2012-12-04 17:59+0100\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -7870,7 +7870,7 @@
 #: ../themes/default/templates/login.tmpl:46
 #, php-format
 msgid ""
-"You may sign in using any [WikiWord|AddingPages] as a user id. (Any "
+"You may sign in using any [[Help:AddingPages|WikiWord]] as a user id. (Any "
 "characters in %s etc. may be used too). The user id will be used as a link "
 "in RecentChanges to your home page."
 msgstr ""

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2012-12-04 16:56:36 UTC (rev 8599)
+++ trunk/locale/po/fr.po	2012-12-04 17:02:12 UTC (rev 8600)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-04 14:25+0100\n"
+"POT-Creation-Date: 2012-12-04 17:59+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."
@@ -7939,7 +7939,7 @@
 #: ../themes/default/templates/login.tmpl:46
 #, php-format
 msgid ""
-"You may sign in using any [WikiWord|AddingPages] as a user id. (Any "
+"You may sign in using any [[Help:AddingPages|WikiWord]] as a user id. (Any "
 "characters in %s etc. may be used too). The user id will be used as a link "
 "in RecentChanges to your home page."
 msgstr ""

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2012-12-04 16:56:36 UTC (rev 8599)
+++ trunk/locale/po/it.po	2012-12-04 17:02:12 UTC (rev 8600)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-04 14:25+0100\n"
+"POT-Creation-Date: 2012-12-04 17:59+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"
@@ -7816,7 +7816,7 @@
 #: ../themes/default/templates/login.tmpl:46
 #, php-format
 msgid ""
-"You may sign in using any [WikiWord|AddingPages] as a user id. (Any "
+"You may sign in using any [[Help:AddingPages|WikiWord]] as a user id. (Any "
 "characters in %s etc. may be used too). The user id will be used as a link "
 "in RecentChanges to your home page."
 msgstr ""

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2012-12-04 16:56:36 UTC (rev 8599)
+++ trunk/locale/po/ja.po	2012-12-04 17:02:12 UTC (rev 8600)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-04 14:25+0100\n"
+"POT-Creation-Date: 2012-12-04 17:59+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"
@@ -7980,7 +7980,7 @@
 #: ../themes/default/templates/login.tmpl:46
 #, php-format
 msgid ""
-"You may sign in using any [WikiWord|AddingPages] as a user id. (Any "
+"You may sign in using any [[Help:AddingPages|WikiWord]] as a user id. (Any "
 "characters in %s etc. may be used too). The user id will be used as a link "
 "in RecentChanges to your home page."
 msgstr ""

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2012-12-04 16:56:36 UTC (rev 8599)
+++ trunk/locale/po/nl.po	2012-12-04 17:02:12 UTC (rev 8600)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-04 14:25+0100\n"
+"POT-Creation-Date: 2012-12-04 17:59+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"
@@ -7803,7 +7803,7 @@
 #: ../themes/default/templates/login.tmpl:46
 #, php-format
 msgid ""
-"You may sign in using any [WikiWord|AddingPages] as a user id. (Any "
+"You may sign in using any [[Help:AddingPages|WikiWord]] as a user id. (Any "
 "characters in %s etc. may be used too). The user id will be used as a link "
 "in RecentChanges to your home page."
 msgstr ""

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2012-12-04 16:56:36 UTC (rev 8599)
+++ trunk/locale/po/phpwiki.pot	2012-12-04 17:02:12 UTC (rev 8600)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-04 14:25+0100\n"
+"POT-Creation-Date: 2012-12-04 17:59+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"
@@ -7792,7 +7792,7 @@
 #: ../themes/default/templates/login.tmpl:46
 #, php-format
 msgid ""
-"You may sign in using any [WikiWord|AddingPages] as a user id. (Any "
+"You may sign in using any [[Help:AddingPages|WikiWord]] as a user id. (Any "
 "characters in %s etc. may be used too). The user id will be used as a link "
 "in RecentChanges to your home page."
 msgstr ""

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2012-12-04 16:56:36 UTC (rev 8599)
+++ trunk/locale/po/sv.po	2012-12-04 17:02:12 UTC (rev 8600)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-04 14:25+0100\n"
+"POT-Creation-Date: 2012-12-04 17:59+0100\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -7795,7 +7795,7 @@
 #: ../themes/default/templates/login.tmpl:46
 #, php-format
 msgid ""
-"You may sign in using any [WikiWord|AddingPages] as a user id. (Any "
+"You may sign in using any [[Help:AddingPages|WikiWord]] as a user id. (Any "
 "characters in %s etc. may be used too). The user id will be used as a link "
 "in RecentChanges to your home page."
 msgstr ""

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2012-12-04 16:56:36 UTC (rev 8599)
+++ trunk/locale/po/zh.po	2012-12-04 17:02:12 UTC (rev 8600)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-04 14:25+0100\n"
+"POT-Creation-Date: 2012-12-04 17:59+0100\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -8149,12 +8149,12 @@
 #: ../themes/default/templates/login.tmpl:46
 #, php-format
 msgid ""
-"You may sign in using any [WikiWord|AddingPages] as a user id. (Any "
+"You may sign in using any [[Help:AddingPages|WikiWord]] as a user id. (Any "
 "characters in %s etc. may be used too). The user id will be used as a link "
 "in RecentChanges to your home page."
 msgstr ""
-"在使用任何 [WikiWord|AddingPages] 前必須先以你的帳號簽入. (%s 等.  或許也已經"
-"被其他人使用了). 帳號將會在近期更動中被用來作為連到你首頁的連結."
+"在使用任何 [[Help:AddingPages|WikiWord]] 前必須先以你的帳號簽入. (%s 等.  或"
+"許也已經被其他人使用了). 帳號將會在近期更動中被用來作為連到你首頁的連結."
 
 #: ../themes/default/templates/login.tmpl:58
 msgid ""

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

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

Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/zh/LC_MESSAGES/phpwiki.php	2012-12-04 16:56:36 UTC (rev 8599)
+++ trunk/locale/zh/LC_MESSAGES/phpwiki.php	2012-12-04 17:02:12 UTC (rev 8600)
@@ -675,7 +675,7 @@
 $locale["You can only use it via the _WikiTranslation plugin."] = "你只能透過 _WikiTranslation plugin 使用.";
 $locale["You can personalize various settings in %s."] = "你可以在 %s 自訂多種個人化設定.";
 $locale["You have not made any changes so no new version has been saved."] = "你沒有做任何更動,所以沒有存入任何新版本.";
-$locale["You may sign in using any [WikiWord|AddingPages] as a user id. (Any characters in %s etc. may be used too). The user id will be used as a link in RecentChanges to your home page."] = "在使用任何 [WikiWord|AddingPages] 前必須先以你的帳號簽入. (%s 等.  或許也已經被其他人使用了). 帳號將會在近期更動中被用來作為連到你首頁的連結.";
+$locale["You may sign in using any [[Help:AddingPages|WikiWord]] as a user id. (Any characters in %s etc. may be used too). The user id will be used as a link in RecentChanges to your home page."] = "在使用任何 [[Help:AddingPages|WikiWord]] 前必須先以你的帳號簽入. (%s 等.  或許也已經被其他人使用了). 帳號將會在近期更動中被用來作為連到你首頁的連結.";
 $locale["You must be an administrator to %s."] = "你必須是一個管理者才能 %s.";
 $locale["You must be an administrator to use this plugin."] = "你必須是管理者才能使用此 plugin.";
 $locale["You must sign in to %s."] = "你必須簽入才能 %s.";

Modified: trunk/themes/default/templates/login.tmpl
===================================================================
--- trunk/themes/default/templates/login.tmpl	2012-12-04 16:56:36 UTC (rev 8599)
+++ trunk/themes/default/templates/login.tmpl	2012-12-04 17:02:12 UTC (rev 8600)
@@ -43,7 +43,7 @@
     //sample Japanese login name in unicode
     $examplechars = $examplechars . "&#22825;&#36947;&#12354;&#12363;&#12397;";
   }
-  $t = asXML(TransformText(_("You may sign in using any [WikiWord|AddingPages] as a user id. (Any characters in %s etc. may be used too). The user id will be used as a link in RecentChanges to your home page."), 2.0, true));
+  $t = asXML(TransformText(_("You may sign in using any [[Help:AddingPages|WikiWord]] as a user id. (Any characters in %s etc. may be used too). The user id will be used as a link in RecentChanges to your home page."), 2.0, true));
   if (substr_count($t,"%s") == 1) {
       $s = @sprintf($t, $examplechars);
       // FIXME: Workaround gettext or sprintf problem

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8599] trunk/lib/WikiDB/backend

From: <var...@us...> - 2012-12-04 16:56:44

Revision: 8599
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8599&view=rev
Author:   vargenau
Date:     2012-12-04 16:56:36 +0000 (Tue, 04 Dec 2012)
Log Message:
-----------
Use smart quotes

Modified Paths:
--------------
    trunk/lib/WikiDB/backend/file.php
    trunk/lib/WikiDB/backend/flatfile.php

Modified: trunk/lib/WikiDB/backend/file.php
===================================================================
--- trunk/lib/WikiDB/backend/file.php	2012-12-04 13:26:06 UTC (rev 8598)
+++ trunk/lib/WikiDB/backend/file.php	2012-12-04 16:56:36 UTC (rev 8599)
@@ -108,7 +108,7 @@
                 if ($version != 0)
                     $pd['version'] = $version;
                 if (!is_array($pd))
-                    ExitWiki(sprintf(gettext("'%s': corrupt file"),
+                    ExitWiki(sprintf(gettext("“%s”: corrupt file"),
                         htmlspecialchars($filename)));
                 else
                     return $pd;

Modified: trunk/lib/WikiDB/backend/flatfile.php
===================================================================
--- trunk/lib/WikiDB/backend/flatfile.php	2012-12-04 13:26:06 UTC (rev 8598)
+++ trunk/lib/WikiDB/backend/flatfile.php	2012-12-04 16:56:36 UTC (rev 8599)
@@ -81,7 +81,7 @@
                 $pd['pagename'] = $pagename;
                 //if ($version != 0) $pd['version'] = $version;
                 if (!is_array($pd))
-                    ExitWiki(sprintf(gettext("'%s': corrupt file"),
+                    ExitWiki(sprintf(gettext("“%s”: corrupt file"),
                         htmlspecialchars($filename)));
             }
             fclose($fd);

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

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

From: <var...@us...> - 2012-12-04 13:26:21

Revision: 8598
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8598&view=rev
Author:   vargenau
Date:     2012-12-04 13:26:06 +0000 (Tue, 04 Dec 2012)
Log Message:
-----------
Update locale

Modified Paths:
--------------
    trunk/locale/de/LC_MESSAGES/phpwiki.mo
    trunk/locale/de/LC_MESSAGES/phpwiki.php
    trunk/locale/es/LC_MESSAGES/phpwiki.mo
    trunk/locale/es/LC_MESSAGES/phpwiki.php
    trunk/locale/fr/LC_MESSAGES/phpwiki.mo
    trunk/locale/fr/LC_MESSAGES/phpwiki.php
    trunk/locale/it/LC_MESSAGES/phpwiki.mo
    trunk/locale/it/LC_MESSAGES/phpwiki.php
    trunk/locale/ja/LC_MESSAGES/phpwiki.mo
    trunk/locale/ja/LC_MESSAGES/phpwiki.php
    trunk/locale/nl/LC_MESSAGES/phpwiki.mo
    trunk/locale/nl/LC_MESSAGES/phpwiki.php
    trunk/locale/po/de.po
    trunk/locale/po/es.po
    trunk/locale/po/fr.po
    trunk/locale/po/it.po
    trunk/locale/po/ja.po
    trunk/locale/po/nl.po
    trunk/locale/po/phpwiki.pot
    trunk/locale/po/sv.po
    trunk/locale/po/zh.po
    trunk/locale/sv/LC_MESSAGES/phpwiki.mo
    trunk/locale/sv/LC_MESSAGES/phpwiki.php
    trunk/locale/zh/LC_MESSAGES/phpwiki.mo
    trunk/locale/zh/LC_MESSAGES/phpwiki.php

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

Modified: trunk/locale/de/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/de/LC_MESSAGES/phpwiki.php	2012-12-04 13:12:41 UTC (rev 8597)
+++ trunk/locale/de/LC_MESSAGES/phpwiki.php	2012-12-04 13:26:06 UTC (rev 8598)
@@ -32,7 +32,7 @@
 $locale["%d pages have been removed:"] = "%d Seiten wurden geändert.";
 $locale["%d pages have been renamed:"] = "%d Seiten wurden geändert.";
 $locale["%d pages with less than %d hits (<%d%%)."] = "%d Seiten die weniger als %d aufgerufen haben (<%d%%).";
-$locale["%s %s %s is disallowed on this wiki for %s user '%s' (level: %s)."] = "%s %s »%s« ist auf diesem Wiki für %s Benutzer »%s« (Level: %s) nicht zugelassen.";
+$locale["%s %s %s is disallowed on this wiki for %s user “%s” (level: %s)."] = "%s %s »%s« ist auf diesem Wiki für %s Benutzer »%s« (Level: %s) nicht zugelassen.";
 $locale["%s KiB (%s bytes)"] = "%s KiB (%s Bytes)";
 $locale["%s already exists"] = "%s existiert bereits";
 $locale["%s at %s"] = "%s um %s";
@@ -42,7 +42,7 @@
 $locale["%s days"] = "%s Tagen";
 $locale["%s does not appear to be a WikiPlugin."] = "%s scheint kein Zusatzprogramm zu sein.";
 $locale["%s does not exist"] = "%s existiert nicht";
-$locale["%s does not know about the language '%s', using 'en' instead."] = "%s weißt nichts von die Sprache »%s«, stattdessen wird 'en' angewendet.";
+$locale["%s does not know about the language “%s”, using 'en' instead."] = "%s weißt nichts von die Sprache »%s«, stattdessen wird 'en' angewendet.";
 $locale["%s has no subpages defined."] = "%s hat keine zugewiesenen Unterseiten.";
 $locale["%s is disallowed on this wiki."] = "»%s« ist auf diesem Wiki nicht zugelassen.";
 $locale["%s is empty"] = "%s ist leer";
@@ -74,10 +74,6 @@
 $locale["%s: not a subclass of WikiPlugin."] = "%s scheint kein WikiPlugin zu sein.";
 $locale["%s: not defined"] = "%s: nicht definiert";
 $locale["&version=-1 might help."] = "&version=-1 wird empfohlen.";
-$locale["'%s' is no ModeratedPage anymore."] = "'%s' ist keine ModeratierteSeite mehr.";
-$locale["'%s': Bad page name"] = "»%s«: Ungültiger Seitenname";
-$locale["'%s': Bad page name: %s"] = "»%s«: Ungültiger Seitenname: %s";
-$locale["'%s': corrupt file"] = "»%s«: Datei korrumpiert";
 $locale["'s %d page ratings:"] = "s %d Seiten Bewertungen:";
 $locale["(%d Links)"] = "(%d Verweise)";
 $locale["(Copy your changes to the clipboard. You can try editing a different page or save your text in a text editor.)"] = "(Kopieren Sie Ihre Veränderungen in die Zwischenablage. Sie können versuchen eine andere Seite zu edieren oder Ihr Text in einem Texteditor speichern.)";
@@ -111,20 +107,20 @@
 $locale["<system theme>"] = "<Darstellung des Systems>";
 $locale["<unknown>"] = "<unbekannt>";
 $locale["A plugin to provide for raw HTML within wiki pages."] = "Einer Zusatzprogramm der reine HTML-Befehle im Wiki-Seiten abrufbar stellt.";
-$locale["A required argument '%s' is missing."] = "Erforderliches Argument »%s« fehlt.";
+$locale["A required argument “%s” is missing."] = "Erforderliches Argument »%s« fehlt.";
 $locale["ACCESS DENIED: You must log in to upload files."] = "ZUGRIFF VERWEIGERT: Bitte melden Sie sich erst an, um Dateien hochzuladen.";
 $locale["ACL"] = "ACL";
-$locale["ACL changed for page '%s'"] = "ACL für Seite '%s' geändert.";
-$locale["ACL changed for page '%s' from '%s' to '%s'."] = "ACL für Seite '%s' geändert von '%s' zu '%s'.";
-$locale["ACL deleted for page '%s'"] = "ACL für Seite '%s' gelöscht.";
-$locale["ACL not changed for page '%s'."] = "ACL für Seite '%s' nicht geändert.";
+$locale["ACL changed for page “%s”"] = "ACL für Seite “%s” geändert.";
+$locale["ACL changed for page “%s” from “%s” to “%s”."] = "ACL für Seite “%s” geändert von “%s” zu “%s”.";
+$locale["ACL deleted for page “%s”"] = "ACL für Seite “%s” gelöscht.";
+$locale["ACL not changed for page “%s”."] = "ACL für Seite “%s” nicht geändert.";
 $locale["ADDING"] = "HINZU";
 $locale["ADMIN"] = "ADMIN";
 $locale["ANON"] = "ANON";
 $locale["About"] = "Über";
 $locale["Access"] = "Zugriff";
-$locale["Access denied to change page '%s'."] = "Zugang verweigert um Seite '%s' zu ändern.";
-$locale["Access denied to rename page '%s'."] = "Zugang verweigert um Seite '%s' zu ändern.";
+$locale["Access denied to change page “%s”."] = "Zugang verweigert um Seite “%s” zu ändern.";
+$locale["Access denied to rename page “%s”."] = "Zugang verweigert um Seite “%s” zu ändern.";
 $locale["Action Page"] = "Aktion Seite";
 $locale["ActionPage"] = "Aktion Seite";
 $locale["Add %s"] = "%s Hinzufügen";
@@ -171,9 +167,9 @@
 $locale["Are you sure you want to remove the selected files?"] = "Sind Sie sicher, dass Sie die ausgewählen Seiten wirklich löschen wollen?";
 $locale["Are you sure you want to rename the selected pages?"] = "Sind Sie sicher, dass Sie die ausgewählen Seiten wirklich umbenennen wollen?";
 $locale["Are you sure you want to replace text in the selected files?"] = "Sind Sie sicher, dass Sie alle Wörter in den angegebenen Seiten ersetzen wollen?";
-$locale["Argument '%s' not declared by plugin."] = "Argument »%s« nicht im Zusatzprogramm deklariert.";
+$locale["Argument “%s” not declared by plugin."] = "Argument »%s« nicht im Zusatzprogramm deklariert.";
 $locale["Arguments"] = "Parameter";
-$locale["Attempting to use the directory '%s' instead."] = "Versuche stattdessen das Verzeichnis »%s« zu verwenden.";
+$locale["Attempting to use the directory “%s” instead."] = "Versuche stattdessen das Verzeichnis »%s« zu verwenden.";
 $locale["Attribute"] = "Attribut";
 $locale["Attribute %s, base value: %s"] = "Attribut %s, Basis: %s";
 $locale["Attribute %s, value: %s"] = "Attribut %s, Wert: %s";
@@ -218,12 +214,12 @@
 $locale["Calendar"] = "Kalender";
 $locale["CalendarList"] = "KalenderListe";
 $locale["Can't inflate data: zlib support not enabled in this PHP"] = "Kann Daten nicht dekomprimieren: Die zlib-Bibliothek wurde in PHP nicht installiert/aktiviert.";
-$locale["Can't mix '%s' with '%s' type format strings"] = "Kann »%s« Typ-Formatzeichenketten nicht mit »%s« vermischen.";
+$locale["Can't mix “%s” with “%s” type format strings"] = "Kann »%s« Typ-Formatzeichenketten nicht mit »%s« vermischen.";
 $locale["Can't open the upload logfile."] = "Die Upload-Logdatei konnte nicht geöffnet worden.";
-$locale["Can't open zip file '%s' for reading"] = "Konnte ZIP-Datei »%s« nicht zum Lesen öffnen";
+$locale["Can't open zip file “%s” for reading"] = "Konnte ZIP-Datei »%s« nicht zum Lesen öffnen";
 $locale["Cancel"] = "Abbrechen";
 $locale["Cancel your rating"] = "Bewertung löschen";
-$locale["Cannot create directory '%s'"] = "Das Verzeichnis »%s« kann nicht erzeugt werden";
+$locale["Cannot create directory “%s”"] = "Das Verzeichnis »%s« kann nicht erzeugt werden";
 $locale["Cannot create page with empty name!"] = "Kann Seite mit leerem Namen nicht erzeugen";
 $locale["Cannot open AUTH_GROUP_FILE %s"] = "Kann AUTH_GROUP_FILE %s nicht öffnen";
 $locale["Cannot rename. New page name too long."] = "Kein Ausgewählte. Seite Name zu lang";
@@ -241,7 +237,7 @@
 $locale["Change markup to: "] = "Ändere Formatierung zu:";
 $locale["Change markup type"] = "Ändere Formatierungs-Typ";
 $locale["Change markup type from %s to %s"] = "Ändere Formatierungs-Typ von %s zu %s";
-$locale["Change owner of page '%s' to '%s'."] = "Besitzer der Seite '%s' auf '%s' geändert.";
+$locale["Change owner of page “%s” to “%s”."] = "Besitzer der Seite “%s” auf “%s” geändert.";
 $locale["Change owner of selected pages"] = "Den Besitzer der ausgewählte Seiten ändern";
 $locale["Change owner of selected pages."] = "Den Besitzer ausgewählte Seiten ändern.";
 $locale["Change owner to: "] = "Besitzer ändern zu:";
@@ -293,13 +289,13 @@
 $locale["Converted successfully %d pages"] = "%d Seiten erfolgreich konvertiert";
 $locale["Converts TeX to an image. May be used to embed formulas in PhpWiki."] = "(La)TeX-Dokument nach ein Bild erstellen. Dadurch konnte eine Formel in PhpWiki eingebettet worden.";
 $locale["Copyrights"] = "Urheberrechte";
-$locale["Could not change owner of page '%s' to '%s'."] = "Konnte den Besitzer der Seite '%s' nicht in '%s' ändern.";
+$locale["Could not change owner of page “%s” to “%s”."] = "Konnte den Besitzer der Seite “%s” nicht in “%s” ändern.";
 $locale["Could not connect to LDAP host %s"] = "Kann nicht zu LDAP host »%s« verbinden";
-$locale["Couldn't change page '%s' to markup type '%s'."] = "Konnte die Formatierung der Seite '%s' nicht auf '%s' ändern.";
-$locale["Couldn't chmod page '%s' to '%s'."] = "Konnte die Berechtigung der Seite '%s' nicht auf '%s' ändern.";
+$locale["Couldn't change page “%s” to markup type “%s”."] = "Konnte die Formatierung der Seite “%s” nicht auf “%s” ändern.";
+$locale["Couldn't chmod page “%s” to “%s”."] = "Konnte die Berechtigung der Seite “%s” nicht auf “%s” ändern.";
 $locale["Couldn't connect to %s"] = "Kann nicht zu »%s« verbinden";
-$locale["Couldn't rename page '%s' to '%s'."] = "Konnte Seite '%s' nicht in '%s' umbenennen.";
-$locale["Couldn't start commandline '%s'"] = "Konnte Programm »%s« nicht starten";
+$locale["Couldn't rename page “%s” to “%s”."] = "Konnte Seite “%s” nicht in “%s” umbenennen.";
+$locale["Couldn't start commandline “%s”"] = "Konnte Programm »%s« nicht starten";
 $locale["Count"] = "Anzahl";
 $locale["Create Page"] = "Neue Seite";
 $locale["Create a Wiki page by the provided name."] = "Erzeuge neue Wiki-Seite mit dem angegebenem Namen.";
@@ -310,7 +306,7 @@
 $locale["CreateToc"] = "InhaltsVerzeichnis";
 $locale["CreateToc disabled for old markup."] = "InhaltsVerzeichnis deaktiviert für altes Markup.";
 $locale["Created by CreatePage"] = "Erzeugt von NeueSeite";
-$locale["Created directory '%s' for the page dump..."] = "Ein Verzeichnis »%s« wurde erzeugt, um die Dateien abzulegen...";
+$locale["Created directory “%s” for the page dump..."] = "Ein Verzeichnis »%s« wurde erzeugt, um die Dateien abzulegen...";
 $locale["Creating pages"] = "Neue Seiten erzeugen";
 $locale["Creator"] = "Erzeuger";
 $locale["Current language"] = "Ausgewählte Sprache";
@@ -324,9 +320,9 @@
 $locale["DebugGroupInfo"] = "DebugGruppenInfo";
 $locale["DebugInfo"] = "DebugInfo";
 $locale["Default InterWiki map file not loaded."] = "Standard-Datei der InterWikiListe nicht geladen.";
-$locale["Default language: '%s'"] = "Standardsprache für dieses Wiki: »%s«";
+$locale["Default language: “%s”"] = "Standardsprache für dieses Wiki: »%s«";
 $locale["Default preferences will be used."] = "Die Vorgabe Benutzereinstellungen werden verwendent.";
-$locale["Default theme: '%s'"] = "Darstellung des Systems: »%s«";
+$locale["Default theme: “%s”"] = "Darstellung des Systems: »%s«";
 $locale["Define a translation for a specified text"] = "Definiere die Übersetzung für einen gegebenen Text";
 $locale["Define the translation for %s in %s"] = "Definiere die Übersetzung für %s nach %s";
 $locale["Del/+"] = "Lö/+";
@@ -338,8 +334,8 @@
 $locale["Describe %s here."] = "Beschreiben Sie %s hier.";
 $locale["Description"] = "Beschreibung";
 $locale["Dialog"] = "Dialog";
-$locale["Didn't purge page '%s'. Access denied."] = "Seite »%s« wurde nicht gelöscht. Zugriff verweigert.";
-$locale["Didn't remove page '%s'. Access denied."] = "Seite »%s« wurde nicht gelöscht. Zugriff verweigert.";
+$locale["Didn't purge page “%s”. Access denied."] = "Seite »%s« wurde nicht gelöscht. Zugriff verweigert.";
+$locale["Didn't remove page “%s”. Access denied."] = "Seite »%s« wurde nicht gelöscht. Zugriff verweigert.";
 $locale["Diff"] = "Diff";
 $locale["Diff previous Author"] = "Diff zu vorigem Autor";
 $locale["Diff previous Revision"] = "Diff zu voriger Version";
@@ -371,7 +367,7 @@
 $locale["E-mail"] = "E-Mail";
 $locale["E-mail Notification"] = "E-Mail Bestätigung";
 $locale["E-mail address confirmation"] = "E-Mail Bestätigung";
-$locale["ERROR uploading '%s'"] = "FEHLER beim Hochladen von »%s«";
+$locale["ERROR uploading “%s”"] = "FEHLER beim Hochladen von »%s«";
 $locale["Easy navigation buttons for %s"] = "Einfache Navgiationsknöpfe für %s";
 $locale["Edit"] = "Bearbeiten";
 $locale["Edit %s"] = "Bearbeite %s";
@@ -412,8 +408,8 @@
 $locale["Failed to bind LDAP host"] = "Konnte nicht mit LDAP Host verbinden";
 $locale["Failed to connect to LDAP host"] = "LDAP Server nicht gefunden";
 $locale["Fatal PhpWiki Error"] = "Fataler PhpWiki-Fehler";
-$locale["File '%s' not found."] = "Datei '%s' nicht gefunden";
 $locale["File successfully uploaded."] = "Datei erfolgreich hochgeladen.";
+$locale["File “%s” not found."] = "Datei “%s” nicht gefunden";
 $locale["FileInfo"] = "DateiInfo";
 $locale["Files with extension %s are not allowed."] = "Dateien mit der Endung %s sind nicht erlaubt.";
 $locale["Find page"] = "Seite finden";
@@ -442,7 +438,7 @@
 $locale["GooglePlugin"] = "GoogleZusatzprogramm";
 $locale["Grant"] = "Erlaube";
 $locale["Group %s does not exist"] = "Gruppe %s existiert nicht";
-$locale["Group page '%s' does not exist"] = "Gruppenseite »%s« existiert nicht";
+$locale["Group page “%s” does not exist"] = "Gruppenseite »%s« existiert nicht";
 $locale["Group/User"] = "Gruppe/Benutzer";
 $locale["Guest"] = "Gast";
 $locale["Guests"] = "Gäste";
@@ -503,7 +499,7 @@
 $locale["I'm sorry, there is no such page as %s."] = "Leider gibt es keine solche Seite %s.";
 $locale["I'm sorry.  Version %d of %s is not in the database."] = "Leider ist keine Version %d von %s in der Datenbank.";
 $locale["Ignore wiki formatting"] = "Keine Wiki Formatierung";
-$locale["Illegal character '%s' in page name."] = "Ungültiges Zeichen '%s' in Seitenname.";
+$locale["Illegal character “%s” in page name."] = "Ungültiges Zeichen “%s” in Seitenname.";
 $locale["Illegal chars %s removed"] = "Ungültiges Zeichen %s entfernt";
 $locale["Illegal inclusion of page %s: no read access."] = "Fehler beim Einfügen der Seite %s: kein Lesezugriff.";
 $locale["Image loaded from cache file: %s"] = "Bild geladen von Cachedatei: %s";
@@ -546,7 +542,6 @@
 $locale["Invalid image size"] = "Ungültige Bildgröße";
 $locale["Invalid password or userid."] = "Ungültiges Passwort oder falscher Benutzername.";
 $locale["Invalid password."] = "Ungültiges Passwort.";
-$locale["Invalid username '%s' for LDAP Auth"] = "Ungültiger Benutzername »%s« für LDAP Auth";
 $locale["Invalid username."] = "Ungültiger Benutzername.";
 $locale["Italic text"] = "Kursiver Text";
 $locale["Italic text [alt-i]"] = "Kursiver Text [alt-k]";
@@ -591,7 +586,7 @@
 $locale["List of pages owned by [%s] (%d total):"] = "Liste der Seiten owned by [%s] (%d insgesamt):";
 $locale["List of plugins on this wiki"] = "Alle Zusatzprogrammen in diesem Wiki auflisten.";
 $locale["List of user-created pages (%d total):"] = "Liste der Benutzer erzeugten Seiten (%d insgesamt):";
-$locale["List page names which share an initial or final title word with '%s'."] = "Diese Seiten teilen sich einen Wordteil am Anfang oder Ende mit »%s«.";
+$locale["List page names which share an initial or final title word with “%s”."] = "Diese Seiten teilen sich einen Wordteil am Anfang oder Ende mit »%s«.";
 $locale["List pages which are not linked to by any other page."] = "Liste aller Seiten, die von keiner anderen Seite verlinkt sind.";
 $locale["List the most popular pages nearby."] = "Liste die meistbesuchten Seiten in der Nähe.";
 $locale["List the most popular pages."] = "Die meistbesucht Seiten werden aufgelistet.";
@@ -606,10 +601,10 @@
 $locale["LiveSearch"] = "LiveSuche";
 $locale["Load File"] = "Datei Laden";
 $locale["LoadDump"] = "SeiteLaden";
-$locale["Loading '%s'"] = "»%s« wird geladen";
 $locale["Loading InterWikiMap from external file %s."] = "Die InterWikiListe wird von der externen Datei %s geladen.";
 $locale["Loading files"] = "Dateien hinaufladen";
 $locale["Loading up virgin wiki"] = "Lade neue Seiten in das frische Wiki";
+$locale["Loading “%s”"] = "»%s« wird geladen";
 $locale["Lock"] = "Sperren";
 $locale["Lock Page"] = "Seite Sperren";
 $locale["Lock page to enable link"] = "Seite sperren, um den Link zu aktivieren";
@@ -624,7 +619,7 @@
 $locale["Merge Edit"] = "Zusammenfügen Bearbeiten";
 $locale["Merge and Edit: %s"] = "Zusammenfügen und Bearbeiten: %s";
 $locale["Message"] = "Nachricht";
-$locale["Method '%s' not implemented in this GROUP_METHOD %s"] = "Methode »%s« in GROUP_METHOD %s nicht implementiert";
+$locale["Method “%s” not implemented in this GROUP_METHOD %s"] = "Methode »%s« in GROUP_METHOD %s nicht implementiert";
 $locale["Minor"] = "kleinere";
 $locale["Minor Edit"] = "Kleinere Änderung";
 $locale["Miscellaneous utility functions for the Administrator."] = "Verschiedene Dienstfunktionen für den Administrator.";
@@ -713,9 +708,6 @@
 $locale["PHP was unable to create a new GD image stream. Read 'lib/plugin/text2png.php' for details."] = "PHP konnte keinen neues GD Bild erzeugen. Lesen Sie 'lib/plugin/text2png.php' für Details.";
 $locale["Page"] = "Seite";
 $locale["Page %s not found."] = "Seite %s nicht gefunden.";
-$locale["Page '%s' already exists. Ignored."] = "Seite %s existiert bereits. Ignoriert.";
-$locale["Page '%s' does not exist"] = "Seite »%s« existiert nicht";
-$locale["Page '%s' does not exist."] = "Seite »%s« existiert nicht";
 $locale["Page Content: "] = "Inhalt: ";
 $locale["Page Execution took %s seconds"] = "Ausführung dieser Seite dauerte %s Sekunden";
 $locale["Page Info"] = "Seiten Info";
@@ -728,8 +720,8 @@
 $locale["Page could not be updated. %s doesn't exist!"] = "Seite konnte nicht geändert werden. %s existiert nicht!";
 $locale["Page info"] = "Seiten Info";
 $locale["Page name too long"] = "Seite Name zu lang";
-$locale["Page names with prefix '%s'"] = "Seitennamen mit dem Anfangswort »%s«";
-$locale["Page names with suffix '%s'"] = "Seitennamen mit Endwort »%s«";
+$locale["Page names with prefix “%s”"] = "Seitennamen mit dem Anfangswort »%s«";
+$locale["Page names with suffix “%s”"] = "Seitennamen mit Endwort »%s«";
 $locale["Page now locked."] = "Seite jetzt gesperrt.";
 $locale["Page now not-public."] = "Seite jetzt nicht mehr öffentlich freigegeben.";
 $locale["Page now public."] = "Seite jetzt öffentlich freigegeben.";
@@ -737,6 +729,9 @@
 $locale["Page rename %s to %s"] = "Seite »%s« nach umbenennen »%s«";
 $locale["Page statistics"] = "Seiten Statistiken";
 $locale["Page successfully updated."] = "Datei erfolgreich geändert.";
+$locale["Page “%s” already exists. Ignored."] = "Seite %s existiert bereits. Ignoriert.";
+$locale["Page “%s” does not exist"] = "Seite »%s« existiert nicht";
+$locale["Page “%s” does not exist."] = "Seite »%s« existiert nicht";
 $locale["PageChange Notification Error: Couldn't send %s to %s"] = "SeitenÄnderung Benachrichtigung Fehler: Konnte %s nicht an %s senden";
 $locale["PageChange Notification of %s"] = "SeitenÄnderung Benachrichtigung von %s";
 $locale["PageChange Notification of %s sent to %s"] = "SeitenÄnderung Benachrichtigung von %s an %s gesendet";
@@ -762,7 +757,7 @@
 $locale["Permanently purge selected pages"] = "Endgültige Löschung aller ausgewählten Seiten.";
 $locale["Permanently remove all selected pages."] = "Endgültige Löschung aller ausgewählten Seiten.";
 $locale["Permission"] = "Zugriffsrecht";
-$locale["Personal Auth Settings for '%s'"] = "Spezielle Authentifizierungs-Einstellungen %s";
+$locale["Personal Auth Settings for “%s”"] = "Spezielle Authentifizierungs-Einstellungen %s";
 $locale["Personal language:"] = "Ihre Sprache:";
 $locale["Personal theme:"] = "Ihre Benutzeroberfläche:";
 $locale["PersonalPage login method:"] = "PersonalPage Login Methode:";
@@ -794,7 +789,7 @@
 $locale["Plugin %s disabled."] = "Zusatzprogramm %s deaktiviert.";
 $locale["Plugin %s failed."] = "Zusatzprogramm %s fehlgeschlagen.";
 $locale["Plugin %s: undefined"] = "Zusatzprogramm %s: undefiniert";
-$locale["Plugin '%s' does not exist."] = "Zusatzprogramm »%s« existiert nicht";
+$locale["Plugin “%s” does not exist."] = "Zusatzprogramm »%s« existiert nicht";
 $locale["PluginManager"] = "ZusatzprogrammManager";
 $locale["Plugins"] = "Zusatzprogramme";
 $locale["PopularNearby"] = "MeistBesuchtNahe";
@@ -825,9 +820,9 @@
 $locale["Purge cancelled"] = "Löschen abgebrochen";
 $locale["Purge this page"] = "Lösche diese Seite endgültig";
 $locale["PurgeHtmlCache"] = "HtmlCacheSäubern";
-$locale["Purged page '%s' successfully."] = "Seite »%s« erfolgreich gelöscht.";
+$locale["Purged page “%s” successfully."] = "Seite »%s« erfolgreich gelöscht.";
 $locale["Purging pages"] = "Das Durchblättern der Seiten dieses Wikis";
-$locale["Querying backend directly for '%s'"] = "DB Debug Informationen von der Seite »%s«";
+$locale["Querying backend directly for “%s”"] = "DB Debug Informationen von der Seite »%s«";
 $locale["Quick Search"] = "SchnellSuche";
 $locale["Random Page"] = "ZufallsSeite";
 $locale["RandomPage"] = "ZufallsSeite";
@@ -851,7 +846,7 @@
 $locale["Recursive inclusion of page %s"] = "Rekursiver Selbstaufruf der Seite %s";
 $locale["Recursive inclusion of page %s ignored"] = "Rekursiver Selbstaufruf der Seite %s ignoriert";
 $locale["Recursive inclusion of url %s"] = "Rekursiver Selbstaufruf der URL %s";
-$locale["Recursive redirect to self: '%s'"] = "Eigenbezogene Selbstrückleitung: »%s«";
+$locale["Recursive redirect to self: “%s”"] = "Eigenbezogene Selbstrückleitung: »%s«";
 $locale["Recursively get BackLinks or links"] = "Alle BackLinks für %s (rekursiv)";
 $locale["Redirect"] = "Weiterleiten";
 $locale["Redirect to an external URL is only allowed in locked pages."] = "Weiterleitung zu einer externen URL ist nur in gesperrten Seiten erlaubt.";
@@ -874,17 +869,17 @@
 $locale["Remove cancelled"] = "Löschen abgebrochen";
 $locale["Remove selected pages"] = "Ausgewählte Seiten löschen";
 $locale["Remove this page"] = "Löschen der Seite";
-$locale["Removed page '%s' successfully."] = "Seite »%s« erfolgreich gelöscht.";
+$locale["Removed page “%s” successfully."] = "Seite »%s« erfolgreich gelöscht.";
 $locale["Removing pages"] = "Die Seitenlöschung in diesem Wiki";
 $locale["Rename"] = "Umbenennen";
 $locale["Rename Page"] = "Seite Umbenennen";
 $locale["Rename selected pages"] = "Ausgewählte Seiten umbenennen";
 $locale["Rename to"] = "Umbennen zu";
-$locale["Renamed page from '%s' to '%s'."] = "Seite '%s' auf '%s' umbenannt.";
+$locale["Renamed page from “%s” to “%s”."] = "Seite “%s” auf “%s” umbenannt.";
 $locale["Replace"] = "Ersetze";
 $locale["Replace all occurences of the given string in the content of all pages."] = "Ersetze alle Wörter in den angegebenen Seiten.";
 $locale["Replace with"] = "Ersetze mit";
-$locale["Replaced '%s' with '%s' in page '%s'."] = "'%s' mit '%s' in Seite '%s' ersetzt.";
+$locale["Replaced “%s” with “%s” in page “%s”."] = "“%s” mit “%s” in Seite “%s” ersetzt.";
 $locale["Reply"] = "Antwort";
 $locale["Required argument %s missing"] = "Erforderliches Argument »%s« fehlt";
 $locale["Requires WikiAdmin privileges to edit."] = "Verlangt Administratorenrechte zur Bearbeitung.";
@@ -934,7 +929,7 @@
 $locale["Select: "] = "Auswahl: ";
 $locale["Selected Grant checkboxes allow access, unselected checkboxes deny access."] = "Gesetzte Erlaube Kästchen erlauben Zugriff, ungesetzte Kästchen sperren Zugriff.";
 $locale["Selected Pages: "] = "Ausgewählte Seiten: ";
-$locale["Selected page '%s' passed to '%s'."] = "Ausgewählte Seite »%s« an »%s« übergeben.";
+$locale["Selected page “%s” passed to “%s”."] = "Ausgewählte Seite »%s« an »%s« übergeben.";
 $locale["Semantic relations for %s"] = "Semantische Beziehungen für %s";
 $locale["SemanticRelations"] = "SemantischeBeziehungen";
 $locale["SemanticSearch"] = "SemantischeSuche";
@@ -965,7 +960,7 @@
 $locale["Size"] = "Größe";
 $locale["Skipped."] = "Ausgelassen.";
 $locale["Skipping"] = "Übersprungen";
-$locale["Some of the changes could not automatically be combined.  Please look for sections beginning with '%s', and ending with '%s'.  You will need to edit those sections by hand before you click Save."] = "Einige der Änderungen konnten nicht automatisch miteinander verbunden werden. Bitte suchen Sie nach den Teilen, die mit »%s« anfangen und mit »%s« enden. Sie müssen diese Teile von Hand bearbeiten, bevor Sie auf Speichern klicken.";
+$locale["Some of the changes could not automatically be combined.  Please look for sections beginning with “%s”, and ending with “%s”.  You will need to edit those sections by hand before you click Save."] = "Einige der Änderungen konnten nicht automatisch miteinander verbunden werden. Bitte suchen Sie nach den Teilen, die mit »%s« anfangen und mit »%s« enden. Sie müssen diese Teile von Hand bearbeiten, bevor Sie auf Speichern klicken.";
 $locale["Someone has edited the page!"] = "Jemand hat die Seite bereits bearbeitet!";
 $locale["Sorry but this file is too big."] = "Leider ist diese Datei zu groß.";
 $locale["Sorry for the inconvenience."] = "Entschuldigen Sie bitte die hiermit für Sie verbundenen Unannehmlichkeiten.";
@@ -1023,7 +1018,7 @@
 $locale["The %s files are in the %s directory. Please read the INSTALL file and move the database to a permanent location or risk losing all the pages!"] = "Die %s Dateien liegen im Verzeichnis %s. Bitte lesen Sie jetzt zuerst die INSTALL Anleitung und verschieben Sie danach die DB Datei an einen anderen endgültigen Speicherplatz, Sie laufen sonst Gefahr, alle Seiten zu verlieren.";
 $locale["The %s subpage enables simple weblogging."] = "Die %s UnterSeite ermöglicht ein einfaches Weblog.";
 $locale["The DBA handler %s is unsupported!"] = "Die DBA Methode %s wird nicht unterstützt!";
-$locale["The ICAO '%s' wasn't recognized."] = "Die angegebene ICAO »%s« war nicht bekannt.";
+$locale["The ICAO “%s” wasn't recognized."] = "Die angegebene ICAO »%s« war nicht bekannt.";
 $locale["The PhpWeather plugin provides weather reports from the Internet."] = "Der PhpWetter plugin gibt Auskunft zur Wetterlage vom Internet.";
 $locale["The PhpWiki access log file"] = "Die PhpWiki Zugriffslog Datei";
 $locale["The SQL_ACCESS_LOG is not enabled."] = "SQL_ACCESS_LOG ist nicht aktiviert.";
@@ -1041,9 +1036,9 @@
 $locale["The upload logfile exists but is not writable."] = "Die Upload Logdatei ist nicht schreibbar.";
 $locale["Theme"] = "Benutzeroberfläche";
 $locale["There is already a file with name %s uploaded."] = "Es existiert schon eine gleichnamige, hochgeladene Datei %s.";
-$locale["There is no image creation data available to id '%s'. Please reload referring page."] = "Es sind keine Bilddaten vorhanden für '%'. Bitte laden Sie die Seite neu.";
-$locale["These page titles match fuzzy with '%s'"] = "Diese Seitentitel sind das Ergebnis der FuzzySuche nach »%s«.";
-$locale["These pages share an initial or final title word with '%s'"] = "Diese Seiten teilen sich einen Wordteil am Anfang oder Ende mit »%s«";
+$locale["There is no image creation data available to id “%s”. Please reload referring page."] = "Es sind keine Bilddaten vorhanden für '%'. Bitte laden Sie die Seite neu.";
+$locale["These page titles match fuzzy with “%s”"] = "Diese Seitentitel sind das Ergebnis der FuzzySuche nach »%s«.";
+$locale["These pages share an initial or final title word with “%s”"] = "Diese Seiten teilen sich einen Wordteil am Anfang oder Ende mit »%s«";
 $locale["This data is based on users active over the past %s."] = "Diese Daten basieren auf den Benutzern für die letzten %s.";
 $locale["This is a minor change."] = "Kleinere Änderung.";
 $locale["This page edit seems to contain spam and was therefore not saved."] = "Diese Bearbeitung scheint Spam beinzuhalten und wurde ignoriert.";
@@ -1057,8 +1052,8 @@
 $locale["Title 2"] = "Titel 2";
 $locale["Title 3"] = "Titel 3";
 $locale["Title Search"] = "TitelSuche";
-$locale["Title search results for '%s'"] = "Titel-Suchresultate nach »%s«";
-$locale["Title search results for '%s' (%d total)"] = "Titel-Suchresultate nach »%s« (%d total)";
+$locale["Title search results for “%s”"] = "Titel-Suchresultate nach »%s«";
+$locale["Title search results for “%s” (%d total)"] = "Titel-Suchresultate nach »%s« (%d total)";
 $locale["Title:"] = "Titel:";
 $locale["TitleSearch"] = "TitelSuche";
 $locale["To add check 'Add' near the dropdown list."] = "Setze '+' um ACL Zeile hinzufügen.";
@@ -1075,8 +1070,8 @@
 $locale["Transcluded from %s"] = "Eingebetteter Text von %s";
 $locale["Transcluded page"] = "Eingebettete Seite";
 $locale["Translate"] = "Übersetzen";
-$locale["Translate %s to %s in %s"] = "Übersetze '%s' nach '%s' in %s";
-$locale["Translate '%s' to '%s' in *%s*"] = "Übersetze '%s' nach '%s' in *%s*";
+$locale["Translate %s to %s in %s"] = "Übersetze “%s” nach “%s” in %s";
+$locale["Translate “%s” to “%s” in *%s*"] = "Übersetze “%s” nach “%s” in *%s*";
 $locale["TranslateText"] = "ÜbersetzeText";
 $locale["Translation Error!"] = "Übersetzungsfehler!";
 $locale["Type"] = "Typ";
@@ -1086,16 +1081,16 @@
 $locale["Unable to bind LDAP server %s using %s %s"] = "Konnte nicht mit LDAP Server %s verbinden mit %s %s";
 $locale["Unable to connect to IMAP server "] = "IMAP Server nicht gefunden ";
 $locale["Unable to connect to LDAP server %s"] = "Konnte LDAP Server %s nicht finden";
-$locale["Unable to find src='%s'"] = "Konnte src='%s' nicht lesen";
-$locale["Unable to open directory '%s' for reading"] = "Konnte Verzeichnis »%s« nicht zum Lesen öffnen";
-$locale["Unable to read src='%s'"] = "Konnte src='%s' nicht lesen";
+$locale["Unable to find src=“%s”"] = "Konnte src=“%s” nicht lesen";
+$locale["Unable to open directory “%s” for reading"] = "Konnte Verzeichnis »%s« nicht zum Lesen öffnen";
+$locale["Unable to read src=“%s”"] = "Konnte src=“%s” nicht lesen";
 $locale["Undefined method %s for special group %s"] = "Undefinierte Methode %s für Spezialgruppe %s";
 $locale["Undo"] = "Rückgängig";
 $locale["Undo Search & Replace"] = "Suchen & Ersetzen rückgängig machen";
 $locale["Undo disabled"] = "Undo deaktiviert";
 $locale["Unexpected EOF in zip file"] = "Unerwartetes Dateiende (EOF-Fehler) in ZIP-Datei";
 $locale["UnfoldSubpages"] = "UnterseitenEntfalten";
-$locale["Unknown special group '%s'"] = "Unbekannte Spezialgruppe »%s«";
+$locale["Unknown special group “%s”"] = "Unbekannte Spezialgruppe »%s«";
 $locale["Unlock"] = "Entsperren";
 $locale["Unlock Page"] = "Seite Freigeben";
 $locale["Unlocking pages"] = "Die Seitenfreigabe in diesem Wiki";
@@ -1118,7 +1113,7 @@
 $locale["User not found in LDAP"] = "Benutzer in LDAP nicht gefunden";
 $locale["User page"] = "Benutzer Seite";
 $locale["User preferences for this project"] = "Einstellungen für dieses Projekt";
-$locale["User preferences for user %s"] = "Einstellungen für Benutzer '%s'";
+$locale["User preferences for user %s"] = "Einstellungen für Benutzer “%s”";
 $locale["User statistics"] = "Benutzer Statistiken";
 $locale["UserContribs"] = "BenutzerBewertungen";
 $locale["UserId"] = "Benutzername";
@@ -1126,7 +1121,7 @@
 $locale["UserPreferences"] = "BenutzerEinstellungen";
 $locale["UserRatings"] = "BenutzerBewertungen";
 $locale["Users will not be able to sign in."] = "Benutzer werden sich nicht anmelden können.";
-$locale["Using directory '%s'"] = "Das Verzeichnis »%s« wird verwendet";
+$locale["Using directory “%s”"] = "Das Verzeichnis »%s« wird verwendet";
 $locale["Verification Status"] = "Bestätigungs-Status";
 $locale["Verify the current action"] = "Bestätigen Sie die gegenwärtige Aktion";
 $locale["Version"] = "Version";
@@ -1191,8 +1186,8 @@
 $locale["Wrong password: "] = "Falsches Password: ";
 $locale["XML-RPC access"] = "XML-RPC Zugriff";
 $locale["Yes"] = "Ja";
-$locale["You are about to purge '%s'!"] = "Sie sind im Begriff »%s« zu löschen!";
-$locale["You are about to remove '%s'!"] = "Sie sind im Begriff »%s« zu löschen!";
+$locale["You are about to purge “%s”!"] = "Sie sind im Begriff »%s« zu löschen!";
+$locale["You are about to remove “%s”!"] = "Sie sind im Begriff »%s« zu löschen!";
 $locale["You are signed but not authenticated as %s. "] = "Angemeldet aber nicht authentifiziert als %s.";
 $locale["You are signed in as %s"] = "Sie sind angemeldet als %s";
 $locale["You are viewing an old revision of this page."] = "Sie sehen eine alte Version dieser Seite.";
@@ -1208,9 +1203,9 @@
 $locale["You must specify a directory to dump to"] = "Sie müssen zum Sichern ein Verzeichnis angeben.";
 $locale["You must wait for moderator approval."] = "Sie müssen auf die Zustimmung des Moderators warten.";
 $locale["You need to specify the userid!"] = "Sie müssen den Benutzernamen angeben!";
-$locale["You stored an empty password in your '%s' page."] = "Sie haben ein leeres Passwort in Ihrer HomePage »%s« gespeichert.";
+$locale["You stored an empty password in your “%s” page."] = "Sie haben ein leeres Passwort in Ihrer HomePage »%s« gespeichert.";
 $locale["Your UserPreferences have been successfully reset to default."] = "Ihre BenutzerEinstellungen wurden erfolgreich gelöscht.";
-$locale["Your WikiDB DB backend '%s' cannot be used for DbSession."] = "Ihr WikiDB DB backend '%s' wird von DbSession nicht unterstützt.";
+$locale["Your WikiDB DB backend “%s” cannot be used for DbSession."] = "Ihr WikiDB DB backend “%s” wird von DbSession nicht unterstützt.";
 $locale["Your access permissions are only for a BogoUser."] = "Ihre Zugriffsberechtigung entspricht lediglich einem BogoUser.";
 $locale["Your are probably trying to edit/create an invalid version of this page."] = "Sie versuchen offenbar eine ungültige Version dieser Seite zu bearbeiten.";
 $locale["Your careful attention to detail is much appreciated."] = "Die besondere Aufmerksamkeit, die Sie soeben der Bearbeitung dieser Seite gewidmet haben, wird von allen Benutzern dieses Wikis gern gesehen und hoch geschätzt.";
@@ -1232,20 +1227,20 @@
 $locale["access this wiki via SOAP"] = "um via SOAP auf dieses Wiki zuzugreifen";
 $locale["access this wiki via XML-RPC"] = "um via XML-RPC auf dieses Wiki zuzugreifen";
 $locale["add "] = "hinzufügen ";
-$locale["argument '%s' not declared by plugin"] = "Argument »%s« nicht im Zusatzprogramm deklariert";
+$locale["argument “%s” not declared by plugin"] = "Argument »%s« nicht im Zusatzprogramm deklariert";
 $locale["authenticated"] = "authentifizierten";
 $locale["blog"] = "Blog";
 $locale["by"] = "mit";
 $locale["by %s"] = "von %s";
 $locale["cached pagedata:"] = "Seitendaten in den Cachespeicher aufgenommen:";
 $locale["cached versiondata:"] = "Versionendaten in den Cachespeicher aufgenommen:";
-$locale["change page '%s' to markup type '%s'."] = "Formatierung der Seite '%s' auf '%s' geändert.";
-$locale["chmod page '%s' to '%s'."] = "Berechtigung der Seite '%s' auf '%s' geändert.";
+$locale["change page “%s” to markup type “%s”."] = "Formatierung der Seite “%s” auf “%s” geändert.";
+$locale["chmod page “%s” to “%s”."] = "Berechtigung der Seite “%s” auf “%s” geändert.";
 $locale["comments"] = "Kommentare";
 $locale["compare revisions"] = "Versionen vergleichen";
 $locale["content is identical to current version %d - no new revision created"] = "Inhalt ist identisch mit der aktuellen Version %d - keine neue Version erzeugt";
 $locale["couldn't move %s to %s"] = "Kann »%s« nicht nach »%s« verschieben";
-$locale["couldn't open file '%s' for writing"] = "Datei »%s« konnte nicht zum Schreiben geöffnet werden";
+$locale["couldn't open file “%s” for writing"] = "Datei »%s« konnte nicht zum Schreiben geöffnet werden";
 $locale["create this page"] = "um diese Seite zu erzeugen";
 $locale["current version"] = "aktuelle Version";
 $locale["database"] = "Datenbank";
@@ -1270,7 +1265,7 @@
 $locale["fixed with"] = "Geändert mit";
 $locale["from"] = "von";
 $locale["from %s"] = "von %s";
-$locale["from '%s'"] = "von %s";
+$locale["from “%s”"] = "von %s";
 $locale["has edit conflicts - overwriting anyway"] = "hat unauflösbare Konflikte beim Speichern - wird ungeprüft überschrieben";
 $locale["has edit conflicts - skipped"] = "hat unauflösbare Konflikte beim Speichern - übersprungen";
 $locale["hours"] = "Stunden";
@@ -1322,13 +1317,13 @@
 $locale["sent to %s"] = "an %s gesendet";
 $locale["skipped"] = "ausgelassen";
 $locale["stddev: %2.3f"] = "Standardabweichung: %2.3f";
-$locale["the file '%s'"] = "die Datei %s";
-$locale["the session.save_path directory '%s'"] = "das session.save_path Verzeichnis »%s«";
+$locale["the file “%s”"] = "die Datei %s";
+$locale["the session.save_path directory “%s”"] = "das session.save_path Verzeichnis »%s«";
 $locale["to"] = "nach";
-$locale["to '%s'."] = "Gehe zu %s.";
+$locale["to “%s”."] = "Gehe zu %s.";
 $locale["today"] = "heute";
 $locale["total hits: %d"] = "Anzahl aller Seitenaufrufe %d";
-$locale["trailing cruft in plugin args: '%s'"] = "Überflüssiger Müll in den Zusatzprogramm Argumenten: »%s«";
+$locale["trailing cruft in plugin args: “%s”"] = "Überflüssiger Müll in den Zusatzprogramm Argumenten: »%s«";
 $locale["unknown color %s ignored"] = "unbekannte Farbe %s ignoriert";
 $locale["unlock this page"] = "um diese Seite zu entsperren";
 $locale["upload a zip dump"] = "um einen ZIP-Speicherauszug in dieses Wiki zu laden";
@@ -1344,5 +1339,8 @@
 $locale["view the source of this page"] = "um den Quelltext dieser Seiten anzusehen";
 $locale["view this page"] = "um diese Seite anzuzeigen";
 $locale["weeks"] = "Wochen";
-$locale["yesterday"] =
-   "gestern";
+$locale["yesterday"] = "gestern";
+$locale["“%s” is no ModeratedPage anymore."] = "“%s” ist keine ModeratierteSeite mehr.";
+$locale["“%s”: Bad page name"] = "»%s«: Ungültiger Seitenname";
+$locale["“%s”: Bad page name: %s"] =
+   "»%s«: Ungültiger Seitenname: %s";

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

Modified: trunk/locale/es/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/es/LC_MESSAGES/phpwiki.php	2012-12-04 13:12:41 UTC (rev 8597)
+++ trunk/locale/es/LC_MESSAGES/phpwiki.php	2012-12-04 13:26:06 UTC (rev 8598)
@@ -13,7 +13,7 @@
 $locale["%d most popular nearby: "] = "%d las más populares: ";
 $locale["%d not-empty pages"] = "%d not-empty páginas";
 $locale["%d pages"] = "%d páginas";
-$locale["%s %s %s is disallowed on this wiki for %s user '%s' (level: %s)."] = "%s %s %s se rechaza en este wiki para el usuario '%s' de %s (llano:  %s).";
+$locale["%s %s %s is disallowed on this wiki for %s user “%s” (level: %s)."] = "%s %s %s se rechaza en este wiki para el usuario “%s” de %s (llano:  %s).";
 $locale["%s KiB"] = "%s Kio";
 $locale["%s KiB (%s bytes)"] = "%s Kio (%s octetos)";
 $locale["%s at %s"] = "%s en %s";
@@ -41,8 +41,6 @@
 $locale["%s: not a subclass of WikiPlugin."] = "%s: no una subclase de WikiPlugin.";
 $locale["%s: not defined"] = "%s: no definido";
 $locale["&version=-1 might help."] = "&version=-1 pudo ayudar.";
-$locale["'%s': Bad page name"] = "'%s': Mal nombre de la página";
-$locale["'%s': corrupt file"] = "'%s': archivo corrupto";
 $locale["(Copy your changes to the clipboard. You can try editing a different page or save your text in a text editor.)"] = "Copie sus cambios al portapapeles o a otro sitio temporal (p.ej. editor de textos).";
 $locale["(Redirected from %s)"] = "(vuelto a dirigir de %s)";
 $locale["- saved to database as version %d"] = "- ahorrado a la base de datos como versión %d";
@@ -73,9 +71,9 @@
 $locale["Allow / Deny"] = "Permita/Niegue";
 $locale["An unnamed PhpWiki"] = "Un PhpWiki sin un nombre";
 $locale["Anonymous Users"] = "Usuarios Anónimos";
-$locale["Argument '%s' not declared by plugin."] = "Parámetro '%s' no declarada por plugin.";
+$locale["Argument “%s” not declared by plugin."] = "Parámetro “%s” no declarada por plugin.";
 $locale["Article"] = "Artículo";
-$locale["Attempting to use the directory '%s' instead."] = "El procurar utilizar el directorio '%s' en lugar de otro.";
+$locale["Attempting to use the directory “%s” instead."] = "El procurar utilizar el directorio “%s” en lugar de otro.";
 $locale["Authenticated Users"] = "Usuarios Authenticados";
 $locale["Author will be logged as %s."] = "Registrarán al autor como %s.";
 $locale["BOGO"] = "BOGO";
@@ -90,7 +88,7 @@
 $locale["Calendar"] = "Calendario";
 $locale["CalendarList"] = "CalendarioLista";
 $locale["Cancel"] = "Cancelar";
-$locale["Cannot create directory '%s'"] = "No puede crear el directorio '%s'";
+$locale["Cannot create directory “%s”"] = "No puede crear el directorio “%s”";
 $locale["Cannot create page with empty name!"] = "¡No se puede crear la página con el nombre de vacío!";
 $locale["Cannot open AUTH_GROUP_FILE %s"] = "No puede abrir AUTH_GROUP_FILE %s";
 $locale["Category"] = "Categoría";
@@ -124,7 +122,7 @@
 $locale["CreatePage"] = "CreeLaPágina";
 $locale["CreateToc"] = "CreeToc";
 $locale["Created by CreatePage"] = "Cree par CreeLaPágina";
-$locale["Created directory '%s' for the page dump..."] = "Directorio creado '%s' para la descarga de la página...";
+$locale["Created directory “%s” for the page dump..."] = "Directorio creado “%s” para la descarga de la página...";
 $locale["Creator"] = "Creador";
 $locale["DB admin password:"] = "DB admin contraseña:";
 $locale["DB admin user:"] = "DB admin username:";
@@ -145,9 +143,9 @@
 $locale["Dump to directory"] = "Descarga al directorio";
 $locale["Dumping Pages"] = "Descargar Las Páginas";
 $locale["E-mail Notification"] = "Verificación Del Email";
-$locale["E-mail address '%s' is not properly formatted"] = "La dirección '%s' del email no se ajusta a formato correctamente";
-$locale["E-mail address '%s' is properly formatted"] = "La dirección '%s' del email se ajusta a formato correctamente";
 $locale["E-mail address confirmation"] = "Verificación Del Email";
+$locale["E-mail address “%s” is not properly formatted"] = "La dirección “%s” del email no se ajusta a formato correctamente";
+$locale["E-mail address “%s” is properly formatted"] = "La dirección “%s” del email se ajusta a formato correctamente";
 $locale["Edit"] = "Editar";
 $locale["Edit %s"] = "Editar %s";
 $locale["Edit this page"] = "Corrija esta página";
@@ -155,7 +153,6 @@
 $locale["Edit: %s"] = "Editar: %s";
 $locale["EditText"] = "Editar";
 $locale["Edited by: %s"] = "Editar: %s";
-$locale["Either %s is missing or DATABASE_TYPE != '%s'"] = "Cualquier %s es que falta o DATABASE_TYPE != '%s'";
 $locale["Empty Preferences or format of UserPreferences cookie not recognised."] = "Preferencias o formato vacías de la galleta de UsuarioPreferencias no reconocido.";
 $locale["Empty link to: %s"] = "Acoplamiento vacío a: %s";
 $locale["Empty pagename!"] = "¡Escriba un nombre de página!";
@@ -168,18 +165,18 @@
 $locale["FORBIDDEN"] = "PROHIBIDO";
 $locale["Failed to connect to LDAP host"] = "Incapaz conectar con el servidor de LDAP";
 $locale["Fatal PhpWiki Error"] = "Error Fatal De PhpWiki";
-$locale["File '%s' not found."] = "Fichero '%s' no encontrado.";
+$locale["File “%s” not found."] = "Fichero “%s” no encontrado.";
 $locale["Find page"] = "Buscar Página";
 $locale["FindPage"] = "BuscarPágina";
 $locale["First"] = "Primera";
-$locale["Full text search results for “%s”"] = "Resultados de la búsqueda en el texto completo para '%s'";
+$locale["Full text search results for “%s”"] = "Resultados de la búsqueda en el texto completo para “%s”";
 $locale["FullDump"] = "DescargaCompleta";
 $locale["FullTextSearch"] = "BúsquedaDelTexto";
 $locale["Given password ignored."] = "Contraseña no hecho caso.";
 $locale["Go"] = "Aceptar";
 $locale["Grant"] = "Concesión";
 $locale["Group %s does not exist"] = "El grupo %s no existe";
-$locale["Group page '%s' does not exist"] = "La página '%s' del grupo no existe";
+$locale["Group page “%s” does not exist"] = "La página “%s” del grupo no existe";
 $locale["Group/User"] = "Grupo/Usuario";
 $locale["H"] = "Al";
 $locale["Headline text"] = "Texto del título";
@@ -206,9 +203,9 @@
 $locale["Illegal chars %s removed"] = "Los carbones ilegales %s quitaron";
 $locale["Image map expired. Reload wiki page to recreate its html part."] = "El mapa de imagen expiró.  Recargue la página del wiki para reconstruir su pieza del HTML.";
 $locale["In the time since you started editing this page, another user has saved a new version of it."] = "En el tiempo desde que usted comenzó a corregir esta página, otro usuario ha ahorrado una nueva versión de ella.";
-$locale["Included from %s"] = "Inserción de '%s'";
-$locale["Included from %s (revision %d)"] = "Inserción de '%s' (revisión %d)";
-$locale["Included from %s:"] = "Inserción de '%s':";
+$locale["Included from %s"] = "Inserción de “%s”";
+$locale["Included from %s (revision %d)"] = "Inserción de “%s” (revisión %d)";
+$locale["Included from %s:"] = "Inserción de “%s”:";
 $locale["Info"] = "Informacion";
 $locale["Insert"] = "Relleno";
 $locale["Insert PageLink"] = "Inserte el AcoplamientoDeLaPágina";
@@ -222,7 +219,6 @@
 $locale["Invalid [] syntax ignored"] = "[] el sintaxis inválido no hizo caso";
 $locale["Invalid password or userid."] = "Contraseña o userid inválida.";
 $locale["Invalid password."] = "Contraseña inválido.";
-$locale["Invalid username '%s' for LDAP Auth"] = "Username inválido ' %s' para LDAP Auth";
 $locale["Invalid username."] = "Username inválido.";
 $locale["Italic text"] = "Texto del itálico";
 $locale["Italic text [alt-i]"] = "Texto del itálico [alt-i]";
@@ -244,9 +240,9 @@
 $locale["ListSubpages"] = "ListaPáginasSecundaria";
 $locale["Load File"] = "Archivo De la Carga";
 $locale["LoadDump"] = "CargaDescarga";
-$locale["Loading '%s'"] = "'%s' que carga";
 $locale["Loading InterWikiMap from external file %s."] = "Cargamento InterMapaDeWiki del archivo externo %s.";
 $locale["Loading up virgin wiki"] = "El cargar encima de wiki virginal";
+$locale["Loading “%s”"] = "“%s” que carga";
 $locale["Lock"] = "Bloqueada";
 $locale["Lock Page"] = "Bloquear Página";
 $locale["Locked"] = "Bloqueada";
@@ -256,7 +252,7 @@
 $locale["Merge Edit"] = "Fusión Editar";
 $locale["Merge and Edit: %s"] = "Fusión y Editar: %s";
 $locale["Message"] = "Mensaje";
-$locale["Method '%s' not implemented in this GROUP_METHOD %s"] = "Método ' %s' no puesto en ejecucio'n en este GROUP_METHOD %s";
+$locale["Method “%s” not implemented in this GROUP_METHOD %s"] = "Método ' %s' no puesto en ejecucio'n en este GROUP_METHOD %s";
 $locale["Minor Edit"] = "El Menor de edad Corrige";
 $locale["Missing PagePermission:"] = "Permiso que falta de la página:";
 $locale["ModeratedPage"] = "PáginaModerada";
@@ -297,8 +293,6 @@
 $locale["Owner: %s"] = "Dueño: %s";
 $locale["Page"] = "Página";
 $locale["Page %s not found."] = "%s: Página no encontrado.";
-$locale["Page '%s' does not exist"] = "La página '%s' no existe";
-$locale["Page '%s' does not exist."] = "La página '%s' no existe.";
 $locale["Page Content: "] = "Contenido De la Página: ";
 $locale["Page Info"] = "Informacion de la Pagina";
 $locale["Page Locked"] = "Página Bloqueada";
@@ -312,6 +306,8 @@
 $locale["Page now unlocked."] = "Página desbloquear.";
 $locale["Page rename %s to %s"] = "La página retitula %s a %s";
 $locale["Page successfully updated."] = "Página actualizada con éxito.";
+$locale["Page “%s” does not exist"] = "La página “%s” no existe";
+$locale["Page “%s” does not exist."] = "La página “%s” no existe.";
 $locale["PageChange Notification Error: Couldn't send %s to %s"] = "Error De la Notificación Del Cambio De la Página: No podía enviar %s a %s";
 $locale["PageChange Notification of %s"] = "Pagine la notificación del cambio de %s";
 $locale["PageChange Notification of %s sent to %s"] = "Pagine la notificación del cambio de %s enviado a %s";
@@ -330,10 +326,10 @@
 $locale["Please set ENCRYPTED_PASSWD to false in config/config.ini and probably change ADMIN_PASSWD."] = "En ENCRYPTED_PASSWD por favor fijado a falso config/config.ini y probablemente cambio ADMIN_PASSWD.";
 $locale["Please set ENCRYPTED_PASSWD to true in config/config.ini."] = "ENCRYPTED_PASSWD por favor fijado a verdad en config/config.ini.";
 $locale["Please set a password in UserPreferences."] = "Fije por favor una contraseña en UsuarioPreferencias.";
-$locale["Plugin %s disabled."] = "Plugin '%s' lisiado.";
-$locale["Plugin %s failed."] = "Plugin '%s' falló.";
+$locale["Plugin %s disabled."] = "Plugin “%s” lisiado.";
+$locale["Plugin %s failed."] = "Plugin “%s” falló.";
 $locale["Plugin %s: undefined"] = "Plugin %s: indefinido";
-$locale["Plugin '%s' does not exist."] = "Plugin '%s' no existe.";
+$locale["Plugin “%s” does not exist."] = "Plugin “%s” no existe.";
 $locale["Preferences"] = "Preferencias";
 $locale["Preview"] = "Previsualizar";
 $locale["Previous"] = "Anterior";
@@ -342,7 +338,7 @@
 $locale["Previous Month"] = "Mes Anterior";
 $locale["Previous Revision"] = "Versión archivada";
 $locale["Printer"] = "Impresora";
-$locale["Purged page '%s' successfully."] = "Página '%s' borrada satisfactoriamente.";
+$locale["Purged page “%s” successfully."] = "Página “%s” borrada satisfactoriamente.";
 $locale["Quick Search"] = "Busqueda rápida";
 $locale["Random Page"] = "Página al Azar";
 $locale["RandomPage"] = "PáginaAlAzar";
@@ -364,10 +360,10 @@
 $locale["Remove"] = "Quite";
 $locale["Remove Page"] = "Borrar Página";
 $locale["Remove this page"] = "Quite esta página";
-$locale["Removed page '%s' successfully."] = "Página '%s' borrada satisfactoriamente.";
+$locale["Removed page “%s” successfully."] = "Página “%s” borrada satisfactoriamente.";
 $locale["Removing pages"] = "Borrar páginas";
 $locale["Rename"] = "Retitule";
-$locale["Renamed page from '%s' to '%s'."] = "retitulado de '%s' para '%s'.";
+$locale["Renamed page from “%s” to “%s”."] = "retitulado de “%s” para “%s”.";
 $locale["Replace"] = "Substituya";
 $locale["Replace with"] = "Substituya por";
 $locale["Reset password of user: "] = "Restablecimiento de la contraseña de usuario: ";
@@ -398,7 +394,7 @@
 $locale["Skipped."] = "Saltado.";
 $locale["Skipping"] = "El saltar";
 $locale["Some internal editing error"] = "Un cierto error interno el corregir";
-$locale["Some of the changes could not automatically be combined.  Please look for sections beginning with '%s', and ending with '%s'.  You will need to edit those sections by hand before you click Save."] = "Algunos de los cambios no podían ser combinados automáticamente. Busque por favor las secciones que comienzan con '%s', y terminando con '%s'. Usted necesitará corregir esas secciones a mano antes de que usted chasque excepto.";
+$locale["Some of the changes could not automatically be combined.  Please look for sections beginning with “%s”, and ending with “%s”.  You will need to edit those sections by hand before you click Save."] = "Algunos de los cambios no podían ser combinados automáticamente. Busque por favor las secciones que comienzan con “%s”, y terminando con “%s”. Usted necesitará corregir esas secciones a mano antes de que usted chasque excepto.";
 $locale["Someone has edited the page!"] = "¡Alguien ha modificado la página!";
 $locale["Sorry for the inconvenience."] = "Disculpe la inconveniencia.";
 $locale["Sorry, this page does not exist."] = "Apesadumbrada, esta página no está en la base de datos.";
@@ -432,7 +428,7 @@
 $locale["The most recent %s during the past %s days are listed below."] = "Los %s más recientes durante los últimos días de %s se enumeran abajo.";
 $locale["The most recent %s during the past day are listed below."] = "Los %s más recientes durante el último día se enumeran abajo.";
 $locale["The session.save_path directory"] = "El directorio de session.save_path";
-$locale["There is no image creation data available to id '%s'. Please reload referring page."] = "No hay datos de la creación de la imagen disponibles para la identificación '%s '. Por favor recarga que refiere la página.";
+$locale["There is no image creation data available to id “%s”. Please reload referring page."] = "No hay datos de la creación de la imagen disponibles para la identificación '%s '. Por favor recarga que refiere la página.";
 $locale["This action requires moderator approval. Please be patient."] = "Esta acción requiere la aprobación del asesor.  Sea por favor paciente.";
 $locale["This is a minor change."] = "Esto es un cambio pequeño.";
 $locale["This page edit seems to contain spam and was therefore not saved."] = "Esta página corrige se parece contener el Spam y por lo tanto no fue ahorrada.";
@@ -444,8 +440,8 @@
 $locale["Title 2"] = "Título 2";
 $locale["Title 3"] = "Título 3";
 $locale["Title Search"] = "Una búsqueda de títulos";
-$locale["Title search results for '%s'"] = "Resultados de la búsqueda en el títulos '%s'";
-$locale["Title search results for '%s' (%d total)"] = "Resultados de la búsqueda en el títulos '%s' (%d total)";
+$locale["Title search results for “%s”"] = "Resultados de la búsqueda en el títulos “%s”";
+$locale["Title search results for “%s” (%d total)"] = "Resultados de la búsqueda en el títulos “%s” (%d total)";
 $locale["TitleSearch"] = "BúsquedaDeTítulos";
 $locale["Today"] = "Hoy";
 $locale["Too many external links."] = "También muchos acoplamientos externos.";
@@ -464,7 +460,7 @@
 $locale["Undo disabled"] = "Deshaga lisiado";
 $locale["Unexpected EOF in zip file"] = "EOF inesperado en archivo del zip";
 $locale["UnfoldSubpages"] = "IncluyaPáginasSecundaria";
-$locale["Unknown special group '%s'"] = "Grupo especial desconocido '%s'";
+$locale["Unknown special group “%s”"] = "Grupo especial desconocido “%s”";
 $locale["Unlock"] = "Desbloquear";
 $locale["Unlock Page"] = "Desbloquear Página";
 $locale["Unlocking pages"] = "Desbloquear páginas";
@@ -479,11 +475,11 @@
 $locale["Upload error: unknown error #"] = "Error del upload: error desconocido #";
 $locale["Uploading %s"] = "%s uploading";
 $locale["User %s removed page %s"] = "El usuarios %s eliminado página %s";
-$locale["User preferences for user %s"] = "Preferencias por usuario '%s'";
+$locale["User preferences for user %s"] = "Preferencias por usuario “%s”";
 $locale["UserPreferences"] = "UsuarioPreferencias";
 $locale["UserRatings"] = "GradosUsuario.";
 $locale["Users will not be able to sign in."] = "Los usuarios no podrán firmar adentro.";
-$locale["Using directory '%s'"] = "Usando el directorio '%s'";
+$locale["Using directory “%s”"] = "Usando el directorio “%s”";
 $locale["Version"] = "Versión";
 $locale["Version "] = "Versión ";
 $locale["Version %d"] = "Versión %d";
@@ -503,15 +499,14 @@
 $locale["Wiki Name"] = "Nombre de la Wiki";
 $locale["WikiDB::renamePage() not yet implemented for this backend"] = "WikiDB::renamePage() no todavía puesto en ejecucio'n para este backend";
 $locale["Yes"] = "Si";
-$locale["You are about to purge '%s'!"] = "¡Usted está a punto de eliminar '%s'!";
-$locale["You are about to remove '%s'!"] = "¡Usted está a punto de eliminar '%s'!";
+$locale["You are about to purge “%s”!"] = "¡Usted está a punto de eliminar “%s”!";
+$locale["You are about to remove “%s”!"] = "¡Usted está a punto de eliminar “%s”!";
 $locale["You forgot to set ENCRYPTED_PASSWD to true. Please update your config/config.ini"] = "Usted se olvidó de fijar ENCRYPTED_PASSWD para verdad. Ponga al día por favor su config/config.ini";
 $locale["You must be an administrator to %s."] = "Usted debe ser administrador %s.";
 $locale["You must sign in to %s."] = "Usted debe firmar adentro %s.";
 $locale["You must specify a directory to dump to"] = "Usted debe especificar un directorio para descargar a";
 $locale["You must wait for moderator approval."] = "Usted debe esperar la aprobación del asesor.";
-$locale["You stored an empty password in your '%s' page."] = "Usted almacenó una contraseña vacía en su página de '%s'.";
-$locale["Your WikiDB DB backend '%s' cannot be used for DbSession."] = "Su DB '%s' backend de WikiDB no se puede utilizar para DbSession.";
+$locale["Your WikiDB DB backend “%s” cannot be used for DbSession."] = "Su DB “%s” backend de WikiDB no se puede utilizar para DbSession.";
 $locale["Your access permissions are only for a BogoUser."] = "Sus permisos de acceso están solamente para un BogoUser.";
 $locale["Your are probably trying to edit/create an invalid version of this page."] = "Su están intentando corregir/crean probablemente una versión inválida de esta página.";
 $locale["Your careful attention to detail is much appreciated."] = "Se agradece una cuidadosa atención a los detalles.";
@@ -530,7 +525,7 @@
 $locale["cached pagedata:"] = "Página archivada:";
 $locale["content is identical to current version %d - no new revision created"] = "el contenido es idéntico a la versión actual %d - ninguna nueva revisión creada";
 $locale["couldn't move %s to %s"] = "no podía mover %s a %s";
-$locale["couldn't open file '%s' for writing"] = "Error al escribir la página '%s'";
+$locale["couldn't open file “%s” for writing"] = "Error al escribir la página “%s”";
 $locale["create this page"] = "para crear esta página";
 $locale["current version"] = "versión actual";
 $locale["days"] = "dias";
@@ -571,10 +566,10 @@
 $locale["saved as "] = "ahorrado como ";
 $locale["saved as %s"] = "ahorrado como %s";
 $locale["sent to %s"] = "vuelva a %s";
-$locale["the file '%s'"] = "el archivo %s";
-$locale["the session.save_path directory '%s'"] = "el directorio '%s' de session.save_path";
+$locale["the file “%s”"] = "el archivo %s";
+$locale["the session.save_path directory “%s”"] = "el directorio “%s” de session.save_path";
 $locale["today"] = "hoy";
-$locale["trailing cruft in plugin args: '%s'"] = "absurdo que se arrastra en parámetros plugin: '%s'";
+$locale["trailing cruft in plugin args: “%s”"] = "absurdo que se arrastra en parámetros plugin: “%s”";
 $locale["unknown color %s ignored"] = "el color desconocido %s no hizo caso";
 $locale["unlock this page"] = "para desbloquear página";
 $locale["upload a zip dump"] = "para upload una descarga del cierre relámpago";
@@ -586,5 +581,6 @@
 $locale["view the source of this page"] = "para visión la fuente de esta página";
 $locale["view this page"] = "para visión esta página";
 $locale["weeks"] = "semanas";
-$locale["yesterday"] =
-   "ayer";
+$locale["yesterday"] = "ayer";
+$locale["“%s”: Bad page name"] =
+   "“%s”: Mal nombre de la página";

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-12-04 13:12:41 UTC (rev 8597)
+++ trunk/locale/fr/LC_MESSAGES/phpwiki.php	2012-12-04 13:26:06 UTC (rev 8598)
@@ -13,7 +13,7 @@
 $locale[" Sorry, cannot merge."] = " Désolé, impossible de fusionner.";
 $locale[" and "] = " et ";
 $locale[" for all pages linking to %s"] = " pour les pages liées à %s.";
-$locale[" for all pages matching '%s'"] = " pour les pages correspondant à %s.";
+$locale[" for all pages matching “%s”"] = " pour les pages correspondant à %s.";
 $locale[" for pages changed by %s"] = " pour les pages modifiées par %s";
 $locale[" for pages owned by %s"] = " pour les pages possédées par %s";
 $locale[" is identical."] = " est identique.";
@@ -38,7 +38,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 interdit sur ce wiki pour l'utilisateur %s « %s » (niveau : %s).";
+$locale["%s %s %s is disallowed on this wiki for %s user “%s” (level: %s)...
 
[truncated message content]

[phpwiki-checkins] SF.net SVN: phpwiki:[8597] trunk/lib/WikiUser

From: <var...@us...> - 2012-12-04 13:12:53

Revision: 8597
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8597&view=rev
Author:   vargenau
Date:     2012-12-04 13:12:41 +0000 (Tue, 04 Dec 2012)
Log Message:
-----------
Use smart quotes

Modified Paths:
--------------
    trunk/lib/WikiUser/AdoDb.php
    trunk/lib/WikiUser/LDAP.php
    trunk/lib/WikiUser/PdoDb.php
    trunk/lib/WikiUser/PearDb.php
    trunk/lib/WikiUser/PersonalPage.php

Modified: trunk/lib/WikiUser/AdoDb.php
===================================================================
--- trunk/lib/WikiUser/AdoDb.php	2012-12-04 13:03:14 UTC (rev 8596)
+++ trunk/lib/WikiUser/AdoDb.php	2012-12-04 13:12:41 UTC (rev 8597)
@@ -222,7 +222,7 @@
         if (!isset($this->_authselect))
             $this->userExists();
         if (!isset($this->_authselect))
-            trigger_error(fmt("Either %s is missing or DATABASE_TYPE != '%s'",
+            trigger_error(fmt("Either %s is missing or DATABASE_TYPE != “%s”",
                     'DBAUTH_AUTH_CHECK', 'ADODB'),
                 E_USER_WARNING);
         //NOTE: for auth_crypt_method='crypt'  defined('ENCRYPTED_PASSWD',true) must be set
@@ -280,7 +280,7 @@
                 array("password", "userid"));
         }
         if (!isset($this->_authupdate)) {
-            trigger_error(fmt("Either %s is missing or DATABASE_TYPE != '%s'",
+            trigger_error(fmt("Either %s is missing or DATABASE_TYPE != “%s”",
                     'DBAUTH_AUTH_UPDATE', 'ADODB'),
                 E_USER_WARNING);
             return false;

Modified: trunk/lib/WikiUser/LDAP.php
===================================================================
--- trunk/lib/WikiUser/LDAP.php	2012-12-04 13:03:14 UTC (rev 8596)
+++ trunk/lib/WikiUser/LDAP.php	2012-12-04 13:12:41 UTC (rev 8597)
@@ -161,7 +161,7 @@
             //return WIKIAUTH_FORBIDDEN;
         }
         /*if (strstr($userid,'*')) { // should be safely escaped now
-            trigger_error(fmt("Invalid username '%s' for LDAP Auth", $userid),
+            trigger_error(fmt("Invalid username “%s” for LDAP Auth", $userid),
                           E_USER_WARNING);
             return WIKIAUTH_FORBIDDEN;
         }*/
@@ -229,7 +229,7 @@
         $this->_userid = trim($this->_userid);
         $userid = $this->_userid;
         if (strstr($userid, '*')) {
-            trigger_error(fmt("Invalid username '%s' for LDAP Auth", $userid),
+            trigger_error(fmt("Invalid username “%s” for LDAP Auth", $userid),
                 E_USER_WARNING);
             return false;
         }

Modified: trunk/lib/WikiUser/PdoDb.php
===================================================================
--- trunk/lib/WikiUser/PdoDb.php	2012-12-04 13:03:14 UTC (rev 8596)
+++ trunk/lib/WikiUser/PdoDb.php	2012-12-04 13:12:41 UTC (rev 8597)
@@ -205,7 +205,7 @@
         if (!isset($this->_authselect))
             $this->userExists();
         if (!isset($this->_authselect))
-            trigger_error(fmt("Either %s is missing or DATABASE_TYPE != '%s'",
+            trigger_error(fmt("Either %s is missing or DATABASE_TYPE != “%s”",
                     'DBAUTH_AUTH_CHECK', 'SQL'),
                 E_USER_WARNING);
 
@@ -269,7 +269,7 @@
             }
         }
         if (empty($this->_authupdate)) {
-            trigger_error(fmt("Either %s is missing or DATABASE_TYPE != '%s'",
+            trigger_error(fmt("Either %s is missing or DATABASE_TYPE != “%s”",
                     'DBAUTH_AUTH_UPDATE', 'SQL'),
                 E_USER_WARNING);
             return false;

Modified: trunk/lib/WikiUser/PearDb.php
===================================================================
--- trunk/lib/WikiUser/PearDb.php	2012-12-04 13:03:14 UTC (rev 8596)
+++ trunk/lib/WikiUser/PearDb.php	2012-12-04 13:12:41 UTC (rev 8597)
@@ -199,7 +199,7 @@
         if (!isset($this->_authselect))
             $this->userExists();
         if (!isset($this->_authselect))
-            trigger_error(fmt("Either %s is missing or DATABASE_TYPE != '%s'",
+            trigger_error(fmt("Either %s is missing or DATABASE_TYPE != “%s”",
                     'DBAUTH_AUTH_CHECK', 'SQL'),
                 E_USER_WARNING);
 
@@ -245,7 +245,7 @@
                 array("password", "userid"));
         }
         if (empty($this->_authupdate)) {
-            trigger_error(fmt("Either %s is missing or DATABASE_TYPE != '%s'",
+            trigger_error(fmt("Either %s is missing or DATABASE_TYPE != “%s”",
                     'DBAUTH_AUTH_UPDATE', 'SQL'),
                 E_USER_WARNING);
             return false;

Modified: trunk/lib/WikiUser/PersonalPage.php
===================================================================
--- trunk/lib/WikiUser/PersonalPage.php	2012-12-04 13:03:14 UTC (rev 8596)
+++ trunk/lib/WikiUser/PersonalPage.php	2012-12-04 13:12:41 UTC (rev 8597)
@@ -56,7 +56,7 @@
                 if (PASSWORD_LENGTH_MINIMUM > 0) {
                     trigger_error(sprintf(
                         _("PersonalPage login method:") . "\n" .
-                            _("You stored an empty password in your '%s' page.") . "\n" .
+                            _("You stored an empty password in your “%s” page.") . "\n" .
                             _("Your access permissions are only for a BogoUser.") . "\n" .
                             _("Please set a password in UserPreferences."),
                         $this->_userid), E_USER_WARNING);
@@ -65,7 +65,7 @@
                     if (!empty($submitted_password))
                         trigger_error(sprintf(
                             _("PersonalPage login method:") . "\n" .
-                                _("You stored an empty password in your '%s' page.") . "\n" .
+                                _("You stored an empty password in your “%s” page.") . "\n" .
                                 _("Given password ignored.") . "\n" .
                                 _("Please set a password in UserPreferences."),
                             $this->_userid), E_USER_WARNING);

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

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

From: <var...@us...> - 2012-12-04 13:03:28

Revision: 8596
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8596&view=rev
Author:   vargenau
Date:     2012-12-04 13:03:14 +0000 (Tue, 04 Dec 2012)
Log Message:
-----------
Use smart quotes

Modified Paths:
--------------
    trunk/lib/AccessLog.php
    trunk/lib/ArchiveCleaner.php
    trunk/lib/DbSession.php
    trunk/lib/IniConfig.php
    trunk/lib/InlineParser.php
    trunk/lib/PageType.php
    trunk/lib/Request.php
    trunk/lib/WikiDB.php
    trunk/lib/WikiGroup.php
    trunk/lib/WikiPlugin.php
    trunk/lib/WikiPluginCached.php
    trunk/lib/WikiTheme.php
    trunk/lib/WikiUser.php
    trunk/lib/WikiUserNew.php
    trunk/lib/XmlElement.php
    trunk/lib/editpage.php
    trunk/lib/loadsave.php
    trunk/lib/main.php
    trunk/lib/purgepage.php
    trunk/lib/removepage.php
    trunk/lib/stdlib.php
    trunk/lib/ziplib.php

Modified: trunk/lib/AccessLog.php
===================================================================
--- trunk/lib/AccessLog.php	2012-12-04 12:49:42 UTC (rev 8595)
+++ trunk/lib/AccessLog.php	2012-12-04 13:03:14 UTC (rev 8596)
@@ -47,7 +47,7 @@
             (sprintf(_("%s is not writable."), _("The PhpWiki access log file"))
                     . "\n"
                     . sprintf(_("Please ensure that %s is writable, or redefine %s in config/config.ini."),
-                        sprintf(_("the file '%s'"), ACCESS_LOG),
+                        sprintf(_("the file “%s”"), ACCESS_LOG),
                         'ACCESS_LOG')
                 , E_USER_NOTICE);
         }

Modified: trunk/lib/ArchiveCleaner.php
===================================================================
--- trunk/lib/ArchiveCleaner.php	2012-12-04 12:49:42 UTC (rev 8595)
+++ trunk/lib/ArchiveCleaner.php	2012-12-04 13:03:14 UTC (rev 8596)
@@ -136,7 +136,7 @@
         if (!$supplanted) {
             // Every revision but the most recent should have a supplanted time.
             // However, if it doesn't...
-            trigger_error(sprintf("Warning: Page '%s', version '%d' has no '_supplanted' timestamp",
+            trigger_error(sprintf("Warning: Page “%s”, version '%d' has no '_supplanted' timestamp",
                     $revision->getPageName(),
                     $revision->getVersion()),
                 E_USER_NOTICE);

Modified: trunk/lib/DbSession.php
===================================================================
--- trunk/lib/DbSession.php	2012-12-04 12:49:42 UTC (rev 8595)
+++ trunk/lib/DbSession.php	2012-12-04 13:03:14 UTC (rev 8596)
@@ -39,7 +39,7 @@
             }
         }
         //Fixme: E_USER_WARNING ignored!
-        trigger_error(sprintf(_("Your WikiDB DB backend '%s' cannot be used for DbSession.") . " " .
+        trigger_error(sprintf(_("Your WikiDB DB backend “%s” cannot be used for DbSession.") . " " .
                 _("Set USE_DB_SESSION to false."),
             $db_type), E_USER_WARNING);
         return false;

Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php	2012-12-04 12:49:42 UTC (rev 8595)
+++ trunk/lib/IniConfig.php	2012-12-04 13:03:14 UTC (rev 8596)
@@ -327,7 +327,7 @@
         // try to load it dynamically (unix only)
         if (!loadPhpExtension("pdo")) {
             echo $GLOBALS['php_errormsg'], "<br>\n";
-            trigger_error(sprintf("dl() problem: Required extension '%s' could not be loaded!",
+            trigger_error(sprintf("dl() problem: Required extension “%s” could not be loaded!",
                     "pdo"),
                 E_USER_ERROR);
         }

Modified: trunk/lib/InlineParser.php
===================================================================
--- trunk/lib/InlineParser.php	2012-12-04 12:49:42 UTC (rev 8595)
+++ trunk/lib/InlineParser.php	2012-12-04 13:03:14 UTC (rev 8596)
@@ -412,7 +412,7 @@
         // Check illegal characters in page names: <>[]{}|"
         if (preg_match("/[<\[\{\|\"\}\]>]/", $rawlink, $matches) > 0) {
             return HTML::span(array('class' => 'error'),
-                sprintf(_("Illegal character '%s' in page name."),
+                sprintf(_("Illegal character “%s” in page name."),
                     $matches[0]));
         }
         $link = UnWikiEscape($rawlink);

Modified: trunk/lib/PageType.php
===================================================================
--- trunk/lib/PageType.php	2012-12-04 12:49:42 UTC (rev 8595)
+++ trunk/lib/PageType.php	2012-12-04 13:03:14 UTC (rev 8596)
@@ -84,7 +84,7 @@
         $class = "PageType_" . (string)$name;
         if (class_exists($class))
             return new $class;
-        trigger_error(sprintf("PageType '%s' unknown", (string)$name),
+        trigger_error(sprintf("PageType “%s” unknown", (string)$name),
             E_USER_WARNING);
         return new PageType_wikitext;
     }

Modified: trunk/lib/Request.php
===================================================================
--- trunk/lib/Request.php	2012-12-04 12:49:42 UTC (rev 8595)
+++ trunk/lib/Request.php	2012-12-04 13:03:14 UTC (rev 8596)
@@ -876,7 +876,7 @@
             (sprintf(_("%s is not writable."), _("The PhpWiki access log file"))
                     . "\n"
                     . sprintf(_("Please ensure that %s is writable, or redefine %s in config/config.ini."),
-                        sprintf(_("the file '%s'"), ACCESS_LOG),
+                        sprintf(_("the file “%s”"), ACCESS_LOG),
                         'ACCESS_LOG')
                 , E_USER_NOTICE);
         }

Modified: trunk/lib/WikiDB.php
===================================================================
--- trunk/lib/WikiDB.php	2012-12-04 12:49:42 UTC (rev 8595)
+++ trunk/lib/WikiDB.php	2012-12-04 13:03:14 UTC (rev 8596)
@@ -836,7 +836,7 @@
         $latestversion = $cache->get_latest_version($pagename);
         if ($latestversion && ($version == $latestversion)) {
             $backend->unlock(array('page', 'version'));
-            trigger_error(sprintf("Attempt to delete most recent revision of '%s'",
+            trigger_error(sprintf("Attempt to delete most recent revision of “%s”",
                 $pagename), E_USER_ERROR);
             return;
         }
@@ -890,7 +890,7 @@
         $latestversion = $cache->get_latest_version($pagename);
         if ($latestversion && $version == $latestversion) {
             $backend->unlock(array('version'));
-            trigger_error(sprintf("Attempt to merge most recent revision of '%s'",
+            trigger_error(sprintf("Attempt to merge most recent revision of “%s”",
                 $pagename), E_USER_ERROR);
             return;
         }

Modified: trunk/lib/WikiGroup.php
===================================================================
--- trunk/lib/WikiGroup.php	2012-12-04 12:49:42 UTC (rev 8595)
+++ trunk/lib/WikiGroup.php	2012-12-04 13:03:14 UTC (rev 8596)
@@ -195,7 +195,7 @@
         if ($this->specialGroup($group)) {
             return $this->isSpecialMember($group);
         } else {
-            trigger_error(__sprintf("Method '%s' not implemented in this GROUP_METHOD %s",
+            trigger_error(__sprintf("Method “%s” not implemented in this GROUP_METHOD %s",
                     'isMember', GROUP_METHOD),
                 E_USER_WARNING);
         }
@@ -244,7 +244,7 @@
      */
     function getAllGroupsIn()
     {
-        trigger_error(__sprintf("Method '%s' not implemented in this GROUP_METHOD %s",
+        trigger_error(__sprintf("Method “%s” not implemented in this GROUP_METHOD %s",
                 'getAllGroupsIn', GROUP_METHOD),
             E_USER_WARNING);
         return array();
@@ -328,7 +328,7 @@
         if ($this->specialGroup($group)) {
             return $this->getSpecialMembersOf($group);
         }
-        trigger_error(__sprintf("Method '%s' not implemented in this GROUP_METHOD %s",
+        trigger_error(__sprintf("Method “%s” not implemented in this GROUP_METHOD %s",
                 'getMembersOf', GROUP_METHOD),
             E_USER_WARNING);
         return array();
@@ -373,7 +373,7 @@
                 // this could get complex so just return an empty array
                 return false;
             default:
-                trigger_error(__sprintf("Unknown special group '%s'", $group),
+                trigger_error(__sprintf("Unknown special group “%s”", $group),
                     E_USER_WARNING);
         }
     }
@@ -389,7 +389,7 @@
      */
     function setMemberOf($group, $user = false)
     {
-        trigger_error(__sprintf("Method '%s' not implemented in this GROUP_METHOD %s",
+        trigger_error(__sprintf("Method “%s” not implemented in this GROUP_METHOD %s",
                 'setMemberOf', GROUP_METHOD),
             E_USER_WARNING);
         return false;
@@ -406,7 +406,7 @@
      */
     function removeMemberOf($group, $user = false)
     {
-        trigger_error(__sprintf("Method '%s' not implemented in this GROUP_METHOD %s",
+        trigger_error(__sprintf("Method “%s” not implemented in this GROUP_METHOD %s",
                 'removeMemberOf', GROUP_METHOD),
             E_USER_WARNING);
         return false;
@@ -543,7 +543,7 @@
         $group_revision = $group_page->getCurrentRevision();
         if ($group_revision->hasDefaultContents()) {
             $group = $group_page->getName();
-            if ($strict) trigger_error(sprintf(_("Group page '%s' does not exist"), $group),
+            if ($strict) trigger_error(sprintf(_("Group page “%s” does not exist"), $group),
                 E_USER_WARNING);
             return false;
         }

Modified: trunk/lib/WikiPlugin.php
===================================================================
--- trunk/lib/WikiPlugin.php	2012-12-04 12:49:42 UTC (rev 8595)
+++ trunk/lib/WikiPlugin.php	2012-12-04 13:03:14 UTC (rev 8596)
@@ -231,7 +231,7 @@
     /* A plugin can override this function to define how any remaining text is handled */
     function handle_plugin_args_cruft($argstr, $args)
     {
-        trigger_error(sprintf(_("trailing cruft in plugin args: '%s'"),
+        trigger_error(sprintf(_("trailing cruft in plugin args: “%s”"),
             $argstr), E_USER_NOTICE);
     }
 
@@ -240,7 +240,7 @@
      */
     function allow_undeclared_arg($name, $value)
     {
-        trigger_error(sprintf(_("Argument '%s' not declared by plugin."),
+        trigger_error(sprintf(_("Argument “%s” not declared by plugin."),
             $name), E_USER_NOTICE);
         return false;
     }
@@ -502,7 +502,7 @@
         global $AllAllowedPlugins;
 
         if (in_array($plugin_name, $AllAllowedPlugins) === false) {
-            return $this->_error(sprintf(_("Plugin '%s' does not exist."),
+            return $this->_error(sprintf(_("Plugin “%s” does not exist."),
                 $plugin_name));
         }
 
@@ -519,7 +519,7 @@
 
             if (!class_exists($plugin_class)) {
                 if ($include_failed) {
-                    return $this->_error(sprintf(_("Plugin '%s' does not exist."),
+                    return $this->_error(sprintf(_("Plugin “%s” does not exist."),
                         $plugin_name));
                 }
                 return $this->_error(sprintf(_("%s: no such class"), $plugin_class));

Modified: trunk/lib/WikiPluginCached.php
===================================================================
--- trunk/lib/WikiPluginCached.php	2012-12-04 12:49:42 UTC (rev 8595)
+++ trunk/lib/WikiPluginCached.php	2012-12-04 13:03:14 UTC (rev 8596)
@@ -700,7 +700,7 @@
                 // I think this is the only error which may occur
                 // without having written bad code. So gettextify it.
                 $errortext = sprintf(
-                    gettext("There is no image creation data available to id '%s'. Please reload referring page."),
+                    gettext("There is no image creation data available to id “%s”. Please reload referring page."),
                     $id);
                 $this->printError($errorformat, $errortext);
                 return false;

Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php	2012-12-04 12:49:42 UTC (rev 8595)
+++ trunk/lib/WikiTheme.php	2012-12-04 13:03:14 UTC (rev 8596)
@@ -698,7 +698,7 @@
         if (isa($wikiword, 'WikiPageName'))
             $message = $wikiword->getWarnings();
         else
-            $message = sprintf(_("'%s': Bad page name"), $wikiword);
+            $message = sprintf(_("“%s”: Bad page name"), $wikiword);
         $ErrorManager->warning($message);
 
         return HTML::span(array('class' => 'badwikiword'), $text);

Modified: trunk/lib/WikiUser.php
===================================================================
--- trunk/lib/WikiUser.php	2012-12-04 12:49:42 UTC (rev 8595)
+++ trunk/lib/WikiUser.php	2012-12-04 13:03:14 UTC (rev 8596)
@@ -552,7 +552,7 @@
     function changePassword($newpasswd, $passwd2 = false)
     {
         if (!$this->mayChangePass()) {
-            trigger_error(sprintf("Attempt to change an external password for '%s'. Not allowed!",
+            trigger_error(sprintf("Attempt to change an external password for “%s”. Not allowed!",
                 $this->_userid), E_USER_ERROR);
             return false;
         }

Modified: trunk/lib/WikiUserNew.php
===================================================================
--- trunk/lib/WikiUserNew.php	2012-12-04 12:49:42 UTC (rev 8595)
+++ trunk/lib/WikiUserNew.php	2012-12-04 13:03:14 UTC (rev 8596)
@@ -1878,11 +1878,11 @@
 
     if (!preg_match($rfc822re, $email)) {
         $result[0] = false;
-        $result[1] = sprintf(_("E-mail address '%s' is not properly formatted"), $email);
+        $result[1] = sprintf(_("E-mail address “%s” is not properly formatted"), $email);
         return $result;
     }
     if ($noconnect)
-        return array(true, sprintf(_("E-mail address '%s' is properly formatted"), $email));
+        return array(true, sprintf(_("E-mail address “%s” is properly formatted"), $email));
 
     list ($Username, $Domain) = explode("@", $email);
     //Todo: getmxrr workaround on Windows or manual input field to verify it manually

Modified: trunk/lib/XmlElement.php
===================================================================
--- trunk/lib/XmlElement.php	2012-12-04 12:49:42 UTC (rev 8595)
+++ trunk/lib/XmlElement.php	2012-12-04 13:03:14 UTC (rev 8596)
@@ -513,8 +513,8 @@
             if (preg_match('/(?<!%)%[- ]?\d*[^- \d$]/x', $this->_fs)) // $fmt
                 // literal variable name substitution only to keep locale
                 // strings uncluttered
-                trigger_error(sprintf(_("Can't mix '%s' with '%s' type format strings"),
-                    '%1\$s', '%s'), E_USER_WARNING);
+                trigger_error(sprintf(_("Can't mix “%s” with “%s” type format strings"),
+                    '%1\$s', “%s”), E_USER_WARNING);
 
             $this->_fs = preg_replace('/(?<!%)%\d+\$/x', '%', $this->_fs);
 

Modified: trunk/lib/editpage.php
===================================================================
--- trunk/lib/editpage.php	2012-12-04 12:49:42 UTC (rev 8595)
+++ trunk/lib/editpage.php	2012-12-04 13:03:14 UTC (rev 8596)
@@ -589,7 +589,7 @@
         //$re_edit_link = Button('edit', _("Edit the new version"), $this->page);
 
         if ($unresolved)
-            $message = HTML::p(fmt("Some of the changes could not automatically be combined.  Please look for sections beginning with '%s', and ending with '%s'.  You will need to edit those sections by hand before you click Save.",
+            $message = HTML::p(fmt("Some of the changes could not automatically be combined.  Please look for sections beginning with “%s”, and ending with “%s”.  You will need to edit those sections by hand before you click Save.",
                 "<<<<<<< " . _("Your version"),
                 ">>>>>>> " . _("Other version")));
         else
@@ -953,7 +953,7 @@
 
     function getConflictMessage($unresolved = false)
     {
-        $message = HTML(HTML::p(fmt("Some of the changes could not automatically be combined.  Please look for sections beginning with '%s', and ending with '%s'.  You will need to edit those sections by hand before you click Save.",
+        $message = HTML(HTML::p(fmt("Some of the changes could not automatically be combined.  Please look for sections beginning with “%s”, and ending with “%s”.  You will need to edit those sections by hand before you click Save.",
                 "<<<<<<<",
                 "======="),
             HTML::p(_("Please check it through before saving."))));

Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php	2012-12-04 12:49:42 UTC (rev 8595)
+++ trunk/lib/loadsave.php	2012-12-04 13:03:14 UTC (rev 8596)
@@ -326,12 +326,12 @@
     // see if we can access the directory the user wants us to use
     if (!file_exists($directory)) {
         if (!mkdir($directory, 0755))
-            $request->finish(fmt("Cannot create directory '%s'", $directory));
+            $request->finish(fmt("Cannot create directory “%s”", $directory));
         else
-            $html = HTML::p(fmt("Created directory '%s' for the page dump...",
+            $html = HTML::p(fmt("Created directory “%s” for the page dump...",
                 $directory));
     } else {
-        $html = HTML::p(fmt("Using directory '%s'", $directory));
+        $html = HTML::p(fmt("Using directory “%s”", $directory));
     }
 
     StartLoadDump($request, _("Dumping Pages"), $html);
@@ -388,7 +388,7 @@
             $data = MailifyPage($page);
 
         if (!($fd = fopen($directory . "/" . $filename, "wb"))) {
-            $msg->pushContent(HTML::strong(fmt("couldn't open file '%s' for writing",
+            $msg->pushContent(HTML::strong(fmt("couldn't open file “%s” for writing",
                 "$directory/$filename")));
             $request->finish($msg);
         }
@@ -459,12 +459,12 @@
     // See if we can access the directory the user wants us to use
     if (!file_exists($directory)) {
         if (!mkdir($directory, 0755))
-            $request->finish(fmt("Cannot create directory '%s'", $directory));
+            $request->finish(fmt("Cannot create directory “%s”", $directory));
         else
-            $html = HTML::p(fmt("Created directory '%s' for the page dump...",
+            $html = HTML::p(fmt("Created directory “%s” for the page dump...",
                 $directory));
     } else {
-        $html = HTML::p(fmt("Using directory '%s'", $directory));
+        $html = HTML::p(fmt("Using directory “%s”", $directory));
     }
     StartLoadDump($request, _("Dumping Pages"), $html);
     $thispage = $request->getArg('pagename'); // for "Return to ..."
@@ -707,7 +707,7 @@
         if ($directory) {
             $outfile = $directory . "/" . $filename;
             if (!($fd = fopen($outfile, "wb"))) {
-                $msg->pushContent(HTML::strong(fmt("couldn't open file '%s' for writing",
+                $msg->pushContent(HTML::strong(fmt("couldn't open file “%s” for writing",
                     $outfile)));
                 $request->finish($msg);
             }
@@ -912,7 +912,7 @@
     // remove invalid backend specific chars. utf8 issues mostly
     $pagename_check = new WikiPagename($pageinfo['pagename']);
     if (!$pagename_check->isValid()) {
-        PrintXML(HTML::p(HTML::strong(sprintf(_("'%s': Bad page name"), $pageinfo['pagename']))));
+        PrintXML(HTML::p(HTML::strong(sprintf(_("“%s”: Bad page name"), $pageinfo['pagename']))));
         return;
     }
     $pagename = $pagename_check->getName();
@@ -1479,7 +1479,7 @@
     $finder = new FileFinder;
     $source = $finder->slashifyPath($source);
     StartLoadDump($request,
-        sprintf(_("Loading '%s'"), $source));
+        sprintf(_("Loading “%s”"), $source));
     LoadAny($request, $source);
     EndLoadDump($request);
 }

Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php	2012-12-04 12:49:42 UTC (rev 8595)
+++ trunk/lib/main.php	2012-12-04 13:03:14 UTC (rev 8596)
@@ -212,7 +212,7 @@
         }
         if (empty($WikiTheme) and $user_theme) {
             if (strcspn($user_theme, "./\x00]") != strlen($user_theme)) {
-                trigger_error(sprintf("invalid theme '%s': Invalid characters detected",
+                trigger_error(sprintf("invalid theme “%s”: Invalid characters detected",
                         $user_theme),
                     E_USER_WARNING);
                 $user_theme = "default";
@@ -532,7 +532,7 @@
             if (class_exists('PagePermission')) {
                 $user =& $this->_user;
                 $status = $user->isAuthenticated() ? _("authenticated") : _("not authenticated");
-                $msg = fmt("%s %s %s is disallowed on this wiki for %s user '%s' (level: %s).",
+                $msg = fmt("%s %s %s is disallowed on this wiki for %s user “%s” (level: %s).",
                     _("Missing PagePermission:"),
                     action2access($this->getArg('action')),
                     $this->getArg('pagename'),
@@ -798,7 +798,7 @@
         if (preg_match("/[<\[\{\|\"\}\]>]/", $pagename, $matches) > 0) {
             $CONTENT = HTML::div(
                 array('class' => 'error'),
-                sprintf(_("Illegal character '%s' in page name."),
+                sprintf(_("Illegal character “%s” in page name."),
                     $matches[0]));
             GeneratePage($CONTENT, $pagename);
             $this->finish();
@@ -1376,11 +1376,11 @@
                 _("The session.save_path directory"))
                 . "\n"
                 . sprintf(_("Please ensure that %s is writable, or redefine %s in config/config.ini."),
-                    sprintf(_("the session.save_path directory '%s'"),
+                    sprintf(_("the session.save_path directory “%s”"),
                         ini_get('session.save_path')),
                     'SESSION_SAVE_PATH')
                 . "\n"
-                . sprintf(_("Attempting to use the directory '%s' instead."),
+                . sprintf(_("Attempting to use the directory “%s” instead."),
                     $tmpdir)
             , E_USER_NOTICE);
         if (!is_writeable($tmpdir)) {

Modified: trunk/lib/purgepage.php
===================================================================
--- trunk/lib/purgepage.php	2012-12-04 12:49:42 UTC (rev 8595)
+++ trunk/lib/purgepage.php	2012-12-04 13:03:14 UTC (rev 8596)
@@ -25,7 +25,7 @@
         $cancelB = Button('submit:cancel', _("Cancel"), 'button'); // use generic wiki button look
 
         $fieldset = HTML::fieldset(HTML::legend(_('Confirm purge')),
-            HTML::p(fmt("You are about to purge '%s'!", $pagelink)),
+            HTML::p(fmt("You are about to purge “%s”!", $pagelink)),
             HTML::form(array('method' => 'post',
                     'action' => $request->getPostURL()),
                 HiddenInputs(array('currentversion' => $version,
@@ -51,7 +51,7 @@
         $dbi = $request->getDbh();
         $dbi->purgePage($pagename);
         $dbi->touch();
-        $html = HTML::p(array('class' => 'feedback'), fmt("Purged page '%s' successfully.", $pagename));
+        $html = HTML::p(array('class' => 'feedback'), fmt("Purged page “%s” successfully.", $pagename));
     }
 
     GeneratePage($html, _("Purge Page"));

Modified: trunk/lib/removepage.php
===================================================================
--- trunk/lib/removepage.php	2012-12-04 12:49:42 UTC (rev 8595)
+++ trunk/lib/removepage.php	2012-12-04 13:03:14 UTC (rev 8596)
@@ -25,7 +25,7 @@
         $cancelB = Button('submit:cancel', _("Cancel"), 'button'); // use generic wiki button look
 
         $fieldset = HTML::fieldset(HTML::legend(_('Confirm removal')),
-            HTML::p(fmt("You are about to remove '%s'!", $pagelink)),
+            HTML::p(fmt("You are about to remove “%s”!", $pagelink)),
             HTML::form(array('method' => 'post',
                     'action' => $request->getPostURL()),
                 HiddenInputs(array('currentversion' => $version,
@@ -51,7 +51,7 @@
         $dbi = $request->getDbh();
         $dbi->deletePage($pagename);
         $dbi->touch();
-        $html = HTML::p(array('class' => 'feedback'), fmt("Removed page '%s' successfully.", $pagename));
+        $html = HTML::p(array('class' => 'feedback'), fmt("Removed page “%s” successfully.", $pagename));
     }
 
     GeneratePage($html, _("Remove Page"));

Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2012-12-04 12:49:42 UTC (rev 8595)
+++ trunk/lib/stdlib.php	2012-12-04 13:03:14 UTC (rev 8596)
@@ -911,7 +911,7 @@
         if (!$warnings)
             return false;
 
-        return sprintf(_("'%s': Bad page name: %s"),
+        return sprintf(_("“%s”: Bad page name: %s"),
             $this->shortName, join(', ', $warnings));
     }
 
@@ -924,7 +924,7 @@
             return $page->name;
         // '0' or e.g. '1984' should be allowed though
         if (!is_string($page) and !is_integer($page)) {
-            trigger_error(sprintf("Non-string pagename '%s' (%s)(%s)",
+            trigger_error(sprintf("Non-string pagename “%s” (%s)(%s)",
                     $page, gettype($page), get_class($page)),
                 E_USER_NOTICE);
         }
@@ -1542,8 +1542,8 @@
         if (preg_match('/(?<!%)%[- ]?\d*[^- \d$]/x', $fmt))
             // literal variable name substitution only to keep locale
             // strings uncluttered
-            trigger_error(sprintf(_("Can't mix '%s' with '%s' type format strings"),
-                '%1\$s', '%s'), E_USER_WARNING); //php+locale error
+            trigger_error(sprintf(_("Can't mix “%s” with “%s” type format strings"),
+                '%1\$s', “%s”), E_USER_WARNING); //php+locale error
 
         $fmt = preg_replace('/(?<!%)%\d+\$/x', '%', $fmt);
         $newargs = array();
@@ -1644,7 +1644,7 @@
 
         @ $dir_handle = opendir($dir = $directory);
         if (empty($dir_handle)) {
-            trigger_error(sprintf(_("Unable to open directory '%s' for reading"),
+            trigger_error(sprintf(_("Unable to open directory “%s” for reading"),
                 $dir), E_USER_NOTICE);
             return; // early return
         }

Modified: trunk/lib/ziplib.php
===================================================================
--- trunk/lib/ziplib.php	2012-12-04 12:49:42 UTC (rev 8595)
+++ trunk/lib/ziplib.php	2012-12-04 13:03:14 UTC (rev 8596)
@@ -413,7 +413,7 @@
         if ($zipfile) {
             $this->zipfile = $zipfile;
             if (!($this->fp = fopen($zipfile, "rb"))) {
-                trigger_error(sprintf(_("Can't open zip file '%s' for reading"),
+                trigger_error(sprintf(_("Can't open zip file “%s” for reading"),
                     $zipfile), E_USER_ERROR);
             }
         }

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

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

From: <var...@us...> - 2012-12-04 12:49:54

Revision: 8595
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8595&view=rev
Author:   vargenau
Date:     2012-12-04 12:49:42 +0000 (Tue, 04 Dec 2012)
Log Message:
-----------
Use smart quotes

Modified Paths:
--------------
    trunk/lib/plugin/AddComment.php
    trunk/lib/plugin/Chart.php
    trunk/lib/plugin/CreateBib.php
    trunk/lib/plugin/CreatePage.php
    trunk/lib/plugin/CreateToc.php
    trunk/lib/plugin/FileInfo.php
    trunk/lib/plugin/FullTextSearch.php
    trunk/lib/plugin/FuzzyPages.php
    trunk/lib/plugin/GoogleMaps.php
    trunk/lib/plugin/GraphViz.php
    trunk/lib/plugin/IncludePage.php
    trunk/lib/plugin/LikePages.php
    trunk/lib/plugin/ModeratedPage.php
    trunk/lib/plugin/PageGroup.php
    trunk/lib/plugin/PhotoAlbum.php
    trunk/lib/plugin/PhpHighlight.php
    trunk/lib/plugin/PhpWeather.php
    trunk/lib/plugin/Ploticus.php
    trunk/lib/plugin/RecentChanges.php
    trunk/lib/plugin/RedirectTo.php
    trunk/lib/plugin/SpellCheck.php
    trunk/lib/plugin/SyncWiki.php
    trunk/lib/plugin/SyntaxHighlighter.php
    trunk/lib/plugin/SystemInfo.php
    trunk/lib/plugin/Template.php
    trunk/lib/plugin/TitleSearch.php
    trunk/lib/plugin/TranslateText.php
    trunk/lib/plugin/UpLoad.php
    trunk/lib/plugin/WikiAdminChmod.php
    trunk/lib/plugin/WikiAdminChown.php
    trunk/lib/plugin/WikiAdminDeleteAcl.php
    trunk/lib/plugin/WikiAdminMarkup.php
    trunk/lib/plugin/WikiAdminPurge.php
    trunk/lib/plugin/WikiAdminRemove.php
    trunk/lib/plugin/WikiAdminRename.php
    trunk/lib/plugin/WikiAdminSearchReplace.php
    trunk/lib/plugin/WikiAdminSelect.php
    trunk/lib/plugin/WikiAdminSetAcl.php
    trunk/lib/plugin/WikiAdminSetExternal.php
    trunk/lib/plugin/WikiBlog.php
    trunk/lib/plugin/WikiFormRich.php
    trunk/lib/plugin/WikiForum.php
    trunk/lib/plugin/WikiPoll.php
    trunk/lib/plugin/_AuthInfo.php
    trunk/lib/plugin/_BackendInfo.php
    trunk/lib/plugin/_Retransform.php
    trunk/lib/plugin/text2png.php

Modified: trunk/lib/plugin/AddComment.php
===================================================================
--- trunk/lib/plugin/AddComment.php	2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/AddComment.php	2012-12-04 12:49:42 UTC (rev 8595)
@@ -74,7 +74,7 @@
     {
         $args = $this->getArgs($argstr, $request);
         if (!$args['pagename']) {
-            return $this->error(sprintf(_("A required argument '%s' is missing."), 'pagename'));
+            return $this->error(sprintf(_("A required argument “%s” is missing."), 'pagename'));
         }
 
         // Get our form args.
@@ -129,7 +129,7 @@
                     }
                     break;
                 default:
-                    return $this->error(sprintf("Bad mode ('%s')", $show));
+                    return $this->error(sprintf("Bad mode (“%s”)", $show));
             }
         }
         $html->pushContent($div);

Modified: trunk/lib/plugin/Chart.php
===================================================================
--- trunk/lib/plugin/Chart.php	2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/Chart.php	2012-12-04 12:49:42 UTC (rev 8595)
@@ -80,7 +80,7 @@
         global $WikiTheme;
         $args = $this->getArgs($argstr, $request);
         if (!$args['data']) {
-            return $this->error(sprintf(_("A required argument '%s' is missing."), 'data'));
+            return $this->error(sprintf(_("A required argument “%s” is missing."), 'data'));
         }
         extract($args);
 

Modified: trunk/lib/plugin/CreateBib.php
===================================================================
--- trunk/lib/plugin/CreateBib.php	2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/CreateBib.php	2012-12-04 12:49:42 UTC (rev 8595)
@@ -110,7 +110,7 @@
             $pagename = $page->name;
         }
         if (!$pagename) {
-            return $this->error(sprintf(_("A required argument '%s' is missing."), 'pagename'));
+            return $this->error(sprintf(_("A required argument “%s” is missing."), 'pagename'));
         }
 
         // Get the links page contents

Modified: trunk/lib/plugin/CreatePage.php
===================================================================
--- trunk/lib/plugin/CreatePage.php	2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/CreatePage.php	2012-12-04 12:49:42 UTC (rev 8595)
@@ -73,9 +73,9 @@
         if ($verify) {
             $head = _("CreatePage failed");
             if ($dbi->isWikiPage($verify)) {
-                $msg = _("Do you really want to create the page '%s'?");
+                $msg = _("Do you really want to create the page “%s”?");
             } else {
-                $msg = _("Do you really want to create the page '%s'?");
+                $msg = _("Do you really want to create the page “%s”?");
             }
             if (isSubPage($s)) {
                 $main = subPageSlice(0);

Modified: trunk/lib/plugin/CreateToc.php
===================================================================
--- trunk/lib/plugin/CreateToc.php	2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/CreateToc.php	2012-12-04 12:49:42 UTC (rev 8595)
@@ -396,7 +396,7 @@
             $pagename = $page->name;
         }
         if (!$pagename) {
-            return $this->error(sprintf(_("A required argument '%s' is missing."), 'pagename'));
+            return $this->error(sprintf(_("A required argument “%s” is missing."), 'pagename'));
         }
         if (($notoc) or ($liststyle == 'ol')) {
             $with_counter = 1;
@@ -410,7 +410,7 @@
 
         // Check if page exists.
         if (!($dbi->isWikiPage($pagename))) {
-            return $this->error(sprintf(_("Page '%s' does not exist."), $pagename));
+            return $this->error(sprintf(_("Page “%s” does not exist."), $pagename));
         }
 
         // Check if user is allowed to get the page.

Modified: trunk/lib/plugin/FileInfo.php
===================================================================
--- trunk/lib/plugin/FileInfo.php	2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/FileInfo.php	2012-12-04 12:49:42 UTC (rev 8595)
@@ -62,10 +62,10 @@
         $args = $this->getArgs($argstr, $request);
         extract($args);
         if (!$file) {
-            return $this->error(sprintf(_("A required argument '%s' is missing."), 'file'));
+            return $this->error(sprintf(_("A required argument “%s” is missing."), 'file'));
         }
         if (!$display) {
-            return $this->error(sprintf(_("A required argument '%s' is missing."), 'display'));
+            return $this->error(sprintf(_("A required argument “%s” is missing."), 'display'));
         }
         if (string_starts_with($file, "Upload:")) {
             $file = preg_replace("/^Upload:(.*)$/", getUploadFilePath() . "\\1", $file);
@@ -79,7 +79,7 @@
             if ($quiet) {
                 return HTML::raw('');
             } else {
-                return $this->error(sprintf(_("File '%s' not found."), $file));
+                return $this->error(sprintf(_("File “%s” not found."), $file));
             }
         }
         // sanify $file name

Modified: trunk/lib/plugin/FullTextSearch.php
===================================================================
--- trunk/lib/plugin/FullTextSearch.php	2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/FullTextSearch.php	2012-12-04 12:49:42 UTC (rev 8595)
@@ -119,7 +119,7 @@
             $list->pushContent(HTML::dd(_("<no matches>")));
 
         if (!empty($pages->stoplisted))
-            $list = HTML(HTML::p(fmt(_("Ignored stoplist words '%s'"),
+            $list = HTML(HTML::p(fmt(_("Ignored stoplist words “%s”"),
                     join(', ', $pages->stoplisted))),
                 $list);
         if ($noheader)

Modified: trunk/lib/plugin/FuzzyPages.php
===================================================================
--- trunk/lib/plugin/FuzzyPages.php	2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/FuzzyPages.php	2012-12-04 12:49:42 UTC (rev 8595)
@@ -102,7 +102,7 @@
             $link = WikiLink($this->_searchterm, 'auto');
         else
             $link = $this->_searchterm;
-        $caption = fmt("These page titles match fuzzy with '%s'", $link);
+        $caption = fmt("These page titles match fuzzy with “%s”", $link);
         $table->pushContent(HTML::caption($caption));
     }
 
@@ -144,7 +144,7 @@
     {
 
         if (empty($list)) {
-            return HTML::p(fmt("No fuzzy matches with '%s'", $this->_searchterm));
+            return HTML::p(fmt("No fuzzy matches with “%s”", $this->_searchterm));
         }
         $table = HTML::table(array('class' => 'pagelist'));
         $this->addTableCaption($table, $dbi);

Modified: trunk/lib/plugin/GoogleMaps.php
===================================================================
--- trunk/lib/plugin/GoogleMaps.php	2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/GoogleMaps.php	2012-12-04 12:49:42 UTC (rev 8595)
@@ -90,10 +90,10 @@
         extract($args);
 
         if ($Longitude === '') {
-            return $this->error(sprintf(_("A required argument '%s' is missing."), 'Longitude'));
+            return $this->error(sprintf(_("A required argument “%s” is missing."), 'Longitude'));
         }
         if ($Latitude === '') {
-            return $this->error(sprintf(_("A required argument '%s' is missing."), 'Latitude'));
+            return $this->error(sprintf(_("A required argument “%s” is missing."), 'Latitude'));
         }
 
         $maps = JavaScript('', array('src' => "http://maps.google.com/maps?file=api&v=1&key=" . GOOGLE_LICENSE_KEY));

Modified: trunk/lib/plugin/GraphViz.php
===================================================================
--- trunk/lib/plugin/GraphViz.php	2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/GraphViz.php	2012-12-04 12:49:42 UTC (rev 8595)
@@ -289,7 +289,7 @@
             $cmdline = "$dotbin $args";
             $code = $this->execute($cmdline, $outfile);
             if (!$code)
-                $this->complain(sprintf(_("Couldn't start commandline '%s'"), $cmdline));
+                $this->complain(sprintf(_("Couldn't start commandline “%s”"), $cmdline));
         } else {
             $args = "-T$gif -o $outfile";
             $cmdline = "$dotbin $args";
@@ -297,11 +297,11 @@
             //if (!isWindows()) $cmdline .= " 2>&1";
             $code = $this->filterThroughCmd($source, $cmdline);
             if ($code)
-                $this->complain(sprintf(_("Couldn't start commandline '%s'"), $cmdline));
+                $this->complain(sprintf(_("Couldn't start commandline “%s”"), $cmdline));
             sleep(0.1);
         }
         if (!file_exists($outfile)) {
-            $this->complain(sprintf(_("%s error: outputfile '%s' not created"),
+            $this->complain(sprintf(_("%s error: outputfile “%s” not created"),
                 "GraphViz", $outfile));
             $this->complain("\ncmd-line: $cmdline");
             return false;

Modified: trunk/lib/plugin/IncludePage.php
===================================================================
--- trunk/lib/plugin/IncludePage.php	2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/IncludePage.php	2012-12-04 12:49:42 UTC (rev 8595)
@@ -87,7 +87,7 @@
             $page = $page->name;
         }
         if (!$page) {
-            return $this->error(sprintf(_("A required argument '%s' is missing."), 'page'));
+            return $this->error(sprintf(_("A required argument “%s” is missing."), 'page'));
         }
 
         // A page can include itself once (this is needed, e.g.,  when editing
@@ -100,7 +100,7 @@
 
         // Check if page exists
         if (!($dbi->isWikiPage($page))) {
-            return $this->error(sprintf(_("Page '%s' does not exist"), $page));
+            return $this->error(sprintf(_("Page “%s” does not exist"), $page));
         }
 
         // Check if user is allowed to get the Page.

Modified: trunk/lib/plugin/LikePages.php
===================================================================
--- trunk/lib/plugin/LikePages.php	2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/LikePages.php	2012-12-04 12:49:42 UTC (rev 8595)
@@ -33,7 +33,7 @@
 
     function getDescription()
     {
-        return sprintf(_("List page names which share an initial or final title word with '%s'."),
+        return sprintf(_("List page names which share an initial or final title word with “%s”."),
             '[pagename]');
     }
 
@@ -63,9 +63,9 @@
 
         if ($prefix) {
             $suffix = false;
-            $descrip = fmt("Page names with prefix '%s'", $prefix);
+            $descrip = fmt("Page names with prefix “%s”", $prefix);
         } elseif ($suffix) {
-            $descrip = fmt("Page names with suffix '%s'", $suffix);
+            $descrip = fmt("Page names with suffix “%s”", $suffix);
         } elseif ($page) {
             $words = preg_split('/[\s:-;.,]+/',
                 SplitPagename($page));
@@ -74,7 +74,7 @@
             $prefix = reset($words);
             $suffix = end($words);
 
-            $descrip = fmt("These pages share an initial or final title word with '%s'",
+            $descrip = fmt("These pages share an initial or final title word with “%s”",
                 WikiLink($page, 'auto'));
         }
 

Modified: trunk/lib/plugin/ModeratedPage.php
===================================================================
--- trunk/lib/plugin/ModeratedPage.php	2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/ModeratedPage.php	2012-12-04 12:49:42 UTC (rev 8595)
@@ -66,7 +66,7 @@
         // Handle moderation request from URLs sent by e-mail
         if (!empty($args['id']) and !empty($args['pass'])) {
             if (!$args['page']) {
-                return $this->error(sprintf(_("A required argument '%s' is missing."), 'page'));
+                return $this->error(sprintf(_("A required argument “%s” is missing."), 'page'));
             }
             $page = $dbi->getPage($args['page']);
             if ($moderated = $page->get("moderated")) {
@@ -159,12 +159,12 @@
             }
             $page->set('moderation', array('status' => $status));
             return $this->notice(
-                fmt("ModeratedPage status update:\n  Moderators: '%s'\n  require_access: '%s'",
+                fmt("ModeratedPage status update:\n  Moderators: “%s”\n  require_access: “%s”",
                     join(',', $status['moderators']), $status['require_access']));
         } else {
             $page->set('moderation', false);
             return $this->notice(HTML($status,
-                fmt("'%s' is no ModeratedPage anymore.", $page->getName())));
+                fmt("“%s” is no ModeratedPage anymore.", $page->getName())));
         }
     }
 
@@ -184,7 +184,7 @@
             }
             $page->set('moderation', array('status' => $status));
             return $this->notice(
-                fmt("ModeratedPage status update: '%s' is now a ModeratedPage.\n  Moderators: '%s'\n  require_access: '%s'",
+                fmt("ModeratedPage status update: “%s” is now a ModeratedPage.\n  Moderators: “%s”\n  require_access: “%s”",
                     $page->getName(), join(',', $status['moderators']), $status['require_access']));
         } else { // error
             return $status;

Modified: trunk/lib/plugin/PageGroup.php
===================================================================
--- trunk/lib/plugin/PageGroup.php	2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/PageGroup.php	2012-12-04 12:49:42 UTC (rev 8595)
@@ -98,7 +98,7 @@
         $args = $this->getArgs($argstr, $request);
         extract($args);
         if (empty($parent)) {
-            return $this->error(sprintf(_("A required argument '%s' is missing."), 'parent'));
+            return $this->error(sprintf(_("A required argument “%s” is missing."), 'parent'));
         }
         $directions = array('next' => _("Next"),
             'previous' => _("Previous"),

Modified: trunk/lib/plugin/PhotoAlbum.php
===================================================================
--- trunk/lib/plugin/PhotoAlbum.php	2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/PhotoAlbum.php	2012-12-04 12:49:42 UTC (rev 8595)
@@ -621,7 +621,7 @@
                     return;
                 }
                 if (!file_exists($src))
-                    return $this->error(fmt("Unable to find src='%s'", $src));
+                    return $this->error(fmt("Unable to find src=“%s”", $src));
                 $photos[] = array("src" => $src,
                     "name" => "../" . $src,
                     "name_tile" => $src,
@@ -633,7 +633,7 @@
         if ($web_location == 0) {
             $fp = @fopen($src, "r");
             if (!$fp) {
-                return $this->error(fmt("Unable to read src='%s'", $src));
+                return $this->error(fmt("Unable to read src=“%s”", $src));
             }
             while ($data = fgetcsv($fp, 1024, ';')) {
                 if (count($data) == 0 || empty($data[0])

Modified: trunk/lib/plugin/PhpHighlight.php
===================================================================
--- trunk/lib/plugin/PhpHighlight.php	2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/PhpHighlight.php	2012-12-04 12:49:42 UTC (rev 8595)
@@ -139,14 +139,14 @@
         static $MAXLEN = 7;
         foreach (array($string, $comment, $keyword, $bg, $default, $html) as $color) {
             $length = strlen($color);
-            //trigger_error(sprintf(_("DEBUG: color '%s' is length %d."), $color, $length), E_USER_NOTICE);
+            //trigger_error(sprintf(_("DEBUG: color “%s” is length %d."), $color, $length), E_USER_NOTICE);
             if (($length == 7 || $length == 4) && substr($color, 0, 1) == "#"
                 && "#" == preg_replace("/[a-fA-F0-9]/", "", $color)
             ) {
-                //trigger_error(sprintf(_("DEBUG: color '%s' appears to be hex."), $color), E_USER_NOTICE);
+                //trigger_error(sprintf(_("DEBUG: color “%s” appears to be hex."), $color), E_USER_NOTICE);
                 // stop checking, ok to go
             } elseif (($length < $MAXLEN + 1) && in_array($color, $html4colors)) {
-                //trigger_error(sprintf(_("DEBUG color '%s' appears to be an HTML 4 color."), $color), E_USER_NOTICE);
+                //trigger_error(sprintf(_("DEBUG color “%s” appears to be an HTML 4 color."), $color), E_USER_NOTICE);
                 // stop checking, ok to go
             } else {
                 trigger_error(sprintf(_("Invalid color: %s"),

Modified: trunk/lib/plugin/PhpWeather.php
===================================================================
--- trunk/lib/plugin/PhpWeather.php	2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/PhpWeather.php	2012-12-04 12:49:42 UTC (rev 8595)
@@ -100,7 +100,7 @@
             if (!$w->get_country_code()) {
                 /* The country code couldn't be resolved, so we
                  * shouldn't use the ICAO: */
-                trigger_error(sprintf(_("The ICAO '%s' wasn't recognized."),
+                trigger_error(sprintf(_("The ICAO “%s” wasn't recognized."),
                     $icao), E_USER_NOTICE);
                 $icao = '';
             }
@@ -111,7 +111,7 @@
             /* We check and correct the language if necessary: */
             //if (!in_array($language, array_keys($w->get_languages('text')))) {
             if (!in_array($language, array_keys(get_languages('text')))) {
-                trigger_error(sprintf(_("%s does not know about the language '%s', using 'en' instead."),
+                trigger_error(sprintf(_("%s does not know about the language “%s”, using 'en' instead."),
                         $this->getName(), $language),
                     E_USER_NOTICE);
                 $language = 'en';

Modified: trunk/lib/plugin/Ploticus.php
===================================================================
--- trunk/lib/plugin/Ploticus.php	2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/Ploticus.php	2012-12-04 12:49:42 UTC (rev 8595)
@@ -259,9 +259,9 @@
                 sleep(1);
             }
             //if (empty($code))
-            //    return $this->error(fmt("Couldn't start commandline '%s'", $commandLine));
+            //    return $this->error(fmt("Couldn't start commandline “%s”", $commandLine));
             if (!file_exists($tempfile . ".$gif")) {
-                $this->_errortext .= sprintf(_("%s error: outputfile '%s' not created"),
+                $this->_errortext .= sprintf(_("%s error: outputfile “%s” not created"),
                     "Ploticus", "$tempfile.$gif");
                 if (isWindows())
                     $this->_errortext .= ("\ncmd-line: " . PLOTICUS_EXE . " $tempfile.plo $args");

Modified: trunk/lib/plugin/RecentChanges.php
===================================================================
--- trunk/lib/plugin/RecentChanges.php	2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/RecentChanges.php	2012-12-04 12:49:42 UTC (rev 8595)
@@ -346,7 +346,7 @@
             $edits .= sprintf(_(" for all pages linking to %s"), $category);
         }
         if (!empty($pagematch)) {
-            $edits .= sprintf(_(" for all pages matching '%s'"), $pagematch);
+            $edits .= sprintf(_(" for all pages matching “%s”"), $pagematch);
         }
         if ($timespan = $days > 0) {
             if (intval($days) != $days)

Modified: trunk/lib/plugin/RedirectTo.php
===================================================================
--- trunk/lib/plugin/RedirectTo.php	2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/RedirectTo.php	2012-12-04 12:49:42 UTC (rev 8595)
@@ -84,7 +84,7 @@
         }
 
         if ($page == $request->getArg('pagename')) {
-            return $this->error(fmt("Recursive redirect to self: '%s'", $url));
+            return $this->error(fmt("Recursive redirect to self: “%s”", $url));
         }
 
         if ($request->getArg('action') != 'browse') {

Modified: trunk/lib/plugin/SpellCheck.php
===================================================================
--- trunk/lib/plugin/SpellCheck.php	2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/SpellCheck.php	2012-12-04 12:49:42 UTC (rev 8595)
@@ -146,7 +146,7 @@
             $cache = new WikiPluginCached;
             $code = $cache->filterThroughCmd($source, $commandLine);
             if (empty($code))
-                return $this->error(fmt("Couldn't start commandline '%s'", $commandLine));
+                return $this->error(fmt("Couldn't start commandline “%s”", $commandLine));
             $sugg = array();
             foreach (preg_split("/\n/", $code) as $line) {
                 if (preg_match("/^& (\w+) \d+ \d+: (.+)$/", $line, $m)) {

Modified: trunk/lib/plugin/SyncWiki.php
===================================================================
--- trunk/lib/plugin/SyncWiki.php	2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/SyncWiki.php	2012-12-04 12:49:42 UTC (rev 8595)
@@ -71,7 +71,7 @@
         $args['action'] = 'syncwiki';
         extract($args);
         if (empty($args['url'])) {
-            return $this->error(fmt("A required argument '%s' is missing.", "url"));
+            return $this->error(fmt("A required argument “%s” is missing.", "url"));
         }
         if ($request->getArg('action') != 'browse') {
             return $this->disabled(_("Plugin not run: not in browse mode"));

Modified: trunk/lib/plugin/SyntaxHighlighter.php
===================================================================
--- trunk/lib/plugin/SyntaxHighlighter.php	2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/SyntaxHighlighter.php	2012-12-04 12:49:42 UTC (rev 8595)
@@ -113,7 +113,7 @@
         extract($this->getArgs($argstr, $request));
         $source =& $this->source;
         if (empty($syntax)) {
-            return $this->error(sprintf(_("A required argument '%s' is missing."), 'syntax'));
+            return $this->error(sprintf(_("A required argument “%s” is missing."), 'syntax'));
         }
         if (empty($source)) {
             return HTML::div(array('class' => "error"),
@@ -143,7 +143,7 @@
         $commandLine = HIGHLIGHT_EXE . "$args -q -X -f -S $syntax";
         $code = $this->newFilterThroughCmd($source, $commandLine);
         if (empty($code)) {
-            return $this->error(fmt("Couldn't start commandline '%s'", $commandLine));
+            return $this->error(fmt("Couldn't start commandline “%s”", $commandLine));
         }
         $pre = HTML::pre(HTML::raw($code));
         $html->pushContent($pre);

Modified: trunk/lib/plugin/SystemInfo.php
===================================================================
--- trunk/lib/plugin/SystemInfo.php	2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/SystemInfo.php	2012-12-04 12:49:42 UTC (rev 8595)
@@ -470,7 +470,7 @@
             . implode(', ', $available_languages) . ". "
             . _("Current language") . _(": ") . $GLOBALS['LANG']
             . ((DEFAULT_LANGUAGE != $GLOBALS['LANG'])
-                ? ". " . sprintf(_("Default language: '%s'"), DEFAULT_LANGUAGE)
+                ? ". " . sprintf(_("Default language: “%s”"), DEFAULT_LANGUAGE)
                 : '');
     }
 
@@ -483,7 +483,7 @@
             . implode(', ', $available_themes) . ". "
             . _("Current theme") . _(": ") . $WikiTheme->_name
             . ((THEME != $WikiTheme->_name)
-                ? ". " . sprintf(_("Default theme: '%s'"), THEME)
+                ? ". " . sprintf(_("Default theme: “%s”"), THEME)
                 : '');
     }
 
@@ -496,7 +496,7 @@
             !in_array($arg, array('ADMIN_PASSWD', 'DATABASE_DSN', 'DBAUTH_AUTH_DSN'))
         )
             return constant($arg); else
-            return $this->error(sprintf(_("unknown argument '%s' to SystemInfo"), $arg));
+            return $this->error(sprintf(_("unknown argument “%s” to SystemInfo"), $arg));
     }
 
     function run($dbi, $argstr, &$request, $basepage)
@@ -507,7 +507,7 @@
         $args['seperator'] = ' ';
         $availableargs = // name => callback + 0 args
             array('appname' => create_function('', "return 'PhpWiki';"),
-                'version' => create_function('', "return sprintf('%s', PHPWIKI_VERSION);"),
+                'version' => create_function('', "return sprintf(“%s”, PHPWIKI_VERSION);"),
                 'LANG' => create_function('', 'return $GLOBALS["LANG"];'),
                 'LC_ALL' => create_function('', 'return setlocale(LC_ALL, 0);'),
                 'current_language' => create_function('', 'return $GLOBALS["LANG"];'),

Modified: trunk/lib/plugin/Template.php
===================================================================
--- trunk/lib/plugin/Template.php	2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/Template.php	2012-12-04 12:49:42 UTC (rev 8595)
@@ -112,7 +112,7 @@
             $page = $page->name;
         }
         if (!$page) {
-            return $this->error(sprintf(_("A required argument '%s' is missing."), 'page'));
+            return $this->error(sprintf(_("A required argument “%s” is missing."), 'page'));
         }
 
         // If "Template:$page" exists, use it
@@ -133,7 +133,7 @@
 
         // Check if page exists
         if (!($dbi->isWikiPage($page))) {
-            return $this->error(sprintf(_("Page '%s' does not exist."), $page));
+            return $this->error(sprintf(_("Page “%s” does not exist."), $page));
         }
 
         // Check if user is allowed to get the Page.

Modified: trunk/lib/plugin/TitleSearch.php
===================================================================
--- trunk/lib/plugin/TitleSearch.php	2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/TitleSearch.php	2012-12-04 12:49:42 UTC (rev 8595)
@@ -94,9 +94,9 @@
                 $s = WikiLink($args['s'], 'auto');
             }
             if ($total) {
-                $pagelist->setCaption(fmt("Title search results for '%s' (%d total)", $s, $total));
+                $pagelist->setCaption(fmt("Title search results for “%s” (%d total)", $s, $total));
             } else {
-                $pagelist->setCaption(fmt("Title search results for '%s'", $s));
+                $pagelist->setCaption(fmt("Title search results for “%s”", $s));
             }
         }
 

Modified: trunk/lib/plugin/TranslateText.php
===================================================================
--- trunk/lib/plugin/TranslateText.php	2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/TranslateText.php	2012-12-04 12:49:42 UTC (rev 8595)
@@ -92,7 +92,7 @@
                         'author' => $user->getId());
                 }
                 $text .= $user->getId() . " " . Iso8601DateTime() . "\n" .
-                    "* " . sprintf(_("Translate '%s' to '%s' in *%s*"),
+                    "* " . sprintf(_("Translate “%s” to “%s” in *%s*"),
                     $pagename, $trans, $lang);
                 $text .= "\n  <verbatim>locale/po/$lang.po:\n  msgid \"" . $pagename . "\"\n  msgstr \"" . $trans . "\"\n  </verbatim>";
                 $meta['summary'] = sprintf(_("Translate %s to %s in %s"),

Modified: trunk/lib/plugin/UpLoad.php
===================================================================
--- trunk/lib/plugin/UpLoad.php	2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/UpLoad.php	2012-12-04 12:49:42 UTC (rev 8595)
@@ -213,7 +213,7 @@
             $u_userfile = preg_replace("/ /", "%20", $u_userfile);
             $userfile_tmpname = $userfile->getTmpName();
             $err_header = HTML::div(array('class' => 'error'),
-                HTML::p(fmt("ERROR uploading '%s'", $userfile_name)));
+                HTML::p(fmt("ERROR uploading “%s”", $userfile_name)));
             if (preg_match("/(\." . join("|\.", $this->disallowed_extensions) . ")(\.|\$)/i",
                 $userfile_name)
             ) {

Modified: trunk/lib/plugin/WikiAdminChmod.php
===================================================================
--- trunk/lib/plugin/WikiAdminChmod.php	2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/WikiAdminChmod.php	2012-12-04 12:49:42 UTC (rev 8595)
@@ -74,10 +74,10 @@
         if ($perm = new PagePermission($acl)) {
             foreach ($pages as $name) {
                 if ($perm->store($dbi->getPage($name))) {
-                    $ul->pushContent(HTML::li(fmt("chmod page '%s' to '%s'.", $name, $permstring)));
+                    $ul->pushContent(HTML::li(fmt("chmod page “%s” to “%s”.", $name, $permstring)));
                     $count++;
                 } else {
-                    $ul->pushContent(HTML::li(fmt("Couldn't chmod page '%s' to '%s'.", $name, $permstring)));
+                    $ul->pushContent(HTML::li(fmt("Couldn't chmod page “%s” to “%s”.", $name, $permstring)));
                 }
             }
         } else {

Modified: trunk/lib/plugin/WikiAdminChown.php
===================================================================
--- trunk/lib/plugin/WikiAdminChown.php	2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/WikiAdminChown.php	2012-12-04 12:49:42 UTC (rev 8595)
@@ -66,7 +66,7 @@
                 $newowner != $owner
             ) {
                 if (!mayAccessPage('change', $name)) {
-                    $ul->pushContent(HTML::li(fmt("Access denied to change page '%s'.",
+                    $ul->pushContent(HTML::li(fmt("Access denied to change page “%s”.",
                         WikiLink($name))));
                 } else {
                     $version = $current->getVersion();
@@ -79,11 +79,11 @@
                     $page->set('owner', $newowner);
                     $page->save($text, $version + 1, $meta);
                     if ($page->get('owner') === $newowner) {
-                        $ul->pushContent(HTML::li(fmt("Change owner of page '%s' to '%s'.",
+                        $ul->pushContent(HTML::li(fmt("Change owner of page “%s” to “%s”.",
                             WikiLink($name), WikiLink($newowner))));
                         $count++;
                     } else {
-                        $ul->pushContent(HTML::li(fmt("Could not change owner of page '%s' to '%s'.",
+                        $ul->pushContent(HTML::li(fmt("Could not change owner of page “%s” to “%s”.",
                             WikiLink($name), $newowner)));
                     }
                 }

Modified: trunk/lib/plugin/WikiAdminDeleteAcl.php
===================================================================
--- trunk/lib/plugin/WikiAdminDeleteAcl.php	2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/WikiAdminDeleteAcl.php	2012-12-04 12:49:42 UTC (rev 8595)
@@ -58,12 +58,12 @@
             $oldperm = getPagePermissions($page);
             setPagePermissions($page, $perm);
             $result->setAttr('class', 'feedback');
-            $result->pushContent(HTML::p(fmt("ACL deleted for page '%s'", $pagename)));
+            $result->pushContent(HTML::p(fmt("ACL deleted for page “%s”", $pagename)));
             $current = $page->getCurrentRevision();
             $version = $current->getVersion();
             $meta = $current->_data;
             $text = $current->getPackedContent();
-            $meta['summary'] = sprintf(_("ACL deleted for page '%s'"), $pagename);
+            $meta['summary'] = sprintf(_("ACL deleted for page “%s”"), $pagename);
             $meta['is_minor_edit'] = 1;
             $meta['author'] = $request->_user->UserName();
             unset($meta['mtime']); // force new date

Modified: trunk/lib/plugin/WikiAdminMarkup.php
===================================================================
--- trunk/lib/plugin/WikiAdminMarkup.php	2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/WikiAdminMarkup.php	2012-12-04 12:49:42 UTC (rev 8595)
@@ -66,7 +66,7 @@
             if (!$markup or $newmarkup != $markup) {
                 if (!mayAccessPage('change', $name)) {
                     $result->setAttr('class', 'error');
-                    $result->pushContent(HTML::p(fmt("Access denied to change page '%s'.",
+                    $result->pushContent(HTML::p(fmt("Access denied to change page “%s”.",
                         WikiLink($name))));
                 } else {
                     $version = $current->getVersion();
@@ -81,11 +81,11 @@
                     $page->save($text, $version + 1, $meta);
                     $current = $page->getCurrentRevision();
                     if ($current->get('markup') === $newmarkup) {
-                        $ul->pushContent(HTML::li(fmt("change page '%s' to markup type '%s'.",
+                        $ul->pushContent(HTML::li(fmt("change page “%s” to markup type “%s”.",
                             WikiLink($name), $newmarkup)));
                         $count++;
                     } else {
-                        $ul->pushContent(HTML::li(fmt("Couldn't change page '%s' to markup type '%s'.",
+                        $ul->pushContent(HTML::li(fmt("Couldn't change page “%s” to markup type “%s”.",
                             WikiLink($name), $newmarkup)));
                     }
                 }

Modified: trunk/lib/plugin/WikiAdminPurge.php
===================================================================
--- trunk/lib/plugin/WikiAdminPurge.php	2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/WikiAdminPurge.php	2012-12-04 12:49:42 UTC (rev 8595)
@@ -69,10 +69,10 @@
             $name = str_replace(array('%5B', '%5D'), array('[', ']'), $name);
             if (mayAccessPage('purge', $name)) {
                 $dbi->purgePage($name);
-                $ul->pushContent(HTML::li(fmt("Purged page '%s' successfully.", $name)));
+                $ul->pushContent(HTML::li(fmt("Purged page “%s” successfully.", $name)));
                 $count++;
             } else {
-                $ul->pushContent(HTML::li(fmt("Didn't purge page '%s'. Access denied.", $name)));
+                $ul->pushContent(HTML::li(fmt("Didn't purge page “%s”. Access denied.", $name)));
             }
         }
         if ($count) {

Modified: trunk/lib/plugin/WikiAdminRemove.php
===================================================================
--- trunk/lib/plugin/WikiAdminRemove.php	2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/WikiAdminRemove.php	2012-12-04 12:49:42 UTC (rev 8595)
@@ -113,10 +113,10 @@
             $name = str_replace(array('%5B', '%5D'), array('[', ']'), $name);
             if (mayAccessPage('remove', $name)) {
                 $dbi->deletePage($name);
-                $ul->pushContent(HTML::li(fmt("Removed page '%s' successfully.", $name)));
+                $ul->pushContent(HTML::li(fmt("Removed page “%s” successfully.", $name)));
                 $count++;
             } else {
-                $ul->pushContent(HTML::li(fmt("Didn't remove page '%s'. Access denied.", $name)));
+                $ul->pushContent(HTML::li(fmt("Didn't remove page “%s”. Access denied.", $name)));
             }
         }
         if ($count) {

Modified: trunk/lib/plugin/WikiAdminRename.php
===================================================================
--- trunk/lib/plugin/WikiAdminRename.php	2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/WikiAdminRename.php	2012-12-04 12:49:42 UTC (rev 8595)
@@ -83,9 +83,9 @@
                 if (strlen($newname) > MAX_PAGENAME_LENGTH)
                     $ul->pushContent(HTML::li(_("Cannot rename. New page name too long.")));
                 elseif ($dbi->isWikiPage($newname))
-                    $ul->pushContent(HTML::li(fmt("Page '%s' already exists. Ignored.",
+                    $ul->pushContent(HTML::li(fmt("Page “%s” already exists. Ignored.",
                         WikiLink($newname)))); elseif (!mayAccessPage('edit', $name))
-                    $ul->pushContent(HTML::li(fmt("Access denied to rename page '%s'.",
+                    $ul->pushContent(HTML::li(fmt("Access denied to rename page “%s”.",
                         WikiLink($name)))); elseif ($dbi->renamePage($name, $newname, $updatelinks)) {
                     /* not yet implemented for all backends */
                     $page = $dbi->getPage($newname);
@@ -93,7 +93,7 @@
                     $version = $current->getVersion();
                     $meta = $current->_data;
                     $text = $current->getPackedContent();
-                    $meta['summary'] = sprintf(_("Renamed page from '%s' to '%s'."), $name, $newname);
+                    $meta['summary'] = sprintf(_("Renamed page from “%s” to “%s”."), $name, $newname);
                     $meta['is_minor_edit'] = 1;
                     $meta['author'] = $request->_user->UserName();
                     unset($meta['mtime']); // force new date
@@ -102,21 +102,21 @@
                         $page = $dbi->getPage($name);
                         $text = "<<RedirectTo page=\"" . $newname . "\">>";
                         $meta['summary'] =
-                            sprintf(_("Renaming created redirect page from '%s' to '%s'"),
+                            sprintf(_("Renaming created redirect page from “%s” to “%s”"),
                                 $name, $newname);
                         $meta['is_minor_edit'] = 0;
                         $meta['author'] = $request->_user->UserName();
                         $page->save($text, 1, $meta);
                     }
-                    $ul->pushContent(HTML::li(fmt("Renamed page from '%s' to '%s'.",
+                    $ul->pushContent(HTML::li(fmt("Renamed page from “%s” to “%s”.",
                         $name, WikiLink($newname))));
                     $count++;
                 } else {
-                    $ul->pushContent(HTML::li(fmt("Couldn't rename page '%s' to '%s'.",
+                    $ul->pushContent(HTML::li(fmt("Couldn't rename page “%s” to “%s”.",
                         $name, $newname)));
                 }
             } else {
-                $ul->pushContent(HTML::li(fmt("Couldn't rename page '%s' to '%s'.",
+                $ul->pushContent(HTML::li(fmt("Couldn't rename page “%s” to “%s”.",
                     $name, $newname)));
             }
         }

Modified: trunk/lib/plugin/WikiAdminSearchReplace.php
===================================================================
--- trunk/lib/plugin/WikiAdminSearchReplace.php	2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/WikiAdminSearchReplace.php	2012-12-04 12:49:42 UTC (rev 8595)
@@ -76,7 +76,7 @@
             }
             if ($text != $newtext) {
                 $meta = $current->_data;
-                $meta['summary'] = sprintf(_("Replace '%s' by '%s'"), $from, $to);
+                $meta['summary'] = sprintf(_("Replace “%s” by “%s”"), $from, $to);
                 $meta['is_minor_edit'] = 0;
                 $meta['author'] = $request->_user->UserName();
                 unset($meta['mtime']); // force new date
@@ -97,9 +97,9 @@
         $regex = !empty($post_args['regex']);
         foreach ($pages as $pagename) {
             if (!mayAccessPage('edit', $pagename)) {
-                $ul->pushContent(HTML::li(fmt("Access denied to change page '%s'.", $pagename)));
+                $ul->pushContent(HTML::li(fmt("Access denied to change page “%s”.", $pagename)));
             } elseif ($this->replaceHelper($dbi, $request, $pagename, $from, $to, $case_exact, $regex)) {
-                $ul->pushContent(HTML::li(fmt("Replaced '%s' with '%s' in page '%s'.",
+                $ul->pushContent(HTML::li(fmt("Replaced “%s” with “%s” in page “%s”.",
                     $from, $to, WikiLink($pagename))));
                 $count++;
             }

Modified: trunk/lib/plugin/WikiAdminSelect.php
===================================================================
--- trunk/lib/plugin/WikiAdminSelect.php	2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/WikiAdminSelect.php	2012-12-04 12:49:42 UTC (rev 8595)
@@ -205,7 +205,7 @@
                     // if the plugin requires more args than the pagename,
                     // then this plugin will not return. (Rename, SearchReplace, ...)
                     $action_result = $plugin->run($dbi, $plugin_args, $request, $basepage);
-                    $ul->pushContent(HTML::li(fmt("Selected page '%s' passed to '%s'.",
+                    $ul->pushContent(HTML::li(fmt("Selected page “%s” passed to “%s”.",
                         $name, $select)));
                     $ul->pushContent(HTML::ul(HTML::li($action_result)));
                 }

Modified: trunk/lib/plugin/WikiAdminSetAcl.php
===================================================================
--- trunk/lib/plugin/WikiAdminSetAcl.php	2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/WikiAdminSetAcl.php	2012-12-04 12:49:42 UTC (rev 8595)
@@ -93,15 +93,15 @@
                     $oldperm->sanify();
                 if ($oldperm and $perm->equal($oldperm->perm)) {
                     $result->setAttr('class', 'error');
-                    $result->pushContent(HTML::p(fmt("ACL not changed for page '%s'.", $pagename)));
+                    $result->pushContent(HTML::p(fmt("ACL not changed for page “%s”.", $pagename)));
                 } elseif (mayAccessPage('change', $pagename)) {
                     setPagePermissions($page, $perm);
                     $result->setAttr('class', 'feedback');
-                    $result->pushContent(HTML::p(fmt("ACL changed for page '%s'",
+                    $result->pushContent(HTML::p(fmt("ACL changed for page “%s”",
                         $pagename)));
-                    $result->pushContent(HTML::p(fmt("from '%s'",
+                    $result->pushContent(HTML::p(fmt("from “%s”",
                         $oldperm ? $oldperm->asAclLines() : "None")));
-                    $result->pushContent(HTML::p(fmt("to '%s'.",
+                    $result->pushContent(HTML::p(fmt("to “%s”.",
                         $perm->asAclLines())));
 
                     // Create new revision so that ACL change appears in history.
@@ -109,7 +109,7 @@
                     $version = $current->getVersion();
                     $meta = $current->_data;
                     $text = $current->getPackedContent();
-                    $meta['summary'] = sprintf(_("ACL changed for page '%s' from '%s' to '%s'."),
+                    $meta['summary'] = sprintf(_("ACL changed for page “%s” from “%s” to “%s”."),
                         $pagename,
                         $oldperm ? $oldperm->asAclLines() : "None",
                         $perm->asAclLines());
@@ -121,7 +121,7 @@
                     $count++;
                 } else {
                     $result->setAttr('class', 'error');
-                    $result->pushContent(HTML::p(fmt("Access denied to change page '%s'.", $pagename)));
+                    $result->pushContent(HTML::p(fmt("Access denied to change page “%s”.", $pagename)));
                 }
             }
         } else {

Modified: trunk/lib/plugin/WikiAdminSetExternal.php
===================================================================
--- trunk/lib/plugin/WikiAdminSetExternal.php	2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/WikiAdminSetExternal.php	2012-12-04 12:49:42 UTC (rev 8595)
@@ -67,12 +67,12 @@
             if (!$external) {
                 if (!mayAccessPage('change', $name)) {
                     $result->setAttr('class', 'error');
-                    $result->pushContent(HTML::p(fmt("Access denied to change page '%s'.",
+                    $result->pushContent(HTML::p(fmt("Access denied to change page “%s”.",
                         WikiLink($name))));
                 } else {
                     $version = $current->getVersion();
                     $page->set('external', (bool)1);
-                    $ul->pushContent(HTML::li(fmt("change page '%s' to external.", WikiLink($name))));
+                    $ul->pushContent(HTML::li(fmt("change page “%s” to external.", WikiLink($name))));
                     $count++;
                 }
             }

Modified: trunk/lib/plugin/WikiBlog.php
===================================================================
--- trunk/lib/plugin/WikiBlog.php	2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/WikiBlog.php	2012-12-04 12:49:42 UTC (rev 8595)
@@ -154,7 +154,7 @@
                     $html->pushContent($this->showForm($request, $args));
                     break;
                 default:
-                    return $this->error(sprintf("Bad mode ('%s')", $show));
+                    return $this->error(sprintf("Bad mode (“%s”)", $show));
             }
         }
         return $html;

Modified: trunk/lib/plugin/WikiFormRich.php
===================================================================
--- trunk/lib/plugin/WikiFormRich.php	2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/WikiFormRich.php	2012-12-04 12:49:42 UTC (rev 8595)
@@ -176,7 +176,7 @@
     {
         extract($this->getArgs($argstr, $request));
         if (empty($action)) {
-            return $this->error(fmt("A required argument '%s' is missing.", "action"));
+            return $this->error(fmt("A required argument “%s” is missing.", "action"));
         }
 
         $form = HTML::form(array('action' => $request->getPostURL(),
@@ -193,7 +193,7 @@
                 $text = '';
                 if ($inputtype != 'submit') {
                     if (empty($input['name']))
-                        return $this->error(fmt("A required argument '%s' is missing.",
+                        return $this->error(fmt("A required argument “%s” is missing.",
                             $inputtype . "[][name]"));
                     if (!isset($input['text'])) $input['text'] = gettext($input['name']);
                     $text = $input['text'];

Modified: trunk/lib/plugin/WikiForum.php
===================================================================
--- trunk/lib/plugin/WikiForum.php	2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/WikiForum.php	2012-12-04 12:49:42 UTC (rev 8595)
@@ -72,7 +72,7 @@
     {
         $args = $this->getArgs($argstr, $request);
         if (!$args['pagename']) {
-            return $this->error(sprintf(_("A required argument '%s' is missing."), 'pagename'));
+            return $this->error(sprintf(_("A required argument “%s” is missing."), 'pagename'));
         }
 
         // Get our form args.
@@ -102,7 +102,7 @@
                     $html->pushContent($this->showForm($request, $args, 'forumadd'));
                     break;
                 default:
-                    return $this->error(sprintf("Bad mode ('%s')", $show));
+                    return $this->error(sprintf("Bad mode (“%s”)", $show));
             }
         }
         // FIXME: on empty showTopics() and mode!=add and mode!=summary provide a showForm() here.

Modified: trunk/lib/plugin/WikiPoll.php
===================================================================
--- trunk/lib/plugin/WikiPoll.php	2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/WikiPoll.php	2012-12-04 12:49:42 UTC (rev 8595)
@@ -109,7 +109,7 @@
 
         foreach (array_merge($argstr_args, $argstr_defaults) as $arg => $val) {
             if (!preg_match("/^(answer_|question_)/", $arg))
-                trigger_error(sprintf(_("argument '%s' not declared by plugin"),
+                trigger_error(sprintf(_("argument “%s” not declared by plugin"),
                     $arg), E_USER_NOTICE);
         }
 
@@ -146,7 +146,7 @@
         $request->setArg('nocache', 'purge');
         $args = $this->getArgs($argstr, $request);
         if (!$args['page']) {
-            return $this->error(sprintf(_("A required argument '%s' is missing."), 'page'));
+            return $this->error(sprintf(_("A required argument “%s” is missing."), 'page'));
         }
         if (!empty($args['admin']) and $request->_user->isAdmin()) {
             // reset statistics

Modified: trunk/lib/plugin/_AuthInfo.php
===================================================================
--- trunk/lib/plugin/_AuthInfo.php	2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/_AuthInfo.php	2012-12-04 12:49:42 UTC (rev 8595)
@@ -96,7 +96,7 @@
         unset($DBAuthParams['dummy']);
         $table->pushContent($this->_showhash("\$DBAuthParams[]", $DBAuthParams));
         $html->pushContent($table);
-        $html->pushContent(HTML(HTML::h3(fmt("Personal Auth Settings for '%s'", $userid))));
+        $html->pushContent(HTML(HTML::h3(fmt("Personal Auth Settings for “%s”", $userid))));
         if (!$user) {
             $html->pushContent(HTML::p(fmt("No userid")));
         } else {

Modified: trunk/lib/plugin/_BackendInfo.php
===================================================================
--- trunk/lib/plugin/_BackendInfo.php	2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/_BackendInfo.php	2012-12-04 12:49:42 UTC (rev 8595)
@@ -54,7 +54,7 @@
         $this->readonly_pagemeta = array();
         $this->hidden_pagemeta = array('_cached_html');
 
-        $html = HTML(HTML::h3(fmt("Querying backend directly for '%s'",
+        $html = HTML(HTML::h3(fmt("Querying backend directly for “%s”",
             $page)));
 
         $table = HTML::table(array('border' => 1,

Modified: trunk/lib/plugin/_Retransform.php
===================================================================
--- trunk/lib/plugin/_Retransform.php	2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/_Retransform.php	2012-12-04 12:49:42 UTC (rev 8595)
@@ -49,7 +49,7 @@
         if (empty($page))
             return '';
 
-        $html = HTML(HTML::h3(fmt("Retransform page '%s'",
+        $html = HTML(HTML::h3(fmt("Retransform page “%s”",
             $page)));
 
         // bypass WikiDB and cache, go directly through the backend.

Modified: trunk/lib/plugin/text2png.php
===================================================================
--- trunk/lib/plugin/text2png.php	2012-12-03 17:42:48 UTC (rev 8594)
+++ trunk/lib/plugin/text2png.php	2012-12-04 12:49:42 UTC (rev 8595)
@@ -223,7 +223,7 @@
                 'alt' => $text,
                 'title' => '"' . $text . '"' . _(" produced by ") . $this->getName())));
         } else {
-            trigger_error(sprintf(_("couldn't open file '%s' for writing"),
+            trigger_error(sprintf(_("couldn't open file “%s” for writing"),
                 $filepath . $filename), E_USER_NOTICE);
         }
         return $html;

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8594] trunk/pgsrc/Help%2FPhotoAlbumPlugin

From: <var...@us...> - 2012-12-03 17:42:54

Revision: 8594
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8594&view=rev
Author:   vargenau
Date:     2012-12-03 17:42:48 +0000 (Mon, 03 Dec 2012)
Log Message:
-----------
Wikicreole syntax

Modified Paths:
--------------
    trunk/pgsrc/Help%2FPhotoAlbumPlugin

Modified: trunk/pgsrc/Help%2FPhotoAlbumPlugin
===================================================================
--- trunk/pgsrc/Help%2FPhotoAlbumPlugin	2012-12-03 17:32:29 UTC (rev 8593)
+++ trunk/pgsrc/Help%2FPhotoAlbumPlugin	2012-12-03 17:42:48 UTC (rev 8594)
@@ -1,4 +1,4 @@
-Date: Fri, 16 Dec 2011 12:42:36 +0000
+Date: Mon,  3 Dec 2012 18:41:07 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FPhotoAlbumPlugin;
@@ -27,7 +27,7 @@
 
 == Arguments ==
 
-_Only the ='src'= parameter is required._
+//Only the ='src'= parameter is required.//
 
 *src*:
   Url or local path to a CSV textfile which separates filename and
@@ -116,24 +116,23 @@
 }}}
 
 === Sample Albums ===
+
 local dir:
-<<PhotoAlbum
-         src="themes/Hawaiian/images/pictures/"
->>
-or via external url:
 {{{
-<<PhotoAlbum
-         src="http://phpwiki.sourceforge.net/demo/themes/Hawaiian/images/pictures/PhotoAlbum.csv"
->>
+<<PhotoAlbum src="themes/Hawaiian/images/pictures/" >>
 }}}
+or via external URL:
+{{{
+<<PhotoAlbum src="http://phpwiki.sourceforge.net/demo/themes/Hawaiian/images/pictures/PhotoAlbum.csv" >>
+}}}
 
-[ /Slides ]
+[[/Slides]] 
 
 == Authors ==
 
-* [Ted Vinke|mailto:te...@jo...] Original author
-* [Reini Urban|PhpWiki:ReiniUrban] local fs
-* [Thomas Harding|PhpWiki:ThomasHarding] slides and thumbs
+* [[mailto:te...@jo...|Ted Vinke]]: original author
+* [[PhpWiki:ReiniUrban|Reini Urban]]: local fs
+* [[PhpWiki:ThomasHarding|Thomas Harding]]: slides and thumbs
 
 <noinclude>
 ----

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8593] trunk/pgsrc/Help%2FPhotoAlbumPlugin%2FSlides

From: <var...@us...> - 2012-12-03 17:32:36

Revision: 8593
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8593&view=rev
Author:   vargenau
Date:     2012-12-03 17:32:29 +0000 (Mon, 03 Dec 2012)
Log Message:
-----------
Wikicreole syntax

Modified Paths:
--------------
    trunk/pgsrc/Help%2FPhotoAlbumPlugin%2FSlides

Modified: trunk/pgsrc/Help%2FPhotoAlbumPlugin%2FSlides
===================================================================
--- trunk/pgsrc/Help%2FPhotoAlbumPlugin%2FSlides	2012-12-03 14:48:38 UTC (rev 8592)
+++ trunk/pgsrc/Help%2FPhotoAlbumPlugin%2FSlides	2012-12-03 17:32:29 UTC (rev 8593)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Mon,  3 Dec 2012 18:31:39 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FPhotoAlbumPlugin%2FSlides;
@@ -7,7 +7,7 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
-[ Back | Help/PhotoAlbumPlugin ]
+[[Help:PhotoAlbumPlugin|Back to PhotoAlbumPlugin help page]]
 
 <<PhotoAlbum
          src="themes/Hawaiian/images/pictures/"

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8592] trunk/themes/fusionforge/interwiki.map

From: <var...@us...> - 2012-12-03 14:48:45

Revision: 8592
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8592&view=rev
Author:   vargenau
Date:     2012-12-03 14:48:38 +0000 (Mon, 03 Dec 2012)
Log Message:
-----------
less interwiki.map entries for Fusionforge

Modified Paths:
--------------
    trunk/themes/fusionforge/interwiki.map

Modified: trunk/themes/fusionforge/interwiki.map
===================================================================
--- trunk/themes/fusionforge/interwiki.map	2012-12-03 13:40:09 UTC (rev 8591)
+++ trunk/themes/fusionforge/interwiki.map	2012-12-03 14:48:38 UTC (rev 8592)
@@ -5,84 +5,18 @@
 Relation SearchRelations?s=
 Talk %s/Discussion
 User %s
-AIWiki http://www.ifi.unizh.ch/ailab/aiwiki/aiw.cgi?
-ALife http://news.alife.org/wiki/index.php?
-AbbeNormal http://www.ourpla.net/cgi-bin/pikie.cgi?
-AcadWiki http://xarch.tu-graz.ac.at/autocad/wiki/
-Acronym http://www.acronymfinder.com/af-query.asp?String=exact&Acronym=
-Advogato http://www.advogato.org/
-Annotation http://bayle.stanford.edu/crit/nph-med.cgi/
-AnnotationWiki http://www.seedwiki.com/page.cfm?wikiid=368&doc=
-AviSynth http://www.avisynth.org/
-AwarenessWiki http://taoriver.net/aware/
-BcWireless http://www.bcwireless.net/wiki-moinmoin/moin.cgi/
-BenefitsWiki http://www.benefitslink.com/cgi-bin/wiki.cgi?
-BridgesWiki http://c2.com/w2/bridges/
-bsdWiki http://profile.sh/syswiki/index.php?
-C2find http://c2.com/cgi/wiki?FindPage&value=
-CLiki http://ww.telent.net/cliki/
-Cache http://www.google.com/search?q=cache:
-CmWiki http://www.ourpla.net/cgi-bin/wiki.pl?
-CreationMatters http://www.ourpla.net/cgi-bin/wiki.pl?
 CPAN http://search.cpan.org/
-DeWikiPedia http://de.wikipedia.org/wiki/
-DejaNews http://www.deja.com/=dnc/getdoc.xp?AN=
-Dict http://www.dict.org/bin/Dict?Database=*&Form=Dict1&Strategy=*&Query=
-Dictionary http://www.dict.org/bin/Dict?Database=*&Form=Dict1&Strategy=*&Query=
-DiveIntoOsx http://diveintoosx.org/
 DocBook http://docbook.org/wiki/moin.cgi/
-DolphinWiki http://www.object-arts.com/wiki/html/Dolphin/
-DseWiki http://www.wikiservice.at/dse/wiki.cgi?
-EfnetCeeWiki http://purl.net/wiki/c/
-EfnetCppWiki http://purl.net/wiki/cpp/
-EfnetPythonWiki http://purl.net/wiki/python/
-EfnetXmlWiki http://purl.net/wiki/xml/
-EljWiki http://elj.sourceforge.net/phpwiki/index.php/
-EmacsWiki http://www.emacswiki.org/cgi-bin/wiki.pl?
-EoWikiPedia http://eo.wikipedia.org/wiki/
-FinalEmpire http://final-empire.sourceforge.net/cgi-bin/wiki.pl?
-Foldoc http://www.foldoc.org/foldoc/foldoc.cgi?
-FoxWiki http://fox.wikis.com/wc.dll?Wiki~
-FrWikiPedia http://fr.wikipedia.org/wiki/
-FreeBSDman http://www.FreeBSD.org/cgi/man.cgi?apropos=1&query=
-FreeNetworks http://www.freenetworks.org/index.cgi/
-FreshMeat http://freshmeat.net/
-Froogle http://froogle.google.com/froogle?q=
 Google http://www.google.com/search?q=
-GoogleGroups http://groups.google.com/groups?q=
-GreenCheese http://www.greencheese.org/
-HammondWiki http://www.dairiki.org/HammondWiki/index.php3?
-Haribeau http://wiki.haribeau.de/cgi-bin/wiki.pl?
-IAWiki http://www.IAwiki.net/
 IMDB http://us.imdb.com/Title?
 ISBN http://www.amazon.com/exec/obidos/ISBN=
-IfDef http://ifdef.undef.net/
-JTF http://www.justthefaqs.org/?page=
 JargonFile http://sunir.org/apps/meta.pl?wiki=JargonFile&redirect=
 JiniWiki http://www.cdegroot.com/cgi-bin/jini?
 JspWiki http://www.ecyrd.com/JSPWiki/Wiki.jsp?page=
-KmWiki http://www.voght.com/cgi-bin/pywiki?
-KnowHow http://www2.iro.umontreal.ca/~paquetse/cgi-bin/wiki.cgi?
-LanifexWiki http://opt.lanifex.com/cgi-bin/wiki.pl?
-LegoWiki http://www.object-arts.com/wiki/html/Lego-Robotics/
-LinuxWiki http://www.linuxwiki.de/
-LugKR http://lug-kr.sourceforge.net/cgi-bin/lugwiki.pl?
-MACCAWS http://www.maccaws.com/wiki/
-MathSongsWiki http://SeedWiki.com/page.cfm?wikiid=237&doc=
-MbTest http://www.usemod.com/cgi-bin/mbtest.pl?
 MeatBall http://www.usemod.com/cgi-bin/mb.pl?
 MetaWiki http://sunir.org/apps/meta.pl?
 MetaWikiPedia http://meta.wikipedia.com/wiki/
 MoinMoin http://moinmoin.wikiwikiweb.de/
-MoinMaster http://moinmaster.wikiwikiweb.de/
-MuWeb http://www.dunstable.com/scripts/MuWebWeb?
-NetVillage http://www.netbros.com/?
-OpenWiki http://openwiki.com/?
-OrgPatterns http://www.bell-labs.com/cgi-user/OrgPatterns/OrgPatterns?
-OsFaq2 http://www.mega-tokyo.com/osfaq2/index.php/
-PPR http://c2.com/cgi/wiki?
-PangalacticOrg http://www.pangalactic.org/Wiki/
-PersonalTelco http://www.personaltelco.net/index.cgi/
 php-function http://www.php.net/%s
 php-lookup http://www.php.net/manual-lookup.php?pattern=
 PhpWiki http://phpwiki.sourceforge.net/phpwiki/
@@ -90,37 +24,9 @@
 PhpWikiSvn http://phpwiki.svn.sourceforge.net/viewvc/phpwiki/trunk/pgsrc/%s?view=log
 PhpWikiDemo http://phpwiki.sourceforge.net/demo/
 PhpWikiTest http://phpwiki.sourceforge.net/test/
-Pikie http://pikie.darktech.org/cgi/pikie?
-PlWikiPedia http://pl.wikipedia.org/wiki/
-PolitizenWiki http://www.politizen.com/wiki.asp?
-PoundPython http://twistedmatrix.com/wiki/python/
-PurlNet http://www.palowireless.com/zigbee/
-PyWiki http://www.voght.com/cgi-bin/pywiki?
-PythonInfo http://www.python.org/cgi-bin/moinmoin/
-PythonWiki http://www.pythonwiki.de/
-RFC http://www.faqs.org/rfcs/rfc%s.html
-RussellFreedom http://www.russellfreedom.com/
-SVGWiki http://www.protocol7.com/svg-wiki/default.asp?
-SeaPig http://www.seapig.org/ 
-SeattleWireless http://seattlewireless.net/?
-SenseisLibrary http://senseis.xmp.net/?
-Shakti http://cgi.algonet.se/htbin/cgiwrap/pgd/ShaktiWiki/
 SourceForge http://sourceforge.net/
-Squeak http://minnow.cc.gatech.edu/squeak/
-StrikiWiki http://ch.twi.tudelft.nl/~mostert/striki/teststriki.pl?
-TMwiki http://www.EasyTopicMaps.com/?page=
 TWiki http://twiki.org/cgi-bin/view/
-Tavi http://tavi.sourceforge.net/index.php?
-Thesaurus http://www.thesaurus.com/cgi-bin/search?config=roget&words=
-Thinki http://www.thinkware.se/cgi-bin/thinki.cgi/
-TmNet http://www.technomanifestos.net/?
-Unreal http://wiki.beyondunreal.com/wiki/
 UseMod http://www.usemod.com/cgi-bin/wiki.pl?
-VisualWorks http://wiki.cs.uiuc.edu/VisualWorks/
-WakkaWiki http://www.wakkawiki.com/
-WebDevWikiNL http://www.promo-it.nl/WebDevWiki/index.php?page=
-WebSeitzWiki http://webseitz.fluxent.com/wiki/
-Why http://clublet.com/c/c/why?
 Wiktionary http://wiktionary.org/wiki/
 Wiki http://c2.com/cgi/wiki?
 WikiLens http://www.wikilens.org/wiki.php/
@@ -129,8 +35,3 @@
 WikiPedia http://www.wikipedia.com/wiki/
 Wikiquote http://wikiquote.org/wiki/
 Wikisource http://wikisource.org/wiki/
-WikiWorld http://WikiWorld.com/wiki/index.php/
-WikkiTikkiTavi http://tavi.sourceforge.net/
-WLUG http://www.wlug.org.nz/
-YpsiEyeball http://sknkwrks.dyndns.org:1957/writewiki/wiki.pl?
-ZWiki http://www.zwiki.org/

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

[phpwiki-checkins] SF.net SVN: phpwiki:[8591] trunk/Makefile

From: <var...@us...> - 2012-12-03 13:40:18

Revision: 8591
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8591&view=rev
Author:   vargenau
Date:     2012-12-03 13:40:09 +0000 (Mon, 03 Dec 2012)
Log Message:
-----------
No longer a makefile in themes

Modified Paths:
--------------
    trunk/Makefile

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2012-12-03 13:29:21 UTC (rev 8590)
+++ trunk/Makefile	2012-12-03 13:40:09 UTC (rev 8591)
@@ -76,12 +76,8 @@
 	cd locale
 	make
 
-themes:
-	cd themes
-	make
+install: install-config install-database
 
-install: install-config install-database themes
-
 install-config: config/config.ini
 
 config/config.ini: config/config-dist.ini

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

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

From: <var...@us...> - 2012-12-03 13:29:35

Revision: 8590
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8590&view=rev
Author:   vargenau
Date:     2012-12-03 13:29:21 +0000 (Mon, 03 Dec 2012)
Log Message:
-----------
Update to fpdf 1.7

Modified Paths:
--------------
    trunk/lib/font/chinese.php
    trunk/lib/font/courier.php
    trunk/lib/font/helvetica.php
    trunk/lib/font/helveticab.php
    trunk/lib/font/helveticabi.php
    trunk/lib/font/helveticai.php
    trunk/lib/font/japanese.php
    trunk/lib/font/symbol.php
    trunk/lib/font/times.php
    trunk/lib/font/timesb.php
    trunk/lib/font/timesbi.php
    trunk/lib/font/timesi.php
    trunk/lib/font/zapfdingbats.php
    trunk/lib/fpdf.php

Added Paths:
-----------
    trunk/lib/font/
    trunk/lib/font/courierb.php
    trunk/lib/font/courierbi.php
    trunk/lib/font/courieri.php

Removed Paths:
-------------
    trunk/lib/fpdf/

Modified: trunk/lib/font/chinese.php
===================================================================
--- trunk/lib/fpdf/chinese.php	2012-12-03 12:43:20 UTC (rev 8589)
+++ trunk/lib/font/chinese.php	2012-12-03 13:29:21 UTC (rev 8590)
@@ -1,417 +1,456 @@
 <?php // -*-php-*-
+// $Id: chinese.php 7956 2011-03-03 17:08:31Z vargenau $
 
 // PDF functions taken from FPDF http://www.fpdf.org
 
-require 'lib/pdf.php';
+require('lib/pdf.php');
 
-$Big5_widths = array(' ' => 250, '!' => 250, '"' => 408, '#' => 668, '$' => 490, '%' => 875, '&' => 698, '\'' => 250,
-    '(' => 240, ')' => 240, '*' => 417, '+' => 667, ',' => 250, '-' => 313, '.' => 250, '/' => 520, '0' => 500, '1' => 500,
-    '2' => 500, '3' => 500, '4' => 500, '5' => 500, '6' => 500, '7' => 500, '8' => 500, '9' => 500, ':' => 250, ';' => 250,
-    '<' => 667, '=' => 667, '>' => 667, '?' => 396, '@' => 921, 'A' => 677, 'B' => 615, 'C' => 719, 'D' => 760, 'E' => 625,
-    'F' => 552, 'G' => 771, 'H' => 802, 'I' => 354, 'J' => 354, 'K' => 781, 'L' => 604, 'M' => 927, 'N' => 750, 'O' => 823,
-    'P' => 563, 'Q' => 823, 'R' => 729, 'S' => 542, 'T' => 698, 'U' => 771, 'V' => 729, 'W' => 948, 'X' => 771, 'Y' => 677,
-    'Z' => 635, '[' => 344, '\\' => 520, ']' => 344, '^' => 469, '_' => 500, '`' => 250, 'a' => 469, 'b' => 521, 'c' => 427,
-    'd' => 521, 'e' => 438, 'f' => 271, 'g' => 469, 'h' => 531, 'i' => 250, 'j' => 250, 'k' => 458, 'l' => 240, 'm' => 802,
-    'n' => 531, 'o' => 500, 'p' => 521, 'q' => 521, 'r' => 365, 's' => 333, 't' => 292, 'u' => 521, 'v' => 458, 'w' => 677,
-    'x' => 479, 'y' => 458, 'z' => 427, '{' => 480, '|' => 496, '}' => 480, '~' => 667);
+$Big5_widths=array(' '=>250,'!'=>250,'"'=>408,'#'=>668,'$'=>490,'%'=>875,'&'=>698,'\''=>250,
+    '('=>240,')'=>240,'*'=>417,'+'=>667,','=>250,'-'=>313,'.'=>250,'/'=>520,'0'=>500,'1'=>500,
+    '2'=>500,'3'=>500,'4'=>500,'5'=>500,'6'=>500,'7'=>500,'8'=>500,'9'=>500,':'=>250,';'=>250,
+    '<'=>667,'='=>667,'>'=>667,'?'=>396,'@'=>921,'A'=>677,'B'=>615,'C'=>719,'D'=>760,'E'=>625,
+    'F'=>552,'G'=>771,'H'=>802,'I'=>354,'J'=>354,'K'=>781,'L'=>604,'M'=>927,'N'=>750,'O'=>823,
+    'P'=>563,'Q'=>823,'R'=>729,'S'=>542,'T'=>698,'U'=>771,'V'=>729,'W'=>948,'X'=>771,'Y'=>677,
+    'Z'=>635,'['=>344,'\\'=>520,']'=>344,'^'=>469,'_'=>500,'`'=>250,'a'=>469,'b'=>521,'c'=>427,
+    'd'=>521,'e'=>438,'f'=>271,'g'=>469,'h'=>531,'i'=>250,'j'=>250,'k'=>458,'l'=>240,'m'=>802,
+    'n'=>531,'o'=>500,'p'=>521,'q'=>521,'r'=>365,'s'=>333,'t'=>292,'u'=>521,'v'=>458,'w'=>677,
+    'x'=>479,'y'=>458,'z'=>427,'{'=>480,'|'=>496,'}'=>480,'~'=>667);
 
-$GB_widths = array(' ' => 207, '!' => 270, '"' => 342, '#' => 467, '$' => 462, '%' => 797, '&' => 710, '\'' => 239,
-    '(' => 374, ')' => 374, '*' => 423, '+' => 605, ',' => 238, '-' => 375, '.' => 238, '/' => 334, '0' => 462, '1' => 462,
-    '2' => 462, '3' => 462, '4' => 462, '5' => 462, '6' => 462, '7' => 462, '8' => 462, '9' => 462, ':' => 238, ';' => 238,
-    '<' => 605, '=' => 605, '>' => 605, '?' => 344, '@' => 748, 'A' => 684, 'B' => 560, 'C' => 695, 'D' => 739, 'E' => 563,
-    'F' => 511, 'G' => 729, 'H' => 793, 'I' => 318, 'J' => 312, 'K' => 666, 'L' => 526, 'M' => 896, 'N' => 758, 'O' => 772,
-    'P' => 544, 'Q' => 772, 'R' => 628, 'S' => 465, 'T' => 607, 'U' => 753, 'V' => 711, 'W' => 972, 'X' => 647, 'Y' => 620,
-    'Z' => 607, '[' => 374, '\\' => 333, ']' => 374, '^' => 606, '_' => 500, '`' => 239, 'a' => 417, 'b' => 503, 'c' => 427,
-    'd' => 529, 'e' => 415, 'f' => 264, 'g' => 444, 'h' => 518, 'i' => 241, 'j' => 230, 'k' => 495, 'l' => 228, 'm' => 793,
-    'n' => 527, 'o' => 524, 'p' => 524, 'q' => 504, 'r' => 338, 's' => 336, 't' => 277, 'u' => 517, 'v' => 450, 'w' => 652,
-    'x' => 466, 'y' => 452, 'z' => 407, '{' => 370, '|' => 258, '}' => 370, '~' => 605);
+$GB_widths=array(' '=>207,'!'=>270,'"'=>342,'#'=>467,'$'=>462,'%'=>797,'&'=>710,'\''=>239,
+    '('=>374,')'=>374,'*'=>423,'+'=>605,','=>238,'-'=>375,'.'=>238,'/'=>334,'0'=>462,'1'=>462,
+    '2'=>462,'3'=>462,'4'=>462,'5'=>462,'6'=>462,'7'=>462,'8'=>462,'9'=>462,':'=>238,';'=>238,
+    '<'=>605,'='=>605,'>'=>605,'?'=>344,'@'=>748,'A'=>684,'B'=>560,'C'=>695,'D'=>739,'E'=>563,
+    'F'=>511,'G'=>729,'H'=>793,'I'=>318,'J'=>312,'K'=>666,'L'=>526,'M'=>896,'N'=>758,'O'=>772,
+    'P'=>544,'Q'=>772,'R'=>628,'S'=>465,'T'=>607,'U'=>753,'V'=>711,'W'=>972,'X'=>647,'Y'=>620,
+    'Z'=>607,'['=>374,'\\'=>333,']'=>374,'^'=>606,'_'=>500,'`'=>239,'a'=>417,'b'=>503,'c'=>427,
+    'd'=>529,'e'=>415,'f'=>264,'g'=>444,'h'=>518,'i'=>241,'j'=>230,'k'=>495,'l'=>228,'m'=>793,
+    'n'=>527,'o'=>524,'p'=>524,'q'=>504,'r'=>338,'s'=>336,'t'=>277,'u'=>517,'v'=>450,'w'=>652,
+    'x'=>466,'y'=>452,'z'=>407,'{'=>370,'|'=>258,'}'=>370,'~'=>605);
 
 class PDF_Chinese extends PDF
 {
-    function AddCIDFont($family, $style, $name, $cw, $CMap, $registry)
+    function AddCIDFont($family,$style,$name,$cw,$CMap,$registry)
     {
-        $fontkey = strtolower($family) . strtoupper($style);
-        if (isset($this->fonts[$fontkey]))
-            $this->Error("Font already added: $family $style");
-        $i = count($this->fonts) + 1;
-        $name = str_replace(' ', '', $name);
-        $this->fonts[$fontkey] = array('i' => $i, 'type' => 'Type0', 'name' => $name, 'up' => -130, 'ut' => 40, 'cw' => $cw, 'CMap' => $CMap, 'registry' => $registry);
+    $fontkey=strtolower($family).strtoupper($style);
+    if(isset($this->fonts[$fontkey]))
+        $this->Error("Font already added: $family $style");
+    $i=count($this->fonts)+1;
+    $name=str_replace(' ','',$name);
+    $this->fonts[$fontkey]=array('i'=>$i,'type'=>'Type0','name'=>$name,'up'=>-130,'ut'=>40,'cw'=>$cw,'CMap'=>$CMap,'registry'=>$registry);
     }
 
-    function AddCIDFonts($family, $name, $cw, $CMap, $registry)
+    function AddCIDFonts($family,$name,$cw,$CMap,$registry)
     {
-        $this->AddCIDFont($family, '', $name, $cw, $CMap, $registry);
-        $this->AddCIDFont($family, 'B', $name . ',Bold', $cw, $CMap, $registry);
-        $this->AddCIDFont($family, 'I', $name . ',Italic', $cw, $CMap, $registry);
-        $this->AddCIDFont($family, 'BI', $name . ',BoldItalic', $cw, $CMap, $registry);
+    $this->AddCIDFont($family,'',$name,$cw,$CMap,$registry);
+    $this->AddCIDFont($family,'B',$name.',Bold',$cw,$CMap,$registry);
+    $this->AddCIDFont($family,'I',$name.',Italic',$cw,$CMap,$registry);
+    $this->AddCIDFont($family,'BI',$name.',BoldItalic',$cw,$CMap,$registry);
     }
 
-    function AddBig5Font($family = 'Big5', $name = 'MSungStd-Light-Acro')
+    function AddBig5Font($family='Big5',$name='MSungStd-Light-Acro')
     {
-        //Add Big5 font with proportional Latin
-        $cw = $GLOBALS['Big5_widths'];
-        $CMap = 'ETenms-B5-H';
-        $registry = array('ordering' => 'CNS1', 'supplement' => 0);
-        $this->AddCIDFonts($family, $name, $cw, $CMap, $registry);
+    //Add Big5 font with proportional Latin
+    $cw=$GLOBALS['Big5_widths'];
+    $CMap='ETenms-B5-H';
+    $registry=array('ordering'=>'CNS1','supplement'=>0);
+    $this->AddCIDFonts($family,$name,$cw,$CMap,$registry);
     }
 
-    function AddBig5hwFont($family = 'Big5-hw', $name = 'MSungStd-Light-Acro')
+    function AddBig5hwFont($family='Big5-hw',$name='MSungStd-Light-Acro')
     {
-        //Add Big5 font with half-witdh Latin
-        for ($i = 32; $i <= 126; $i++)
-            $cw[chr($i)] = 500;
-        $CMap = 'ETen-B5-H';
-        $registry = array('ordering' => 'CNS1', 'supplement' => 0);
-        $this->AddCIDFonts($family, $name, $cw, $CMap, $registry);
+    //Add Big5 font with half-witdh Latin
+    for($i=32;$i<=126;$i++)
+        $cw[chr($i)]=500;
+    $CMap='ETen-B5-H';
+    $registry=array('ordering'=>'CNS1','supplement'=>0);
+    $this->AddCIDFonts($family,$name,$cw,$CMap,$registry);
     }
 
-    function AddGBFont($family = 'GB', $name = 'STSongStd-Light-Acro')
+    function AddGBFont($family='GB',$name='STSongStd-Light-Acro')
     {
-        //Add GB font with proportional Latin
-        $cw = $GLOBALS['GB_widths'];
-        $CMap = 'GBKp-EUC-H';
-        $registry = array('ordering' => 'GB1', 'supplement' => 2);
-        $this->AddCIDFonts($family, $name, $cw, $CMap, $registry);
+    //Add GB font with proportional Latin
+    $cw=$GLOBALS['GB_widths'];
+    $CMap='GBKp-EUC-H';
+    $registry=array('ordering'=>'GB1','supplement'=>2);
+    $this->AddCIDFonts($family,$name,$cw,$CMap,$registry);
     }
 
-    function AddGBhwFont($family = 'GB-hw', $name = 'STSongStd-Light-Acro')
+    function AddGBhwFont($family='GB-hw',$name='STSongStd-Light-Acro')
     {
-        //Add GB font with half-width Latin
-        for ($i = 32; $i <= 126; $i++)
-            $cw[chr($i)] = 500;
-        $CMap = 'GBK-EUC-H';
-        $registry = array('ordering' => 'GB1', 'supplement' => 2);
-        $this->AddCIDFonts($family, $name, $cw, $CMap, $registry);
+    //Add GB font with half-width Latin
+    for($i=32;$i<=126;$i++)
+        $cw[chr($i)]=500;
+    $CMap='GBK-EUC-H';
+    $registry=array('ordering'=>'GB1','supplement'=>2);
+    $this->AddCIDFonts($family,$name,$cw,$CMap,$registry);
     }
 
     function GetStringWidth($s)
     {
-        if ($this->CurrentFont['type'] == 'Type0')
-            return $this->GetMBStringWidth($s);
-        else
-            return parent::GetStringWidth($s);
+    if ($this->CurrentFont['type']=='Type0')
+        return $this->GetMBStringWidth($s);
+    else
+        return parent::GetStringWidth($s);
     }
 
     function GetMBStringWidth($s)
     {
-        //Multi-byte version of GetStringWidth()
-        $l = 0;
-        $cw =& $this->CurrentFont['cw'];
-        $nb = strlen($s);
-        $i = 0;
-        while ($i < $nb) {
-            $c = $s[$i];
-            if (ord($c) < 128) {
-                $l += $cw[$c];
-                $i++;
-            } else {
-                $l += 1000;
-                $i += 2;
-            }
+    //Multi-byte version of GetStringWidth()
+    $l=0;
+    $cw=&$this->CurrentFont['cw'];
+    $nb=strlen($s);
+    $i=0;
+    while($i<$nb)
+    {
+        $c=$s[$i];
+        if(ord($c)<128)
+        {
+            $l+=$cw[$c];
+            $i++;
         }
-        return $l * $this->FontSize / 1000;
+        else
+        {
+            $l+=1000;
+            $i+=2;
+        }
     }
+    return $l*$this->FontSize/1000;
+    }
 
-    function MultiCell($w, $h, $txt, $border = 0, $align = 'L', $fill = 0)
+    function MultiCell($w,$h,$txt,$border=0,$align='L',$fill=0)
     {
-        if ($this->CurrentFont['type'] == 'Type0')
-            $this->MBMultiCell($w, $h, $txt, $border, $align, $fill);
-        else
-            parent::MultiCell($w, $h, $txt, $border, $align, $fill);
+    if($this->CurrentFont['type']=='Type0')
+        $this->MBMultiCell($w,$h,$txt,$border,$align,$fill);
+    else
+        parent::MultiCell($w,$h,$txt,$border,$align,$fill);
     }
 
-    function MBMultiCell($w, $h, $txt, $border = 0, $align = 'L', $fill = 0)
+    function MBMultiCell($w,$h,$txt,$border=0,$align='L',$fill=0)
     {
-        //Multi-byte version of MultiCell()
-        $cw =& $this->CurrentFont['cw'];
-        if ($w == 0)
-            $w = $this->w - $this->rMargin - $this->x;
-        $wmax = ($w - 2 * $this->cMargin) * 1000 / $this->FontSize;
-        $s = str_replace("\r", '', $txt);
-        $nb = strlen($s);
-        if ($nb > 0 and $s[$nb - 1] == "\n")
-            $nb--;
-        $b = 0;
-        if ($border) {
-            if ($border == 1) {
-                $border = 'LTRB';
-                $b = 'LRT';
-                $b2 = 'LR';
-            } else {
-                $b2 = '';
-                if (is_int(strpos($border, 'L')))
-                    $b2 .= 'L';
-                if (is_int(strpos($border, 'R')))
-                    $b2 .= 'R';
-                $b = is_int(strpos($border, 'T')) ? $b2 . 'T' : $b2;
-            }
+    //Multi-byte version of MultiCell()
+    $cw=&$this->CurrentFont['cw'];
+    if($w==0)
+        $w=$this->w-$this->rMargin-$this->x;
+    $wmax=($w-2*$this->cMargin)*1000/$this->FontSize;
+    $s=str_replace("\r",'',$txt);
+    $nb=strlen($s);
+    if($nb>0 and $s[$nb-1]=="\n")
+        $nb--;
+    $b=0;
+    if($border)
+    {
+        if($border==1)
+        {
+            $border='LTRB';
+            $b='LRT';
+            $b2='LR';
         }
-        $sep = -1;
-        $i = 0;
-        $j = 0;
-        $l = 0;
-        $nl = 1;
-        while ($i < $nb) {
-            //Get next character
-            $c = $s[$i];
-            //Check if ASCII or MB
-            $ascii = (ord($c) < 128);
-            if ($c == "\n") {
-                //Explicit line break
-                $this->Cell($w, $h, substr($s, $j, $i - $j), $b, 2, $align, $fill);
-                $i++;
-                $sep = -1;
-                $j = $i;
-                $l = 0;
-                $nl++;
-                if ($border and $nl == 2)
-                    $b = $b2;
-                continue;
+        else
+        {
+            $b2='';
+            if(is_int(strpos($border,'L')))
+                $b2.='L';
+            if(is_int(strpos($border,'R')))
+                $b2.='R';
+            $b=is_int(strpos($border,'T')) ? $b2.'T' : $b2;
+        }
+    }
+    $sep=-1;
+    $i=0;
+    $j=0;
+    $l=0;
+    $nl=1;
+    while($i<$nb)
+    {
+        //Get next character
+        $c=$s[$i];
+        //Check if ASCII or MB
+        $ascii=(ord($c)<128);
+        if($c=="\n")
+        {
+            //Explicit line break
+            $this->Cell($w,$h,substr($s,$j,$i-$j),$b,2,$align,$fill);
+            $i++;
+            $sep=-1;
+            $j=$i;
+            $l=0;
+            $nl++;
+            if($border and $nl==2)
+                $b=$b2;
+            continue;
+        }
+        if(!$ascii)
+        {
+            $sep=$i;
+            $ls=$l;
+        }
+        elseif($c==' ')
+        {
+            $sep=$i;
+            $ls=$l;
+        }
+        $l+=$ascii ? $cw[$c] : 1000;
+        if($l>$wmax)
+        {
+            //Automatic line break
+            if($sep==-1 or $i==$j)
+            {
+                if($i==$j)
+                    $i+=$ascii ? 1 : 2;
+                $this->Cell($w,$h,substr($s,$j,$i-$j),$b,2,$align,$fill);
             }
-            if (!$ascii) {
-                $sep = $i;
-                $ls = $l;
-            } elseif ($c == ' ') {
-                $sep = $i;
-                $ls = $l;
+            else
+            {
+                $this->Cell($w,$h,substr($s,$j,$sep-$j),$b,2,$align,$fill);
+                $i=($s[$sep]==' ') ? $sep+1 : $sep;
             }
-            $l += $ascii ? $cw[$c] : 1000;
-            if ($l > $wmax) {
-                //Automatic line break
-                if ($sep == -1 or $i == $j) {
-                    if ($i == $j)
-                        $i += $ascii ? 1 : 2;
-                    $this->Cell($w, $h, substr($s, $j, $i - $j), $b, 2, $align, $fill);
-                } else {
-                    $this->Cell($w, $h, substr($s, $j, $sep - $j), $b, 2, $align, $fill);
-                    $i = ($s[$sep] == ' ') ? $sep + 1 : $sep;
-                }
-                $sep = -1;
-                $j = $i;
-                $l = 0;
-                $nl++;
-                if ($border and $nl == 2)
-                    $b = $b2;
-            } else
-                $i += $ascii ? 1 : 2;
+            $sep=-1;
+            $j=$i;
+            $l=0;
+            $nl++;
+            if($border and $nl==2)
+                $b=$b2;
         }
-        //Last chunk
-        if ($border and is_int(strpos($border, 'B')))
-            $b .= 'B';
-        $this->Cell($w, $h, substr($s, $j, $i - $j), $b, 2, $align, $fill);
-        $this->x = $this->lMargin;
+        else
+            $i+=$ascii ? 1 : 2;
     }
+    //Last chunk
+    if($border and is_int(strpos($border,'B')))
+        $b.='B';
+    $this->Cell($w,$h,substr($s,$j,$i-$j),$b,2,$align,$fill);
+    $this->x=$this->lMargin;
+    }
 
-    function Write($h, $txt, $link = '')
+    function Write($h,$txt,$link='')
     {
-        if ($this->CurrentFont['type'] == 'Type0')
-            $this->MBWrite($h, $txt, $link);
-        else
-            parent::Write($h, $txt, $link);
+    if($this->CurrentFont['type']=='Type0')
+        $this->MBWrite($h,$txt,$link);
+    else
+        parent::Write($h,$txt,$link);
     }
 
-    function MBWrite($h, $txt, $link)
+    function MBWrite($h,$txt,$link)
     {
-        //Multi-byte version of Write()
-        $cw =& $this->CurrentFont['cw'];
-        $w = $this->w - $this->rMargin - $this->x;
-        $wmax = ($w - 2 * $this->cMargin) * 1000 / $this->FontSize;
-        $s = str_replace("\r", '', $txt);
-        $nb = strlen($s);
-        $sep = -1;
-        $i = 0;
-        $j = 0;
-        $l = 0;
-        $nl = 1;
-        while ($i < $nb) {
-            //Get next character
-            $c = $s[$i];
-            //Check if ASCII or MB
-            $ascii = (ord($c) < 128);
-            if ($c == "\n") {
-                //Explicit line break
-                $this->Cell($w, $h, substr($s, $j, $i - $j), 0, 2, '', 0, $link);
-                $i++;
-                $sep = -1;
-                $j = $i;
-                $l = 0;
-                if ($nl == 1) {
-                    $this->x = $this->lMargin;
-                    $w = $this->w - $this->rMargin - $this->x;
-                    $wmax = ($w - 2 * $this->cMargin) * 1000 / $this->FontSize;
+    //Multi-byte version of Write()
+    $cw=&$this->CurrentFont['cw'];
+    $w=$this->w-$this->rMargin-$this->x;
+    $wmax=($w-2*$this->cMargin)*1000/$this->FontSize;
+    $s=str_replace("\r",'',$txt);
+    $nb=strlen($s);
+    $sep=-1;
+    $i=0;
+    $j=0;
+    $l=0;
+    $nl=1;
+    while($i<$nb)
+    {
+        //Get next character
+        $c=$s[$i];
+        //Check if ASCII or MB
+        $ascii=(ord($c)<128);
+        if($c=="\n")
+        {
+            //Explicit line break
+            $this->Cell($w,$h,substr($s,$j,$i-$j),0,2,'',0,$link);
+            $i++;
+            $sep=-1;
+            $j=$i;
+            $l=0;
+            if($nl==1)
+            {
+                $this->x=$this->lMargin;
+                $w=$this->w-$this->rMargin-$this->x;
+                $wmax=($w-2*$this->cMargin)*1000/$this->FontSize;
+            }
+            $nl++;
+            continue;
+        }
+        if(!$ascii or $c==' ')
+            $sep=$i;
+        $l+=$ascii ? $cw[$c] : 1000;
+        if($l>$wmax)
+        {
+            //Automatic line break
+            if($sep==-1 or $i==$j)
+            {
+                if($this->x>$this->lMargin)
+                {
+                    //Move to next line
+                    $this->x=$this->lMargin;
+                    $this->y+=$h;
+                    $w=$this->w-$this->rMargin-$this->x;
+                    $wmax=($w-2*$this->cMargin)*1000/$this->FontSize;
+                    $i++;
+                    $nl++;
+                    continue;
                 }
-                $nl++;
-                continue;
+                if($i==$j)
+                    $i+=$ascii ? 1 : 2;
+                $this->Cell($w,$h,substr($s,$j,$i-$j),0,2,'',0,$link);
             }
-            if (!$ascii or $c == ' ')
-                $sep = $i;
-            $l += $ascii ? $cw[$c] : 1000;
-            if ($l > $wmax) {
-                //Automatic line break
-                if ($sep == -1 or $i == $j) {
-                    if ($this->x > $this->lMargin) {
-                        //Move to next line
-                        $this->x = $this->lMargin;
-                        $this->y += $h;
-                        $w = $this->w - $this->rMargin - $this->x;
-                        $wmax = ($w - 2 * $this->cMargin) * 1000 / $this->FontSize;
-                        $i++;
-                        $nl++;
-                        continue;
-                    }
-                    if ($i == $j)
-                        $i += $ascii ? 1 : 2;
-                    $this->Cell($w, $h, substr($s, $j, $i - $j), 0, 2, '', 0, $link);
-                } else {
-                    $this->Cell($w, $h, substr($s, $j, $sep - $j), 0, 2, '', 0, $link);
-                    $i = ($s[$sep] == ' ') ? $sep + 1 : $sep;
-                }
-                $sep = -1;
-                $j = $i;
-                $l = 0;
-                if ($nl == 1) {
-                    $this->x = $this->lMargin;
-                    $w = $this->w - $this->rMargin - $this->x;
-                    $wmax = ($w - 2 * $this->cMargin) * 1000 / $this->FontSize;
-                }
-                $nl++;
-            } else
-                $i += $ascii ? 1 : 2;
+            else
+            {
+                $this->Cell($w,$h,substr($s,$j,$sep-$j),0,2,'',0,$link);
+                $i=($s[$sep]==' ') ? $sep+1 : $sep;
+            }
+            $sep=-1;
+            $j=$i;
+            $l=0;
+            if($nl==1)
+            {
+                $this->x=$this->lMargin;
+                $w=$this->w-$this->rMargin-$this->x;
+                $wmax=($w-2*$this->cMargin)*1000/$this->FontSize;
+            }
+            $nl++;
         }
-        //Last chunk
-        if ($i != $j)
-            $this->Cell($l / 1000 * $this->FontSize, $h, substr($s, $j, $i - $j), 0, 0, '', 0, $link);
+        else
+            $i+=$ascii ? 1 : 2;
     }
+    //Last chunk
+    if($i!=$j)
+        $this->Cell($l/1000*$this->FontSize,$h,substr($s,$j,$i-$j),0,0,'',0,$link);
+    }
 
     function _putfonts()
     {
-        $nf = $this->n;
-        foreach ($this->diffs as $diff) {
-            //Encodings
-            $this->_newobj();
-            $this->_out('<</Type /Encoding /BaseEncoding /WinAnsiEncoding /Differences [' . $diff . ']>>');
-            $this->_out('endobj');
-        }
+    $nf=$this->n;
+    foreach($this->diffs as $diff)
+    {
+        //Encodings
+        $this->_newobj();
+        $this->_out('<</Type /Encoding /BaseEncoding /WinAnsiEncoding /Differences ['.$diff.']>>');
+        $this->_out('endobj');
+    }
 
-        if (!check_php_version(5, 3)) {
-            $mqr = get_magic_quotes_runtime();
-            set_magic_quotes_runtime(0);
-        }
-        foreach ($this->FontFiles as $file => $info) {
-            //Font file embedding
-            $this->_newobj();
-            $this->FontFiles[$file]['n'] = $this->n;
-            if (defined('FPDF_FONTPATH'))
-                $file = FPDF_FONTPATH . $file;
-            $size = filesize($file);
-            if (!$size)
-                $this->Error('Font file not found');
-            $this->_out('<</Length ' . $size);
-            if (substr($file, -2) == '.z')
-                $this->_out('/Filter /FlateDecode');
-            $this->_out('/Length1 ' . $info['length1']);
-            if (isset($info['length2']))
-                $this->_out('/Length2 ' . $info['length2'] . ' /Length3 0');
+    if (!check_php_version(5,3)) {
+        $mqr=get_magic_quotes_runtime();
+        set_magic_quotes_runtime(0);
+    }
+    foreach($this->FontFiles as $file=>$info)
+    {
+        //Font file embedding
+        $this->_newobj();
+        $this->FontFiles[$file]['n']=$this->n;
+        if(defined('FPDF_FONTPATH'))
+            $file=FPDF_FONTPATH.$file;
+        $size=filesize($file);
+        if(!$size)
+            $this->Error('Font file not found');
+        $this->_out('<</Length '.$size);
+        if(substr($file,-2)=='.z')
+            $this->_out('/Filter /FlateDecode');
+        $this->_out('/Length1 '.$info['length1']);
+        if(isset($info['length2']))
+            $this->_out('/Length2 '.$info['length2'].' /Length3 0');
+        $this->_out('>>');
+        $f=fopen($file,'rb');
+        $this->_putstream(fread($f,$size));
+        fclose($f);
+        $this->_out('endobj');
+    }
+    if (!check_php_version(5,3)) {
+        set_magic_quotes_runtime($mqr);
+    }
+    foreach($this->fonts as $k=>$font)
+    {
+        //Font objects
+        $this->_newobj();
+        $this->fonts[$k]['n']=$this->n;
+        $this->_out('<</Type /Font');
+        if($font['type']=='Type0')
+            $this->_putType0($font);
+        else
+        {
+            $name=$font['name'];
+            $this->_out('/BaseFont /'.$name);
+            if($font['type']=='core')
+            {
+                //Standard font
+                $this->_out('/Subtype /Type1');
+                if($name!='Symbol' and $name!='ZapfDingbats')
+                    $this->_out('/Encoding /WinAnsiEncoding');
+            }
+            else
+            {
+                //Additional font
+                $this->_out('/Subtype /'.$font['type']);
+                $this->_out('/FirstChar 32');
+                $this->_out('/LastChar 255');
+                $this->_out('/Widths '.($this->n+1).' 0 R');
+                $this->_out('/FontDescriptor '.($this->n+2).' 0 R');
+                if($font['enc'])
+                {
+                    if(isset($font['diff']))
+                        $this->_out('/Encoding '.($nf+$font['diff']).' 0 R');
+                    else
+                        $this->_out('/Encoding /WinAnsiEncoding');
+                }
+            }
             $this->_out('>>');
-            $f = fopen($file, 'rb');
-            $this->_putstream(fread($f, $size));
-            fclose($f);
             $this->_out('endobj');
-        }
-        if (!check_php_version(5, 3)) {
-            set_magic_quotes_runtime($mqr);
-        }
-        foreach ($this->fonts as $k => $font) {
-            //Font objects
-            $this->_newobj();
-            $this->fonts[$k]['n'] = $this->n;
-            $this->_out('<</Type /Font');
-            if ($font['type'] == 'Type0')
-                $this->_putType0($font);
-            else {
-                $name = $font['name'];
-                $this->_out('/BaseFont /' . $name);
-                if ($font['type'] == 'core') {
-                    //Standard font
-                    $this->_out('/Subtype /Type1');
-                    if ($name != 'Symbol' and $name != 'ZapfDingbats')
-                        $this->_out('/Encoding /WinAnsiEncoding');
-                } else {
-                    //Additional font
-                    $this->_out('/Subtype /' . $font['type']);
-                    $this->_out('/FirstChar 32');
-                    $this->_out('/LastChar 255');
-                    $this->_out('/Widths ' . ($this->n + 1) . ' 0 R');
-                    $this->_out('/FontDescriptor ' . ($this->n + 2) . ' 0 R');
-                    if ($font['enc']) {
-                        if (isset($font['diff']))
-                            $this->_out('/Encoding ' . ($nf + $font['diff']) . ' 0 R');
-                        else
-                            $this->_out('/Encoding /WinAnsiEncoding');
-                    }
-                }
-                $this->_out('>>');
+            if($font['type']!='core')
+            {
+                //Widths
+                $this->_newobj();
+                $cw=&$font['cw'];
+                $s='[';
+                for($i=32;$i<=255;$i++)
+                    $s.=$cw[chr($i)].' ';
+                $this->_out($s.']');
                 $this->_out('endobj');
-                if ($font['type'] != 'core') {
-                    //Widths
-                    $this->_newobj();
-                    $cw =& $font['cw'];
-                    $s = '[';
-                    for ($i = 32; $i <= 255; $i++)
-                        $s .= $cw[chr($i)] . ' ';
-                    $this->_out($s . ']');
-                    $this->_out('endobj');
-                    //Descriptor
-                    $this->_newobj();
-                    $s = '<</Type /FontDescriptor /FontName /' . $name;
-                    foreach ($font['desc'] as $k => $v)
-                        $s .= ' /' . $k . ' ' . $v;
-                    $file = $font['file'];
-                    if ($file)
-                        $s .= ' /FontFile' . ($font['type'] == 'Type1' ? '' : '2') . ' ' . $this->FontFiles[$file]['n'] . ' 0 R';
-                    $this->_out($s . '>>');
-                    $this->_out('endobj');
-                }
+                //Descriptor
+                $this->_newobj();
+                $s='<</Type /FontDescriptor /FontName /'.$name;
+                foreach($font['desc'] as $k=>$v)
+                    $s.=' /'.$k.' '.$v;
+                $file=$font['file'];
+                if($file)
+                    $s.=' /FontFile'.($font['type']=='Type1' ? '' : '2').' '.$this->FontFiles[$file]['n'].' 0 R';
+                $this->_out($s.'>>');
+                $this->_out('endobj');
             }
         }
     }
+    }
 
     function _putType0($font)
     {
-        //Type0
-        $this->_out('/Subtype /Type0');
-        $this->_out('/BaseFont /' . $font['name'] . '-' . $font['CMap']);
-        $this->_out('/Encoding /' . $font['CMap']);
-        $this->_out('/DescendantFonts [' . ($this->n + 1) . ' 0 R]');
-        $this->_out('>>');
-        $this->_out('endobj');
-        //CIDFont
-        $this->_newobj();
-        $this->_out('<</Type /Font');
-        $this->_out('/Subtype /CIDFontType0');
-        $this->_out('/BaseFont /' . $font['name']);
-        $this->_out('/CIDSystemInfo <</Registry ' . $this->_textstring('Adobe') . ' /Ordering ' . $this->_textstring($font['registry']['ordering']) . ' /Supplement ' . $font['registry']['supplement'] . '>>');
-        $this->_out('/FontDescriptor ' . ($this->n + 1) . ' 0 R');
-        if ($font['CMap'] == 'ETen-B5-H')
-            $W = '13648 13742 500';
-        elseif ($font['CMap'] == 'GBK-EUC-H')
-            $W = '814 907 500 7716 [500]'; else
-            $W = '1 [' . implode(' ', $font['cw']) . ']';
-        $this->_out('/W [' . $W . ']>>');
-        $this->_out('endobj');
-        //Font descriptor
-        $this->_newobj();
-        $this->_out('<</Type /FontDescriptor');
-        $this->_out('/FontName /' . $font['name']);
-        $this->_out('/Flags 6');
-        $this->_out('/FontBBox [0 -200 1000 900]');
-        $this->_out('/ItalicAngle 0');
-        $this->_out('/Ascent 800');
-        $this->_out('/Descent -200');
-        $this->_out('/CapHeight 800');
-        $this->_out('/StemV 50');
-        $this->_out('>>');
-        $this->_out('endobj');
+    //Type0
+    $this->_out('/Subtype /Type0');
+    $this->_out('/BaseFont /'.$font['name'].'-'.$font['CMap']);
+    $this->_out('/Encoding /'.$font['CMap']);
+    $this->_out('/DescendantFonts ['.($this->n+1).' 0 R]');
+    $this->_out('>>');
+    $this->_out('endobj');
+    //CIDFont
+    $this->_newobj();
+    $this->_out('<</Type /Font');
+    $this->_out('/Subtype /CIDFontType0');
+    $this->_out('/BaseFont /'.$font['name']);
+    $this->_out('/CIDSystemInfo <</Registry '.$this->_textstring('Adobe').' /Ordering '.$this->_textstring($font['registry']['ordering']).' /Supplement '.$font['registry']['supplement'].'>>');
+    $this->_out('/FontDescriptor '.($this->n+1).' 0 R');
+    if($font['CMap']=='ETen-B5-H')
+        $W='13648 13742 500';
+    elseif($font['CMap']=='GBK-EUC-H')
+        $W='814 907 500 7716 [500]';
+    else
+        $W='1 ['.implode(' ',$font['cw']).']';
+    $this->_out('/W ['.$W.']>>');
+    $this->_out('endobj');
+    //Font descriptor
+    $this->_newobj();
+    $this->_out('<</Type /FontDescriptor');
+    $this->_out('/FontName /'.$font['name']);
+    $this->_out('/Flags 6');
+    $this->_out('/FontBBox [0 -200 1000 900]');
+    $this->_out('/ItalicAngle 0');
+    $this->_out('/Ascent 800');
+    $this->_out('/Descent -200');
+    $this->_out('/CapHeight 800');
+    $this->_out('/StemV 50');
+    $this->_out('>>');
+    $this->_out('endobj');
     }
 }
 
@@ -422,3 +461,4 @@
 // c-hanging-comment-ender-p: nil
 // indent-tabs-mode: nil
 // End:
+?>

Modified: trunk/lib/font/courier.php
===================================================================
--- trunk/lib/fpdf/courier.php	2012-12-03 12:43:20 UTC (rev 8589)
+++ trunk/lib/font/courier.php	2012-12-03 13:29:21 UTC (rev 8590)
@@ -1,6 +1,8 @@
 <?php
-for ($i = 0; $i <= 255; $i++)
-    $fpdf_charwidths['courier'][chr($i)] = 600;
-$fpdf_charwidths['courierB'] = $fpdf_charwidths['courier'];
-$fpdf_charwidths['courierI'] = $fpdf_charwidths['courier'];
-$fpdf_charwidths['courierBI'] = $fpdf_charwidths['courier'];
+$type = 'Core';
+$name = 'Courier';
+$up = -100;
+$ut = 50;
+for($i=0;$i<=255;$i++)
+	$cw[chr($i)] = 600;
+?>

Added: trunk/lib/font/courierb.php
===================================================================
--- trunk/lib/font/courierb.php	                        (rev 0)
+++ trunk/lib/font/courierb.php	2012-12-03 13:29:21 UTC (rev 8590)
@@ -0,0 +1,8 @@
+<?php
+$type = 'Core';
+$name = 'Courier-Bold';
+$up = -100;
+$ut = 50;
+for($i=0;$i<=255;$i++)
+	$cw[chr($i)] = 600;
+?>

Added: trunk/lib/font/courierbi.php
===================================================================
--- trunk/lib/font/courierbi.php	                        (rev 0)
+++ trunk/lib/font/courierbi.php	2012-12-03 13:29:21 UTC (rev 8590)
@@ -0,0 +1,8 @@
+<?php
+$type = 'Core';
+$name = 'Courier-BoldOblique';
+$up = -100;
+$ut = 50;
+for($i=0;$i<=255;$i++)
+	$cw[chr($i)] = 600;
+?>

Added: trunk/lib/font/courieri.php
===================================================================
--- trunk/lib/font/courieri.php	                        (rev 0)
+++ trunk/lib/font/courieri.php	2012-12-03 13:29:21 UTC (rev 8590)
@@ -0,0 +1,8 @@
+<?php
+$type = 'Core';
+$name = 'Courier-Oblique';
+$up = -100;
+$ut = 50;
+for($i=0;$i<=255;$i++)
+	$cw[chr($i)] = 600;
+?>

Modified: trunk/lib/font/helvetica.php
===================================================================
--- trunk/lib/fpdf/helvetica.php	2012-12-03 12:43:20 UTC (rev 8589)
+++ trunk/lib/font/helvetica.php	2012-12-03 13:29:21 UTC (rev 8590)
@@ -1,14 +1,19 @@
 <?php
-$fpdf_charwidths['helvetica'] = array(
-    chr(0) => 278, chr(1) => 278, chr(2) => 278, chr(3) => 278, chr(4) => 278, chr(5) => 278, chr(6) => 278, chr(7) => 278, chr(8) => 278, chr(9) => 278, chr(10) => 278, chr(11) => 278, chr(12) => 278, chr(13) => 278, chr(14) => 278, chr(15) => 278, chr(16) => 278, chr(17) => 278, chr(18) => 278, chr(19) => 278, chr(20) => 278, chr(21) => 278,
-    chr(22) => 278, chr(23) => 278, chr(24) => 278, chr(25) => 278, chr(26) => 278, chr(27) => 278, chr(28) => 278, chr(29) => 278, chr(30) => 278, chr(31) => 278, ' ' => 278, '!' => 278, '"' => 355, '#' => 556, '$' => 556, '%' => 889, '&' => 667, '\'' => 191, '(' => 333, ')' => 333, '*' => 389, '+' => 584,
-    ',' => 278, '-' => 333, '.' => 278, '/' => 278, '0' => 556, '1' => 556, '2' => 556, '3' => 556, '4' => 556, '5' => 556, '6' => 556, '7' => 556, '8' => 556, '9' => 556, ':' => 278, ';' => 278, '<' => 584, '=' => 584, '>' => 584, '?' => 556, '@' => 1015, 'A' => 667,
-    'B' => 667, 'C' => 722, 'D' => 722, 'E' => 667, 'F' => 611, 'G' => 778, 'H' => 722, 'I' => 278, 'J' => 500, 'K' => 667, 'L' => 556, 'M' => 833, 'N' => 722, 'O' => 778, 'P' => 667, 'Q' => 778, 'R' => 722, 'S' => 667, 'T' => 611, 'U' => 722, 'V' => 667, 'W' => 944,
-    'X' => 667, 'Y' => 667, 'Z' => 611, '[' => 278, '\\' => 278, ']' => 278, '^' => 469, '_' => 556, '`' => 333, 'a' => 556, 'b' => 556, 'c' => 500, 'd' => 556, 'e' => 556, 'f' => 278, 'g' => 556, 'h' => 556, 'i' => 222, 'j' => 222, 'k' => 500, 'l' => 222, 'm' => 833,
-    'n' => 556, 'o' => 556, 'p' => 556, 'q' => 556, 'r' => 333, 's' => 500, 't' => 278, 'u' => 556, 'v' => 500, 'w' => 722, 'x' => 500, 'y' => 500, 'z' => 500, '{' => 334, '|' => 260, '}' => 334, '~' => 584, chr(127) => 350, chr(128) => 556, chr(129) => 350, chr(130) => 222, chr(131) => 556,
-    chr(132) => 333, chr(133) => 1000, chr(134) => 556, chr(135) => 556, chr(136) => 333, chr(137) => 1000, chr(138) => 667, chr(139) => 333, chr(140) => 1000, chr(141) => 350, chr(142) => 611, chr(143) => 350, chr(144) => 350, chr(145) => 222, chr(146) => 222, chr(147) => 333, chr(148) => 333, chr(149) => 350, chr(150) => 556, chr(151) => 1000, chr(152) => 333, chr(153) => 1000,
-    chr(154) => 500, chr(155) => 333, chr(156) => 944, chr(157) => 350, chr(158) => 500, chr(159) => 667, chr(160) => 278, chr(161) => 333, chr(162) => 556, chr(163) => 556, chr(164) => 556, chr(165) => 556, chr(166) => 260, chr(167) => 556, chr(168) => 333, chr(169) => 737, chr(170) => 370, chr(171) => 556, chr(172) => 584, chr(173) => 333, chr(174) => 737, chr(175) => 333,
-    chr(176) => 400, chr(177) => 584, chr(178) => 333, chr(179) => 333, chr(180) => 333, chr(181) => 556, chr(182) => 537, chr(183) => 278, chr(184) => 333, chr(185) => 333, chr(186) => 365, chr(187) => 556, chr(188) => 834, chr(189) => 834, chr(190) => 834, chr(191) => 611, chr(192) => 667, chr(193) => 667, chr(194) => 667, chr(195) => 667, chr(196) => 667, chr(197) => 667,
-    chr(198) => 1000, chr(199) => 722, chr(200) => 667, chr(201) => 667, chr(202) => 667, chr(203) => 667, chr(204) => 278, chr(205) => 278, chr(206) => 278, chr(207) => 278, chr(208) => 722, chr(209) => 722, chr(210) => 778, chr(211) => 778, chr(212) => 778, chr(213) => 778, chr(214) => 778, chr(215) => 584, chr(216) => 778, chr(217) => 722, chr(218) => 722, chr(219) => 722,
-    chr(220) => 722, chr(221) => 667, chr(222) => 667, chr(223) => 611, chr(224) => 556, chr(225) => 556, chr(226) => 556, chr(227) => 556, chr(228) => 556, chr(229) => 556, chr(230) => 889, chr(231) => 500, chr(232) => 556, chr(233) => 556, chr(234) => 556, chr(235) => 556, chr(236) => 278, chr(237) => 278, chr(238) => 278, chr(239) => 278, chr(240) => 556, chr(241) => 556,
-    chr(242) => 556, chr(243) => 556, chr(244) => 556, chr(245) => 556, chr(246) => 556, chr(247) => 584, chr(248) => 611, chr(249) => 556, chr(250) => 556, chr(251) => 556, chr(252) => 556, chr(253) => 500, chr(254) => 556, chr(255) => 500);
+$type = 'Core';
+$name = 'Helvetica';
+$up = -100;
+$ut = 50;
+$cw = array(
+	chr(0)=>278,chr(1)=>278,chr(2)=>278,chr(3)=>278,chr(4)=>278,chr(5)=>278,chr(6)=>278,chr(7)=>278,chr(8)=>278,chr(9)=>278,chr(10)=>278,chr(11)=>278,chr(12)=>278,chr(13)=>278,chr(14)=>278,chr(15)=>278,chr(16)=>278,chr(17)=>278,chr(18)=>278,chr(19)=>278,chr(20)=>278,chr(21)=>278,
+	chr(22)=>278,chr(23)=>278,chr(24)=>278,chr(25)=>278,chr(26)=>278,chr(27)=>278,chr(28)=>278,chr(29)=>278,chr(30)=>278,chr(31)=>278,' '=>278,'!'=>278,'"'=>355,'#'=>556,'$'=>556,'%'=>889,'&'=>667,'\''=>191,'('=>333,')'=>333,'*'=>389,'+'=>584,
+	','=>278,'-'=>333,'.'=>278,'/'=>278,'0'=>556,'1'=>556,'2'=>556,'3'=>556,'4'=>556,'5'=>556,'6'=>556,'7'=>556,'8'=>556,'9'=>556,':'=>278,';'=>278,'<'=>584,'='=>584,'>'=>584,'?'=>556,'@'=>1015,'A'=>667,
+	'B'=>667,'C'=>722,'D'=>722,'E'=>667,'F'=>611,'G'=>778,'H'=>722,'I'=>278,'J'=>500,'K'=>667,'L'=>556,'M'=>833,'N'=>722,'O'=>778,'P'=>667,'Q'=>778,'R'=>722,'S'=>667,'T'=>611,'U'=>722,'V'=>667,'W'=>944,
+	'X'=>667,'Y'=>667,'Z'=>611,'['=>278,'\\'=>278,']'=>278,'^'=>469,'_'=>556,'`'=>333,'a'=>556,'b'=>556,'c'=>500,'d'=>556,'e'=>556,'f'=>278,'g'=>556,'h'=>556,'i'=>222,'j'=>222,'k'=>500,'l'=>222,'m'=>833,
+	'n'=>556,'o'=>556,'p'=>556,'q'=>556,'r'=>333,'s'=>500,'t'=>278,'u'=>556,'v'=>500,'w'=>722,'x'=>500,'y'=>500,'z'=>500,'{'=>334,'|'=>260,'}'=>334,'~'=>584,chr(127)=>350,chr(128)=>556,chr(129)=>350,chr(130)=>222,chr(131)=>556,
+	chr(132)=>333,chr(133)=>1000,chr(134)=>556,chr(135)=>556,chr(136)=>333,chr(137)=>1000,chr(138)=>667,chr(139)=>333,chr(140)=>1000,chr(141)=>350,chr(142)=>611,chr(143)=>350,chr(144)=>350,chr(145)=>222,chr(146)=>222,chr(147)=>333,chr(148)=>333,chr(149)=>350,chr(150)=>556,chr(151)=>1000,chr(152)=>333,chr(153)=>1000,
+	chr(154)=>500,chr(155)=>333,chr(156)=>944,chr(157)=>350,chr(158)=>500,chr(159)=>667,chr(160)=>278,chr(161)=>333,chr(162)=>556,chr(163)=>556,chr(164)=>556,chr(165)=>556,chr(166)=>260,chr(167)=>556,chr(168)=>333,chr(169)=>737,chr(170)=>370,chr(171)=>556,chr(172)=>584,chr(173)=>333,chr(174)=>737,chr(175)=>333,
+	chr(176)=>400,chr(177)=>584,chr(178)=>333,chr(179)=>333,chr(180)=>333,chr(181)=>556,chr(182)=>537,chr(183)=>278,chr(184)=>333,chr(185)=>333,chr(186)=>365,chr(187)=>556,chr(188)=>834,chr(189)=>834,chr(190)=>834,chr(191)=>611,chr(192)=>667,chr(193)=>667,chr(194)=>667,chr(195)=>667,chr(196)=>667,chr(197)=>667,
+	chr(198)=>1000,chr(199)=>722,chr(200)=>667,chr(201)=>667,chr(202)=>667,chr(203)=>667,chr(204)=>278,chr(205)=>278,chr(206)=>278,chr(207)=>278,chr(208)=>722,chr(209)=>722,chr(210)=>778,chr(211)=>778,chr(212)=>778,chr(213)=>778,chr(214)=>778,chr(215)=>584,chr(216)=>778,chr(217)=>722,chr(218)=>722,chr(219)=>722,
+	chr(220)=>722,chr(221)=>667,chr(222)=>667,chr(223)=>611,chr(224)=>556,chr(225)=>556,chr(226)=>556,chr(227)=>556,chr(228)=>556,chr(229)=>556,chr(230)=>889,chr(231)=>500,chr(232)=>556,chr(233)=>556,chr(234)=>556,chr(235)=>556,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>556,chr(241)=>556,
+	chr(242)=>556,chr(243)=>556,chr(244)=>556,chr(245)=>556,chr(246)=>556,chr(247)=>584,chr(248)=>611,chr(249)=>556,chr(250)=>556,chr(251)=>556,chr(252)=>556,chr(253)=>500,chr(254)=>556,chr(255)=>500);
+?>

Modified: trunk/lib/font/helveticab.php
===================================================================
--- trunk/lib/fpdf/helveticab.php	2012-12-03 12:43:20 UTC (rev 8589)
+++ trunk/lib/font/helveticab.php	2012-12-03 13:29:21 UTC (rev 8590)
@@ -1,14 +1,19 @@
 <?php
-$fpdf_charwidths['helveticaB'] = array(
-    chr(0) => 278, chr(1) => 278, chr(2) => 278, chr(3) => 278, chr(4) => 278, chr(5) => 278, chr(6) => 278, chr(7) => 278, chr(8) => 278, chr(9) => 278, chr(10) => 278, chr(11) => 278, chr(12) => 278, chr(13) => 278, chr(14) => 278, chr(15) => 278, chr(16) => 278, chr(17) => 278, chr(18) => 278, chr(19) => 278, chr(20) => 278, chr(21) => 278,
-    chr(22) => 278, chr(23) => 278, chr(24) => 278, chr(25) => 278, chr(26) => 278, chr(27) => 278, chr(28) => 278, chr(29) => 278, chr(30) => 278, chr(31) => 278, ' ' => 278, '!' => 333, '"' => 474, '#' => 556, '$' => 556, '%' => 889, '&' => 722, '\'' => 238, '(' => 333, ')' => 333, '*' => 389, '+' => 584,
-    ',' => 278, '-' => 333, '.' => 278, '/' => 278, '0' => 556, '1' => 556, '2' => 556, '3' => 556, '4' => 556, '5' => 556, '6' => 556, '7' => 556, '8' => 556, '9' => 556, ':' => 333, ';' => 333, '<' => 584, '=' => 584, '>' => 584, '?' => 611, '@' => 975, 'A' => 722,
-    'B' => 722, 'C' => 722, 'D' => 722, 'E' => 667, 'F' => 611, 'G' => 778, 'H' => 722, 'I' => 278, 'J' => 556, 'K' => 722, 'L' => 611, 'M' => 833, 'N' => 722, 'O' => 778, 'P' => 667, 'Q' => 778, 'R' => 722, 'S' => 667, 'T' => 611, 'U' => 722, 'V' => 667, 'W' => 944,
-    'X' => 667, 'Y' => 667, 'Z' => 611, '[' => 333, '\\' => 278, ']' => 333, '^' => 584, '_' => 556, '`' => 333, 'a' => 556, 'b' => 611, 'c' => 556, 'd' => 611, 'e' => 556, 'f' => 333, 'g' => 611, 'h' => 611, 'i' => 278, 'j' => 278, 'k' => 556, 'l' => 278, 'm' => 889,
-    'n' => 611, 'o' => 611, 'p' => 611, 'q' => 611, 'r' => 389, 's' => 556, 't' => 333, 'u' => 611, 'v' => 556, 'w' => 778, 'x' => 556, 'y' => 556, 'z' => 500, '{' => 389, '|' => 280, '}' => 389, '~' => 584, chr(127) => 350, chr(128) => 556, chr(129) => 350, chr(130) => 278, chr(131) => 556,
-    chr(132) => 500, chr(133) => 1000, chr(134) => 556, chr(135) => 556, chr(136) => 333, chr(137) => 1000, chr(138) => 667, chr(139) => 333, chr(140) => 1000, chr(141) => 350, chr(142) => 611, chr(143) => 350, chr(144) => 350, chr(145) => 278, chr(146) => 278, chr(147) => 500, chr(148) => 500, chr(149) => 350, chr(150) => 556, chr(151) => 1000, chr(152) => 333, chr(153) => 1000,
-    chr(154) => 556, chr(155) => 333, chr(156) => 944, chr(157) => 350, chr(158) => 500, chr(159) => 667, chr(160) => 278, chr(161) => 333, chr(162) => 556, chr(163) => 556, chr(164) => 556, chr(165) => 556, chr(166) => 280, chr(167) => 556, chr(168) => 333, chr(169) => 737, chr(170) => 370, chr(171) => 556, chr(172) => 584, chr(173) => 333, chr(174) => 737, chr(175) => 333,
-    chr(176) => 400, chr(177) => 584, chr(178) => 333, chr(179) => 333, chr(180) => 333, chr(181) => 611, chr(182) => 556, chr(183) => 278, chr(184) => 333, chr(185) => 333, chr(186) => 365, chr(187) => 556, chr(188) => 834, chr(189) => 834, chr(190) => 834, chr(191) => 611, chr(192) => 722, chr(193) => 722, chr(194) => 722, chr(195) => 722, chr(196) => 722, chr(197) => 722,
-    chr(198) => 1000, chr(199) => 722, chr(200) => 667, chr(201) => 667, chr(202) => 667, chr(203) => 667, chr(204) => 278, chr(205) => 278, chr(206) => 278, chr(207) => 278, chr(208) => 722, chr(209) => 722, chr(210) => 778, chr(211) => 778, chr(212) => 778, chr(213) => 778, chr(214) => 778, chr(215) => 584, chr(216) => 778, chr(217) => 722, chr(218) => 722, chr(219) => 722,
-    chr(220) => 722, chr(221) => 667, chr(222) => 667, chr(223) => 611, chr(224) => 556, chr(225) => 556, chr(226) => 556, chr(227) => 556, chr(228) => 556, chr(229) => 556, chr(230) => 889, chr(231) => 556, chr(232) => 556, chr(233) => 556, chr(234) => 556, chr(235) => 556, chr(236) => 278, chr(237) => 278, chr(238) => 278, chr(239) => 278, chr(240) => 611, chr(241) => 611,
-    chr(242) => 611, chr(243) => 611, chr(244) => 611, chr(245) => 611, chr(246) => 611, chr(247) => 584, chr(248) => 611, chr(249) => 611, chr(250) => 611, chr(251) => 611, chr(252) => 611, chr(253) => 556, chr(254) => 611, chr(255) => 556);
+$type = 'Core';
+$name = 'Helvetica-Bold';
+$up = -100;
+$ut = 50;
+$cw = array(
+	chr(0)=>278,chr(1)=>278,chr(2)=>278,chr(3)=>278,chr(4)=>278,chr(5)=>278,chr(6)=>278,chr(7)=>278,chr(8)=>278,chr(9)=>278,chr(10)=>278,chr(11)=>278,chr(12)=>278,chr(13)=>278,chr(14)=>278,chr(15)=>278,chr(16)=>278,chr(17)=>278,chr(18)=>278,chr(19)=>278,chr(20)=>278,chr(21)=>278,
+	chr(22)=>278,chr(23)=>278,chr(24)=>278,chr(25)=>278,chr(26)=>278,chr(27)=>278,chr(28)=>278,chr(29)=>278,chr(30)=>278,chr(31)=>278,' '=>278,'!'=>333,'"'=>474,'#'=>556,'$'=>556,'%'=>889,'&'=>722,'\''=>238,'('=>333,')'=>333,'*'=>389,'+'=>584,
+	','=>278,'-'=>333,'.'=>278,'/'=>278,'0'=>556,'1'=>556,'2'=>556,'3'=>556,'4'=>556,'5'=>556,'6'=>556,'7'=>556,'8'=>556,'9'=>556,':'=>333,';'=>333,'<'=>584,'='=>584,'>'=>584,'?'=>611,'@'=>975,'A'=>722,
+	'B'=>722,'C'=>722,'D'=>722,'E'=>667,'F'=>611,'G'=>778,'H'=>722,'I'=>278,'J'=>556,'K'=>722,'L'=>611,'M'=>833,'N'=>722,'O'=>778,'P'=>667,'Q'=>778,'R'=>722,'S'=>667,'T'=>611,'U'=>722,'V'=>667,'W'=>944,
+	'X'=>667,'Y'=>667,'Z'=>611,'['=>333,'\\'=>278,']'=>333,'^'=>584,'_'=>556,'`'=>333,'a'=>556,'b'=>611,'c'=>556,'d'=>611,'e'=>556,'f'=>333,'g'=>611,'h'=>611,'i'=>278,'j'=>278,'k'=>556,'l'=>278,'m'=>889,
+	'n'=>611,'o'=>611,'p'=>611,'q'=>611,'r'=>389,'s'=>556,'t'=>333,'u'=>611,'v'=>556,'w'=>778,'x'=>556,'y'=>556,'z'=>500,'{'=>389,'|'=>280,'}'=>389,'~'=>584,chr(127)=>350,chr(128)=>556,chr(129)=>350,chr(130)=>278,chr(131)=>556,
+	chr(132)=>500,chr(133)=>1000,chr(134)=>556,chr(135)=>556,chr(136)=>333,chr(137)=>1000,chr(138)=>667,chr(139)=>333,chr(140)=>1000,chr(141)=>350,chr(142)=>611,chr(143)=>350,chr(144)=>350,chr(145)=>278,chr(146)=>278,chr(147)=>500,chr(148)=>500,chr(149)=>350,chr(150)=>556,chr(151)=>1000,chr(152)=>333,chr(153)=>1000,
+	chr(154)=>556,chr(155)=>333,chr(156)=>944,chr(157)=>350,chr(158)=>500,chr(159)=>667,chr(160)=>278,chr(161)=>333,chr(162)=>556,chr(163)=>556,chr(164)=>556,chr(165)=>556,chr(166)=>280,chr(167)=>556,chr(168)=>333,chr(169)=>737,chr(170)=>370,chr(171)=>556,chr(172)=>584,chr(173)=>333,chr(174)=>737,chr(175)=>333,
+	chr(176)=>400,chr(177)=>584,chr(178)=>333,chr(179)=>333,chr(180)=>333,chr(181)=>611,chr(182)=>556,chr(183)=>278,chr(184)=>333,chr(185)=>333,chr(186)=>365,chr(187)=>556,chr(188)=>834,chr(189)=>834,chr(190)=>834,chr(191)=>611,chr(192)=>722,chr(193)=>722,chr(194)=>722,chr(195)=>722,chr(196)=>722,chr(197)=>722,
+	chr(198)=>1000,chr(199)=>722,chr(200)=>667,chr(201)=>667,chr(202)=>667,chr(203)=>667,chr(204)=>278,chr(205)=>278,chr(206)=>278,chr(207)=>278,chr(208)=>722,chr(209)=>722,chr(210)=>778,chr(211)=>778,chr(212)=>778,chr(213)=>778,chr(214)=>778,chr(215)=>584,chr(216)=>778,chr(217)=>722,chr(218)=>722,chr(219)=>722,
+	chr(220)=>722,chr(221)=>667,chr(222)=>667,chr(223)=>611,chr(224)=>556,chr(225)=>556,chr(226)=>556,chr(227)=>556,chr(228)=>556,chr(229)=>556,chr(230)=>889,chr(231)=>556,chr(232)=>556,chr(233)=>556,chr(234)=>556,chr(235)=>556,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>611,chr(241)=>611,
+	chr(242)=>611,chr(243)=>611,chr(244)=>611,chr(245)=>611,chr(246)=>611,chr(247)=>584,chr(248)=>611,chr(249)=>611,chr(250)=>611,chr(251)=>611,chr(252)=>611,chr(253)=>556,chr(254)=>611,chr(255)=>556);
+?>

Modified: trunk/lib/font/helveticabi.php
===================================================================
--- trunk/lib/fpdf/helveticabi.php	2012-12-03 12:43:20 UTC (rev 8589)
+++ trunk/lib/font/helveticabi.php	2012-12-03 13:29:21 UTC (rev 8590)
@@ -1,14 +1,19 @@
 <?php
-$fpdf_charwidths['helveticaBI'] = array(
-    chr(0) => 278, chr(1) => 278, chr(2) => 278, chr(3) => 278, chr(4) => 278, chr(5) => 278, chr(6) => 278, chr(7) => 278, chr(8) => 278, chr(9) => 278, chr(10) => 278, chr(11) => 278, chr(12) => 278, chr(13) => 278, chr(14) => 278, chr(15) => 278, chr(16) => 278, chr(17) => 278, chr(18) => 278, chr(19) => 278, chr(20) => 278, chr(21) => 278,
-    chr(22) => 278, chr(23) => 278, chr(24) => 278, chr(25) => 278, chr(26) => 278, chr(27) => 278, chr(28) => 278, chr(29) => 278, chr(30) => 278, chr(31) => 278, ' ' => 278, '!' => 333, '"' => 474, '#' => 556, '$' => 556, '%' => 889, '&' => 722, '\'' => 238, '(' => 333, ')' => 333, '*' => 389, '+' => 584,
-    ',' => 278, '-' => 333, '.' => 278, '/' => 278, '0' => 556, '1' => 556, '2' => 556, '3' => 556, '4' => 556, '5' => 556, '6' => 556, '7' => 556, '8' => 556, '9' => 556, ':' => 333, ';' => 333, '<' => 584, '=' => 584, '>' => 584, '?' => 611, '@' => 975, 'A' => 722,
-    'B' => 722, 'C' => 722, 'D' => 722, 'E' => 667, 'F' => 611, 'G' => 778, 'H' => 722, 'I' => 278, 'J' => 556, 'K' => 722, 'L' => 611, 'M' => 833, 'N' => 722, 'O' => 778, 'P' => 667, 'Q' => 778, 'R' => 722, 'S' => 667, 'T' => 611, 'U' => 722, 'V' => 667, 'W' => 944,
-    'X' => 667, 'Y' => 667, 'Z' => 611, '[' => 333, '\\' => 278, ']' => 333, '^' => 584, '_' => 556, '`' => 333, 'a' => 556, 'b' => 611, 'c' => 556, 'd' => 611, 'e' => 556, 'f' => 333, 'g' => 611, 'h' => 611, 'i' => 278, 'j' => 278, 'k' => 556, 'l' => 278, 'm' => 889,
-    'n' => 611, 'o' => 611, 'p' => 611, 'q' => 611, 'r' => 389, 's' => 556, 't' => 333, 'u' => 611, 'v' => 556, 'w' => 778, 'x' => 556, 'y' => 556, 'z' => 500, '{' => 389, '|' => 280, '}' => 389, '~' => 584, chr(127) => 350, chr(128) => 556, chr(129) => 350, chr(130) => 278, chr(131) => 556,
-    chr(132) => 500, chr(133) => 1000, chr(134) => 556, chr(135) => 556, chr(136) => 333, chr(137) => 1000, chr(138) => 667, chr(139) => 333, chr(140) => 1000, chr(141) => 350, chr(142) => 611, chr(143) => 350, chr(144) => 350, chr(145) => 278, chr(146) => 278, chr(147) => 500, chr(148) => 500, chr(149) => 350, chr(150) => 556, chr(151) => 1000, chr(152) => 333, chr(153) => 1000,
-    chr(154) => 556, chr(155) => 333, chr(156) => 944, chr(157) => 350, chr(158) => 500, chr(159) => 667, chr(160) => 278, chr(161) => 333, chr(162) => 556, chr(163) => 556, chr(164) => 556, chr(165) => 556, chr(166) => 280, chr(167) => 556, chr(168) => 333, chr(169) => 737, chr(170) => 370, chr(171) => 556, chr(172) => 584, chr(173) => 333, chr(174) => 737, chr(175) => 333,
-    chr(176) => 400, chr(177) => 584, chr(178) => 333, chr(179) => 333, chr(180) => 333, chr(181) => 611, chr(182) => 556, chr(183) => 278, chr(184) => 333, chr(185) => 333, chr(186) => 365, chr(187) => 556, chr(188) => 834, chr(189) => 834, chr(190) => 834, chr(191) => 611, chr(192) => 722, chr(193) => 722, chr(194) => 722, chr(195) => 722, chr(196) => 722, chr(197) => 722,
-    chr(198) => 1000, chr(199) => 722, chr(200) => 667, chr(201) => 667, chr(202) => 667, chr(203) => 667, chr(204) => 278, chr(205) => 278, chr(206) => 278, chr(207) => 278, chr(208) => 722, chr(209) => 722, chr(210) => 778, chr(211) => 778, chr(212) => 778, chr(213) => 778, chr(214) => 778, chr(215) => 584, chr(216) => 778, chr(217) => 722, chr(218) => 722, chr(219) => 722,
-    chr(220) => 722, chr(221) => 667, chr(222) => 667, chr(223) => 611, chr(224) => 556, chr(225) => 556, chr(226) => 556, chr(227) => 556, chr(228) => 556, chr(229) => 556, chr(230) => 889, chr(231) => 556, chr(232) => 556, chr(233) => 556, chr(234) => 556, chr(235) => 556, chr(236) => 278, chr(237) => 278, chr(238) => 278, chr(239) => 278, chr(240) => 611, chr(241) => 611,
-    chr(242) => 611, chr(243) => 611, chr(244) => 611, chr(245) => 611, chr(246) => 611, chr(247) => 584, chr(248) => 611, chr(249) => 611, chr(250) => 611, chr(251) => 611, chr(252) => 611, chr(253) => 556, chr(254) => 611, chr(255) => 556);
+$type = 'Core';
+$name = 'Helvetica-BoldOblique';
+$up = -100;
+$ut = 50;
+$cw = array(
+	chr(0)=>278,chr(1)=>278,chr(2)=>278,chr(3)=>278,chr(4)=>278,chr(5)=>278,chr(6)=>278,chr(7)=>278,chr(8)=>278,chr(9)=>278,chr(10)=>278,chr(11)=>278,chr(12)=>278,chr(13)=>278,chr(14)=>278,chr(15)=>278,chr(16)=>278,chr(17)=>278,chr(18)=>278,chr(19)=>278,chr(20)=>278,chr(21)=>278,
+	chr(22)=>278,chr(23)=>278,chr(24)=>278,chr(25)=>278,chr(26)=>278,chr(27)=>278,chr(28)=>278,chr(29)=>278,chr(30)=>278,chr(31)=>278,' '=>278,'!'=>333,'"'=>474,'#'=>556,'$'=>556,'%'=>889,'&'=>722,'\''=>238,'('=>333,')'=>333,'*'=>389,'+'=>584,
+	','=>278,'-'=>333,'.'=>278,'/'=>278,'0'=>556,'1'=>556,'2'=>556,'3'=>556,'4'=>556,'5'=>556,'6'=>556,'7'=>556,'8'=>556,'9'=>556,':'=>333,';'=>333,'<'=>584,'='=>584,'>'=>584,'?'=>611,'@'=>975,'A'=>722,
+	'B'=>722,'C'=>722,'D'=>722,'E'=>667,'F'=>611,'G'=>778,'H'=>722,'I'=>278,'J'=>556,'K'=>722,'L'=>611,'M'=>833,'N'=>722,'O'=>778,'P'=>667,'Q'=>778,'R'=>722,'S'=>667,'T'=>611,'U'=>722,'V'=>667,'W'=>944,
+	'X'=>667,'Y'=>667,'Z'=>611,'['=>333,'\\'=>278,']'=>333,'^'=>584,'_'=>556,'`'=>333,'a'=>556,'b'=>611,'c'=>556,'d'=>611,'e'=>556,'f'=>333,'g'=>611,'h'=>611,'i'=>278,'j'=>278,'k'=>556,'l'=>278,'m'=>889,
+	'n'=>611,'o'=>611,'p'=>611,'q'=>611,'r'=>389,'s'=>556,'t'=>333,'u'=>611,'v'=>556,'w'=>778,'x'=>556,'y'=>556,'z'=>500,'{'=>389,'|'=>280,'}'=>389,'~'=>584,chr(127)=>350,chr(128)=>556,chr(129)=>350,chr(130)=>278,chr(131)=>556,
+	chr(132)=>500,chr(133)=>1000,chr(134)=>556,chr(135)=>556,chr(136)=>333,chr(137)=>1000,chr(138)=>667,chr(139)=>333,chr(140)=>1000,chr(141)=>350,chr(142)=>611,chr(143)=>350,chr(144)=>350,chr(145)=>278,chr(146)=>278,chr(147)=>500,chr(148)=>500,chr(149)=>350,chr(150)=>556,chr(151)=>1000,chr(152)=>333,chr(153)=>1000,
+	chr(154)=>556,chr(155)=>333,chr(156)=>944,chr(157)=>350,chr(158)=>500,chr(159)=>667,chr(160)=>278,chr(161)=>333,chr(162)=>556,chr(163)=>556,chr(164)=>556,chr(165)=>556,chr(166)=>280,chr(167)=>556,chr(168)=>333,chr(169)=>737,chr(170)=>370,chr(171)=>556,chr(172)=>584,chr(173)=>333,chr(174)=>737,chr(175)=>333,
+	chr(176)=>400,chr(177)=>584,chr(178)=>333,chr(179)=>333,chr(180)=>333,chr(181)=>611,chr(182)=>556,chr(183)=>278,chr(184)=>333,chr(185)=>333,chr(186)=>365,chr(187)=>556,chr(188)=>834,chr(189)=>834,chr(190)=>834,chr(191)=>611,chr(192)=>722,chr(193)=>722,chr(194)=>722,chr(195)=>722,chr(196)=>722,chr(197)=>722,
+	chr(198)=>1000,chr(199)=>722,chr(200)=>667,chr(201)=>667,chr(202)=>667,chr(203)=>667,chr(204)=>278,chr(205)=>278,chr(206)=>278,chr(207)=>278,chr(208)=>722,chr(209)=>722,chr(210)=>778,chr(211)=>778,chr(212)=>778,chr(213)=>778,chr(214)=>778,chr(215)=>584,chr(216)=>778,chr(217)=>722,chr(218)=>722,chr(219)=>722,
+	chr(220)=>722,chr(221)=>667,chr(222)=>667,chr(223)=>611,chr(224)=>556,chr(225)=>556,chr(226)=>556,chr(227)=>556,chr(228)=>556,chr(229)=>556,chr(230)=>889,chr(231)=>556,chr(232)=>556,chr(233)=>556,chr(234)=>556,chr(235)=>556,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>611,chr(241)=>611,
+	chr(242)=>611,chr(243)=>611,chr(244)=>611,chr(245)=>611,chr(246)=>611,chr(247)=>584,chr(248)=>611,chr(249)=>611,chr(250)=>611,chr(251)=>611,chr(252)=>611,chr(253)=>556,chr(254)=>611,chr(255)=>556);
+?>

Modified: trunk/lib/font/helveticai.php
===================================================================
--- trunk/lib/fpdf/helveticai.php	2012-12-03 12:43:20 UTC (rev 8589)
+++ trunk/lib/font/helveticai.php	2012-12-03 13:29:21 UTC (rev 8590)
@@ -1,14 +1,19 @@
 <?php
-$fpdf_charwidths['helveticaI'] = array(
-    chr(0) => 278, chr(1) => 278, chr(2) => 278, chr(3) => 278, chr(4) => 278, chr(5) => 278, chr(6) => 278, chr(7) => 278, chr(8) => 278, chr(9) => 278, chr(10) => 278, chr(11) => 278, chr(12) => 278, chr(13) => 278, chr(14) => 278, chr(15) => 278, chr(16) => 278, chr(17) => 278, chr(18) => 278, chr(19) => 278, chr(20) => 278, chr(21) => 278,
-    chr(22) => 278, chr(23) => 278, chr(24) => 278, chr(25) => 278, chr(26) => 278, chr(27) => 278, chr(28) => 278, chr(29) => 278, chr(30) => 278, chr(31) => 278, ' ' => 278, '!' => 278, '"' => 355, '#' => 556, '$' => 556, '%' => 889, '&' => 667, '\'' => 191, '(' => 333, ')' => 333, '*' => 389, '+' => 584,
-    ',' => 278, '-' => 333, '.' => 278, '/' => 278, '0' => 556, '1' => 556, '2' => 556, '3' => 556, '4' => 556, '5' => 556, '6' => 556, '7' => 556, '8' => 556, '9' => 556, ':' => 278, ';' => 278, '<' => 584, '=' => 584, '>' => 584, '?' => 556, '@' => 1015, 'A' => 667,
-    'B' => 667, 'C' => 722, 'D' => 722, 'E' => 667, 'F' => 611, 'G' => 778, 'H' => 722, 'I' => 278, 'J' => 500, 'K' => 667, 'L' => 556, 'M' => 833, 'N' => 722, 'O' => 778, 'P' => 667, 'Q' => 778, 'R' => 722, 'S' => 667, 'T' => 611, 'U' => 722, 'V' => 667, 'W' => 944,
-    'X' => 667, 'Y' => 667, 'Z' => 611, '[' => 278, '\\' => 278, ']' => 278, '^' => 469, '_' => 556, '`' => 333, 'a' => 556, 'b' => 556, 'c' => 500, 'd' => 556, 'e' => 556, 'f' => 278, 'g' => 556, 'h' => 556, 'i' => 222, 'j' => 222, 'k' => 500, 'l' => 222, 'm' => 833,
-    'n' => 556, 'o' => 556, 'p' => 556, 'q' => 556, 'r' => 333, 's' => 500, 't' => 278, 'u' => 556, 'v' => 500, 'w' => 722, 'x' => 500, 'y' => 500, 'z' => 500, '{' => 334, '|' => 260, '}' => 334, '~' => 584, chr(127) => 350, chr(128) => 556, chr(129) => 350, chr(130) => 222, chr(131) => 556,
-    chr(132) => 333, chr(133) => 1000, chr(134) => 556, chr(135) => 556, chr(136) => 333, chr(137) => 1000, chr(138) => 667, chr(139) => 333, chr(140) => 1000, chr(141) => 350, chr(142) => 611, chr(143) => 350, chr(144) => 350, chr(145) => 222, chr(146) => 222, chr(147) => 333, chr(148) => 333, chr(149) => 350, chr(150) => 556, chr(151) => 1000, chr(152) => 333, chr(153) => 1000,
-    chr(154) => 500, chr(155) => 333, chr(156) => 944, chr(157) => 350, chr(158) => 500, chr(159) => 667, chr(160) => 278, chr(161) => 333, chr(162) => 556, chr(163) => 556, chr(164) => 556, chr(165) => 556, chr(166) => 260, chr(167) => 556, chr(168) => 333, chr(169) => 737, chr(170) => 370, chr(171) => 556, chr(172) => 584, chr(173) => 333, chr(174) => 737, chr(175) => 333,
-    chr(176) => 400, chr(177) => 584, chr(178) => 333, chr(179) => 333, chr(180) => 333, chr(181) => 556, chr(182) => 537, chr(183) => 278, chr(184) => 333, chr(185) => 333, chr(186) => 365, chr(187) => 556, chr(188) => 834, chr(189) => 834, chr(190) => 834, chr(191) => 611, chr(192) => 667, chr(193) => 667, chr(194) => 667, chr(195) => 667, chr(196) => 667, chr(197) => 667,
-    chr(198) => 1000, chr(199) => 722, chr(200) => 667, chr(201) => 667, chr(202) => 667, chr(203) => 667, chr(204) => 278, chr(205) => 278, chr(206) => 278, chr(207) => 278, chr(208) => 722, chr(209) => 722, chr(210) => 778, chr(211) => 778, chr(212) => 778, chr(213) => 778, chr(214) => 778, chr(215) => 584, chr(216) => 778, chr(217) => 722, chr(218) => 722, chr(219) => 722,
-    chr(220) => 722, chr(221) => 667, chr(222) => 667, chr(223) => 611, chr(224) => 556, chr(225) => 556, chr(226) => 556, chr(227) => 556, chr(228) => 556, chr(229) => 556, chr(230) => 889, chr(231) => 500, chr(232) => 556, chr(233) => 556, chr(234) => 556, chr(235) => 556, chr(236) => 278, chr(237) => 278, chr(238) => 278, chr(239) => 278, chr(240) => 556, chr(241) => 556,
-    chr(242)...
 
[truncated message content]

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

Flat | Threaded

<< < 1 .. 102 103 104 105 106 .. 538 > >> (Page 104 of 538)