Menu
▾
▴
phpwiki-checkins
|
From: <var...@us...> - 2012-09-30 16:54:34
|
Revision: 8327
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8327&view=rev
Author: vargenau
Date: 2012-09-30 16:54:28 +0000 (Sun, 30 Sep 2012)
Log Message:
-----------
Remove X-Rcs-Id
Modified Paths:
--------------
trunk/lib/loadsave.php
trunk/locale/README
Property Changed:
----------------
trunk/locale/README
Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php 2012-09-29 19:08:08 UTC (rev 8326)
+++ trunk/lib/loadsave.php 2012-09-30 16:54:28 UTC (rev 8327)
@@ -1,6 +1,4 @@
-<?php //-*-php-*-
-
-
+<?php
/*
* Copyright 1999,2000,2001,2002,2004,2005,2006,2007 $ThePhpWikiProgrammingTeam
* Copyright 2008-2010 Marc-Etienne Vargenau, Alcatel-Lucent
@@ -176,11 +174,6 @@
$head .= sprintf("Mime-Version: 1.0 (Produced by PhpWiki %s)\r\n",
PHPWIKI_VERSION);
- // This should just be entered by hand (or by script?)
- // in the actual pgsrc files, since only they should have
- // RCS ids.
- //$head .= "X-Rcs-Id: \$Id\$\r\n";
-
$iter = $page->getAllRevisions();
$parts = array();
while ($revision = $iter->next()) {
Modified: trunk/locale/README
===================================================================
--- trunk/locale/README 2012-09-29 19:08:08 UTC (rev 8326)
+++ trunk/locale/README 2012-09-30 16:54:28 UTC (rev 8327)
@@ -201,7 +201,6 @@
Date: Sat, 4 Jul 2009 19:09:38 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.3.11pre)
- X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
pagename=G%C3%A4steBuch;
flags="";
@@ -379,4 +378,4 @@
Carsten Klapp <car...@us...>
Reini Urban <ru...@x-...>
-$Id$
+$Id: README 7001 2009-07-06 14:23:30Z vargenau $
Property changes on: trunk/locale/README
___________________________________________________________________
Deleted: svn:keywords
- Id
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2012-09-30 17:01:14
|
Revision: 8328
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8328&view=rev
Author: vargenau
Date: 2012-09-30 17:01:07 +0000 (Sun, 30 Sep 2012)
Log Message:
-----------
Remove svn:keywords
Modified Paths:
--------------
trunk/tests/CompatInfo.php
trunk/tests/unit_test_backend_cvs.php
Property Changed:
----------------
trunk/admin/wiki2public.php
trunk/tests/CompatInfo.php
trunk/tests/unit_test_backend_cvs.php
trunk/uploads/index.php
Property changes on: trunk/admin/wiki2public.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/tests/CompatInfo.php
===================================================================
--- trunk/tests/CompatInfo.php 2012-09-30 16:54:28 UTC (rev 8327)
+++ trunk/tests/CompatInfo.php 2012-09-30 17:01:07 UTC (rev 8328)
@@ -1,8 +1,6 @@
<?php
/* Get the Compatibility info for phpwiki
http://pear.php.net/package/PHP_CompatInfo
-
- $Id$
*/
/*
* Copyright (C) 2004 Reini Urban <ru...@x-...>
Property changes on: trunk/tests/CompatInfo.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/tests/unit_test_backend_cvs.php
===================================================================
--- trunk/tests/unit_test_backend_cvs.php 2012-09-30 16:54:28 UTC (rev 8327)
+++ trunk/tests/unit_test_backend_cvs.php 2012-09-30 17:01:07 UTC (rev 8328)
@@ -5,7 +5,6 @@
* is designed to be run directly using the php4 command.
*
* Author: Gerrit Riessen, ger...@op...
- * $Id$
*/
// assume that the we've cd'ed to the tests directory
Property changes on: trunk/tests/unit_test_backend_cvs.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Property changes on: trunk/uploads/index.php
___________________________________________________________________
Deleted: svn:keywords
- Id
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2012-10-01 08:24:42
|
Revision: 8344
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8344&view=rev
Author: vargenau
Date: 2012-10-01 08:24:31 +0000 (Mon, 01 Oct 2012)
Log Message:
-----------
Remove svn:keywords
Modified Paths:
--------------
trunk/admin/odt2phpwiki.xsl
trunk/config/SqlResult.ini
trunk/config/config-default.ini
trunk/config/make-dbhelper.pl
trunk/config/migrate-phpwiki-config
trunk/doc/INSTALL.mysql
trunk/doc/INSTALL.oci8
trunk/doc/INSTALL.pgsql
trunk/doc/INSTALL.sqlite
trunk/doc/README.coding
Property Changed:
----------------
trunk/admin/odt2phpwiki.xsl
trunk/config/SqlResult.ini
trunk/config/config-default.ini
trunk/config/make-dbhelper.pl
trunk/config/migrate-phpwiki-config
trunk/doc/INSTALL.mysql
trunk/doc/INSTALL.oci8
trunk/doc/INSTALL.pgsql
trunk/doc/INSTALL.sqlite
trunk/doc/README.coding
Modified: trunk/admin/odt2phpwiki.xsl
===================================================================
--- trunk/admin/odt2phpwiki.xsl 2012-10-01 08:20:19 UTC (rev 8343)
+++ trunk/admin/odt2phpwiki.xsl 2012-10-01 08:24:31 UTC (rev 8344)
@@ -2,7 +2,6 @@
<!--
odt2phpwiki: OpenDocument to Phpwiki transformation
- $Id$
Copyright (C) 2007 Bernhard Haumacher (haui at haumacher dot de)
Copyright (C) 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
Property changes on: trunk/admin/odt2phpwiki.xsl
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/config/SqlResult.ini
===================================================================
--- trunk/config/SqlResult.ini 2012-10-01 08:20:19 UTC (rev 8343)
+++ trunk/config/SqlResult.ini 2012-10-01 08:24:31 UTC (rev 8344)
@@ -1,6 +1,4 @@
; Sample SqlResult.ini file for lib/plugin/SqlResult.ini
-; $Id$
-
; alias = dsn
phpwiki = mysql://wikiuser:@localhost/phpwiki
test = "mysql://localhost/test"
Property changes on: trunk/config/SqlResult.ini
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/config/config-default.ini
===================================================================
--- trunk/config/config-default.ini 2012-10-01 08:20:19 UTC (rev 8343)
+++ trunk/config/config-default.ini 2012-10-01 08:24:31 UTC (rev 8344)
@@ -1,4 +1,3 @@
-; $Id$
; This is the default PhpWiki configuration for undefined config.ini entries.
; recent development and debugging features:
Property changes on: trunk/config/config-default.ini
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/config/make-dbhelper.pl
===================================================================
--- trunk/config/make-dbhelper.pl 2012-10-01 08:20:19 UTC (rev 8343)
+++ trunk/config/make-dbhelper.pl 2012-10-01 08:24:31 UTC (rev 8344)
@@ -1,6 +1,5 @@
#!/usr/bin/perl -sn
# makefile helper to extract various settings from config/config.ini
-# $Id$
#if ($v eq 'DATABASE_TYPE' and /^\s*DATABASE_TYPE\s*=\s*(\w+)/) {
# print "$1\n";
Property changes on: trunk/config/make-dbhelper.pl
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/config/migrate-phpwiki-config
===================================================================
--- trunk/config/migrate-phpwiki-config 2012-10-01 08:20:19 UTC (rev 8343)
+++ trunk/config/migrate-phpwiki-config 2012-10-01 08:24:31 UTC (rev 8344)
@@ -5,7 +5,6 @@
#
# Author: Matt Brown <ma...@ma...>,
# Reini Urban <ru...@x-...>
-# Version: $Id$
#
# Run this script without any arguments for usage information.
#
Property changes on: trunk/config/migrate-phpwiki-config
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/doc/INSTALL.mysql
===================================================================
--- trunk/doc/INSTALL.mysql 2012-10-01 08:20:19 UTC (rev 8343)
+++ trunk/doc/INSTALL.mysql 2012-10-01 08:24:31 UTC (rev 8344)
@@ -77,5 +77,3 @@
?action=upgrade also brings all changed pgsrc files up-to-date.
/Reini Urban and Arno aho...@ma...
-
-$Id$
Property changes on: trunk/doc/INSTALL.mysql
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/doc/INSTALL.oci8
===================================================================
--- trunk/doc/INSTALL.oci8 2012-10-01 08:20:19 UTC (rev 8343)
+++ trunk/doc/INSTALL.oci8 2012-10-01 08:24:31 UTC (rev 8344)
@@ -66,5 +66,3 @@
/Phil
Phi...@to...
-
-$Id$
Property changes on: trunk/doc/INSTALL.oci8
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/doc/INSTALL.pgsql
===================================================================
--- trunk/doc/INSTALL.pgsql 2012-10-01 08:20:19 UTC (rev 8343)
+++ trunk/doc/INSTALL.pgsql 2012-10-01 08:24:31 UTC (rev 8344)
@@ -100,5 +100,3 @@
Reini Urban, Steve Wainstead <sw...@pa...>
Report bugs to php...@li...
-
-$Id$
Property changes on: trunk/doc/INSTALL.pgsql
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/doc/INSTALL.sqlite
===================================================================
--- trunk/doc/INSTALL.sqlite 2012-10-01 08:20:19 UTC (rev 8343)
+++ trunk/doc/INSTALL.sqlite 2012-10-01 08:24:31 UTC (rev 8344)
@@ -37,5 +37,3 @@
Authors:
ReiniUrban (phpwiki developer) and Matthew Palmer (phpwiki debian maintainer)
-
-$Id$
Property changes on: trunk/doc/INSTALL.sqlite
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/doc/README.coding
===================================================================
--- trunk/doc/README.coding 2012-10-01 08:20:19 UTC (rev 8343)
+++ trunk/doc/README.coding 2012-10-01 08:24:31 UTC (rev 8344)
@@ -1,4 +1,3 @@
-
Here are the coding guidelines for PhpWiki.
!!! Code Indentation Style
@@ -80,5 +79,3 @@
See INSTALL.MacOSX for instructions on using Project Builder with
PhpWiki and SourceForge.
-
-$Id$
Property changes on: trunk/doc/README.coding
___________________________________________________________________
Deleted: svn:keywords
- Id
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2012-10-01 08:36:28
|
Revision: 8346
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8346&view=rev
Author: vargenau
Date: 2012-10-01 08:36:17 +0000 (Mon, 01 Oct 2012)
Log Message:
-----------
Remove svn:keywords
Modified Paths:
--------------
trunk/lib/XMLRPC/xmlrpc.inc
trunk/lib/XMLRPC/xmlrpc_emu.inc
trunk/lib/XMLRPC/xmlrpcs.inc
trunk/lib/XMLRPC/xmlrpcs_emu.inc
trunk/tests/unit/mysql-test-destroy.sql
trunk/tests/unit/mysql-test-initialize.sql
trunk/tests/unit/psql-test-initialize.sql
Property Changed:
----------------
trunk/lib/XMLRPC/xmlrpc.inc
trunk/lib/XMLRPC/xmlrpc_emu.inc
trunk/lib/XMLRPC/xmlrpcs.inc
trunk/lib/XMLRPC/xmlrpcs_emu.inc
trunk/tests/unit/mysql-test-destroy.sql
trunk/tests/unit/mysql-test-initialize.sql
trunk/tests/unit/psql-test-initialize.sql
Modified: trunk/lib/XMLRPC/xmlrpc.inc
===================================================================
--- trunk/lib/XMLRPC/xmlrpc.inc 2012-10-01 08:32:10 UTC (rev 8345)
+++ trunk/lib/XMLRPC/xmlrpc.inc 2012-10-01 08:36:17 UTC (rev 8346)
@@ -1,9 +1,7 @@
-<?php // -*-c++-*-
+<?php
// by Edd Dumbill (C) 1999-2002
// <ed...@us...>
-// $Id$
-
// Copyright (c) 1999,2000,2002 Edd Dumbill.
// All rights reserved.
//
Property changes on: trunk/lib/XMLRPC/xmlrpc.inc
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/XMLRPC/xmlrpc_emu.inc
===================================================================
--- trunk/lib/XMLRPC/xmlrpc_emu.inc 2012-10-01 08:32:10 UTC (rev 8345)
+++ trunk/lib/XMLRPC/xmlrpc_emu.inc 2012-10-01 08:36:17 UTC (rev 8346)
@@ -36,9 +36,6 @@
// <ed...@us...>
//
-// $Id$
-
-
// Copyright (c) 1999,2000,2001 Edd Dumbill.
// All rights reserved.
//
@@ -675,4 +672,4 @@
return $xmlrpc_val;
}
-?>
\ No newline at end of file
+?>
Property changes on: trunk/lib/XMLRPC/xmlrpc_emu.inc
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/XMLRPC/xmlrpcs.inc
===================================================================
--- trunk/lib/XMLRPC/xmlrpcs.inc 2012-10-01 08:32:10 UTC (rev 8345)
+++ trunk/lib/XMLRPC/xmlrpcs.inc 2012-10-01 08:36:17 UTC (rev 8346)
@@ -1,7 +1,6 @@
<?php
// by Edd Dumbill (C) 1999-2002
// <ed...@us...>
-// $Id$
// Copyright (c) 1999,2000,2002 Edd Dumbill.
// All rights reserved.
Property changes on: trunk/lib/XMLRPC/xmlrpcs.inc
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/XMLRPC/xmlrpcs_emu.inc
===================================================================
--- trunk/lib/XMLRPC/xmlrpcs_emu.inc 2012-10-01 08:32:10 UTC (rev 8345)
+++ trunk/lib/XMLRPC/xmlrpcs_emu.inc 2012-10-01 08:36:17 UTC (rev 8346)
@@ -38,10 +38,8 @@
*/
-
// by Edd Dumbill (C) 1999,2000
// <ed...@us...>
-// $Id$
// License is granted to use or modify this software ("XML-RPC for PHP")
// for commercial or non-commercial use provided the copyright of the author
@@ -269,4 +267,4 @@
global $_xmlrpc_debuginfo;
$_xmlrpc_debuginfo=$_xmlrpc_debuginfo . $m . "\n";
}
-?>
\ No newline at end of file
+?>
Property changes on: trunk/lib/XMLRPC/xmlrpcs_emu.inc
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/tests/unit/mysql-test-destroy.sql
===================================================================
--- trunk/tests/unit/mysql-test-destroy.sql 2012-10-01 08:32:10 UTC (rev 8345)
+++ trunk/tests/unit/mysql-test-destroy.sql 2012-10-01 08:36:17 UTC (rev 8346)
@@ -1,5 +1,3 @@
--- $Id$
-
drop table if exists test_page;
drop table if exists test_version;
drop table if exists test_recent;
Property changes on: trunk/tests/unit/mysql-test-destroy.sql
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/tests/unit/mysql-test-initialize.sql
===================================================================
--- trunk/tests/unit/mysql-test-initialize.sql 2012-10-01 08:32:10 UTC (rev 8345)
+++ trunk/tests/unit/mysql-test-initialize.sql 2012-10-01 08:36:17 UTC (rev 8346)
@@ -1,4 +1,3 @@
--- $Id$
-- for the regression suite
drop table if exists test_page;
Property changes on: trunk/tests/unit/mysql-test-initialize.sql
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/tests/unit/psql-test-initialize.sql
===================================================================
--- trunk/tests/unit/psql-test-initialize.sql 2012-10-01 08:32:10 UTC (rev 8345)
+++ trunk/tests/unit/psql-test-initialize.sql 2012-10-01 08:36:17 UTC (rev 8346)
@@ -1,4 +1,3 @@
--- $Id$
-- for the regression suite
\set prefix 'test_'
Property changes on: trunk/tests/unit/psql-test-initialize.sql
___________________________________________________________________
Deleted: svn:keywords
- Id
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2012-10-01 09:20:44
|
Revision: 8350
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8350&view=rev
Author: vargenau
Date: 2012-10-01 09:20:36 +0000 (Mon, 01 Oct 2012)
Log Message:
-----------
Remove svn:keywords
Modified Paths:
--------------
trunk/lib/pear/Cache/Container.php
trunk/lib/pear/Cache/Error.php
trunk/lib/pear/Cache/Graphics.php
trunk/lib/pear/DB/Pager.php
trunk/lib/pear/DB/common.php
trunk/lib/pear/DB/dbase.php
trunk/lib/pear/DB/fbsql.php
trunk/lib/pear/DB/ibase.php
trunk/lib/pear/DB/ifx.php
trunk/lib/pear/DB/ldap.php
trunk/lib/pear/DB/msql.php
trunk/lib/pear/DB/mssql.php
trunk/lib/pear/DB/mysql.php
trunk/lib/pear/DB/mysqli.php
trunk/lib/pear/DB/oci8.php
trunk/lib/pear/DB/odbc.php
trunk/lib/pear/DB/pgsql.php
trunk/lib/pear/DB/sqlite.php
trunk/lib/pear/DB/storage.php
trunk/lib/pear/DB/sybase.php
trunk/tests/unit/lib/AtomParserTest.php
trunk/tests/unit/lib/DumpHtml.php
trunk/tests/unit/lib/HtmlParserTest.php
trunk/tests/unit/lib/InlineParserTest.php
trunk/tests/unit/lib/PageListTest.php
trunk/tests/unit/lib/SetupWiki.php
trunk/tests/unit/lib/TextSearchTest.php
trunk/tests/unit/lib/XmlRpcTest.php
Property Changed:
----------------
trunk/lib/WikiDB/adodb/adodb-csvlib.inc.php
trunk/lib/WikiDB/adodb/adodb-error.inc.php
trunk/lib/WikiDB/adodb/adodb-errorhandler.inc.php
trunk/lib/WikiDB/adodb/adodb-errorpear.inc.php
trunk/lib/WikiDB/adodb/adodb-exceptions.inc.php
trunk/lib/WikiDB/adodb/adodb-iterator.inc.php
trunk/lib/WikiDB/adodb/adodb-lib.inc.php
trunk/lib/WikiDB/adodb/adodb-pear.inc.php
trunk/lib/WikiDB/adodb/adodb-php4.inc.php
trunk/lib/WikiDB/adodb/adodb-time.inc.php
trunk/lib/WikiDB/adodb/adodb.inc.php
trunk/lib/WikiDB/backend/ADODB.php
trunk/lib/WikiDB/backend/ADODB_mssql.php
trunk/lib/WikiDB/backend/ADODB_mssqlnative.php
trunk/lib/WikiDB/backend/ADODB_mysql.php
trunk/lib/WikiDB/backend/ADODB_oci8po.php
trunk/lib/WikiDB/backend/ADODB_postgres7.php
trunk/lib/WikiDB/backend/ADODB_sqlite.php
trunk/lib/WikiDB/backend/PDO.php
trunk/lib/WikiDB/backend/PDO_mysql.php
trunk/lib/WikiDB/backend/PDO_oci8.php
trunk/lib/WikiDB/backend/PDO_pgsql.php
trunk/lib/WikiDB/backend/PearDB.php
trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
trunk/lib/WikiDB/backend/PearDB_mysql.php
trunk/lib/WikiDB/backend/PearDB_oci8.php
trunk/lib/WikiDB/backend/PearDB_pgsql.php
trunk/lib/WikiDB/backend/PearDB_sqlite.php
trunk/lib/WikiDB/backend/cvs.php
trunk/lib/WikiDB/backend/dba.php
trunk/lib/WikiDB/backend/dbaBase.php
trunk/lib/WikiDB/backend/file.php
trunk/lib/WikiDB/backend/flatfile.php
trunk/lib/pear/Cache/Container.php
trunk/lib/pear/Cache/Error.php
trunk/lib/pear/Cache/Graphics.php
trunk/lib/pear/DB/Pager.php
trunk/lib/pear/DB/common.php
trunk/lib/pear/DB/dbase.php
trunk/lib/pear/DB/fbsql.php
trunk/lib/pear/DB/ibase.php
trunk/lib/pear/DB/ifx.php
trunk/lib/pear/DB/ldap.php
trunk/lib/pear/DB/msql.php
trunk/lib/pear/DB/mssql.php
trunk/lib/pear/DB/mysql.php
trunk/lib/pear/DB/mysqli.php
trunk/lib/pear/DB/oci8.php
trunk/lib/pear/DB/odbc.php
trunk/lib/pear/DB/pgsql.php
trunk/lib/pear/DB/sqlite.php
trunk/lib/pear/DB/storage.php
trunk/lib/pear/DB/sybase.php
trunk/tests/unit/lib/AtomParserTest.php
trunk/tests/unit/lib/DumpHtml.php
trunk/tests/unit/lib/HtmlParserTest.php
trunk/tests/unit/lib/InlineParserTest.php
trunk/tests/unit/lib/PageListTest.php
trunk/tests/unit/lib/SetupWiki.php
trunk/tests/unit/lib/TextSearchTest.php
trunk/tests/unit/lib/XmlRpcTest.php
trunk/themes/MacOSX/lib/RecentChanges.php
trunk/themes/Portland/lib/RecentChanges.php
trunk/themes/Wordpress/lib/RecentChanges.php
trunk/themes/blog/lib/RecentChanges.php
Property changes on: trunk/lib/WikiDB/adodb/adodb-csvlib.inc.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Property changes on: trunk/lib/WikiDB/adodb/adodb-error.inc.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Property changes on: trunk/lib/WikiDB/adodb/adodb-errorhandler.inc.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Property changes on: trunk/lib/WikiDB/adodb/adodb-errorpear.inc.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Property changes on: trunk/lib/WikiDB/adodb/adodb-exceptions.inc.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Property changes on: trunk/lib/WikiDB/adodb/adodb-iterator.inc.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Property changes on: trunk/lib/WikiDB/adodb/adodb-lib.inc.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Property changes on: trunk/lib/WikiDB/adodb/adodb-pear.inc.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Property changes on: trunk/lib/WikiDB/adodb/adodb-php4.inc.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Property changes on: trunk/lib/WikiDB/adodb/adodb-time.inc.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Property changes on: trunk/lib/WikiDB/adodb/adodb.inc.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Property changes on: trunk/lib/WikiDB/backend/ADODB.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Property changes on: trunk/lib/WikiDB/backend/ADODB_mssql.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Property changes on: trunk/lib/WikiDB/backend/ADODB_mssqlnative.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Property changes on: trunk/lib/WikiDB/backend/ADODB_mysql.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Property changes on: trunk/lib/WikiDB/backend/ADODB_oci8po.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Property changes on: trunk/lib/WikiDB/backend/ADODB_postgres7.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Property changes on: trunk/lib/WikiDB/backend/ADODB_sqlite.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Property changes on: trunk/lib/WikiDB/backend/PDO.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Property changes on: trunk/lib/WikiDB/backend/PDO_mysql.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Property changes on: trunk/lib/WikiDB/backend/PDO_oci8.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Property changes on: trunk/lib/WikiDB/backend/PDO_pgsql.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Property changes on: trunk/lib/WikiDB/backend/PearDB.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Property changes on: trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Property changes on: trunk/lib/WikiDB/backend/PearDB_mysql.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Property changes on: trunk/lib/WikiDB/backend/PearDB_oci8.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Property changes on: trunk/lib/WikiDB/backend/PearDB_pgsql.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Property changes on: trunk/lib/WikiDB/backend/PearDB_sqlite.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Property changes on: trunk/lib/WikiDB/backend/cvs.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Property changes on: trunk/lib/WikiDB/backend/dba.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Property changes on: trunk/lib/WikiDB/backend/dbaBase.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Property changes on: trunk/lib/WikiDB/backend/file.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Property changes on: trunk/lib/WikiDB/backend/flatfile.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/pear/Cache/Container.php
===================================================================
--- trunk/lib/pear/Cache/Container.php 2012-10-01 08:57:51 UTC (rev 8349)
+++ trunk/lib/pear/Cache/Container.php 2012-10-01 09:20:36 UTC (rev 8350)
@@ -16,8 +16,6 @@
// | Sebastian Bergmann <sb...@se...> |
// | Christian Stocker <ch...@ph...> |
// +----------------------------------------------------------------------+
-//
-// $Id$
require_once 'Cache/Error.php';
@@ -39,7 +37,7 @@
* not recommended!
*
* @author Ulf Wendel <ulf...@ph...>
-* @version $Id$
+* @version
* @package Cache
* @access public
* @abstract
Property changes on: trunk/lib/pear/Cache/Container.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/pear/Cache/Error.php
===================================================================
--- trunk/lib/pear/Cache/Error.php 2012-10-01 08:57:51 UTC (rev 8349)
+++ trunk/lib/pear/Cache/Error.php 2012-10-01 09:20:36 UTC (rev 8350)
@@ -14,8 +14,6 @@
// +----------------------------------------------------------------------+
// | Authors: Ulf Wendel <ulf...@ph...> |
// +----------------------------------------------------------------------+
-//
-// $Id$
require_once 'PEAR.php';
Property changes on: trunk/lib/pear/Cache/Error.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/pear/Cache/Graphics.php
===================================================================
--- trunk/lib/pear/Cache/Graphics.php 2012-10-01 08:57:51 UTC (rev 8349)
+++ trunk/lib/pear/Cache/Graphics.php 2012-10-01 09:20:36 UTC (rev 8350)
@@ -14,8 +14,6 @@
// +----------------------------------------------------------------------+
// | Authors: Ulf Wendel <ulf...@ph...> |
// +----------------------------------------------------------------------+
-//
-// $Id$
require_once 'Cache.php';
@@ -66,7 +64,7 @@
* the output buffer. Modify it if required!
*
* @author Ulf Wendel <ulf...@ph...>
-* @version $Id$
+* @version
* @package Cache
*/
class Cache_Graphics extends Cache {
Property changes on: trunk/lib/pear/Cache/Graphics.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/pear/DB/Pager.php
===================================================================
--- trunk/lib/pear/DB/Pager.php 2012-10-01 08:57:51 UTC (rev 8349)
+++ trunk/lib/pear/DB/Pager.php 2012-10-01 09:20:36 UTC (rev 8350)
@@ -20,7 +20,6 @@
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
//
//
-// $Id$
///
// Based on DB_Pager 0.7 from the pear.php.net repository.
// The only modifications made have been modification of the include paths.
Property changes on: trunk/lib/pear/DB/Pager.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/pear/DB/common.php
===================================================================
--- trunk/lib/pear/DB/common.php 2012-10-01 08:57:51 UTC (rev 8349)
+++ trunk/lib/pear/DB/common.php 2012-10-01 09:20:36 UTC (rev 8350)
@@ -17,8 +17,6 @@
// | Tomas V.V.Cox <co...@id...> |
// | Maintainer: Daniel Convissor <da...@ph...> |
// +----------------------------------------------------------------------+
-//
-// $Id$
require_once 'PEAR.php';
@@ -27,7 +25,7 @@
* inherited by all such
*
* @package DB
- * @version $Id$
+ * @version
* @category Database
* @author Stig Bakken <ss...@ph...>
* @author Tomas V.V.Cox <co...@id...>
Property changes on: trunk/lib/pear/DB/common.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/pear/DB/dbase.php
===================================================================
--- trunk/lib/pear/DB/dbase.php 2012-10-01 08:57:51 UTC (rev 8349)
+++ trunk/lib/pear/DB/dbase.php 2012-10-01 09:20:36 UTC (rev 8350)
@@ -16,8 +16,6 @@
// | Author: Tomas V.V.Cox <co...@id...> |
// | Maintainer: Daniel Convissor <da...@ph...> |
// +----------------------------------------------------------------------+
-//
-// $Id$
// XXX legend:
// You have to compile your PHP with the --enable-dbase option
@@ -29,7 +27,7 @@
* extension.
*
* @package DB
- * @version $Id$
+ * @version
* @category Database
* @author Stig Bakken <ss...@ph...>
*/
Property changes on: trunk/lib/pear/DB/dbase.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/pear/DB/fbsql.php
===================================================================
--- trunk/lib/pear/DB/fbsql.php 2012-10-01 08:57:51 UTC (rev 8349)
+++ trunk/lib/pear/DB/fbsql.php 2012-10-01 09:20:36 UTC (rev 8350)
@@ -16,8 +16,6 @@
// | Author: Frank M. Kromann <fr...@fr...> |
// | Maintainer: Daniel Convissor <da...@ph...> |
// +----------------------------------------------------------------------+
-//
-// $Id$
// XXX legend:
//
@@ -35,7 +33,7 @@
* extension.
*
* @package DB
- * @version $Id$
+ * @version
* @category Database
* @author Frank M. Kromann <fr...@fr...>
*/
Property changes on: trunk/lib/pear/DB/fbsql.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/pear/DB/ibase.php
===================================================================
--- trunk/lib/pear/DB/ibase.php 2012-10-01 08:57:51 UTC (rev 8349)
+++ trunk/lib/pear/DB/ibase.php 2012-10-01 09:20:36 UTC (rev 8350)
@@ -16,8 +16,6 @@
// | Author: Sterling Hughes <ste...@ph...> |
// | Maintainer: Daniel Convissor <da...@ph...> |
// +----------------------------------------------------------------------+
-//
-// $Id$
// Bugs:
// - If dbsyntax is not firebird, the limitQuery may fail
@@ -29,7 +27,7 @@
* extension.
*
* @package DB
- * @version $Id$
+ * @version
* @category Database
* @author Sterling Hughes <ste...@ph...>
*/
Property changes on: trunk/lib/pear/DB/ibase.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/pear/DB/ifx.php
===================================================================
--- trunk/lib/pear/DB/ifx.php 2012-10-01 08:57:51 UTC (rev 8349)
+++ trunk/lib/pear/DB/ifx.php 2012-10-01 09:20:36 UTC (rev 8350)
@@ -16,8 +16,6 @@
// | Author: Tomas V.V.Cox <co...@id...> |
// | Maintainer: Daniel Convissor <da...@ph...> |
// +----------------------------------------------------------------------+
-//
-// $Id$
// Legend:
// For more info on Informix errors see:
@@ -34,7 +32,7 @@
* extension.
*
* @package DB
- * @version $Id$
+ * @version
* @category Database
* @author Tomas V.V.Cox <co...@id...>
*/
Property changes on: trunk/lib/pear/DB/ifx.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/pear/DB/ldap.php
===================================================================
--- trunk/lib/pear/DB/ldap.php 2012-10-01 08:57:51 UTC (rev 8349)
+++ trunk/lib/pear/DB/ldap.php 2012-10-01 09:20:36 UTC (rev 8350)
@@ -23,8 +23,6 @@
// - Piotr Roszatycki <Pio...@ne...>
// DB_ldap::base() method, support for LDAP sequences, various fixes
//
-// $Id$
-//
// Based on DB 1.3 from the pear.php.net repository.
// The only modifications made have been modification of the include paths.
//
Property changes on: trunk/lib/pear/DB/ldap.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/pear/DB/msql.php
===================================================================
--- trunk/lib/pear/DB/msql.php 2012-10-01 08:57:51 UTC (rev 8349)
+++ trunk/lib/pear/DB/msql.php 2012-10-01 09:20:36 UTC (rev 8350)
@@ -16,8 +16,6 @@
// | Author: Sterling Hughes <ste...@ph...> |
// | Maintainer: Daniel Convissor <da...@ph...> |
// +----------------------------------------------------------------------+
-//
-// $Id$
require_once 'DB/common.php';
@@ -26,7 +24,7 @@
* extension.
*
* @package DB
- * @version $Id$
+ * @version
* @category Database
* @author Sterling Hughes <ste...@ph...>
*/
Property changes on: trunk/lib/pear/DB/msql.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/pear/DB/mssql.php
===================================================================
--- trunk/lib/pear/DB/mssql.php 2012-10-01 08:57:51 UTC (rev 8349)
+++ trunk/lib/pear/DB/mssql.php 2012-10-01 09:20:36 UTC (rev 8350)
@@ -16,8 +16,6 @@
// | Author: Sterling Hughes <ste...@ph...> |
// | Maintainer: Daniel Convissor <da...@ph...> |
// +----------------------------------------------------------------------+
-//
-// $Id$
require_once 'DB/common.php';
@@ -26,7 +24,7 @@
* extension.
*
* @package DB
- * @version $Id$
+ * @version
* @category Database
* @author Sterling Hughes <ste...@ph...>
*/
Property changes on: trunk/lib/pear/DB/mssql.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/pear/DB/mysql.php
===================================================================
--- trunk/lib/pear/DB/mysql.php 2012-10-01 08:57:51 UTC (rev 8349)
+++ trunk/lib/pear/DB/mysql.php 2012-10-01 09:20:36 UTC (rev 8350)
@@ -16,8 +16,6 @@
// | Author: Stig Bakken <ss...@ph...> |
// | Maintainer: Daniel Convissor <da...@ph...> |
// +----------------------------------------------------------------------+
-//
-// $Id$
// XXX legend:
//
@@ -37,7 +35,7 @@
* This is for MySQL versions 4.0 and below.
*
* @package DB
- * @version $Id$
+ * @version
* @category Database
* @author Stig Bakken <ss...@ph...>
*/
Property changes on: trunk/lib/pear/DB/mysql.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/pear/DB/mysqli.php
===================================================================
--- trunk/lib/pear/DB/mysqli.php 2012-10-01 08:57:51 UTC (rev 8349)
+++ trunk/lib/pear/DB/mysqli.php 2012-10-01 09:20:36 UTC (rev 8350)
@@ -17,8 +17,6 @@
// | Based on mysql.php by Stig Bakken <ss...@ph...> |
// | Maintainer: Daniel Convissor <da...@ph...> |
// +----------------------------------------------------------------------+
-//
-// $Id$
// NOTE: The tableInfo() method must be redone because the functions it
// relies on no longer exist in the new extension.
@@ -36,7 +34,7 @@
* Note that persistent connections no longer exist.
*
* @package DB
- * @version $Id$
+ * @version
* @category Database
* @author Chaillan Nicolas <ni...@ph...>
*/
Property changes on: trunk/lib/pear/DB/mysqli.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/pear/DB/oci8.php
===================================================================
--- trunk/lib/pear/DB/oci8.php 2012-10-01 08:57:51 UTC (rev 8349)
+++ trunk/lib/pear/DB/oci8.php 2012-10-01 09:20:36 UTC (rev 8350)
@@ -16,8 +16,6 @@
// | Author: James L. Pine <jl...@va...> |
// | Maintainer: Daniel Convissor <da...@ph...> |
// +----------------------------------------------------------------------+
-//
-// $Id$
// be aware... OCIError() only appears to return anything when given a
// statement, so functions return the generic DB_ERROR instead of more
@@ -32,7 +30,7 @@
* Definitely works with versions 8 and 9 of Oracle.
*
* @package DB
- * @version $Id$
+ * @version
* @category Database
* @author James L. Pine <jl...@va...>
*/
Property changes on: trunk/lib/pear/DB/oci8.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/pear/DB/odbc.php
===================================================================
--- trunk/lib/pear/DB/odbc.php 2012-10-01 08:57:51 UTC (rev 8349)
+++ trunk/lib/pear/DB/odbc.php 2012-10-01 09:20:36 UTC (rev 8350)
@@ -16,8 +16,6 @@
// | Author: Stig Bakken <ss...@ph...> |
// | Maintainer: Daniel Convissor <da...@ph...> |
// +----------------------------------------------------------------------+
-//
-// $Id$
// XXX legend:
// More info on ODBC errors could be found here:
@@ -33,7 +31,7 @@
* extension.
*
* @package DB
- * @version $Id$
+ * @version
* @category Database
* @author Stig Bakken <ss...@ph...>
*/
Property changes on: trunk/lib/pear/DB/odbc.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/pear/DB/pgsql.php
===================================================================
--- trunk/lib/pear/DB/pgsql.php 2012-10-01 08:57:51 UTC (rev 8349)
+++ trunk/lib/pear/DB/pgsql.php 2012-10-01 09:20:36 UTC (rev 8350)
@@ -17,8 +17,6 @@
// | Stig Bakken <ss...@ph...> |
// | Maintainer: Daniel Convissor <da...@ph...> |
// +----------------------------------------------------------------------+
-//
-// $Id$
require_once 'DB/common.php';
@@ -27,7 +25,7 @@
* extension.
*
* @package DB
- * @version $Id$
+ * @version
* @category Database
* @author Rui Hirokawa <hir...@ph...>
* @author Stig Bakken <ss...@ph...>
Property changes on: trunk/lib/pear/DB/pgsql.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/pear/DB/sqlite.php
===================================================================
--- trunk/lib/pear/DB/sqlite.php 2012-10-01 08:57:51 UTC (rev 8349)
+++ trunk/lib/pear/DB/sqlite.php 2012-10-01 09:20:36 UTC (rev 8350)
@@ -17,8 +17,6 @@
// | Mika Tuupola <tu...@ap...> |
// | Maintainer: Daniel Convissor <da...@ph...> |
// +----------------------------------------------------------------------+
-//
-// $Id$
require_once 'DB/common.php';
@@ -27,7 +25,7 @@
* PECL extension.
*
* @package DB
- * @version $Id$
+ * @version
* @category Database
* @author Urs Gehrig <ur...@ci...>
* @author Mika Tuupola <tu...@ap...>
Property changes on: trunk/lib/pear/DB/sqlite.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/pear/DB/storage.php
===================================================================
--- trunk/lib/pear/DB/storage.php 2012-10-01 08:57:51 UTC (rev 8349)
+++ trunk/lib/pear/DB/storage.php 2012-10-01 09:20:36 UTC (rev 8350)
@@ -16,8 +16,6 @@
// | Author: Stig Bakken <st...@ph...> |
// | Maintainer: Daniel Convissor <da...@ph...> |
// +----------------------------------------------------------------------+
-//
-// $Id$
require_once 'DB.php';
@@ -28,7 +26,7 @@
* statements.
*
* @package DB
- * @version $Id$
+ * @version
* @category Database
* @author Stig Bakken <st...@ph...>
*/
Property changes on: trunk/lib/pear/DB/storage.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/pear/DB/sybase.php
===================================================================
--- trunk/lib/pear/DB/sybase.php 2012-10-01 08:57:51 UTC (rev 8349)
+++ trunk/lib/pear/DB/sybase.php 2012-10-01 09:20:36 UTC (rev 8350)
@@ -17,8 +17,6 @@
// | Antônio Carlos Venâncio Júnior <fl...@ph...> |
// | Maintainer: Daniel Convissor <da...@ph...> |
// +----------------------------------------------------------------------+
-//
-// $Id$
// TODO
// - This driver may fail with multiple connections under the same
@@ -31,7 +29,7 @@
* extension.
*
* @package DB
- * @version $Id$
+ * @version
* @category Database
* @author Sterling Hughes <ste...@ph...>
* @author Antônio Carlos Venâncio Júnior <fl...@ph...>
Property changes on: trunk/lib/pear/DB/sybase.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/tests/unit/lib/AtomParserTest.php
===================================================================
--- trunk/tests/unit/lib/AtomParserTest.php 2012-10-01 08:57:51 UTC (rev 8349)
+++ trunk/tests/unit/lib/AtomParserTest.php 2012-10-01 09:20:36 UTC (rev 8350)
@@ -1,5 +1,4 @@
<?php
-// $Id$
/*
* Copyright 2010 Sébastien Le Callonnec
*
Property changes on: trunk/tests/unit/lib/AtomParserTest.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/tests/unit/lib/DumpHtml.php
===================================================================
--- trunk/tests/unit/lib/DumpHtml.php 2012-10-01 08:57:51 UTC (rev 8349)
+++ trunk/tests/unit/lib/DumpHtml.php 2012-10-01 09:20:36 UTC (rev 8350)
@@ -1,4 +1,4 @@
-<?php // $Id$
+<?php
/**
* 2nd important test:
* Check if all standard pages can be rendered (dumped)
Property changes on: trunk/tests/unit/lib/DumpHtml.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/tests/unit/lib/HtmlParserTest.php
===================================================================
--- trunk/tests/unit/lib/HtmlParserTest.php 2012-10-01 08:57:51 UTC (rev 8349)
+++ trunk/tests/unit/lib/HtmlParserTest.php 2012-10-01 09:20:36 UTC (rev 8350)
@@ -1,6 +1,4 @@
<?php
-// $Id$
-
/* Copyright (C) 2004, Reini Urban <ru...@x-...>
*/
Property changes on: trunk/tests/unit/lib/HtmlParserTest.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/tests/unit/lib/InlineParserTest.php
===================================================================
--- trunk/tests/unit/lib/InlineParserTest.php 2012-10-01 08:57:51 UTC (rev 8349)
+++ trunk/tests/unit/lib/InlineParserTest.php 2012-10-01 09:20:36 UTC (rev 8350)
@@ -1,6 +1,4 @@
<?php
-// $Id$
-
/* Copyright (C) 2004 Dan Frankowski <dfr...@cs...>
* (C) 2006, 2007 Reini Urban <ru...@x-...>
*/
Property changes on: trunk/tests/unit/lib/InlineParserTest.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/tests/unit/lib/PageListTest.php
===================================================================
--- trunk/tests/unit/lib/PageListTest.php 2012-10-01 08:57:51 UTC (rev 8349)
+++ trunk/tests/unit/lib/PageListTest.php 2012-10-01 09:20:36 UTC (rev 8350)
@@ -1,4 +1,4 @@
-<?php // $Id$
+<?php
require_once 'lib/PageList.php';
require_once 'PHPUnit.php';
Property changes on: trunk/tests/unit/lib/PageListTest.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/tests/unit/lib/SetupWiki.php
===================================================================
--- trunk/tests/unit/lib/SetupWiki.php 2012-10-01 08:57:51 UTC (rev 8349)
+++ trunk/tests/unit/lib/SetupWiki.php 2012-10-01 09:20:36 UTC (rev 8350)
@@ -1,4 +1,4 @@
-<?php // $Id$
+<?php
/**
* 1st important test: Check if all pgsrc files import without failure
*/
Property changes on: trunk/tests/unit/lib/SetupWiki.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/tests/unit/lib/TextSearchTest.php
===================================================================
--- trunk/tests/unit/lib/TextSearchTest.php 2012-10-01 08:57:51 UTC (rev 8349)
+++ trunk/tests/unit/lib/TextSearchTest.php 2012-10-01 09:20:36 UTC (rev 8350)
@@ -1,4 +1,4 @@
-<?php // $Id$
+<?php
require_once 'lib/TextSearchQuery.php';
require_once 'PHPUnit.php';
Property changes on: trunk/tests/unit/lib/TextSearchTest.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/tests/unit/lib/XmlRpcTest.php
===================================================================
--- trunk/tests/unit/lib/XmlRpcTest.php 2012-10-01 08:57:51 UTC (rev 8349)
+++ trunk/tests/unit/lib/XmlRpcTest.php 2012-10-01 09:20:36 UTC (rev 8350)
@@ -1,6 +1,4 @@
<?php
-// $Id$
-
/* Copyright (C) 2007 Reini Urban
*/
Property changes on: trunk/tests/unit/lib/XmlRpcTest.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Property changes on: trunk/themes/MacOSX/lib/RecentChanges.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Property changes on: trunk/themes/Portland/lib/RecentChanges.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Property changes on: trunk/themes/Wordpress/lib/RecentChanges.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Property changes on: trunk/themes/blog/lib/RecentChanges.php
___________________________________________________________________
Deleted: svn:keywords
- Id
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2012-10-01 09:36:07
|
Revision: 8352
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8352&view=rev
Author: vargenau
Date: 2012-10-01 09:35:55 +0000 (Mon, 01 Oct 2012)
Log Message:
-----------
Remove svn:keywords
Modified Paths:
--------------
trunk/lib/WikiDB/backend/dumb/AllRevisionsIter.php
trunk/lib/WikiDB/backend/dumb/BackLinkIter.php
trunk/lib/WikiDB/backend/dumb/LinkSearchIter.php
trunk/lib/WikiDB/backend/dumb/MostPopularIter.php
trunk/lib/WikiDB/backend/dumb/MostRecentIter.php
trunk/lib/WikiDB/backend/dumb/TextSearchIter.php
trunk/lib/WikiDB/backend/dumb/WantedPagesIter.php
trunk/lib/pear/Cache/Container/db.php
trunk/lib/pear/Cache/Container/file.php
trunk/lib/pear/Cache/Container/imgfile.php
trunk/lib/pear/Cache/Container/trifile.php
trunk/tests/unit/lib/plugin/AllPagesTest.php
trunk/tests/unit/lib/plugin/AllUsersTest.php
trunk/tests/unit/lib/plugin/AtomFeedTest.php
trunk/tests/unit/lib/plugin/IncludePageTest.php
trunk/tests/unit/lib/plugin/ListPagesTest.php
trunk/tests/unit/lib/plugin/OrphanedPagesTest.php
trunk/tests/unit/lib/plugin/WantedPagesTest.php
Property Changed:
----------------
trunk/lib/WikiDB/backend/dumb/AllRevisionsIter.php
trunk/lib/WikiDB/backend/dumb/BackLinkIter.php
trunk/lib/WikiDB/backend/dumb/LinkSearchIter.php
trunk/lib/WikiDB/backend/dumb/MostPopularIter.php
trunk/lib/WikiDB/backend/dumb/MostRecentIter.php
trunk/lib/WikiDB/backend/dumb/TextSearchIter.php
trunk/lib/WikiDB/backend/dumb/WantedPagesIter.php
trunk/lib/pear/Cache/Container/db.php
trunk/lib/pear/Cache/Container/file.php
trunk/lib/pear/Cache/Container/imgfile.php
trunk/lib/pear/Cache/Container/trifile.php
trunk/tests/unit/lib/plugin/AllPagesTest.php
trunk/tests/unit/lib/plugin/AllUsersTest.php
trunk/tests/unit/lib/plugin/AtomFeedTest.php
trunk/tests/unit/lib/plugin/IncludePageTest.php
trunk/tests/unit/lib/plugin/ListPagesTest.php
trunk/tests/unit/lib/plugin/OrphanedPagesTest.php
trunk/tests/unit/lib/plugin/WantedPagesTest.php
trunk/tests/unit/lib/plugin/atom-example.xml
Modified: trunk/lib/WikiDB/backend/dumb/AllRevisionsIter.php
===================================================================
--- trunk/lib/WikiDB/backend/dumb/AllRevisionsIter.php 2012-10-01 09:24:02 UTC (rev 8351)
+++ trunk/lib/WikiDB/backend/dumb/AllRevisionsIter.php 2012-10-01 09:35:55 UTC (rev 8352)
@@ -1,5 +1,5 @@
<?php // -*-php-*-
-// $Id$
+// $Id: AllRevisionsIter.php 8286 2012-09-28 11:20:42Z vargenau $
/**
* An iterator which returns all revisions of page.
Property changes on: trunk/lib/WikiDB/backend/dumb/AllRevisionsIter.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/WikiDB/backend/dumb/BackLinkIter.php
===================================================================
--- trunk/lib/WikiDB/backend/dumb/BackLinkIter.php 2012-10-01 09:24:02 UTC (rev 8351)
+++ trunk/lib/WikiDB/backend/dumb/BackLinkIter.php 2012-10-01 09:35:55 UTC (rev 8352)
@@ -1,5 +1,4 @@
-<?php // -*-php-*-
-// $Id$
+<?php
require_once 'lib/WikiDB/backend.php';
@@ -43,4 +42,3 @@
// c-hanging-comment-ender-p: nil
// indent-tabs-mode: nil
// End:
-
Property changes on: trunk/lib/WikiDB/backend/dumb/BackLinkIter.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/WikiDB/backend/dumb/LinkSearchIter.php
===================================================================
--- trunk/lib/WikiDB/backend/dumb/LinkSearchIter.php 2012-10-01 09:24:02 UTC (rev 8351)
+++ trunk/lib/WikiDB/backend/dumb/LinkSearchIter.php 2012-10-01 09:35:55 UTC (rev 8352)
@@ -1,5 +1,4 @@
-<?php // -*-php-*-
-// $Id$
+<?php
/*
* Copyright 2007 Reini Urban
*
Property changes on: trunk/lib/WikiDB/backend/dumb/LinkSearchIter.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/WikiDB/backend/dumb/MostPopularIter.php
===================================================================
--- trunk/lib/WikiDB/backend/dumb/MostPopularIter.php 2012-10-01 09:24:02 UTC (rev 8351)
+++ trunk/lib/WikiDB/backend/dumb/MostPopularIter.php 2012-10-01 09:35:55 UTC (rev 8352)
@@ -1,6 +1,4 @@
-<?php // -*-php-*-
-// $Id$
-
+<?php
require_once 'lib/WikiDB/backend.php';
/**
Property changes on: trunk/lib/WikiDB/backend/dumb/MostPopularIter.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/WikiDB/backend/dumb/MostRecentIter.php
===================================================================
--- trunk/lib/WikiDB/backend/dumb/MostRecentIter.php 2012-10-01 09:24:02 UTC (rev 8351)
+++ trunk/lib/WikiDB/backend/dumb/MostRecentIter.php 2012-10-01 09:35:55 UTC (rev 8352)
@@ -1,6 +1,4 @@
-<?php // -*-php-*-
-// $Id$
-
+<?php
require_once 'lib/WikiDB/backend.php';
/**
Property changes on: trunk/lib/WikiDB/backend/dumb/MostRecentIter.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/WikiDB/backend/dumb/TextSearchIter.php
===================================================================
--- trunk/lib/WikiDB/backend/dumb/TextSearchIter.php 2012-10-01 09:24:02 UTC (rev 8351)
+++ trunk/lib/WikiDB/backend/dumb/TextSearchIter.php 2012-10-01 09:35:55 UTC (rev 8352)
@@ -1,6 +1,4 @@
-<?php // -*-php-*-
-// $Id$
-
+<?php
class WikiDB_backend_dumb_TextSearchIter
extends WikiDB_backend_iterator
{
Property changes on: trunk/lib/WikiDB/backend/dumb/TextSearchIter.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/WikiDB/backend/dumb/WantedPagesIter.php
===================================================================
--- trunk/lib/WikiDB/backend/dumb/WantedPagesIter.php 2012-10-01 09:24:02 UTC (rev 8351)
+++ trunk/lib/WikiDB/backend/dumb/WantedPagesIter.php 2012-10-01 09:35:55 UTC (rev 8352)
@@ -1,8 +1,4 @@
-<?php // -*-php-*-
-// $Id$
-
-//require_once('lib/WikiDB/backend.php');
-
+<?php
/**
* This iterator will work with any WikiDB_backend
* which has a working get_links(,'links_from') method.
Property changes on: trunk/lib/WikiDB/backend/dumb/WantedPagesIter.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/pear/Cache/Container/db.php
===================================================================
--- trunk/lib/pear/Cache/Container/db.php 2012-10-01 09:24:02 UTC (rev 8351)
+++ trunk/lib/pear/Cache/Container/db.php 2012-10-01 09:35:55 UTC (rev 8352)
@@ -16,8 +16,6 @@
// | Sebastian Bergmann <sb...@se...> |
// | Chuck Hagenbuch <ch...@ho...> |
// +----------------------------------------------------------------------+
-//
-// $Id$
require_once 'DB.php';
require_once 'Cache/Container.php';
@@ -52,7 +50,7 @@
* )
*
* @author Sebastian Bergmann <sb...@se...>
-* @version $Id$
+* @version
* @package Cache
*/
class Cache_Container_db extends Cache_Container {
Property changes on: trunk/lib/pear/Cache/Container/db.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/pear/Cache/Container/file.php
===================================================================
--- trunk/lib/pear/Cache/Container/file.php 2012-10-01 09:24:02 UTC (rev 8351)
+++ trunk/lib/pear/Cache/Container/file.php 2012-10-01 09:35:55 UTC (rev 8352)
@@ -15,8 +15,6 @@
// | Authors: Ulf Wendel <ulf...@ph...> |
// | Sebastian Bergmann <sb...@se...> |
// +----------------------------------------------------------------------+
-//
-// $Id$
require_once 'Cache/Container.php';
@@ -24,7 +22,7 @@
* Stores cache contents in a file.
*
* @author Ulf Wendel <ulf...@ph...>
-* @version $Id$
+* @version
*/
class Cache_Container_file extends Cache_Container {
Property changes on: trunk/lib/pear/Cache/Container/file.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/pear/Cache/Container/imgfile.php
===================================================================
--- trunk/lib/pear/Cache/Container/imgfile.php 2012-10-01 09:24:02 UTC (rev 8351)
+++ trunk/lib/pear/Cache/Container/imgfile.php 2012-10-01 09:35:55 UTC (rev 8352)
@@ -15,8 +15,6 @@
// | Authors: Ulf Wendel <ulf...@ph...> |
// | Sebastian Bergmann <sb...@se...> |
// +----------------------------------------------------------------------+
-//
-// $Id$
require_once('Cache/Container.php');
@@ -24,7 +22,7 @@
* Stores cache contents in a file.
*
* @author Ulf Wendel <ulf...@ph...>
-* @version $Id$
+* @version
*/
class Cache_Container_file extends Cache_Container {
Property changes on: trunk/lib/pear/Cache/Container/imgfile.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/pear/Cache/Container/trifile.php
===================================================================
--- trunk/lib/pear/Cache/Container/trifile.php 2012-10-01 09:24:02 UTC (rev 8351)
+++ trunk/lib/pear/Cache/Container/trifile.php 2012-10-01 09:35:55 UTC (rev 8352)
@@ -16,8 +16,6 @@
// | Sebastian Bergmann <sb...@se...> |
// | Ian Eure <ie...@ph...> |
// +----------------------------------------------------------------------+
-//
-// $Id$
require_once 'Cache/Container/file.php';
Property changes on: trunk/lib/pear/Cache/Container/trifile.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/tests/unit/lib/plugin/AllPagesTest.php
===================================================================
--- trunk/tests/unit/lib/plugin/AllPagesTest.php 2012-10-01 09:24:02 UTC (rev 8351)
+++ trunk/tests/unit/lib/plugin/AllPagesTest.php 2012-10-01 09:35:55 UTC (rev 8352)
@@ -1,4 +1,4 @@
-<?php // $Id$
+<?php
require_once 'lib/WikiPlugin.php';
require_once 'lib/plugin/AllPages.php';
Property changes on: trunk/tests/unit/lib/plugin/AllPagesTest.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/tests/unit/lib/plugin/AllUsersTest.php
===================================================================
--- trunk/tests/unit/lib/plugin/AllUsersTest.php 2012-10-01 09:24:02 UTC (rev 8351)
+++ trunk/tests/unit/lib/plugin/AllUsersTest.php 2012-10-01 09:35:55 UTC (rev 8352)
@@ -1,4 +1,4 @@
-<?php // $Id$
+<?php
require_once 'lib/WikiPlugin.php';
require_once 'lib/plugin/AllUsers.php';
Property changes on: trunk/tests/unit/lib/plugin/AllUsersTest.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/tests/unit/lib/plugin/AtomFeedTest.php
===================================================================
--- trunk/tests/unit/lib/plugin/AtomFeedTest.php 2012-10-01 09:24:02 UTC (rev 8351)
+++ trunk/tests/unit/lib/plugin/AtomFeedTest.php 2012-10-01 09:35:55 UTC (rev 8352)
@@ -1,5 +1,4 @@
<?php
-// $Id$
/*
* Copyright 2010 Sébastien Le Callonnec
*
Property changes on: trunk/tests/unit/lib/plugin/AtomFeedTest.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/tests/unit/lib/plugin/IncludePageTest.php
===================================================================
--- trunk/tests/unit/lib/plugin/IncludePageTest.php 2012-10-01 09:24:02 UTC (rev 8351)
+++ trunk/tests/unit/lib/plugin/IncludePageTest.php 2012-10-01 09:35:55 UTC (rev 8352)
@@ -1,4 +1,4 @@
-<?php // $Id$
+<?php
require_once 'lib/WikiPlugin.php';
require_once 'lib/plugin/IncludePage.php';
Property changes on: trunk/tests/unit/lib/plugin/IncludePageTest.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/tests/unit/lib/plugin/ListPagesTest.php
===================================================================
--- trunk/tests/unit/lib/plugin/ListPagesTest.php 2012-10-01 09:24:02 UTC (rev 8351)
+++ trunk/tests/unit/lib/plugin/ListPagesTest.php 2012-10-01 09:35:55 UTC (rev 8352)
@@ -1,5 +1,4 @@
-<?php // $Id$
-
+<?php
require_once 'lib/WikiPlugin.php';
require_once 'lib/plugin/ListPages.php';
require_once 'PHPUnit.php';
Property changes on: trunk/tests/unit/lib/plugin/ListPagesTest.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/tests/unit/lib/plugin/OrphanedPagesTest.php
===================================================================
--- trunk/tests/unit/lib/plugin/OrphanedPagesTest.php 2012-10-01 09:24:02 UTC (rev 8351)
+++ trunk/tests/unit/lib/plugin/OrphanedPagesTest.php 2012-10-01 09:35:55 UTC (rev 8352)
@@ -1,5 +1,4 @@
-<?php // $Id$
-
+<?php
require_once 'lib/WikiPlugin.php';
require_once 'lib/plugin/OrphanedPages.php';
require_once 'PHPUnit.php';
Property changes on: trunk/tests/unit/lib/plugin/OrphanedPagesTest.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/tests/unit/lib/plugin/WantedPagesTest.php
===================================================================
--- trunk/tests/unit/lib/plugin/WantedPagesTest.php 2012-10-01 09:24:02 UTC (rev 8351)
+++ trunk/tests/unit/lib/plugin/WantedPagesTest.php 2012-10-01 09:35:55 UTC (rev 8352)
@@ -1,5 +1,4 @@
-<?php // $Id$
-
+<?php
require_once 'lib/WikiPlugin.php';
require_once 'lib/plugin/WantedPages.php';
require_once 'PHPUnit.php';
Property changes on: trunk/tests/unit/lib/plugin/WantedPagesTest.php
___________________________________________________________________
Deleted: svn:keywords
- Id
Property changes on: trunk/tests/unit/lib/plugin/atom-example.xml
___________________________________________________________________
Deleted: svn:keywords
- Id
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2012-10-02 09:05:45
|
Revision: 8370
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8370&view=rev
Author: vargenau
Date: 2012-10-02 09:05:34 +0000 (Tue, 02 Oct 2012)
Log Message:
-----------
php_closing_tag [PSR-2] The closing ?> tag MUST be omitted from files containing only PHP.
Modified Paths:
--------------
trunk/g
trunk/wiki
Modified: trunk/g
===================================================================
--- trunk/g 2012-10-02 09:04:52 UTC (rev 8369)
+++ trunk/g 2012-10-02 09:05:34 UTC (rev 8370)
@@ -276,4 +276,3 @@
}
return $val;
}
-?>
Modified: trunk/wiki
===================================================================
--- trunk/wiki 2012-10-02 09:04:52 UTC (rev 8369)
+++ trunk/wiki 2012-10-02 09:05:34 UTC (rev 8370)
@@ -1,4 +1,4 @@
-<?php // -*-php-*-
+<?php
/*
PrettyWiki startup script.
Sample to override the default wiki (Theme, Language, DB, ...).
@@ -34,4 +34,3 @@
// Start the wiki
include "lib/main.php";
-?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2012-10-02 09:25:22
|
Revision: 8372
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8372&view=rev
Author: vargenau
Date: 2012-10-02 09:25:13 +0000 (Tue, 02 Oct 2012)
Log Message:
-----------
php_closing_tag [PSR-2] The closing ?> tag MUST be omitted from files containing only PHP.
Modified Paths:
--------------
trunk/lib/ASCIIMathPHP/ASCIIMathPHP-2.0.cfg.php
trunk/lib/ASCIIMathPHP/ASCIIMathPHP-2.0.class.php
trunk/lib/ASCIIMathPHP/ASCIIMathPHP.cfg.php
trunk/lib/ASCIIMathPHP/ASCIIMathPHP.class.php
trunk/locale/de/LC_MESSAGES/phpwiki.php
trunk/locale/es/LC_MESSAGES/phpwiki.php
trunk/locale/fr/LC_MESSAGES/phpwiki.php
trunk/locale/it/LC_MESSAGES/phpwiki.php
trunk/locale/ja/LC_MESSAGES/phpwiki.php
trunk/locale/nl/LC_MESSAGES/phpwiki.php
trunk/locale/sv/LC_MESSAGES/phpwiki.php
trunk/locale/zh/LC_MESSAGES/phpwiki.php
trunk/themes/MacOSX/buttons/index.php
Modified: trunk/lib/ASCIIMathPHP/ASCIIMathPHP-2.0.cfg.php
===================================================================
--- trunk/lib/ASCIIMathPHP/ASCIIMathPHP-2.0.cfg.php 2012-10-02 09:21:20 UTC (rev 8371)
+++ trunk/lib/ASCIIMathPHP/ASCIIMathPHP-2.0.cfg.php 2012-10-02 09:25:13 UTC (rev 8372)
@@ -215,4 +215,3 @@
'>>' => array( 'input'=>'>>', 'tag'=>'mo', 'output'=>'&#' . hexdec('232A') . ';', 'right_bracket'=>TRUE) // 2005-06-07 wes
);
-?>
Modified: trunk/lib/ASCIIMathPHP/ASCIIMathPHP-2.0.class.php
===================================================================
--- trunk/lib/ASCIIMathPHP/ASCIIMathPHP-2.0.class.php 2012-10-02 09:21:20 UTC (rev 8371)
+++ trunk/lib/ASCIIMathPHP/ASCIIMathPHP-2.0.class.php 2012-10-02 09:25:13 UTC (rev 8372)
@@ -1116,4 +1116,3 @@
}
}
}
-?>
Modified: trunk/lib/ASCIIMathPHP/ASCIIMathPHP.cfg.php
===================================================================
--- trunk/lib/ASCIIMathPHP/ASCIIMathPHP.cfg.php 2012-10-02 09:21:20 UTC (rev 8371)
+++ trunk/lib/ASCIIMathPHP/ASCIIMathPHP.cfg.php 2012-10-02 09:25:13 UTC (rev 8372)
@@ -215,4 +215,3 @@
'>>' => array( 'input'=>'>>', 'tag'=>'mo', 'output'=>'&#' . hexdec('232A') . ';', 'right_bracket'=>TRUE) // 2005-06-07 wes
);
-?>
Modified: trunk/lib/ASCIIMathPHP/ASCIIMathPHP.class.php
===================================================================
--- trunk/lib/ASCIIMathPHP/ASCIIMathPHP.class.php 2012-10-02 09:21:20 UTC (rev 8371)
+++ trunk/lib/ASCIIMathPHP/ASCIIMathPHP.class.php 2012-10-02 09:25:13 UTC (rev 8372)
@@ -1113,4 +1113,3 @@
}
}
}
-?>
Modified: trunk/locale/de/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/de/LC_MESSAGES/phpwiki.php 2012-10-02 09:21:20 UTC (rev 8371)
+++ trunk/locale/de/LC_MESSAGES/phpwiki.php 2012-10-02 09:25:13 UTC (rev 8372)
@@ -1341,4 +1341,3 @@
$locale["yesterday"] =
"gestern";
-?>
Modified: trunk/locale/es/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/es/LC_MESSAGES/phpwiki.php 2012-10-02 09:21:20 UTC (rev 8371)
+++ trunk/locale/es/LC_MESSAGES/phpwiki.php 2012-10-02 09:25:13 UTC (rev 8372)
@@ -591,4 +591,3 @@
$locale["yesterday"] =
"ayer";
-?>
Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/fr/LC_MESSAGES/phpwiki.php 2012-10-02 09:21:20 UTC (rev 8371)
+++ trunk/locale/fr/LC_MESSAGES/phpwiki.php 2012-10-02 09:25:13 UTC (rev 8372)
@@ -1397,4 +1397,3 @@
$locale["yesterday"] =
"hier";
-?>
Modified: trunk/locale/it/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/it/LC_MESSAGES/phpwiki.php 2012-10-02 09:21:20 UTC (rev 8371)
+++ trunk/locale/it/LC_MESSAGES/phpwiki.php 2012-10-02 09:25:13 UTC (rev 8372)
@@ -294,4 +294,3 @@
$locale["yesterday"] =
"ieri";
-?>
Modified: trunk/locale/ja/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/ja/LC_MESSAGES/phpwiki.php 2012-10-02 09:21:20 UTC (rev 8371)
+++ trunk/locale/ja/LC_MESSAGES/phpwiki.php 2012-10-02 09:25:13 UTC (rev 8372)
@@ -245,4 +245,3 @@
$locale["yesterday"] =
"昨日";
-?>
Modified: trunk/locale/nl/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/nl/LC_MESSAGES/phpwiki.php 2012-10-02 09:21:20 UTC (rev 8371)
+++ trunk/locale/nl/LC_MESSAGES/phpwiki.php 2012-10-02 09:25:13 UTC (rev 8372)
@@ -151,4 +151,3 @@
$locale["version <em>%s</em>"] =
"versie <em>%s</em>";
-?>
Modified: trunk/locale/sv/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/sv/LC_MESSAGES/phpwiki.php 2012-10-02 09:21:20 UTC (rev 8371)
+++ trunk/locale/sv/LC_MESSAGES/phpwiki.php 2012-10-02 09:25:13 UTC (rev 8372)
@@ -149,4 +149,3 @@
$locale["yesterday"] =
"i går";
-?>
Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/zh/LC_MESSAGES/phpwiki.php 2012-10-02 09:21:20 UTC (rev 8371)
+++ trunk/locale/zh/LC_MESSAGES/phpwiki.php 2012-10-02 09:25:13 UTC (rev 8372)
@@ -762,4 +762,3 @@
$locale["yesterday"] =
"昨天";
-?>
Modified: trunk/themes/MacOSX/buttons/index.php
===================================================================
--- trunk/themes/MacOSX/buttons/index.php 2012-10-02 09:21:20 UTC (rev 8371)
+++ trunk/themes/MacOSX/buttons/index.php 2012-10-02 09:25:13 UTC (rev 8372)
@@ -1 +1 @@
-<?php include("../images/index.php")?>
+<?php include("../images/index.php")
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2012-10-02 14:59:18
|
Revision: 8391
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8391&view=rev
Author: vargenau
Date: 2012-10-02 14:59:08 +0000 (Tue, 02 Oct 2012)
Log Message:
-----------
Remove svn:keywords
Modified Paths:
--------------
trunk/admin/.htaccess
trunk/config/.htaccess
trunk/lib/.htaccess
trunk/locale/.htaccess
trunk/locale/ja/pgsrc/.htaccess
trunk/pgsrc/.htaccess
trunk/schemas/.htaccess
trunk/tests/.htaccess
Property Changed:
----------------
trunk/admin/.htaccess
trunk/config/.htaccess
trunk/lib/.htaccess
trunk/locale/.htaccess
trunk/locale/ja/pgsrc/.htaccess
trunk/pgsrc/.htaccess
trunk/schemas/.htaccess
trunk/tests/.htaccess
trunk/themes/wikilens/pgsrc/LeftbarContent
Modified: trunk/admin/.htaccess
===================================================================
--- trunk/admin/.htaccess 2012-10-02 14:46:33 UTC (rev 8390)
+++ trunk/admin/.htaccess 2012-10-02 14:59:08 UTC (rev 8391)
@@ -1,3 +1,2 @@
-# $Id$
order allow,deny
Deny from all
Property changes on: trunk/admin/.htaccess
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/config/.htaccess
===================================================================
--- trunk/config/.htaccess 2012-10-02 14:46:33 UTC (rev 8390)
+++ trunk/config/.htaccess 2012-10-02 14:59:08 UTC (rev 8391)
@@ -1,3 +1,2 @@
-# $Id$
order allow,deny
Deny from all
Property changes on: trunk/config/.htaccess
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/lib/.htaccess
===================================================================
--- trunk/lib/.htaccess 2012-10-02 14:46:33 UTC (rev 8390)
+++ trunk/lib/.htaccess 2012-10-02 14:59:08 UTC (rev 8391)
@@ -1,3 +1,2 @@
-# $Id$
order allow,deny
Deny from all
Property changes on: trunk/lib/.htaccess
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/locale/.htaccess
===================================================================
--- trunk/locale/.htaccess 2012-10-02 14:46:33 UTC (rev 8390)
+++ trunk/locale/.htaccess 2012-10-02 14:59:08 UTC (rev 8391)
@@ -1,3 +1,2 @@
-# $Id$
order allow,deny
Deny from all
Property changes on: trunk/locale/.htaccess
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/locale/ja/pgsrc/.htaccess
===================================================================
--- trunk/locale/ja/pgsrc/.htaccess 2012-10-02 14:46:33 UTC (rev 8390)
+++ trunk/locale/ja/pgsrc/.htaccess 2012-10-02 14:59:08 UTC (rev 8391)
@@ -1,3 +1,2 @@
-# $Id$
order allow,deny
Deny from all
Property changes on: trunk/locale/ja/pgsrc/.htaccess
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/pgsrc/.htaccess
===================================================================
--- trunk/pgsrc/.htaccess 2012-10-02 14:46:33 UTC (rev 8390)
+++ trunk/pgsrc/.htaccess 2012-10-02 14:59:08 UTC (rev 8391)
@@ -1,3 +1,2 @@
-# $Id$
order allow,deny
Deny from all
Property changes on: trunk/pgsrc/.htaccess
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/schemas/.htaccess
===================================================================
--- trunk/schemas/.htaccess 2012-10-02 14:46:33 UTC (rev 8390)
+++ trunk/schemas/.htaccess 2012-10-02 14:59:08 UTC (rev 8391)
@@ -1,3 +1,2 @@
-# $Id$
order allow,deny
Deny from all
Property changes on: trunk/schemas/.htaccess
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: trunk/tests/.htaccess
===================================================================
--- trunk/tests/.htaccess 2012-10-02 14:46:33 UTC (rev 8390)
+++ trunk/tests/.htaccess 2012-10-02 14:59:08 UTC (rev 8391)
@@ -1,4 +1,3 @@
-# $Id$
Order Deny,Allow
Deny from all
Allow from localhost 192.168.1.0/24
Property changes on: trunk/tests/.htaccess
___________________________________________________________________
Deleted: svn:keywords
- Id
Property changes on: trunk/themes/wikilens/pgsrc/LeftbarContent
___________________________________________________________________
Deleted: svn:keywords
- Id
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2012-10-06 10:28:43
|
Revision: 8398
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8398&view=rev
Author: vargenau
Date: 2012-10-06 10:28:33 +0000 (Sat, 06 Oct 2012)
Log Message:
-----------
Reformat code
Modified Paths:
--------------
trunk/ImageTile.php
trunk/RPC2.php
trunk/SOAP.php
trunk/admin/wiki2public.php
trunk/configurator.php
trunk/index.php
trunk/lib/AccessLog.php
trunk/lib/ArchiveCleaner.php
trunk/lib/AtomParser.php
trunk/lib/BlockParser.php
trunk/lib/CachedMarkup.php
trunk/lib/Captcha.php
trunk/lib/DbSession/ADODB.php
trunk/lib/DbSession/PDO.php
trunk/lib/DbSession/SQL.php
trunk/lib/DbSession/dba.php
trunk/lib/DbSession.php
trunk/lib/DbaDatabase.php
trunk/lib/DbaListSet.php
trunk/lib/DbaPartition.php
trunk/lib/EditToolbar.php
trunk/lib/ErrorManager.php
trunk/lib/ExternalReferrer.php
trunk/lib/FileFinder.php
trunk/lib/Google.php
trunk/lib/HtmlElement.php
trunk/lib/HtmlElement5.php
trunk/lib/HtmlParser.php
trunk/lib/HttpClient.php
trunk/lib/IniConfig.php
trunk/lib/InlineParser.php
trunk/lib/MailNotify.php
trunk/lib/PageList.php
trunk/lib/PagePerm.php
trunk/lib/PageType.php
trunk/lib/RSSWriter091.php
trunk/lib/Request.php
trunk/lib/RssParser.php
trunk/lib/RssWriter.php
trunk/lib/RssWriter2.php
trunk/lib/SemanticWeb.php
trunk/lib/SpamBlocklist.php
trunk/lib/Template.php
trunk/lib/TextSearchQuery.php
trunk/lib/Units.php
trunk/lib/WikiCallback.php
trunk/lib/WikiDB/ADODB.php
trunk/lib/WikiDB/PDO.php
trunk/lib/WikiDB/SQL.php
trunk/lib/WikiDB/adodb/adodb-csvlib.inc.php
trunk/lib/WikiDB/adodb/adodb-error.inc.php
trunk/lib/WikiDB/adodb/adodb-errorhandler.inc.php
trunk/lib/WikiDB/adodb/adodb-errorpear.inc.php
trunk/lib/WikiDB/adodb/adodb-exceptions.inc.php
trunk/lib/WikiDB/adodb/adodb-iterator.inc.php
trunk/lib/WikiDB/adodb/adodb-lib.inc.php
trunk/lib/WikiDB/adodb/adodb-pear.inc.php
trunk/lib/WikiDB/adodb/adodb-php4.inc.php
trunk/lib/WikiDB/adodb/adodb-time.inc.php
trunk/lib/WikiDB/adodb/adodb.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-access.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-ado.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-ado_access.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-ado_mssql.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-borland_ibase.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-csv.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-db2.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-fbsql.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-firebird.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-ibase.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-informix.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-informix72.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-ldap.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-mssqlnative.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-mssqlpo.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-mysql.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-mysqli.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-mysqlt.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-netezza.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-oci8.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-oci805.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-oci8po.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-odbc.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-odbc_mssql.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-odbc_oracle.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-odbtp.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-odbtp_unicode.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-oracle.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-postgres64.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-postgres7.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-proxy.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-sapdb.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-sqlanywhere.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-sqlite.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-sybase.inc.php
trunk/lib/WikiDB/adodb/drivers/adodb-vfp.inc.php
trunk/lib/WikiDB/adodb/readme.htm
trunk/lib/WikiDB/backend/ADODB.php
trunk/lib/WikiDB/backend/ADODB_mssql.php
trunk/lib/WikiDB/backend/ADODB_mssqlnative.php
trunk/lib/WikiDB/backend/ADODB_mysql.php
trunk/lib/WikiDB/backend/ADODB_oci8po.php
trunk/lib/WikiDB/backend/ADODB_postgres7.php
trunk/lib/WikiDB/backend/ADODB_sqlite.php
trunk/lib/WikiDB/backend/PDO.php
trunk/lib/WikiDB/backend/PDO_mysql.php
trunk/lib/WikiDB/backend/PDO_oci8.php
trunk/lib/WikiDB/backend/PDO_pgsql.php
trunk/lib/WikiDB/backend/PearDB.php
trunk/lib/WikiDB/backend/PearDB_ffpgsql.php
trunk/lib/WikiDB/backend/PearDB_mysql.php
trunk/lib/WikiDB/backend/PearDB_oci8.php
trunk/lib/WikiDB/backend/PearDB_pgsql.php
trunk/lib/WikiDB/backend/PearDB_sqlite.php
trunk/lib/WikiDB/backend/cvs.php
trunk/lib/WikiDB/backend/dba.php
trunk/lib/WikiDB/backend/dbaBase.php
trunk/lib/WikiDB/backend/dumb/AllRevisionsIter.php
trunk/lib/WikiDB/backend/dumb/BackLinkIter.php
trunk/lib/WikiDB/backend/dumb/LinkSearchIter.php
trunk/lib/WikiDB/backend/dumb/MostPopularIter.php
trunk/lib/WikiDB/backend/dumb/MostRecentIter.php
trunk/lib/WikiDB/backend/dumb/TextSearchIter.php
trunk/lib/WikiDB/backend/dumb/WantedPagesIter.php
trunk/lib/WikiDB/backend/file.php
trunk/lib/WikiDB/backend/flatfile.php
trunk/lib/WikiDB/backend.php
trunk/lib/WikiDB/cvs.php
trunk/lib/WikiDB/dba.php
trunk/lib/WikiDB/file.php
trunk/lib/WikiDB/flatfile.php
trunk/lib/WikiDB.php
trunk/lib/WikiGroup.php
trunk/lib/WikiPlugin.php
trunk/lib/WikiPluginCached.php
trunk/lib/WikiTheme.php
trunk/lib/WikiUser/AdoDb.php
trunk/lib/WikiUser/BogoLogin.php
trunk/lib/WikiUser/Db.php
trunk/lib/WikiUser/EMailConfirm.php
trunk/lib/WikiUser/Facebook.php
trunk/lib/WikiUser/File.php
trunk/lib/WikiUser/Forbidden.php
trunk/lib/WikiUser/FusionForge.php
trunk/lib/WikiUser/HttpAuth.php
trunk/lib/WikiUser/HttpAuthUpper.php
trunk/lib/WikiUser/IMAP.php
trunk/lib/WikiUser/LDAP.php
trunk/lib/WikiUser/LdapUpper.php
trunk/lib/WikiUser/OpenID.php
trunk/lib/WikiUser/POP3.php
trunk/lib/WikiUser/PdoDb.php
trunk/lib/WikiUser/PearDb.php
trunk/lib/WikiUser/PersonalPage.php
trunk/lib/WikiUser/Session.php
trunk/lib/WikiUser.php
trunk/lib/WikiUserNew.php
trunk/lib/WysiwygEdit/FCKeditor.php
trunk/lib/WysiwygEdit/Wikiwyg.php
trunk/lib/WysiwygEdit/htmlarea2.php
trunk/lib/WysiwygEdit/htmlarea3.php
trunk/lib/WysiwygEdit/spaw.php
trunk/lib/WysiwygEdit/tinymce.php
trunk/lib/WysiwygEdit.php
trunk/lib/XMLRPC/utils.php
trunk/lib/XMLRPC/xmlrpc.inc
trunk/lib/XMLRPC/xmlrpc_emu.inc
trunk/lib/XMLRPC/xmlrpcs.inc
trunk/lib/XMLRPC/xmlrpcs_emu.inc
trunk/lib/XmlElement.php
trunk/lib/XmlParser.php
trunk/lib/XmlRpcClient.php
trunk/lib/XmlRpcServer.php
trunk/lib/config.php
trunk/lib/diff.php
trunk/lib/diff3.php
trunk/lib/difflib.php
trunk/lib/display.php
trunk/lib/editpage.php
trunk/lib/fortune.php
trunk/lib/fpdf/chinese.php
trunk/lib/fpdf/courier.php
trunk/lib/fpdf/helvetica.php
trunk/lib/fpdf/helveticab.php
trunk/lib/fpdf/helveticabi.php
trunk/lib/fpdf/helveticai.php
trunk/lib/fpdf/japanese.php
trunk/lib/fpdf/symbol.php
trunk/lib/fpdf/times.php
trunk/lib/fpdf/timesb.php
trunk/lib/fpdf/timesbi.php
trunk/lib/fpdf/timesi.php
trunk/lib/fpdf/zapfdingbats.php
trunk/lib/fpdf.php
trunk/lib/gif.php
trunk/lib/imagecache.php
trunk/lib/imdb.php
trunk/lib/install.php
trunk/lib/loadsave.php
trunk/lib/main.php
trunk/lib/nusoap/nusoap.php
trunk/lib/pdf.php
trunk/lib/plugin/SystemInfo.php
trunk/lib/prepend.php
trunk/lib/purgepage.php
trunk/lib/removepage.php
trunk/lib/spam_babycart.php
trunk/lib/stdlib.php
trunk/lib/wikilens/Buddy.php
trunk/lib/wikilens/CustomPrefs.php
trunk/lib/wikilens/PageListColumns.php
trunk/lib/wikilens/RatingsDb.php
trunk/lib/wikilens/RatingsUser.php
trunk/lib/wikilens/Utils.php
trunk/lib/ziplib.php
trunk/passencrypt.php
trunk/themes/Crao/themeinfo.php
trunk/themes/Hawaiian/lib/random.php
trunk/themes/Hawaiian/themeinfo.php
trunk/themes/MacOSX/images/index.php
trunk/themes/MacOSX/lib/RecentChanges.php
trunk/themes/MacOSX/themeinfo.php
trunk/themes/MonoBook/themeinfo.php
trunk/themes/Portland/lib/RecentChanges.php
trunk/themes/Portland/themeinfo.php
trunk/themes/Sidebar/clock.php
trunk/themes/Sidebar/hyperapplet.php
trunk/themes/Sidebar/hyperwiki.php
trunk/themes/Sidebar/themeinfo.php
trunk/themes/SpaceWiki/lib/RecentChanges.php
trunk/themes/SpaceWiki/themeinfo.php
trunk/themes/Wordpress/lib/RecentChanges.php
trunk/themes/Wordpress/themeinfo.php
trunk/themes/alphatest.php
trunk/themes/blog/lib/RecentChanges.php
trunk/themes/blog/themeinfo.php
trunk/themes/fusionforge/themeinfo.php
trunk/themes/shamino_com/themeinfo.php
trunk/themes/smaller/themeinfo.php
trunk/themes/wikilens/themeinfo.php
trunk/uploads/index.php
trunk/view.php
trunk/wikiadmin.php
trunk/wikilist.php
Modified: trunk/ImageTile.php
===================================================================
--- trunk/ImageTile.php 2012-10-05 16:47:39 UTC (rev 8397)
+++ trunk/ImageTile.php 2012-10-06 10:28:33 UTC (rev 8398)
@@ -3,38 +3,38 @@
require_once 'lib/stdlib.php';
$remove = 0;
-if (preg_match('/^(http|ftp|https):\/\//i',$_REQUEST['url'])) {
+if (preg_match('/^(http|ftp|https):\/\//i', $_REQUEST['url'])) {
$data_path = '';
list($usec, $sec) = explode(" ", microtime());
- $fp = fopen('config/config.ini','r');
- while ($config = fgetcsv($fp,1024,';')) {
- if (preg_match('/DATA_PATH/',$config[0])) {
- list($key,$value) = explode('=', $config[0]);
- $data_path = trim($value).'/';
- break;
+ $fp = fopen('config/config.ini', 'r');
+ while ($config = fgetcsv($fp, 1024, ';')) {
+ if (preg_match('/DATA_PATH/', $config[0])) {
+ list($key, $value) = explode('=', $config[0]);
+ $data_path = trim($value) . '/';
+ break;
+ }
}
- }
fclose($fp);
- @mkdir($data_path."uploads/thumbs",0775);
- $file = $data_path."uploads/thumbs/image_" . ((float)$usec + (float)$sec);
+ @mkdir($data_path . "uploads/thumbs", 0775);
+ $file = $data_path . "uploads/thumbs/image_" . ((float)$usec + (float)$sec);
$source = url_get_contents($_REQUEST['url']);
- @$fp = fopen($file,'w+');
+ @$fp = fopen($file, 'w+');
if (!$fp) {
- header ("Content-type: text/html");
+ header("Content-type: text/html");
echo "<html><head></head><body>ERROR : unable to open $file in write mode</body></html>";
}
- fwrite($fp,$source);
+ fwrite($fp, $source);
$remove = 1;
} else {
- @$fp = fopen($_REQUEST['url'],"r");
+ @$fp = fopen($_REQUEST['url'], "r");
if (!$fp) {
- header ("Content-type: text/html");
+ header("Content-type: text/html");
echo "<html><head></head><body>Not an image</body></html>";
exit();
@@ -43,83 +43,83 @@
fclose($fp);
}
}
-list ($a, $b, $type, $attr) = @getimagesize ($file);
+list ($a, $b, $type, $attr) = @getimagesize($file);
if (!$type) {
- $type = basename ($_REQUEST['url']);
- $type = preg_split ('/\./',$type);
- $type = array_pop ($type);
+ $type = basename($_REQUEST['url']);
+ $type = preg_split('/\./', $type);
+ $type = array_pop($type);
}
switch ($type) {
case '2':
if (function_exists("imagecreatefromjpeg"))
- $img = @imagecreatefromjpeg ($file);
+ $img = @imagecreatefromjpeg($file);
else
- show_plain ($file);
+ show_plain($file);
break;
case '3':
if (function_exists("imagecreatefrompng"))
- $img = @imagecreatefrompng ($file);
+ $img = @imagecreatefrompng($file);
else
- show_plain ($file);
+ show_plain($file);
break;
case '1':
if (function_exists("imagecreatefromgif"))
- $img = @imagecreatefromgif ($file);
+ $img = @imagecreatefromgif($file);
else
- show_plain ($file);
+ show_plain($file);
break;
case '15':
if (function_exists("imagecreatefromwbmp"))
- $img = @imagecreatefromwbmp ($file);
+ $img = @imagecreatefromwbmp($file);
else
- show_plain ($file);
+ show_plain($file);
break;
case '16':
if (function_exists("imagecreatefromxbm"))
- $img = @imagecreatefromxbm ($file);
+ $img = @imagecreatefromxbm($file);
else
- show_plain ($file);
+ show_plain($file);
break;
case 'xpm':
if (function_exists("imagecreatefromxpm"))
- $img = @imagecreatefromxpm ($file);
+ $img = @imagecreatefromxpm($file);
else
- show_plain ($file);
+ show_plain($file);
break;
case 'gd':
if (function_exists("imagecreatefromgd"))
- $img = @imagecreatefromgd ($file);
+ $img = @imagecreatefromgd($file);
else
- show_plain ($file);
+ show_plain($file);
break;
case 'gd2':
if (function_exists("imagecreatefromgd2"))
- $img = @imagecreatefromgd2 ($file);
+ $img = @imagecreatefromgd2($file);
else
- show_plain ($file);
+ show_plain($file);
break;
default:
//we are not stupid...
- header ("Content-type: text/html");
+ header("Content-type: text/html");
echo "<html><head></head><body>Not an image</body></html>";
exit();
break;
}
-$width = @imagesx($img);
+$width = @imagesx($img);
$height = @imagesy($img);
$newwidth = $_REQUEST['width'];
if (empty($newidth)) $newidth = 50;
$newheight = $_REQUEST['height'];
-if (empty($newheight)) $newheight = round($newwidth * ($height / $width)) ;
+if (empty($newheight)) $newheight = round($newwidth * ($height / $width));
// php-4.2.x is stupid enough to define on gd only a stub for imagecopyresampled.
// So function_exists('imagecopyresampled') will fail.
-if (!extension_loaded('gd2') and (substr(PHP_OS,0,3) != 'WIN'))
+if (!extension_loaded('gd2') and (substr(PHP_OS, 0, 3) != 'WIN'))
loadPhpExtension('gd2');
if (extension_loaded('gd2')) {
$thumb = imagecreatetruecolor($newwidth, $newheight);
@@ -129,14 +129,15 @@
$img = imagecopyresized($thumb, $img, 0, 0, 0, 0, $newwidth, $newheight, $width, $height);
}
-if ($remove == 1) unlink ($file);
+if ($remove == 1) unlink($file);
-header ("Content-type: image/png");
+header("Content-type: image/png");
imagepng($thumb);
-function show_plain () {
- $mime = mime_content_type ($_REQUEST['url']);
- header ("Content-type: $mime");
+function show_plain()
+{
+ $mime = mime_content_type($_REQUEST['url']);
+ header("Content-type: $mime");
readfile($_REQUEST['url']);
exit();
}
Modified: trunk/RPC2.php
===================================================================
--- trunk/RPC2.php 2012-10-05 16:47:39 UTC (rev 8397)
+++ trunk/RPC2.php 2012-10-06 10:28:33 UTC (rev 8398)
@@ -10,9 +10,8 @@
// Intercept GET requests from confused users. Only POST is allowed here!
if (empty($GLOBALS['HTTP_SERVER_VARS']))
- $GLOBALS['HTTP_SERVER_VARS'] =& $_SERVER;
-if ($HTTP_SERVER_VARS['REQUEST_METHOD'] != "POST")
-{
+ $GLOBALS['HTTP_SERVER_VARS'] =& $_SERVER;
+if ($HTTP_SERVER_VARS['REQUEST_METHOD'] != "POST") {
die('This is the address of the XML-RPC interface.' .
' You must use XML-RPC calls to access information here.');
}
Modified: trunk/SOAP.php
===================================================================
--- trunk/SOAP.php 2012-10-05 16:47:39 UTC (rev 8397)
+++ trunk/SOAP.php 2012-10-06 10:28:33 UTC (rev 8398)
@@ -37,11 +37,12 @@
require_once 'lib/WikiGroup.php';
*/
-function checkCredentials(&$server, &$credentials, $access, $pagename) {
+function checkCredentials(&$server, &$credentials, $access, $pagename)
+{
// check the "Authorization: Basic '.base64_encode("$this->username:$this->password").'\r\n'" header
if (isset($server->header['Authorization'])) {
- $line = base64_decode(str_replace("Basic ","",trim($server->header['Authorization'])));
- list($credentials['username'],$credentials['password']) = explode(':',$line);
+ $line = base64_decode(str_replace("Basic ", "", trim($server->header['Authorization'])));
+ list($credentials['username'], $credentials['password']) = explode(':', $line);
} else {
if (!isset($_SERVER))
$_SERVER =& $GLOBALS['HTTP_SERVER_VARS'];
@@ -50,8 +51,7 @@
if (isset($_SERVER['REMOTE_ADDR']))
$credentials['username'] = $_SERVER['REMOTE_ADDR'];
elseif (isset($GLOBALS['REMOTE_ADDR']))
- $credentials['username'] = $GLOBALS['REMOTE_ADDR'];
- else
+ $credentials['username'] = $GLOBALS['REMOTE_ADDR']; else
$credentials['username'] = $server->host;
}
}
@@ -64,9 +64,9 @@
$request->_user = new WikiUser($request, $credentials['username']);
}
$request->_user->AuthCheck(array('userid' => $credentials['username'],
- 'passwd' => $credentials['password']));
- if (! mayAccessPage ($access, $pagename))
- $server->fault(401,'',"no permission");
+ 'passwd' => $credentials['password']));
+ if (!mayAccessPage($access, $pagename))
+ $server->fault(401, '', "no permission");
}
$GLOBALS['SERVER_NAME'] = SERVER_URL;
@@ -76,22 +76,22 @@
// Local or external wdsl support is experimental.
// It works without also. Just the client has to
// know the wdsl definitions.
-$server = new soap_server(/* 'PhpWiki.wdsl' */);
+$server = new soap_server( /* 'PhpWiki.wdsl' */);
// Now change the server url to ours, because in the wdsl is the original PhpWiki address
// <soap:address location="http://phpwiki.sourceforge.net/phpwiki/SOAP.php" />
// <soap:operation soapAction="http://phpwiki.sourceforge.net/phpwiki/SOAP.php" />
$server->ports[$server->currentPort]['location'] = $url;
-$server->bindings[ $server->ports[$server->currentPort]['binding'] ]['endpoint'] = $url;
+$server->bindings[$server->ports[$server->currentPort]['binding']]['endpoint'] = $url;
$server->soapaction = $url; // soap_transport_http
-$actions = array('getPageContent','getPageRevision','getCurrentRevision',
- 'getPageMeta','doSavePage','getAllPagenames',
- 'getBackLinks','doTitleSearch','doFullTextSearch',
- 'getRecentChanges','listLinks','listPlugins',
- 'getPluginSynopsis','callPlugin','listRelations',
- 'linkSearch'
- );
+$actions = array('getPageContent', 'getPageRevision', 'getCurrentRevision',
+ 'getPageMeta', 'doSavePage', 'getAllPagenames',
+ 'getBackLinks', 'doTitleSearch', 'doFullTextSearch',
+ 'getRecentChanges', 'listLinks', 'listPlugins',
+ 'getPluginSynopsis', 'callPlugin', 'listRelations',
+ 'linkSearch'
+);
foreach ($actions as $action) {
$server->register($actions);
$server->operations[$actions]['soapaction'] = $url;
@@ -100,9 +100,10 @@
//todo: check and set credentials
// requiredAuthorityForPage($action);
// require 'edit' access
-function doSavePage($pagename,$content,$credentials=false) {
+function doSavePage($pagename, $content, $credentials = false)
+{
global $server;
- checkCredentials($server, $credentials,'edit',$pagename);
+ checkCredentials($server, $credentials, 'edit', $pagename);
$dbi = WikiDB::open($GLOBALS['DBParams']);
$page = $dbi->getPage($pagename);
$current = $page->getCurrentRevision();
@@ -113,41 +114,48 @@
}
// require 'view' access
-function getPageContent($pagename,$credentials=false) {
+function getPageContent($pagename, $credentials = false)
+{
global $server;
- checkCredentials($server,$credentials,'view',$pagename);
+ checkCredentials($server, $credentials, 'view', $pagename);
$dbi = WikiDB::open($GLOBALS['DBParams']);
$page = $dbi->getPage($pagename);
$rev = $page->getCurrentRevision();
$text = $rev->getPackedContent();
return $text;
}
+
// require 'view' access
-function getPageRevision($pagename,$revision,$credentials=false) {
+function getPageRevision($pagename, $revision, $credentials = false)
+{
global $server;
- checkCredentials($server,$credentials,'view',$pagename);
+ checkCredentials($server, $credentials, 'view', $pagename);
$dbi = WikiDB::open($GLOBALS['DBParams']);
$page = $dbi->getPage($pagename);
$rev = $page->getCurrentRevision();
$text = $rev->getPackedContent();
return $text;
}
+
// require 'view' access
-function getCurrentRevision($pagename,$credentials=false) {
+function getCurrentRevision($pagename, $credentials = false)
+{
global $server;
- checkCredentials($server,$credentials,'view',$pagename);
- if (!mayAccessPage ('view',$pagename))
- $server->fault(401,'',"no permission");
+ checkCredentials($server, $credentials, 'view', $pagename);
+ if (!mayAccessPage('view', $pagename))
+ $server->fault(401, '', "no permission");
$dbi = WikiDB::open($GLOBALS['DBParams']);
$page = $dbi->getPage($pagename);
$rev = $page->getCurrentRevision();
$version = $current->getVersion();
return (double)$version;
}
+
// require 'change' or 'view' access ?
-function getPageMeta($pagename,$credentials=false) {
+function getPageMeta($pagename, $credentials = false)
+{
global $server;
- checkCredentials($server,$credentials,'view',$pagename);
+ checkCredentials($server, $credentials, 'view', $pagename);
$dbi = WikiDB::open($GLOBALS['DBParams']);
$page = $dbi->getPage($pagename);
$rev = $page->getCurrentRevision();
@@ -155,10 +163,12 @@
//todo: reformat the meta hash
return $meta;
}
+
// require 'view' access to AllPages
-function getAllPagenames($credentials=false) {
+function getAllPagenames($credentials = false)
+{
global $server;
- checkCredentials($server,$credentials,'view',_("AllPages"));
+ checkCredentials($server, $credentials, 'view', _("AllPages"));
$dbi = WikiDB::open($GLOBALS['DBParams']);
$page_iter = $dbi->getAllPages();
$pages = array();
@@ -167,13 +177,15 @@
}
return $pages;
}
+
// require 'view' access
-function getBacklinks($pagename,$credentials=false) {
+function getBacklinks($pagename, $credentials = false)
+{
global $server;
- checkCredentials($server,$credentials,'view',$pagename);
+ checkCredentials($server, $credentials, 'view', $pagename);
$dbi = WikiDB::open($GLOBALS['DBParams']);
$backend = &$dbi->_backend;
- $result = $backend->get_links($pagename);
+ $result = $backend->get_links($pagename);
$page_iter = new WikiDB_PageIterator($dbi, $result);
$pages = array();
while ($page = $page_iter->next()) {
@@ -181,10 +193,12 @@
}
return $pages;
}
+
// require 'view' access to TitleSearch
-function doTitleSearch($s, $credentials=false) {
+function doTitleSearch($s, $credentials = false)
+{
global $server;
- checkCredentials($server,$credentials,'view',_("TitleSearch"));
+ checkCredentials($server, $credentials, 'view', _("TitleSearch"));
$dbi = WikiDB::open($GLOBALS['DBParams']);
$query = new TextSearchQuery($s);
$page_iter = $dbi->titleSearch($query);
@@ -194,10 +208,12 @@
}
return $pages;
}
+
// require 'view' access to FullTextSearch
-function doFullTextSearch($s, $credentials=false) {
+function doFullTextSearch($s, $credentials = false)
+{
global $server;
- checkCredentials($server,$credentials,'view',_("FullTextSearch"));
+ checkCredentials($server, $credentials, 'view', _("FullTextSearch"));
$dbi = WikiDB::open($GLOBALS['DBParams']);
$query = new TextSearchQuery($s);
$page_iter = $dbi->fullSearch($query);
@@ -209,28 +225,31 @@
}
// require 'view' access to RecentChanges
-function getRecentChanges($limit=false, $since=false, $include_minor=false, $credentials=false) {
+function getRecentChanges($limit = false, $since = false, $include_minor = false, $credentials = false)
+{
global $server;
- checkCredentials($server,$credentials,'view',_("RecentChanges"));
+ checkCredentials($server, $credentials, 'view', _("RecentChanges"));
$dbi = WikiDB::open($GLOBALS['DBParams']);
$params = array('limit' => $limit, 'since' => $since,
- 'include_minor_revisions' => $include_minor);
+ 'include_minor_revisions' => $include_minor);
$page_iter = $dbi->mostRecent($params);
$pages = array();
while ($page = $page_iter->next()) {
$pages[] = array('pagename' => $page->getName(),
- 'lastModified' => $page->get('mtime'),
- 'author' => $page->get('author'),
- 'summary' => $page->get('summary'), // added with 1.3.13
- 'version' => $page->getVersion()
- );
+ 'lastModified' => $page->get('mtime'),
+ 'author' => $page->get('author'),
+ 'summary' => $page->get('summary'), // added with 1.3.13
+ 'version' => $page->getVersion()
+ );
}
return $pages;
}
+
// require 'view' access
-function listLinks($pagename, $credentials=false) {
+function listLinks($pagename, $credentials = false)
+{
global $server;
- checkCredentials($server,$credentials,'view',$pagename);
+ checkCredentials($server, $credentials, 'view', $pagename);
$dbi = WikiDB::open($GLOBALS['DBParams']);
$page = $dbi->getPage($pagename);
$linkiterator = $page->getPageLinks();
@@ -241,9 +260,11 @@
}
return $links;
}
-function listPlugins($credentials=false) {
+
+function listPlugins($credentials = false)
+{
global $server;
- checkCredentials($server,$credentials,'change',_("HomePage"));
+ checkCredentials($server, $credentials, 'change', _("HomePage"));
$plugin_dir = 'lib/plugin';
if (defined('PHPWIKI_DIR'))
$plugin_dir = PHPWIKI_DIR . "/$plugin_dir";
@@ -266,9 +287,11 @@
}
return $RetArray;
}
-function getPluginSynopsis($pluginname, $credentials=false) {
+
+function getPluginSynopsis($pluginname, $credentials = false)
+{
global $server;
- checkCredentials($server,$credentials,'change',"Help/".$pluginname."Plugin");
+ checkCredentials($server, $credentials, 'change', "Help/" . $pluginname . "Plugin");
require_once 'lib/WikiPlugin.php';
$w = new WikiPluginLoader;
$synopsis = '';
@@ -277,21 +300,24 @@
if (strtolower(substr(get_parent_class($p), 0, 10)) == 'wikiplugin') {
$plugin_args = '';
$desc = $p->getArgumentsDescription();
- $src = array("\n",'"',"'",'|','[',']','\\');
- $replace = array('%0A','%22','%27','%7C','%5B','%5D','%5C');
- $desc = str_replace("<br />",' ',$desc->asXML());
+ $src = array("\n", '"', "'", '|', '[', ']', '\\');
+ $replace = array('%0A', '%22', '%27', '%7C', '%5B', '%5D', '%5C');
+ $desc = str_replace("<br />", ' ', $desc->asXML());
if ($desc)
- $plugin_args = '\n'.str_replace($src, $replace, $desc);
- $synopsis = "<?plugin ".$pluginName.$plugin_args."?>"; // args?
+ $plugin_args = '\n' . str_replace($src, $replace, $desc);
+ $synopsis = "<?plugin " . $pluginName . $plugin_args . "?>"; // args?
}
return $synopsis;
}
+
// only plugins returning pagelists will return something useful. so omit the html output
-function callPlugin($pluginname, $pluginargs, $credentials=false) {
+function callPlugin($pluginname, $pluginargs, $credentials = false)
+{
global $server;
- checkCredentials($server,$credentials,'change',"Help/".$pluginname."Plugin");
+ checkCredentials($server, $credentials, 'change', "Help/" . $pluginname . "Plugin");
- $basepage = '';;
+ $basepage = '';
+ ;
require_once 'lib/WikiPlugin.php';
$w = new WikiPluginLoader;
$p = $w->getPlugin($pluginName, false); // second arg?
@@ -303,6 +329,7 @@
}
return $pages;
}
+
/**
* array listRelations([ Integer option = 1 ])
*
@@ -315,20 +342,23 @@
*
* @author: Reini Urban
*/
-function listRelations($option = 1, $credentials=false) {
+function listRelations($option = 1, $credentials = false)
+{
global $server;
- checkCredentials($server,$credentials,'view',_("HomePage"));
+ checkCredentials($server, $credentials, 'view', _("HomePage"));
$also_attributes = $option & 2;
$only_attributes = $option & 2 and !($option & 1);
$sorted = !($option & 4);
return $dbh->listRelations($also_attributes,
- $only_attributes,
- $sorted);
+ $only_attributes,
+ $sorted);
}
+
// some basic semantic search
-function linkSearch($linktype, $search, $pages="*", $relation="*", $credentials=false) {
+function linkSearch($linktype, $search, $pages = "*", $relation = "*", $credentials = false)
+{
global $server;
- checkCredentials($server,$credentials,'view',_("HomePage"));
+ checkCredentials($server, $credentials, 'view', _("HomePage"));
$dbi = WikiDB::open($GLOBALS['DBParams']);
require_once 'lib/TextSearchQuery.php';
$pagequery = new TextSearchQuery($pages);
Modified: trunk/admin/wiki2public.php
===================================================================
--- trunk/admin/wiki2public.php 2012-10-05 16:47:39 UTC (rev 8397)
+++ trunk/admin/wiki2public.php 2012-10-06 10:28:33 UTC (rev 8398)
@@ -1,4 +1,4 @@
<?php
- // cronjob script to copy pages marked as "public" to a seperate public wiki area.
- // If ENABLE_PAGE_PUBLIC = true
- // can only run via localhost for security reasons
+// cronjob script to copy pages marked as "public" to a seperate public wiki area.
+// If ENABLE_PAGE_PUBLIC = true
+// can only run via localhost for security reasons
Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php 2012-10-05 16:47:39 UTC (rev 8397)
+++ trunk/configurator.php 2012-10-06 10:28:33 UTC (rev 8398)
@@ -54,17 +54,17 @@
*/
global $HTTP_SERVER_VARS, $HTTP_POST_VARS, $tdwidth;
-if (empty($_SERVER)) $_SERVER =& $GLOBALS['HTTP_SERVER_VARS'];
-if (empty($_GET)) $_GET =& $GLOBALS['HTTP_GET_VARS'];
-if (empty($_ENV)) $_ENV =& $GLOBALS['HTTP_ENV_VARS'];
-if (empty($_POST)) $_POST =& $GLOBALS['HTTP_POST_VARS'];
+if (empty($_SERVER)) $_SERVER =& $GLOBALS['HTTP_SERVER_VARS'];
+if (empty($_GET)) $_GET =& $GLOBALS['HTTP_GET_VARS'];
+if (empty($_ENV)) $_ENV =& $GLOBALS['HTTP_ENV_VARS'];
+if (empty($_POST)) $_POST =& $GLOBALS['HTTP_POST_VARS'];
if (empty($configurator))
$configurator = "configurator.php";
if (!strstr($_SERVER["SCRIPT_NAME"], $configurator) and defined('DATA_PATH'))
$configurator = DATA_PATH . "/" . $configurator;
$scriptname = str_replace('configurator.php', 'index.php', $_SERVER["SCRIPT_NAME"]);
-if (strstr($_SERVER["SCRIPT_NAME"],"/php")) { // cgi got this different
+if (strstr($_SERVER["SCRIPT_NAME"], "/php")) { // cgi got this different
if (defined('DATA_PATH'))
$scriptname = DATA_PATH . "/index.php";
else
@@ -72,13 +72,14 @@
}
$tdwidth = 700;
-$config_file = (substr(PHP_OS,0,3) == 'WIN') ? 'config\\config.ini' : 'config/config.ini';
-$fs_config_file = dirname(__FILE__) . (substr(PHP_OS,0,3) == 'WIN' ? '\\' : '/') . $config_file;
-if (isset($_POST['create'])) header('Location: '.$configurator.'?show=_part1&create=1#create');
+$config_file = (substr(PHP_OS, 0, 3) == 'WIN') ? 'config\\config.ini' : 'config/config.ini';
+$fs_config_file = dirname(__FILE__) . (substr(PHP_OS, 0, 3) == 'WIN' ? '\\' : '/') . $config_file;
+if (isset($_POST['create'])) header('Location: ' . $configurator . '?show=_part1&create=1#create');
// helpers from lib/WikiUser/HttpAuth.php
if (!function_exists('_http_user')) {
- function _http_user() {
+ function _http_user()
+ {
if (!isset($_SERVER))
$_SERVER = $GLOBALS['HTTP_SERVER_VARS'];
if (!empty($_SERVER['PHP_AUTH_USER']))
@@ -87,7 +88,7 @@
return array($_SERVER['REMOTE_USER'], $_SERVER['PHP_AUTH_PW']);
if (!empty($GLOBALS['HTTP_ENV_VARS']['REMOTE_USER']))
return array($GLOBALS['HTTP_ENV_VARS']['REMOTE_USER'],
- $GLOBALS['HTTP_ENV_VARS']['PHP_AUTH_PW']);
+ $GLOBALS['HTTP_ENV_VARS']['PHP_AUTH_PW']);
if (!empty($GLOBALS['REMOTE_USER']))
return array($GLOBALS['REMOTE_USER'], $GLOBALS['PHP_AUTH_PW']);
@@ -96,14 +97,16 @@
list($userid, $passwd) = explode(':', base64_decode(substr($_SERVER['HTTP_AUTHORIZATION'], 6)));
return array($userid, $passwd);
}
- return array('','');
+ return array('', '');
}
- function _http_logout() {
+
+ function _http_logout()
+ {
if (!isset($_SERVER))
$_SERVER =& $GLOBALS['HTTP_SERVER_VARS'];
// maybe we should random the realm to really force a logout. but the next login will fail.
// better_srand(); $realm = microtime().rand();
- header('WWW-Authenticate: Basic realm="'.WIKI_NAME.'"');
+ header('WWW-Authenticate: Basic realm="' . WIKI_NAME . '"');
if (strstr(php_sapi_name(), 'apache'))
header('HTTP/1.0 401 Unauthorized');
else
@@ -122,22 +125,21 @@
if (file_exists($fs_config_file)) {
// Require admin user
if (!defined('ADMIN_USER') or !defined('ADMIN_PASSWD')) {
- if (!function_exists("IniConfig")) {
- include_once 'lib/prepend.php';
+ if (!function_exists("IniConfig")) {
+ include_once 'lib/prepend.php';
include_once 'lib/IniConfig.php';
- }
+ }
IniConfig($fs_config_file);
}
if (!defined('ADMIN_USER') or ADMIN_USER == '') {
trigger_error("Configuration problem:\nADMIN_USER not defined in \"$fs_config_file\".\n"
- . "Cannot continue: You have to fix that manually.", E_USER_ERROR);
+ . "Cannot continue: You have to fix that manually.", E_USER_ERROR);
exit();
}
list($admin_user, $admin_pw) = _http_user();
//$required_user = ADMIN_USER;
- if (empty($admin_user) or $admin_user != ADMIN_USER)
- {
+ if (empty($admin_user) or $admin_user != ADMIN_USER) {
_http_logout();
}
// check password
@@ -152,121 +154,167 @@
include_once 'lib/prepend.php';
include_once 'lib/IniConfig.php';
}
- $def_file = (substr(PHP_OS,0,3) == 'WIN') ? 'config\\config-default.ini' : 'config/config-default.ini';
- $fs_def_file = dirname(__FILE__) . (substr(PHP_OS,0,3) == 'WIN' ? '\\' : '/') . $def_file;
+ $def_file = (substr(PHP_OS, 0, 3) == 'WIN') ? 'config\\config-default.ini' : 'config/config-default.ini';
+ $fs_def_file = dirname(__FILE__) . (substr(PHP_OS, 0, 3) == 'WIN' ? '\\' : '/') . $def_file;
IniConfig($fs_def_file);
}
-echo '<','?xml version="1.0" encoding="utf-8"?',">\n";
+echo '<', '?xml version="1.0" encoding="utf-8"?', ">\n";
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>Configuration tool for PhpWiki <?php echo $config_file ?></title>
-<style type="text/css" media="screen">
-<!--
-/* TABLE { border: thin solid black } */
-body { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 80%; }
-pre { font-size: 120%; }
-td { border: thin solid black }
-tr { border: none }
-div.hint { background-color: #eeeeee; }
-tr.hidden { border: none; display: none; }
-td.part { background-color: #eeeeee; color: inherit; }
-td.instructions { background-color: #ffffee; width: <?php echo $tdwidth ?>px; color: inherit; }
-td.unchangeable-variable-top { border-bottom: none; background-color: #ffffee; color:inherit; }
-td.unchangeable-variable-left { border-top: none; background-color: #ffffee; color:inherit; }
--->
-</style>
-<script type="text/javascript">
-<!--
-function update(accepted, error, value, output) {
- var msg = document.getElementById(output);
- if (accepted) {
- /* MSIE 5.0 fails here */
- if (msg && msg.innerHTML) { msg.innerHTML = "<font color=\"green\">Input accepted.</font>"; }
- } else {
- while ((index = error.indexOf("%s")) > -1) {
- error = error.substring(0, index) + value + error.substring(index+2);
- }
- if (msg) { msg.innerHTML = "<font color=\"red\">" + error + "</font>"; }
- }
- if (submit = document.getElementById('submit')) submit.disabled = accepted ? false : true;
-}
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <title>Configuration tool for PhpWiki <?php echo $config_file ?></title>
+ <style type="text/css" media="screen">
+ <!--
+ /* TABLE { border: thin solid black } */
+ body {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 80%;
+ }
-function validate(error, value, output, field) {
- update(field.value == value, error, field.value, output);
-}
+ pre {
+ font-size: 120%;
+ }
-function validate_ereg(error, ereg, output, field) {
- regex = new RegExp(ereg);
- update(regex.test(field.value), error, field.value, output);
-}
+ td {
+ border: thin solid black
+ }
-function validate_range(error, low, high, empty_ok, output, field) {
- update((empty_ok == 1 && field.value == "") ||
- (field.value >= low && field.value <= high),
- error, field.value, output);
-}
+ tr {
+ border: none
+ }
-function toggle_group(id) {
- var text = document.getElementById(id + "_text");
- var do_hide = false;
- if (text.innerHTML == "Hide options.") {
- do_hide = true;
- text.innerHTML = "Show options.";
- } else {
- text.innerHTML = "Hide options.";
- }
+ div.hint {
+ background-color: #eeeeee;
+ }
- var rows = document.getElementsByTagName('tr');
- var i = 0;
- for (i = 0; i < rows.length; i++) {
- var tr = rows[i];
- if (tr.className == 'header' && tr.id == id) {
- i++;
- break;
- }
- }
- for (; i < rows.length; i++) {
- var tr = rows[i];
- if (tr.className == 'header')
- break;
- tr.className = do_hide ? 'hidden': 'nonhidden';
- }
-}
+ tr.hidden {
+ border: none;
+ display: none;
+ }
-function do_init() {
- // Hide all groups. We do this via JavaScript to avoid
- // hiding the groups if JavaScript is not supported...
- var rows = document.getElementsByTagName('tr');
- var show = '<?php echo $_GET["show"] ?>';
- for (var i = 0; i < rows.length; i++) {
- var tr = rows[i];
- if (tr.className == 'header')
- if (!show || tr.id != show)
- toggle_group(tr.id);
- }
+ td.part {
+ background-color: #eeeeee;
+ color: inherit;
+ }
- // Select text in textarea upon focus
- var area = document.getElementById('config-output');
- if (area) {
- listener = { handleEvent: function (e) { area.select(); } };
- area.addEventListener('focus', listener, false);
- }
-}
+ td.instructions {
+ background-color: #ffffee;
+ width: <?php echo $tdwidth ?>px;
+ color: inherit;
+ }
--->
-</script>
+ td.unchangeable-variable-top {
+ border-bottom: none;
+ background-color: #ffffee;
+ color: inherit;
+ }
+
+ td.unchangeable-variable-left {
+ border-top: none;
+ background-color: #ffffee;
+ color: inherit;
+ }
+
+ -->
+ </style>
+ <script type="text/javascript">
+ <
+ !--
+ function update(accepted, error, value, output) {
+ var msg = document.getElementById(output);
+ if (accepted) {
+ /* MSIE 5.0 fails here */
+ if (msg && msg.innerHTML) {
+ msg.innerHTML = "<font color=\"green\">Input accepted.</font>";
+ }
+ } else {
+ while ((index = error.indexOf("%s")) > -1) {
+ error = error.substring(0, index) + value + error.substring(index + 2);
+ }
+ if (msg) {
+ msg.innerHTML = "<font color=\"red\">" + error + "</font>";
+ }
+ }
+ if (submit = document.getElementById('submit')) submit.disabled = accepted ? false : true;
+ }
+
+ function validate(error, value, output, field) {
+ update(field.value == value, error, field.value, output);
+ }
+
+ function validate_ereg(error, ereg, output, field) {
+ regex = new RegExp(ereg);
+ update(regex.test(field.value), error, field.value, output);
+ }
+
+ function validate_range(error, low, high, empty_ok, output, field) {
+ update((empty_ok == 1 && field.value == "") ||
+ (field.value >= low && field.value <= high),
+ error, field.value, output);
+ }
+
+ function toggle_group(id) {
+ var text = document.getElementById(id + "_text");
+ var do_hide = false;
+ if (text.innerHTML == "Hide options.") {
+ do_hide = true;
+ text.innerHTML = "Show options.";
+ } else {
+ text.innerHTML = "Hide options.";
+ }
+
+ var rows = document.getElementsByTagName('tr');
+ var i = 0;
+ for (i = 0; i < rows.length; i++) {
+ var tr = rows[i];
+ if (tr.className == 'header' && tr.id == id) {
+ i++;
+ break;
+ }
+ }
+ for (; i < rows.length; i++) {
+ var tr = rows[i];
+ if (tr.className == 'header')
+ break;
+ tr.className = do_hide ? 'hidden' : 'nonhidden';
+ }
+ }
+
+ function do_init() {
+ // Hide all groups. We do this via JavaScript to avoid
+ // hiding the groups if JavaScript is not supported...
+ var rows = document.getElementsByTagName('tr');
+ var show = '<?php echo $_GET["show"] ?>';
+ for (var i = 0; i < rows.length; i++) {
+ var tr = rows[i];
+ if (tr.className == 'header')
+ if (!show || tr.id != show)
+ toggle_group(tr.id);
+ }
+
+ // Select text in textarea upon focus
+ var area = document.getElementById('config-output');
+ if (area) {
+ listener = { handleEvent:function (e) {
+ area.select();
+ } };
+ area.addEventListener('focus', listener, false);
+ }
+ }
+
+ -- >
+ </script>
</head>
<body onload="do_init();">
- <h1>Configuration for PhpWiki <?php echo $config_file ?></h1>
+<h1>Configuration for PhpWiki <?php echo $config_file ?></h1>
<div class="hint">
- Using this configurator.php is experimental!<br />
+ Using this configurator.php is experimental!<br/>
On any configuration problems, please edit the resulting config.ini manually.
</div>
@@ -330,121 +378,121 @@
// grep \'$x\' configurator.php >/dev/null || echo $x ; done
$properties["Part Zero"] =
-new part('_part0', $SEPARATOR."\n", "
+ new part('_part0', $SEPARATOR . "\n", "
Part Zero: (optional)
Latest Development and Tricky Options");
if (defined('INCLUDE_PATH'))
$include_path = INCLUDE_PATH;
else {
- if (substr(PHP_OS,0,3) == 'WIN') {
- $include_path = dirname(__FILE__) . ';' . ini_get('include_path');
- if (strchr(ini_get('include_path'),'/'))
- $include_path = strtr($include_path,'\\','/');
- } else {
- $include_path = dirname(__FILE__) . ':' . ini_get('include_path');
- }
+ if (substr(PHP_OS, 0, 3) == 'WIN') {
+ $include_path = dirname(__FILE__) . ';' . ini_get('include_path');
+ if (strchr(ini_get('include_path'), '/'))
+ $include_path = strtr($include_path, '\\', '/');
+ } else {
+ $include_path = dirname(__FILE__) . ':' . ini_get('include_path');
+ }
}
$properties["PHP include_path"] =
-new _define('INCLUDE_PATH', $include_path);
+ new _define('INCLUDE_PATH', $include_path);
// TODO: Convert this to a checkbox row as in tests/unit/test.php
$properties["DEBUG"] =
-new numeric_define_optional('DEBUG', DEBUG);
+ new numeric_define_optional('DEBUG', DEBUG);
$properties["ENABLE_EDIT_TOOLBAR"] =
-new boolean_define_commented_optional('ENABLE_EDIT_TOOLBAR');
+ new boolean_define_commented_optional('ENABLE_EDIT_TOOLBAR');
$properties["JS_SEARCHREPLACE"] =
-new boolean_define_commented_optional('JS_SEARCHREPLACE');
+ new boolean_define_commented_optional('JS_SEARCHREPLACE');
// TESTME: use config-default: = false
$properties["ENABLE_DOUBLECLICKEDIT"] =
-new boolean_define_commented_optional('ENABLE_DOUBLECLICKEDIT');
+ new boolean_define_commented_optional('ENABLE_DOUBLECLICKEDIT');
$properties["ENABLE_WYSIWYG"] =
-new boolean_define_commented_optional('ENABLE_WYSIWYG');
+ new boolean_define_commented_optional('ENABLE_WYSIWYG');
$properties["WYSIWYG_BACKEND"] =
-new _define_selection(
-'WYSIWYG_BACKEND',
-array('Wikiwyg' => 'Wikiwyg',
- 'tinymce' => 'tinymce',
- 'FCKeditor' => 'FCKeditor',
- 'spaw' => 'spaw',
- 'htmlarea3' => 'htmlarea3',
- 'htmlarea2' => 'htmlarea2',
-));
+ new _define_selection(
+ 'WYSIWYG_BACKEND',
+ array('Wikiwyg' => 'Wikiwyg',
+ 'tinymce' => 'tinymce',
+ 'FCKeditor' => 'FCKeditor',
+ 'spaw' => 'spaw',
+ 'htmlarea3' => 'htmlarea3',
+ 'htmlarea2' => 'htmlarea2',
+ ));
$properties["WYSIWYG_DEFAULT_PAGETYPE_HTML"] =
-new boolean_define_commented_optional('WYSIWYG_DEFAULT_PAGETYPE_HTML');
+ new boolean_define_commented_optional('WYSIWYG_DEFAULT_PAGETYPE_HTML');
$properties["UPLOAD_USERDIR"] =
-new boolean_define_commented_optional('UPLOAD_USERDIR');
+ new boolean_define_commented_optional('UPLOAD_USERDIR');
$properties["DISABLE_UNITS"] =
-new boolean_define_commented_optional('DISABLE_UNITS');
+ new boolean_define_commented_optional('DISABLE_UNITS');
$properties["UNITS_EXE"] =
-new _define_commented_optional('UNITS_EXE');
+ new _define_commented_optional('UNITS_EXE');
$properties["ENABLE_XHTML_XML"] =
-new boolean_define_commented_optional('ENABLE_XHTML_XML');
+ new boolean_define_commented_optional('ENABLE_XHTML_XML');
$properties["ENABLE_OPEN_GRAPH"] =
-new boolean_define_commented_optional('ENABLE_OPEN_GRAPH');
+ new boolean_define_commented_optional('ENABLE_OPEN_GRAPH');
$properties["ENABLE_SPAMASSASSIN"] =
-new boolean_define_commented_optional('ENABLE_SPAMASSASSIN');
+ new boolean_define_commented_optional('ENABLE_SPAMASSASSIN');
$properties["ENABLE_SPAMBLOCKLIST"] =
-new boolean_define_optional('ENABLE_SPAMBLOCKLIST');
+ new boolean_define_optional('ENABLE_SPAMBLOCKLIST');
$properties["NUM_SPAM_LINKS"] =
-new numeric_define_optional('NUM_SPAM_LINKS');
+ new numeric_define_optional('NUM_SPAM_LINKS');
$properties["GOOGLE_LINKS_NOFOLLOW"] =
-new boolean_define_commented_optional('GOOGLE_LINKS_NOFOLLOW');
+ new boolean_define_commented_optional('GOOGLE_LINKS_NOFOLLOW');
$properties["ENABLE_LIVESEARCH"] =
-new boolean_define_commented_optional('ENABLE_LIVESEARCH');
+ new boolean_define_commented_optional('ENABLE_LIVESEARCH');
$properties["ENABLE_ACDROPDOWN"] =
-new boolean_define_commented_optional('ENABLE_ACDROPDOWN');
+ new boolean_define_commented_optional('ENABLE_ACDROPDOWN');
$properties["ENABLE_DISCUSSION_LINK"] =
-new boolean_define_commented_optional('ENABLE_DISCUSSION_LINK');
+ new boolean_define_commented_optional('ENABLE_DISCUSSION_LINK');
$properties["ENABLE_CAPTCHA"] =
-new boolean_define_commented_optional('ENABLE_CAPTCHA');
+ new boolean_define_commented_optional('ENABLE_CAPTCHA');
$properties["USE_CAPTCHA_RANDOM_WORD"] =
-new boolean_define_commented_optional('USE_CAPTCHA_RANDOM_WORD');
+ new boolean_define_commented_optional('USE_CAPTCHA_RANDOM_WORD');
$properties["USE_SAFE_DBSESSION"] =
-new boolean_define_commented_optional('USE_SAFE_DBSESSION');
+ new boolean_define_commented_optional('USE_SAFE_DBSESSION');
$properties["BLOG_DEFAULT_EMPTY_PREFIX"] =
-new boolean_define_commented_optional('BLOG_DEFAULT_EMPTY_PREFIX');
+ new boolean_define_commented_optional('BLOG_DEFAULT_EMPTY_PREFIX');
$properties["ENABLE_SEARCHHIGHLIGHT"] =
-new boolean_define_commented_optional('ENABLE_SEARCHHIGHLIGHT');
+ new boolean_define_commented_optional('ENABLE_SEARCHHIGHLIGHT');
$properties["Part One"] =
-new part('_part1', $SEPARATOR."\n", "
+ new part('_part1', $SEPARATOR . "\n", "
Part One: Authentication and security settings. See Part Three for more.");
$properties["Wiki Name"] =
-new _define_optional('WIKI_NAME', WIKI_NAME);
+ new _define_optional('WIKI_NAME', WIKI_NAME);
$properties["Admin Username"] =
-new _define_notempty('ADMIN_USER', ADMIN_USER, "
+ new _define_notempty('ADMIN_USER', ADMIN_USER, "
You must set this! Username and password of the administrator.",
-"onchange=\"validate_ereg('Sorry, ADMIN_USER cannot be empty.', '^.+$', 'ADMIN_USER', this);\"");
+ "onchange=\"validate_ereg('Sorry, ADMIN_USER cannot be empty.', '^.+$', 'ADMIN_USER', this);\"");
$properties["Admin Password"] =
-new _define_password('ADMIN_PASSWD', ADMIN_PASSWD, "
+ new _define_password('ADMIN_PASSWD', ADMIN_PASSWD, "
You must set this!
For heaven's sake pick a good password.
@@ -453,74 +501,74 @@
Use the \"Create Random Password\" button to create a good (random) password.
ADMIN_PASSWD is ignored on HttpAuth",
-"onchange=\"validate_ereg('Sorry, ADMIN_PASSWD must be at least 4 chars long.', '^....+$', 'ADMIN_PASSWD', this);\"");
+ "onchange=\"validate_ereg('Sorry, ADMIN_PASSWD must be at least 4 chars long.', '^....+$', 'ADMIN_PASSWD', this);\"");
$properties["Encrypted Passwords"] =
-new boolean_define
-('ENCRYPTED_PASSWD',
- array('true' => "true. use crypt for all passwords",
- 'false' => "false. use plaintest passwords (not recommended)"));
+ new boolean_define
+ ('ENCRYPTED_PASSWD',
+ array('true' => "true. use crypt for all passwords",
+ 'false' => "false. use plaintest passwords (not recommended)"));
$properties["Reverse DNS"] =
-new boolean_define_optional
-('ENABLE_REVERSE_DNS',
- array('true' => "true. perform additional reverse dns lookups",
- 'false' => "false. just record the address as given by the httpd server"));
+ new boolean_define_optional
+ ('ENABLE_REVERSE_DNS',
+ array('true' => "true. perform additional reverse dns lookups",
+ 'false' => "false. just record the address as given by the httpd server"));
$properties["ZIP Dump Authentication"] =
-new boolean_define_optional('ZIPDUMP_AUTH',
- array('false' => "false. Everyone may download zip dumps",
- 'true' => "true. Only admin may download zip dumps"));
+ new boolean_define_optional('ZIPDUMP_AUTH',
+ array('false' => "false. Everyone may download zip dumps",
+ 'true' => "true. Only admin may download zip dumps"));
$properties["Enable RawHtml Plugin"] =
-new boolean_define_commented_optional('ENABLE_RAW_HTML');
+ new boolean_define_commented_optional('ENABLE_RAW_HTML');
$properties["Allow RawHtml Plugin only on locked pages"] =
-new boolean_define_commented_optional('ENABLE_RAW_HTML_LOCKEDONLY');
+ new boolean_define_commented_optional('ENABLE_RAW_HTML_LOCKEDONLY');
$properties["Allow RawHtml Plugin if safe HTML code"] =
- new boolean_define_commented_optional('ENABLE_RAW_HTML_SAFE','', "
+ new boolean_define_commented_optional('ENABLE_RAW_HTML_SAFE', '', "
If this is set, all unsafe html code is stripped automatically (experimental!)
See <a href=\"http://chxo.com/scripts/safe_html-test.php\" target=\"_new\">chxo.com/scripts/safe_html-test.php</a>
");
$properties["Maximum Upload Size"] =
-new numeric_define_optional('MAX_UPLOAD_SIZE', MAX_UPLOAD_SIZE);
+ new numeric_define_optional('MAX_UPLOAD_SIZE', MAX_UPLOAD_SIZE);
$properties["Minor Edit Timeout"] =
-new numeric_define_optional('MINOR_EDIT_TIMEOUT', MINOR_EDIT_TIMEOUT);
+ new numeric_define_optional('MINOR_EDIT_TIMEOUT', MINOR_EDIT_TIMEOUT);
$properties["Disabled Actions"] =
-new array_define('DISABLED_ACTIONS', DISABLED_ACTIONS /*array()*/);
+ new array_define('DISABLED_ACTIONS', DISABLED_ACTIONS /*array()*/);
$properties["Moderate all Pagechanges"] =
-new boolean_define_commented_optional('ENABLE_MODERATEDPAGE_ALL');
+ new boolean_define_commented_optional('ENABLE_MODERATEDPAGE_ALL');
$properties["Access Log File"] =
-new _define_commented_optional('ACCESS_LOG', ACCESS_LOG);
+ new _define_commented_optional('ACCESS_LOG', ACCESS_LOG);
$properties["Access Log SQL"] =
-new _define_selection(
-'ACCESS_LOG_SQL',
-array('0' => 'disabled',
- '1' => 'read only',
- '2' => 'read + write'));
+ new _define_selection(
+ 'ACCESS_LOG_SQL',
+ array('0' => 'disabled',
+ '1' => 'read only',
+ '2' => 'read + write'));
$properties["Compress Output"] =
-new boolean_define_commented_optional
-( 'COMPRESS_OUTPUT',
- array('' => 'undefined - GZIP compress when appropriate.',
- 'false' => 'Never compress output.',
- 'true' => 'Always try to compress output.'));
+ new boolean_define_commented_optional
+ ('COMPRESS_OUTPUT',
+ array('' => 'undefined - GZIP compress when appropriate.',
+ 'false' => 'Never compress output.',
+ 'true' => 'Always try to compress output.'));
$properties["HTTP Cache Control"] =
-new _define_selection_optional
-('CACHE_CONTROL',
- array('LOOSE' => 'LOOSE',
- 'STRICT' => 'STRICT',
- 'NO_CACHE' => 'NO_CACHE',
- 'ALLOW_STALE' => 'ALLOW_STALE'),
-"
+ new _define_selection_optional
+ ('CACHE_CONTROL',
+ array('LOOSE' => 'LOOSE',
+ 'STRICT' => 'STRICT',
+ 'NO_CACHE' => 'NO_CACHE',
+ 'ALLOW_STALE' => 'ALLOW_STALE'),
+ "
HTTP CACHE_CONTROL
This controls how PhpWiki sets the HTTP cache control
@@ -559,46 +607,46 @@
The default is currently LOOSE.");
$properties["HTTP Cache Control Max Age"] =
-new numeric_define_optional('CACHE_CONTROL_MAX_AGE', CACHE_CONTROL_MAX_AGE);
+ new numeric_define_optional('CACHE_CONTROL_MAX_AGE', CACHE_CONTROL_MAX_AGE);
$properties["Markup Caching"] =
-new boolean_define_commented_optional
-('WIKIDB_NOCACHE_MARKUP',
- array('false' => 'Enable markup cache',
- 'true' => 'Disable markup cache'));
+ new boolean_define_commented_optional
+ ('WIKIDB_NOCACHE_MARKUP',
+ array('false' => 'Enable markup cache',
+ 'true' => 'Disable markup cache'));
$properties["COOKIE_EXPIRATION_DAYS"] =
-new numeric_define_optional('COOKIE_EXPIRATION_DAYS', COOKIE_EXPIRATION_DAYS);
+ new numeric_define_optional('COOKIE_EXPIRATION_DAYS', COOKIE_EXPIRATION_DAYS);
$properties["COOKIE_DOMAIN"] =
-new _define_commented_optional('COOKIE_DOMAIN', COOKIE_DOMAIN);
+ new _define_commented_optional('COOKIE_DOMAIN', COOKIE_DOMAIN);
$properties["Path for PHP Session Support"] =
-new _define_optional('SESSION_SAVE_PATH', defined('SESSION_SAVE_PATH') ? SESSION_SAVE_PATH : ini_get('session.save_path'));
+ new _define_optional('SESSION_SAVE_PATH', defined('SESSION_SAVE_PATH') ? SESSION_SAVE_PATH : ini_get('session.save_path'));
$properties["Force PHP Database Sessions"] =
-new boolean_define_commented_optional
-('USE_DB_SESSION',
- array('false' => 'Disable database sessions, use files',
- 'true' => 'Enable database sessions'));
+ new boolean_define_commented_optional
+ ('USE_DB_SESSION',
+ array('false' => 'Disable database sessions, use files',
+ 'true' => 'Enable database sessions'));
///////// database selection
$properties["Part Two"] =
-new part('_part2', $SEPARATOR."\n", "
+ new part('_part2', $SEPARATOR . "\n", "
Part Two:
Database Configuration
");
$properties["Database Type"] =
-new _define_selection("DATABASE_TYPE",
- array('dba' => "dba",
- 'SQL' => "SQL PEAR",
- 'ADODB' => "SQL ADODB",
- 'PDO' => "PDO (php5 only)",
- 'file' => "flatfile",
- 'cvs' => "CVS File handler")/*, "
+ new _define_selection("DATABASE_TYPE",
+ array('dba' => "dba",
+ 'SQL' => "SQL PEAR",
+ 'ADODB' => "SQL ADODB",
+ 'PDO' => "PDO (php5 only)",
+ 'file' => "flatfile",
+ 'cvs' => "CVS File handler")/*, "
Select the database backend type:
Choose dba (default) to use one of the standard UNIX dba libraries. This is the fastest.
Choose ADODB or SQL to use an SQL database with ADODB or PEAR.
@@ -608,7 +656,7 @@
Recommended is dba or SQL: PEAR or ADODB."*/);
$properties["SQL DSN Setup"] =
-new unchangeable_variable('_sqldsnstuff', "", "
+ new unchangeable_variable('_sqldsnstuff', "", "
For SQL based backends, specify the database as a DSN
The most general form of a DSN looks like:
<pre>
@@ -632,30 +680,30 @@
// Choose dba to use one of the standard UNIX dbm libraries.
$properties["SQL Type"] =
-new _variable_selection('_dsn_sqltype',
- array('mysql' => "MySQL",
- 'pgsql' => "PostgreSQL",
- 'mssql' => "Microsoft SQL Server",
- 'mssqlnative' => "Microsoft SQL Server (native)",
- 'oci8' => "Oracle 8",
- 'mysqli' => "mysqli (only ADODB)",
- 'mysqlt' => "mysqlt (only ADODB)",
- 'ODBC' => "ODBC (only ADODB or PDO)",
- 'firebird' => "Firebird (only PDO)",
- 'oracle' => "Oracle (only PDO)",
-), "
+ new _variable_selection('_dsn_sqltype',
+ array('mysql' => "MySQL",
+ 'pgsql' => "PostgreSQL",
+ 'mssql' => "Microsoft SQL Server",
+ 'mssqlnative' => "Microsoft SQL Server (native)",
+ 'oci8' => "Oracle 8",
+ 'mysqli' => "mysqli (only ADODB)",
+ 'mysqlt' => "mysqlt (only ADODB)",
+ 'ODBC' => "ODBC (only ADODB or PDO)",
+ 'firebird' => "Firebird (only PDO)",
+ 'oracle' => "Oracle (only PDO)",
+ ), "
SQL DB types. The DSN hosttype.");
$properties["SQL User"] =
-new _variable('_dsn_sqluser', "wikiuser", "
+ new _variable('_dsn_sqluser', "wikiuser", "
SQL User Id:");
$properties["SQL Password"] =
-new _variable('_dsn_sqlpass', "", "
+ new _variable('_dsn_sqlpass', "", "
SQL Password:");
$properties["SQL Database Host"] =
-new _variable('_dsn_sqlhostorsock', "localhost", "
+ new _variable('_dsn_sqlhostorsock', "localhost", "
SQL Database Hostname:
To connect ov...
[truncated message content] |
|
From: <var...@us...> - 2012-11-14 17:35:15
|
Revision: 8461
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8461&view=rev
Author: vargenau
Date: 2012-11-14 17:35:05 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
Add action DeleteAcl
Modified Paths:
--------------
trunk/lib/IniConfig.php
trunk/lib/PagePerm.php
trunk/lib/main.php
trunk/pgsrc/PhpWikiAdministration
trunk/themes/fusionforge/pgsrc/PhpWikiAdministration
Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php 2012-11-14 17:33:09 UTC (rev 8460)
+++ trunk/lib/IniConfig.php 2012-11-14 17:35:05 UTC (rev 8461)
@@ -716,6 +716,7 @@
$AllAllowedPlugins[] = 'WikiAdminRemove';
$AllAllowedPlugins[] = 'WikiAdminRename';
$AllAllowedPlugins[] = 'WikiAdminSearchReplace';
+ $AllAllowedPlugins[] = 'WikiAdminDeleteAcl';
$AllAllowedPlugins[] = 'WikiAdminSetAcl';
$AllAllowedPlugins[] = 'WikiAdminSetAclSimple';
$AllAllowedPlugins[] = 'WikiAdminUtils';
@@ -781,6 +782,7 @@
$AllActionPages[] = 'PhpWikiAdministration/Remove';
$AllActionPages[] = 'PhpWikiAdministration/Rename';
$AllActionPages[] = 'PhpWikiAdministration/SearchReplace';
+ $AllActionPages[] = 'PhpWikiAdministration/DeleteAcl';
$AllActionPages[] = 'PhpWikiAdministration/SetAcl';
$AllActionPages[] = 'PhpWikiAdministration/SetAclSimple';
$AllActionPages[] = 'RecentChangesMyPages';
@@ -1131,9 +1133,9 @@
// Detect PrettyWiki setup (not loading index.php directly)
// $SCRIPT_FILENAME should be the same as __FILE__ in index.php
if (!isset($SCRIPT_FILENAME))
- $SCRIPT_FILENAME = @$HTTP_SERVER_VARS['SCRIPT_FILENAME'];
+ $SCRIPT_FILENAME = @$_SERVER['SCRIPT_FILENAME'];
if (!isset($SCRIPT_FILENAME))
- $SCRIPT_FILENAME = @$HTTP_ENV_VARS['SCRIPT_FILENAME'];
+ $SCRIPT_FILENAME = @$_ENV['SCRIPT_FILENAME'];
if (!isset($SCRIPT_FILENAME))
$SCRIPT_FILENAME = dirname(__FILE__ . '/../') . '/index.php';
if (isWindows())
Modified: trunk/lib/PagePerm.php
===================================================================
--- trunk/lib/PagePerm.php 2012-11-14 17:33:09 UTC (rev 8460)
+++ trunk/lib/PagePerm.php 2012-11-14 17:35:05 UTC (rev 8461)
@@ -211,6 +211,7 @@
case 'upgrade':
case 'chown':
case 'setacl':
+ case 'deleteacl':
return 'change';
default:
//Todo: Plugins should be able to override its access type
Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php 2012-11-14 17:33:09 UTC (rev 8460)
+++ trunk/lib/main.php 2012-11-14 17:35:05 UTC (rev 8461)
@@ -1129,6 +1129,11 @@
$this->adminActionSubpage(_("SetAclSimple"));
}
+ function action_deleteacl()
+ {
+ $this->adminActionSubpage(_("DeleteAcl"));
+ }
+
function action_rename()
{
$this->adminActionSubpage(_("Rename"));
Modified: trunk/pgsrc/PhpWikiAdministration
===================================================================
--- trunk/pgsrc/PhpWikiAdministration 2012-11-14 17:33:09 UTC (rev 8460)
+++ trunk/pgsrc/PhpWikiAdministration 2012-11-14 17:35:05 UTC (rev 8461)
@@ -20,7 +20,7 @@
or call the available ~WikiAdmin actions directly:
-| [[/Chown]] | [[/Markup]] | [[/Purge]] | [[/Remove]] | [[/Rename]] | [[/SearchReplace]] | [[/SetAcl]] | [[/SetAclSimple]]
+| [[/Chown]] | [[/Markup]] | [[/Purge]] | [[/Remove]] | [[/Rename]] | [[/SearchReplace]] | [[/SetAcl]] | [[/SetAclSimple]] | [[/DeleteAcl]]
== Global Access Rights ==
Modified: trunk/themes/fusionforge/pgsrc/PhpWikiAdministration
===================================================================
--- trunk/themes/fusionforge/pgsrc/PhpWikiAdministration 2012-11-14 17:33:09 UTC (rev 8460)
+++ trunk/themes/fusionforge/pgsrc/PhpWikiAdministration 2012-11-14 17:35:05 UTC (rev 8461)
@@ -20,7 +20,7 @@
or call the available ~WikiAdmin actions directly:
-| [[/Chown]] | [[/Purge]] | [[/Remove]] | [[/Rename]] | [[/SearchReplace]] | [[/SetAcl]] | [[/SetAclSimple]]
+| [[/Chown]] | [[/Purge]] | [[/Remove]] | [[/Rename]] | [[/SearchReplace]] | [[/SetAcl]] | [[/SetAclSimple]] | [[/DeleteAcl]]
== Global Access Rights ==
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2012-11-14 18:09:22
|
Revision: 8465
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8465&view=rev
Author: vargenau
Date: 2012-11-14 18:09:15 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
Use __ for translation
Modified Paths:
--------------
trunk/lib/PageType.php
trunk/lib/display.php
trunk/lib/loadsave.php
trunk/lib/main.php
trunk/lib/plugin/InterWikiSearch.php
trunk/lib/plugin/WantedPages.php
trunk/lib/plugin/WantedPagesOld.php
trunk/themes/fusionforge/templates/actionbar.tmpl
trunk/themes/fusionforge/templates/blogform.tmpl
trunk/themes/fusionforge/templates/navbar.tmpl
Modified: trunk/lib/PageType.php
===================================================================
--- trunk/lib/PageType.php 2012-11-14 17:52:31 UTC (rev 8464)
+++ trunk/lib/PageType.php 2012-11-14 18:09:15 UTC (rev 8465)
@@ -160,7 +160,7 @@
{
if (!$pagetext) {
$dbi = $GLOBALS['request']->getDbh();
- $page = $dbi->getPage(_("InterWikiMap"));
+ $page = $dbi->getPage(__("InterWikiMap"));
if ($page->get('locked')) {
$current = $page->getCurrentRevision();
$pagetext = $current->getPackedContent();
Modified: trunk/lib/display.php
===================================================================
--- trunk/lib/display.php 2012-11-14 17:52:31 UTC (rev 8464)
+++ trunk/lib/display.php 2012-11-14 18:09:15 UTC (rev 8465)
@@ -276,14 +276,14 @@
$first_pages .= $p . SUBPAGE_SEPARATOR;
}
$backlink = HTML::a(array('href' => WikiURL($pagename,
- array('action' => _("BackLinks"))),
+ array('action' => __("BackLinks"))),
'class' => 'backlinks'),
$WikiTheme->maybeSplitWikiWord($last_page));
$backlink->addTooltip(sprintf(_("BackLinks for %s"), $pagename));
$pageheader->pushContent($backlink);
} else {
$pageheader = HTML::a(array('href' => WikiURL($pagename,
- array('action' => _("BackLinks"))),
+ array('action' => __("BackLinks"))),
'class' => 'backlinks'),
$WikiTheme->maybeSplitWikiWord($pagename));
$pageheader->addTooltip(sprintf(_("BackLinks for %s"), $pagename));
Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php 2012-11-14 17:52:31 UTC (rev 8464)
+++ trunk/lib/loadsave.php 2012-11-14 18:09:15 UTC (rev 8465)
@@ -918,7 +918,7 @@
$pagename = $pagename_check->getName();
$content = $pageinfo['content'];
- if ($pagename == _("InterWikiMap"))
+ if ($pagename == __("InterWikiMap"))
$content = _tryinsertInterWikiMap($content);
$dbi =& $request->_dbi;
@@ -1554,7 +1554,7 @@
}
}
- $pagename = _("InterWikiMap");
+ $pagename = __("InterWikiMap");
$map = $dbi->getPage($pagename);
$map->set('locked', true);
PrintXML(HTML::p(HTML::em(WikiLink($pagename)), HTML::strong(" locked")));
Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php 2012-11-14 17:52:31 UTC (rev 8464)
+++ trunk/lib/main.php 2012-11-14 18:09:15 UTC (rev 8465)
@@ -1035,6 +1035,9 @@
static $cache;
if (!$action) return false;
+ if (isActionPage($action))
+ return $cache[$action] = $action;
+
// check for translated version, as per users preferred language
// (or system default in case it is not en)
$translation = gettext($action);
@@ -1095,7 +1098,7 @@
function adminActionSubpage($subpage)
{
- $page = _("PhpWikiAdministration") . "/" . $subpage;
+ $page = __("PhpWikiAdministration") . "/" . $subpage;
$action = $this->findActionPage($page);
if ($action) {
if (!$this->getArg('s'))
@@ -1117,27 +1120,27 @@
function action_chown()
{
- $this->adminActionSubpage(_("Chown"));
+ $this->adminActionSubpage(__("Chown"));
}
function action_setacl()
{
- $this->adminActionSubpage(_("SetAcl"));
+ $this->adminActionSubpage(__("SetAcl"));
}
function action_setaclsimple()
{
- $this->adminActionSubpage(_("SetAclSimple"));
+ $this->adminActionSubpage(__("SetAclSimple"));
}
function action_deleteacl()
{
- $this->adminActionSubpage(_("DeleteAcl"));
+ $this->adminActionSubpage(__("DeleteAcl"));
}
function action_rename()
{
- $this->adminActionSubpage(_("Rename"));
+ $this->adminActionSubpage(__("Rename"));
}
function action_dump()
Modified: trunk/lib/plugin/InterWikiSearch.php
===================================================================
--- trunk/lib/plugin/InterWikiSearch.php 2012-11-14 17:52:31 UTC (rev 8464)
+++ trunk/lib/plugin/InterWikiSearch.php 2012-11-14 18:09:15 UTC (rev 8465)
@@ -53,11 +53,11 @@
return $this->disabled("Sorry, this plugin is currently out of order.");
$page = $dbi->getPage($request->getArg('pagename'));
- return new TransformedText($page, _('InterWikiMap'), array('markup' => 2),
+ return new TransformedText($page, __('InterWikiMap'), array('markup' => 2),
'searchableInterWikiMap');
/*
return new PageType($pagerevisionhandle,
- $pagename = _('InterWikiMap'),
+ $pagename = __('InterWikiMap'),
$markup = 2,
$overridePageType = 'PageType_searchableInterWikiMap');
*/
Modified: trunk/lib/plugin/WantedPages.php
===================================================================
--- trunk/lib/plugin/WantedPages.php 2012-11-14 17:52:31 UTC (rev 8464)
+++ trunk/lib/plugin/WantedPages.php 2012-11-14 18:09:15 UTC (rev 8465)
@@ -53,7 +53,7 @@
array('page' => '[pagename]', // just for a single page.
'withlinks' => 0,
'noheader' => false,
- 'exclude_from' => _("PgsrcTranslation") . ',' . _("InterWikiMap"),
+ 'exclude_from' => __("PgsrcTranslation") . ',' . __("InterWikiMap"),
'limit' => '100',
'paging' => 'auto'));
}
@@ -143,8 +143,6 @@
}
}
-
-
// which links to the missing page
class _PageList_Column_WantedPages_wanted extends _PageList_Column
{
Modified: trunk/lib/plugin/WantedPagesOld.php
===================================================================
--- trunk/lib/plugin/WantedPagesOld.php 2012-11-14 17:52:31 UTC (rev 8464)
+++ trunk/lib/plugin/WantedPagesOld.php 2012-11-14 18:09:15 UTC (rev 8465)
@@ -74,7 +74,7 @@
$allpages_iter = $dbi->getAllPages($include_empty, $sortby, $limit);
while ($page_handle = $allpages_iter->next()) {
$name = $page_handle->getName();
- if ($name == _("InterWikiMap")) continue;
+ if ($name == __("InterWikiMap")) continue;
if (!in_array($name, $exclude))
$this->_iterateLinks($page_handle, $dbi);
}
@@ -215,8 +215,6 @@
}
}
-
-
// Local Variables:
// mode: php
// tab-width: 8
Modified: trunk/themes/fusionforge/templates/actionbar.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/actionbar.tmpl 2012-11-14 17:52:31 UTC (rev 8464)
+++ trunk/themes/fusionforge/templates/actionbar.tmpl 2012-11-14 18:09:15 UTC (rev 8465)
@@ -58,7 +58,7 @@
<?php if ($dbh->isWikiPage($page->getName())) { ?>
- <li><?php echo Button(_("PageHistory"), _("History")) ?></li>
+ <li><?php echo Button(__("PageHistory"), _("History")) ?></li>
<?php if ($curuserprefs->get('diffMenuItem')) { ?>
<li><?php echo Button("diff", _("Last Difference")) ?> </li>
@@ -68,9 +68,9 @@
<li><?php echo Button('revert',_("Revert"), $revision->isCurrent() ? $page->GetRevisionBefore() : $revision) ?></li>
<?php } ?>
- <li><?php echo Button(_("PageInfo"), _("Page Info")) ?></li>
+ <li><?php echo Button(__("PageInfo"), _("Page Info")) ?></li>
- <li><?php echo Button(array('action'=>_("BackLinks")), _("Back Links"),$page->getName()) ?></li>
+ <li><?php echo Button(array('action'=>__("BackLinks")), _("Back Links"),$page->getName()) ?></li>
<?php if (defined('USE_EXTERNAL_HTML2PDF') and USE_EXTERNAL_HTML2PDF) { ?>
<?php if ($curuserprefs->get('pdfMenuItem')) { ?>
@@ -112,7 +112,7 @@
</ul>
<ul>
- <li><?php echo Button(_("WatchPage"), _("Watch Page")) ?></li>
+ <li><?php echo Button(__("WatchPage"), _("Watch Page")) ?></li>
</ul>
</div>
</menu>
Modified: trunk/themes/fusionforge/templates/blogform.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/blogform.tmpl 2012-11-14 17:52:31 UTC (rev 8464)
+++ trunk/themes/fusionforge/templates/blogform.tmpl 2012-11-14 18:09:15 UTC (rev 8465)
@@ -18,7 +18,7 @@
<hr noshade="noshade" />
<div id="newMarkup" class="wiki-edithelp">
- <?plugin IncludePage page=_("TextFormattingRules") section=_("Synopsis") quiet=1?>
+ <?plugin IncludePage page="TextFormattingRules" section="Synopsis" quiet=1?>
</div>
<?php echo $HIDDEN_INPUTS?>
</form>
Modified: trunk/themes/fusionforge/templates/navbar.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/navbar.tmpl 2012-11-14 17:52:31 UTC (rev 8464)
+++ trunk/themes/fusionforge/templates/navbar.tmpl 2012-11-14 18:09:15 UTC (rev 8465)
@@ -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 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>
<?php if ($curuserprefs->get('randomPageMenuItem')) { ?>
- <li class="submenu"><?php echo WikiLink(_("RandomPage"), "", _("Random Page")) ?></li>
+ <li class="submenu"><?php echo WikiLink(__("RandomPage"), "", _("Random Page")) ?></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 WikiLink(__("UpLoad"), "", _("Upload File")) ?></li>
<?php } ?>
<?php if (!empty($user) && $user->isAdmin()) { ?>
- <li class="submenu"><?php echo WikiLink(_("PhpWikiAdministration"), "", _("Wiki Admin")) ?></li>
+ <li class="submenu"><?php echo WikiLink(__("PhpWikiAdministration"), "", _("Wiki Admin")) ?></li>
<?php } ?>
<?php if (!empty($user) && $user->isSignedIn()) { ?>
<?php if ($dbh->isWikiPage($username)) { ?>
<li class="submenu"><?php echo WikiLink($username, "", _("My User Page")) ?></li>
<?php } ?>
- <li class="submenu"><?php echo WikiLink(_("UserPreferences"), "", _("User Preferences")) ?></li>
+ <li class="submenu"><?php echo WikiLink(__("UserPreferences"), "", _("User Preferences")) ?></li>
<?php } ?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2012-11-15 16:34:24
|
Revision: 8479
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8479&view=rev
Author: vargenau
Date: 2012-11-15 16:34:13 +0000 (Thu, 15 Nov 2012)
Log Message:
-----------
Remove moacdropdown/css/dropdown-min.css
Modified Paths:
--------------
trunk/lib/WikiTheme.php
Removed Paths:
-------------
trunk/themes/default/moacdropdown/css/dropdown-min.css
Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php 2012-11-15 16:21:08 UTC (rev 8478)
+++ trunk/lib/WikiTheme.php 2012-11-15 16:34:13 UTC (rev 8479)
@@ -1534,31 +1534,11 @@
static $already = 0;
if (!$this->HTML_DUMP_SUFFIX and !$already) {
$dir = $this->_findData('moacdropdown');
- if (!DEBUG and ($css = $this->_findFile('moacdropdown/css/dropdown-min.css'))) {
+ if (!DEBUG and ($css = $this->_findFile('moacdropdown/css/dropdown.css'))) {
$this->addMoreHeaders($this->_CSSlink(0, $css, 'all'));
} else {
$this->addMoreHeaders(HTML::style(array('type' => 'text/css'), " @import url( $dir/css/dropdown.css );\n"));
}
- // if autocomplete_remote is used: (getobject2 also for calc. the showlist width)
- if (DEBUG) {
- foreach (array("mobrowser.js", "modomevent3.js", "modomt.js",
- "modomext.js", "getobject2.js", "xmlextras.js") as $js) {
- $this->addMoreHeaders(JavaScript('', array('src' => "$dir/js/$js")));
- }
- $this->addMoreHeaders(JavaScript('', array('src' => "$dir/js/acdropdown.js")));
- } else {
- // already in wikicommon-min.js
- ; //$this->addMoreHeaders(JavaScript('', array('src' => DATA_PATH . "/themes/default/moacdropdown.js")));
- }
- /*
- // for local xmlrpc requests
- $xmlrpc_url = deduce_script_name();
- //if (1 or DATABASE_TYPE == 'dba')
- $xmlrpc_url = DATA_PATH . "/RPC2.php";
- if ((DEBUG & _DEBUG_REMOTE) and isset($_GET['start_debug']))
- $xmlrpc_url .= ("?start_debug=".$_GET['start_debug']);
- $this->addMoreHeaders(JavaScript("var xmlrpc_url = '$xmlrpc_url'"));
- */
$already = 1;
}
}
Deleted: trunk/themes/default/moacdropdown/css/dropdown-min.css
===================================================================
--- trunk/themes/default/moacdropdown/css/dropdown-min.css 2012-11-15 16:21:08 UTC (rev 8478)
+++ trunk/themes/default/moacdropdown/css/dropdown-min.css 2012-11-15 16:34:13 UTC (rev 8479)
@@ -1 +0,0 @@
-div.acinputContainer{position:relative;float:left;height:20px;margin:0;padding:0;border-width:1px;border-style:solid;border-color:#aaa #eee #eee #aaa;background-color:ButtonFace;-moz-box-sizing:border-box;}div.acinputContainer input{position:relative;float:left;height:100%;border-width:1px;margin:0;padding:0;clear:none;float:left;-moz-box-sizing:border-box;}div.acinputContainer input.search{background-color:#b41b00;-moz-box-sizing:border-box;}div.acinputContainer input.button{position:relative;float:left;font-size:2px;width:18px;height:100%;border-width:1px;background-image:url(../i/arrowdown.gif);background-repeat:no-repeat;background-position:2px 2px;-moz-box-sizing:border-box;}input.dropdown{border:1px solid #AAA;border-color:#888 #aaa #aaa #888;margin-bottom:2px;-moz-box-sizing:border-box;}div.autocomplete_holder{position:absolute;font-size:95%;visibility:hidden;background-color:#fff;-moz-box-sizing:border-box;}div.autocomplete_firstborder{border-width:1px;border-style:solid;border-color:ButtonShadow;padding:0;margin-left:3px;margin-bottom:5px;-moz-box-sizing:border-box;}div.autocomplete_secondborder{border-style:none;padding:2px;-moz-box-sizing:border-box;}ul.autocomplete{width:100%;height:95px;overflow-y:auto;overflow:-moz-scrollbars-vertical;font:menu;margin:0;margin-left:0;padding-left:0;text-indent:0;list-style-type:none;vertical-align:middle;background-repeat:no-repeat;-moz-box-sizing:border-box;}ul.autocomplete li a,ul.autocomplete li a:hover,ul.autocomplete li a.selected,ul.autocomplete li a:hover.selected{display:block;width:100%;padding:2px;text-decoration:none;color:#333;border:1px solid #fff;-moz-box-sizing:border-box;margin-left:-14px;voice-family:"\"}\"";voice-family:inherit;margin-left:0;}ul.autocomplete li{padding:0;padding-left:5px;background-position:2px 0;background-repeat:no-repeat;line-height:13px;vertical-align:top;margin:0;-moz-box-sizing:border-box;}ul.autocomplete li a:hover{color:HighlightText;background-color:Highlight;border-color:#e0e0e0;}ul.autocomplete li a.selected{border:1px solid #444;color:#fff;background-color:#004ba6;}ul.autocomplete li a:hover.selected{border:1px solid #e0e0e0;color:white;background-color:#004ba6;background-image:none;}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2012-11-17 20:15:36
|
Revision: 8486
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8486&view=rev
Author: vargenau
Date: 2012-11-17 20:15:29 +0000 (Sat, 17 Nov 2012)
Log Message:
-----------
pear --> PEAR
Modified Paths:
--------------
trunk/doc/README.foaf
trunk/lib/plugin/FoafViewer.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
Modified: trunk/doc/README.foaf
===================================================================
--- trunk/doc/README.foaf 2012-11-17 19:24:01 UTC (rev 8485)
+++ trunk/doc/README.foaf 2012-11-17 20:15:29 UTC (rev 8486)
@@ -1,7 +1,7 @@
!FoaF
!Technology
* RAP - RDF API for PHP
-* XML_FOAF, Pear
+* XML_FOAF, PEAR
!Why not bare bones RAP?
RAP is too hard to work with, it provides all of the needed power and functionality, but this means that it tends to get a bit complex to deal with.
@@ -205,8 +205,8 @@
# FoafMakePlugin will get some kind of user id from the database, and retrieve any stored information about the user - outputting as FOAF.
!Installing PEAR / XML_FOAF
-The XML_FOAF pear library will not be included with phpwiki, so you have to install the pear
-library by your own and be sure that the pear path is in the include_path.
+The XML_FOAF PEAR library will not be included with phpwiki, so you have to install the PEAR
+library by your own and be sure that the PEAR path is in the include_path.
Reason: XML_FOAF is based on XML_Parser and XML_Tree, but phpwiki uses its own XML parser and XML
tree representation, so it would be unneccesary and incompatible duplication of the same thing.
@@ -216,7 +216,7 @@
PEAR Package: XML_Tree 1.1 or newer
PEAR Package: XML_Beautifier 0.2.2 or newer
-Pear is dead simple to install.
+PEAR is dead simple to install.
!! Win32
<verbatim>
Start > Run > Command.com
@@ -234,7 +234,7 @@
pear install XML_Beautifier
pear install XML_FOAF
</verbatim>
-Now, chances are, you won't get away with it all this easy, but if you can't get pear to install XML_FOAF (no ''stable'' package available), then follow these steps next
+Now, chances are, you won't get away with it all this easy, but if you can't get PEAR to install XML_FOAF (no ''stable'' package available), then follow these steps next
# Download [XML_FOAF 0.2|http://pear.php.net/get/XML_FOAF-0.2.tgz]
# Extract XML_FOAF-0.2.tgz/XML_FOAF-0.2/FOAF/ to C:\php\pear\XML\FOAF
# Extract documentation to c:\php\pear\docs\
Modified: trunk/lib/plugin/FoafViewer.php
===================================================================
--- trunk/lib/plugin/FoafViewer.php 2012-11-17 19:24:01 UTC (rev 8485)
+++ trunk/lib/plugin/FoafViewer.php 2012-11-17 20:15:29 UTC (rev 8486)
@@ -92,13 +92,13 @@
global $ErrorManager;
$ErrorManager->pushErrorHandler(new WikiMethodCb($this,'_error_handler'));
*/
- // Require the XML_FOAF_Parser class. This is a pear library not included with phpwiki.
+ // Require the XML_FOAF_Parser class. This is a PEAR library not included with phpwiki.
// see doc/README.foaf
if (findFile('XML/FOAF/Parser.php', 'missing_ok'))
require_once 'XML/FOAF/Parser.php';
//$ErrorManager->popErrorHandler();
if (!class_exists('XML_FOAF_Parser'))
- return $this->error(_("required pear library XML/FOAF/Parser.php not found in include_path"));
+ return $this->error(_("required PEAR library XML/FOAF/Parser.php not found in include_path"));
extract($this->getArgs($argstr, $request));
// Get our FOAF File from the foaf plugin argument or $_GET['foaf']
Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po 2012-11-17 19:24:01 UTC (rev 8485)
+++ trunk/locale/po/de.po 2012-11-17 20:15:29 UTC (rev 8486)
@@ -2514,7 +2514,7 @@
msgstr ""
#: ../lib/plugin/FoafViewer.php:101
-msgid "required pear library XML/FOAF/Parser.php not found in include_path"
+msgid "required PEAR library XML/FOAF/Parser.php not found in include_path"
msgstr ""
#: ../lib/plugin/FoafViewer.php:107
Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po 2012-11-17 19:24:01 UTC (rev 8485)
+++ trunk/locale/po/es.po 2012-11-17 20:15:29 UTC (rev 8486)
@@ -2480,7 +2480,7 @@
msgstr ""
#: ../lib/plugin/FoafViewer.php:101
-msgid "required pear library XML/FOAF/Parser.php not found in include_path"
+msgid "required PEAR library XML/FOAF/Parser.php not found in include_path"
msgstr ""
#: ../lib/plugin/FoafViewer.php:107
Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po 2012-11-17 19:24:01 UTC (rev 8485)
+++ trunk/locale/po/fr.po 2012-11-17 20:15:29 UTC (rev 8486)
@@ -2484,7 +2484,7 @@
msgstr ""
#: ../lib/plugin/FoafViewer.php:101
-msgid "required pear library XML/FOAF/Parser.php not found in include_path"
+msgid "required PEAR library XML/FOAF/Parser.php not found in include_path"
msgstr ""
#: ../lib/plugin/FoafViewer.php:107
Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po 2012-11-17 19:24:01 UTC (rev 8485)
+++ trunk/locale/po/it.po 2012-11-17 20:15:29 UTC (rev 8486)
@@ -2460,7 +2460,7 @@
msgstr ""
#: ../lib/plugin/FoafViewer.php:101
-msgid "required pear library XML/FOAF/Parser.php not found in include_path"
+msgid "required PEAR library XML/FOAF/Parser.php not found in include_path"
msgstr ""
#: ../lib/plugin/FoafViewer.php:107
Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po 2012-11-17 19:24:01 UTC (rev 8485)
+++ trunk/locale/po/ja.po 2012-11-17 20:15:29 UTC (rev 8486)
@@ -2485,7 +2485,7 @@
msgstr ""
#: ../lib/plugin/FoafViewer.php:101
-msgid "required pear library XML/FOAF/Parser.php not found in include_path"
+msgid "required PEAR library XML/FOAF/Parser.php not found in include_path"
msgstr ""
#: ../lib/plugin/FoafViewer.php:107
Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po 2012-11-17 19:24:01 UTC (rev 8485)
+++ trunk/locale/po/nl.po 2012-11-17 20:15:29 UTC (rev 8486)
@@ -2452,7 +2452,7 @@
msgstr ""
#: ../lib/plugin/FoafViewer.php:101
-msgid "required pear library XML/FOAF/Parser.php not found in include_path"
+msgid "required PEAR library XML/FOAF/Parser.php not found in include_path"
msgstr ""
#: ../lib/plugin/FoafViewer.php:107
Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot 2012-11-17 19:24:01 UTC (rev 8485)
+++ trunk/locale/po/phpwiki.pot 2012-11-17 20:15:29 UTC (rev 8486)
@@ -2445,7 +2445,7 @@
msgstr ""
#: ../lib/plugin/FoafViewer.php:101
-msgid "required pear library XML/FOAF/Parser.php not found in include_path"
+msgid "required PEAR library XML/FOAF/Parser.php not found in include_path"
msgstr ""
#: ../lib/plugin/FoafViewer.php:107
Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po 2012-11-17 19:24:01 UTC (rev 8485)
+++ trunk/locale/po/sv.po 2012-11-17 20:15:29 UTC (rev 8486)
@@ -2446,7 +2446,7 @@
msgstr ""
#: ../lib/plugin/FoafViewer.php:101
-msgid "required pear library XML/FOAF/Parser.php not found in include_path"
+msgid "required PEAR library XML/FOAF/Parser.php not found in include_path"
msgstr ""
#: ../lib/plugin/FoafViewer.php:107
Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po 2012-11-17 19:24:01 UTC (rev 8485)
+++ trunk/locale/po/zh.po 2012-11-17 20:15:29 UTC (rev 8486)
@@ -2548,7 +2548,7 @@
msgstr ""
#: ../lib/plugin/FoafViewer.php:101
-msgid "required pear library XML/FOAF/Parser.php not found in include_path"
+msgid "required PEAR library XML/FOAF/Parser.php not found in include_path"
msgstr ""
#: ../lib/plugin/FoafViewer.php:107
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2012-11-21 20:50:18
|
Revision: 8518
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8518&view=rev
Author: vargenau
Date: 2012-11-21 20:50:11 +0000 (Wed, 21 Nov 2012)
Log Message:
-----------
Add swf to INLINE_IMAGES
Modified Paths:
--------------
trunk/config/config-default.ini
trunk/config/config-dist.ini
trunk/configurator.php
trunk/lib/stdlib.php
Modified: trunk/config/config-default.ini
===================================================================
--- trunk/config/config-default.ini 2012-11-21 14:13:25 UTC (rev 8517)
+++ trunk/config/config-default.ini 2012-11-21 20:50:11 UTC (rev 8518)
@@ -135,7 +135,7 @@
DEFAULT_WIKI_PAGES = "ReleaseNotes"
ALLOWED_PROTOCOLS = "http|https|mailto|ftp|news|nntp|ssh|gopher"
-INLINE_IMAGES = "png|jpg|jpeg|gif"
+INLINE_IMAGES = "png|jpg|jpeg|gif|swf"
WIKI_NAME_REGEXP = "(?<![[:alnum:]])(?:[[:upper:]][[:lower:][:digit:]]+){2,}(?![[:alnum:]])"
SUBPAGE_SEPARATOR = "/"
INTERWIKI_MAP_FILE = lib/interwiki.map
Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini 2012-11-21 14:13:25 UTC (rev 8517)
+++ trunk/config/config-dist.ini 2012-11-21 20:50:11 UTC (rev 8518)
@@ -981,7 +981,7 @@
; which will create embedded object instead of img.
; Typical CGI extensions as pl or cgi maybe allowed too,
; but those two will be enforced to img.
-;INLINE_IMAGES = "png|jpg|jpeg|gif"
+;INLINE_IMAGES = "png|jpg|jpeg|gif|swf"
; Perl regexp for WikiNames ("bumpy words"):
; (?<!..) & (?!...) used instead of '\b' because \b matches '_' as well
Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php 2012-11-21 14:13:25 UTC (rev 8517)
+++ trunk/configurator.php 2012-11-21 20:50:11 UTC (rev 8518)
@@ -1411,7 +1411,7 @@
within a named link [name|uri] one more protocol is defined: phpwiki");
$properties["Inline Images"] =
- new list_define('INLINE_IMAGES', 'png|jpg|jpeg|gif');
+ new list_define('INLINE_IMAGES', 'png|jpg|jpeg|gif|swf');
$properties["WikiName Regexp"] =
new _define('WIKI_NAME_REGEXP', "(?<![[:alnum:]])(?:[[:upper:]][[:lower:]]+){2,}(?![[:alnum:]])", "
Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php 2012-11-21 14:13:25 UTC (rev 8517)
+++ trunk/lib/stdlib.php 2012-11-21 20:50:11 UTC (rev 8518)
@@ -2540,7 +2540,7 @@
/**
* Returns true if the filename ends with an image suffix.
- * Uses INLINE_IMAGES if defined, else "png|jpg|jpeg|gif"
+ * Uses INLINE_IMAGES if defined, else "png|jpg|jpeg|gif|swf"
*/
function is_image($filename)
{
@@ -2548,7 +2548,7 @@
if (defined('INLINE_IMAGES')) {
$inline_images = INLINE_IMAGES;
} else {
- $inline_images = "png|jpg|jpeg|gif";
+ $inline_images = "png|jpg|jpeg|gif|swf";
}
foreach (explode("|", $inline_images) as $suffix) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2012-11-26 13:47:35
|
Revision: 8537
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8537&view=rev
Author: vargenau
Date: 2012-11-26 13:47:24 +0000 (Mon, 26 Nov 2012)
Log Message:
-----------
$HTTP_SERVER_VARS --> $_SERVER
Modified Paths:
--------------
trunk/RPC2.php
trunk/configurator.php
trunk/lib/ErrorManager.php
trunk/lib/IniConfig.php
trunk/lib/imagecache.php
trunk/lib/main.php
trunk/passencrypt.php
Modified: trunk/RPC2.php
===================================================================
--- trunk/RPC2.php 2012-11-26 13:43:20 UTC (rev 8536)
+++ trunk/RPC2.php 2012-11-26 13:47:24 UTC (rev 8537)
@@ -11,7 +11,7 @@
// Intercept GET requests from confused users. Only POST is allowed here!
if (empty($GLOBALS['HTTP_SERVER_VARS']))
$GLOBALS['HTTP_SERVER_VARS'] =& $_SERVER;
-if ($HTTP_SERVER_VARS['REQUEST_METHOD'] != "POST") {
+if ($_SERVER['REQUEST_METHOD'] != "POST") {
die('This is the address of the XML-RPC interface.' .
' You must use XML-RPC calls to access information here.');
}
Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php 2012-11-26 13:43:20 UTC (rev 8536)
+++ trunk/configurator.php 2012-11-26 13:47:24 UTC (rev 8537)
@@ -53,7 +53,7 @@
* subsequent requests will fail. (POST to save the INI)
*/
-global $HTTP_SERVER_VARS, $HTTP_POST_VARS, $tdwidth;
+global $HTTP_POST_VARS, $tdwidth;
if (empty($_SERVER)) $_SERVER =& $GLOBALS['HTTP_SERVER_VARS'];
if (empty($_GET)) $_GET =& $GLOBALS['HTTP_GET_VARS'];
if (empty($_ENV)) $_ENV =& $GLOBALS['HTTP_ENV_VARS'];
Modified: trunk/lib/ErrorManager.php
===================================================================
--- trunk/lib/ErrorManager.php 2012-11-26 13:43:20 UTC (rev 8536)
+++ trunk/lib/ErrorManager.php 2012-11-26 13:47:24 UTC (rev 8537)
@@ -566,8 +566,7 @@
function printSimpleTrace($bt)
{
- global $HTTP_SERVER_VARS;
- $nl = isset($HTTP_SERVER_VARS['REQUEST_METHOD']) ? "<br />" : "\n";
+ $nl = isset($_SERVER['REQUEST_METHOD']) ? "<br />" : "\n";
echo $nl . "Traceback:" . $nl;
foreach ($bt as $i => $elem) {
if (!array_key_exists('file', $elem)) {
Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php 2012-11-26 13:43:20 UTC (rev 8536)
+++ trunk/lib/IniConfig.php 2012-11-26 13:47:24 UTC (rev 8537)
@@ -586,7 +586,7 @@
function fixup_static_configs($file)
{
global $FieldSeparator, $charset, $WikiNameRegexp, $AllActionPages;
- global $HTTP_SERVER_VARS, $DBParams, $LANG, $ErrorManager;
+ global $DBParams, $LANG, $ErrorManager;
// init FileFinder to add proper include paths
FindFile("lib/interwiki.map", true);
@@ -864,7 +864,7 @@
run_install("_part1");
trigger_error($error, E_USER_ERROR);
exit();
- } elseif ($HTTP_SERVER_VARS["REQUEST_METHOD"] == "POST") {
+ } elseif ($_SERVER["REQUEST_METHOD"] == "POST") {
$GLOBALS['HTTP_GET_VARS']['show'] = '_part1';
trigger_error($error, E_USER_WARNING);
}
@@ -880,7 +880,7 @@
run_install("_part1");
trigger_error($error, E_USER_ERROR);
exit();
- } elseif ($HTTP_SERVER_VARS["REQUEST_METHOD"] == "POST") {
+ } elseif ($_SERVER["REQUEST_METHOD"] == "POST") {
$GLOBALS['HTTP_GET_VARS']['show'] = '_part1';
trigger_error($error, E_USER_WARNING);
}
@@ -925,7 +925,7 @@
function fixup_dynamic_configs()
{
global $WikiNameRegexp;
- global $HTTP_SERVER_VARS, $DBParams, $LANG;
+ global $DBParams, $LANG;
if (defined('INCLUDE_PATH') and INCLUDE_PATH) {
@ini_set('include_path', INCLUDE_PATH);
@@ -1017,21 +1017,21 @@
//
foreach (array('SERVER_NAME', 'SERVER_PORT') as $var) {
//FIXME: for CGI without _SERVER
- if (!defined($var) and !empty($HTTP_SERVER_VARS[$var]))
+ if (!defined($var) and !empty($_SERVER[$var]))
// IPV6 fix by matt brown, #1546571
// An IPv6 address must be surrounded by square brackets to form a valid server name.
if ($var == 'SERVER_NAME' &&
- strstr($HTTP_SERVER_VARS[$var], ':')
+ strstr($_SERVER[$var], ':')
) {
- define($var, '[' . $HTTP_SERVER_VARS[$var] . ']');
+ define($var, '[' . $_SERVER[$var] . ']');
} else {
- define($var, $HTTP_SERVER_VARS[$var]);
+ define($var, $_SERVER[$var]);
}
}
if (!defined('SERVER_NAME')) define('SERVER_NAME', '127.0.0.1');
if (!defined('SERVER_PORT')) define('SERVER_PORT', 80);
if (!defined('SERVER_PROTOCOL')) {
- if (empty($HTTP_SERVER_VARS['HTTPS']) || $HTTP_SERVER_VARS['HTTPS'] == 'off')
+ if (empty($_SERVER['HTTPS']) || $_SERVER['HTTPS'] == 'off')
define('SERVER_PROTOCOL', 'http');
else
define('SERVER_PROTOCOL', 'https');
@@ -1100,7 +1100,7 @@
// pages will appear at e.g. '/wikidir/index.php/HomePage'.
//
- $REDIRECT_URL = &$HTTP_SERVER_VARS['REDIRECT_URL'];
+ $REDIRECT_URL = &$_SERVER['REDIRECT_URL'];
if (USE_PATH_INFO and isset($REDIRECT_URL)
and !IsProbablyRedirectToIndex()
) {
@@ -1140,11 +1140,11 @@
define('SCRIPT_FILENAME', $SCRIPT_FILENAME);
// Get remote host name, if Apache hasn't done it for us
- if (empty($HTTP_SERVER_VARS['REMOTE_HOST'])
- and !empty($HTTP_SERVER_VARS['REMOTE_ADDR'])
+ if (empty($_SERVER['REMOTE_HOST'])
+ and !empty($_SERVER['REMOTE_ADDR'])
and ENABLE_REVERSE_DNS
)
- $HTTP_SERVER_VARS['REMOTE_HOST'] = gethostbyaddr($HTTP_SERVER_VARS['REMOTE_ADDR']);
+ $_SERVER['REMOTE_HOST'] = gethostbyaddr($_SERVER['REMOTE_ADDR']);
}
Modified: trunk/lib/imagecache.php
===================================================================
--- trunk/lib/imagecache.php 2012-11-26 13:43:20 UTC (rev 8536)
+++ trunk/lib/imagecache.php 2012-11-26 13:47:24 UTC (rev 8537)
@@ -64,11 +64,11 @@
function deduceUsername()
{
- global $request, $HTTP_SERVER_VARS, $HTTP_ENV_VARS;
+ global $request, $HTTP_ENV_VARS;
if (!empty($request->args['auth']) and !empty($request->args['auth']['userid']))
return $request->args['auth']['userid'];
- if (!empty($HTTP_SERVER_VARS['PHP_AUTH_USER']))
- return $HTTP_SERVER_VARS['PHP_AUTH_USER'];
+ if (!empty($_SERVER['PHP_AUTH_USER']))
+ return $_SERVER['PHP_AUTH_USER'];
if (!empty($HTTP_ENV_VARS['REMOTE_USER']))
return $HTTP_ENV_VARS['REMOTE_USER'];
Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php 2012-11-26 13:43:20 UTC (rev 8536)
+++ trunk/lib/main.php 2012-11-26 13:47:24 UTC (rev 8537)
@@ -977,7 +977,7 @@
function _deduceUsername()
{
- global $HTTP_SERVER_VARS, $HTTP_ENV_VARS;
+ global $HTTP_ENV_VARS;
if (!empty($this->args['auth']) and !empty($this->args['auth']['userid']))
return $this->args['auth']['userid'];
@@ -987,7 +987,7 @@
// Note: There's no way to demandload a missing class-definition
// afterwards! Stupid php.
if (defined('FUSIONFORGE') and FUSIONFORGE) {
- if (empty($HTTP_SERVER_VARS['PHP_AUTH_USER'])) {
+ if (empty($_SERVER['PHP_AUTH_USER'])) {
return false;
}
} elseif (isa($user, WikiUserClassname())) {
@@ -998,11 +998,11 @@
}
// Sessions override http auth
- if (!empty($HTTP_SERVER_VARS['PHP_AUTH_USER']))
- return $HTTP_SERVER_VARS['PHP_AUTH_USER'];
+ if (!empty($_SERVER['PHP_AUTH_USER']))
+ return $_SERVER['PHP_AUTH_USER'];
// pubcookie et al
- if (!empty($HTTP_SERVER_VARS['REMOTE_USER']))
- return $HTTP_SERVER_VARS['REMOTE_USER'];
+ if (!empty($_SERVER['REMOTE_USER']))
+ return $_SERVER['REMOTE_USER'];
if (!empty($HTTP_ENV_VARS['REMOTE_USER']))
return $HTTP_ENV_VARS['REMOTE_USER'];
@@ -1018,10 +1018,10 @@
trigger_error("Wrong always_populate_raw_post_data = Off setting in your php.ini\nCannot use xmlrpc!", E_USER_ERROR);
// wiki.putPage has special otional userid/passwd arguments. check that later.
$userid = '';
- if (isset($HTTP_SERVER_VARS['REMOTE_USER']))
- $userid = $HTTP_SERVER_VARS['REMOTE_USER'];
- elseif (isset($HTTP_SERVER_VARS['REMOTE_ADDR']))
- $userid = $HTTP_SERVER_VARS['REMOTE_ADDR']; elseif (isset($HTTP_ENV_VARS['REMOTE_ADDR']))
+ if (isset($_SERVER['REMOTE_USER']))
+ $userid = $_SERVER['REMOTE_USER'];
+ elseif (isset($_SERVER['REMOTE_ADDR']))
+ $userid = $_SERVER['REMOTE_ADDR']; elseif (isset($HTTP_ENV_VARS['REMOTE_ADDR']))
$userid = $HTTP_ENV_VARS['REMOTE_ADDR']; elseif (isset($GLOBALS['REMOTE_ADDR']))
$userid = $GLOBALS['REMOTE_ADDR'];
return $userid;
Modified: trunk/passencrypt.php
===================================================================
--- trunk/passencrypt.php 2012-11-26 13:43:20 UTC (rev 8536)
+++ trunk/passencrypt.php 2012-11-26 13:47:24 UTC (rev 8537)
@@ -149,7 +149,7 @@
if (empty($REQUEST_URI))
$REQUEST_URI = $HTTP_ENV_VARS['REQUEST_URI'];
if (empty($REQUEST_URI))
- $REQUEST_URI = $HTTP_SERVER_VARS['REQUEST_URI'];
+ $REQUEST_URI = $_SERVER['REQUEST_URI'];
?>
<form action="<?php echo $REQUEST_URI ?>" method="post">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2012-11-26 14:36:07
|
Revision: 8540
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8540&view=rev
Author: vargenau
Date: 2012-11-26 14:35:56 +0000 (Mon, 26 Nov 2012)
Log Message:
-----------
'on windows' --> 'on Windows'
Modified Paths:
--------------
trunk/lib/Units.php
trunk/lib/WikiUserNew.php
trunk/lib/upgrade.php
trunk/locale/de/LC_MESSAGES/phpwiki.mo
trunk/locale/de/LC_MESSAGES/phpwiki.php
trunk/locale/po/de.po
trunk/locale/po/es.po
trunk/locale/po/fr.po
trunk/locale/po/it.po
trunk/locale/po/ja.po
trunk/locale/po/nl.po
trunk/locale/po/phpwiki.pot
trunk/locale/po/sv.po
trunk/locale/po/zh.po
trunk/pgsrc/Help%2FPloticusPlugin
trunk/pgsrc/ReleaseNotes
Modified: trunk/lib/Units.php
===================================================================
--- trunk/lib/Units.php 2012-11-26 14:31:03 UTC (rev 8539)
+++ trunk/lib/Units.php 2012-11-26 14:35:56 UTC (rev 8540)
@@ -15,7 +15,7 @@
* Windows requires the cygwin /usr/bin/units.
* All successfully parsed unit definitions are stored in the wikidb,
* so that subsequent expansions will not require /usr/bin/units be called again.
- * So far even on windows (cygwin) the process is fast enough.
+ * So far even on Windows (cygwin) the process is fast enough.
*
* TODO: understand dates and maybe times
* YYYY-MM-DD, "CW"ww/yy (CalendarWeek)
Modified: trunk/lib/WikiUserNew.php
===================================================================
--- trunk/lib/WikiUserNew.php 2012-11-26 14:31:03 UTC (rev 8539)
+++ trunk/lib/WikiUserNew.php 2012-11-26 14:35:56 UTC (rev 8540)
@@ -1870,7 +1870,7 @@
return array(true, sprintf(_("E-mail address '%s' is properly formatted"), $email));
list ($Username, $Domain) = explode("@", $email);
- //Todo: getmxrr workaround on windows or manual input field to verify it manually
+ //Todo: getmxrr workaround on Windows or manual input field to verify it manually
if (!isWindows() and getmxrr($Domain, $MXHost)) { // avoid warning on Windows.
$ConnectAddress = $MXHost[0];
} else {
Modified: trunk/lib/upgrade.php
===================================================================
--- trunk/lib/upgrade.php 2012-11-26 14:31:03 UTC (rev 8539)
+++ trunk/lib/upgrade.php 2012-11-26 14:35:56 UTC (rev 8540)
@@ -601,7 +601,7 @@
// Illegal mix of collations (latin1_bin,IMPLICIT) and
// (utf8_general_ci, COERCIBLE) for operation '='])
if (isWindows() and substr($backend_type, 0, 5) == 'mysql') {
- echo _("Check for mysql 4.1.x/5.0.0 binary search on windows problem"), " ...";
+ echo _("Check for mysql 4.1.x/5.0.0 binary search on Windows problem"), " ...";
$mysql_version = $this->dbi->_backend->_serverinfo['version'];
if ($mysql_version < 401.0) {
echo sprintf(_("version <em>%s</em>"), $mysql_version), " ",
@@ -775,13 +775,13 @@
}
}
// Check if the privileges are enough. Need CREATE and ALTER perms.
- // And on windows: SELECT FROM mysql, possibly: UPDATE mysql.
+ // And on Windows: SELECT FROM mysql, possibly: UPDATE mysql.
$form = HTML::form(array("method" => "post",
"action" => $this->request->getPostURL(),
"accept-charset" => $GLOBALS['charset']),
HTML::p(_("Upgrade requires database privileges to CREATE and ALTER the phpwiki database."),
HTML::br(),
- _("And on windows at least the privilege to SELECT FROM mysql, and possibly UPDATE mysql")),
+ _("And on Windows at least the privilege to SELECT FROM mysql, and possibly UPDATE mysql")),
HiddenInputs(array('action' => 'upgrade',
'overwrite' => $this->request->getArg('overwrite'))),
HTML::table(array("cellspacing" => 4),
@@ -979,7 +979,7 @@
if (isWindows())
$tmp = str_replace("/", "\\", $tmp);
// Detect the existing linesep at first line. fgets strips it even if 'rb'.
- // Before we simply assumed \r\n on windows local files.
+ // Before we simply assumed \r\n on Windows local files.
$s = fread($in, 1024);
rewind($in);
$linesep = (substr_count($s, "\r\n") > substr_count($s, "\n")) ? "\r\n" : "\n";
Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/de/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/de/LC_MESSAGES/phpwiki.php 2012-11-26 14:31:03 UTC (rev 8539)
+++ trunk/locale/de/LC_MESSAGES/phpwiki.php 2012-11-26 14:35:56 UTC (rev 8540)
@@ -253,7 +253,7 @@
$locale["Check for %s"] = "Prüfe %s";
$locale["Check for ACCESS_LOG_SQL passwords in POST requests"] = "Prüfe auf ACCESS_LOG_SQL Passwörter in POST Requests";
$locale["Check for ACCESS_LOG_SQL remote_host varchar(50)"] = "Prüfe auf ACCESS_LOG_SQL Passwörter in POST Requests";
-$locale["Check for mysql 4.1.x/5.0.0 binary search on windows problem"] = "prüfe auf mysql 4.1.x/5.0.0 Binärsuch-Problem (nur Windows)";
+$locale["Check for mysql 4.1.x/5.0.0 binary search on Windows problem"] = "prüfe auf mysql 4.1.x/5.0.0 Binärsuch-Problem (nur Windows)";
$locale["Check for mysql LOCK TABLE privilege"] = "Prüfe mysql LOCK TABLE Rechte";
$locale["Check for mysql page.id auto_increment flag"] = "Prüfe auf mysql page.id auto_increment Flag";
$locale["Check for mysql session.sess_id sanity"] = "Prüfe auf mysql session.sess_id Korrektheit";
Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po 2012-11-26 14:31:03 UTC (rev 8539)
+++ trunk/locale/po/de.po 2012-11-26 14:35:56 UTC (rev 8540)
@@ -6693,7 +6693,7 @@
msgstr "Prüfe auf mysql page.id auto_increment Flag"
#: ../lib/upgrade.php:604
-msgid "Check for mysql 4.1.x/5.0.0 binary search on windows problem"
+msgid "Check for mysql 4.1.x/5.0.0 binary search on Windows problem"
msgstr "prüfe auf mysql 4.1.x/5.0.0 Binärsuch-Problem (nur Windows)"
#: ../lib/upgrade.php:607 ../lib/upgrade.php:623 ../lib/upgrade.php:644
@@ -6730,7 +6730,7 @@
#: ../lib/upgrade.php:784
msgid ""
-"And on windows at least the privilege to SELECT FROM mysql, and possibly "
+"And on Windows at least the privilege to SELECT FROM mysql, and possibly "
"UPDATE mysql"
msgstr ""
Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po 2012-11-26 14:31:03 UTC (rev 8539)
+++ trunk/locale/po/es.po 2012-11-26 14:35:56 UTC (rev 8540)
@@ -6523,7 +6523,7 @@
msgstr ""
#: ../lib/upgrade.php:604
-msgid "Check for mysql 4.1.x/5.0.0 binary search on windows problem"
+msgid "Check for mysql 4.1.x/5.0.0 binary search on Windows problem"
msgstr ""
#: ../lib/upgrade.php:607 ../lib/upgrade.php:623 ../lib/upgrade.php:644
@@ -6560,7 +6560,7 @@
#: ../lib/upgrade.php:784
msgid ""
-"And on windows at least the privilege to SELECT FROM mysql, and possibly "
+"And on Windows at least the privilege to SELECT FROM mysql, and possibly "
"UPDATE mysql"
msgstr ""
Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po 2012-11-26 14:31:03 UTC (rev 8539)
+++ trunk/locale/po/fr.po 2012-11-26 14:35:56 UTC (rev 8540)
@@ -6602,7 +6602,7 @@
msgstr ""
#: ../lib/upgrade.php:604
-msgid "Check for mysql 4.1.x/5.0.0 binary search on windows problem"
+msgid "Check for mysql 4.1.x/5.0.0 binary search on Windows problem"
msgstr ""
#: ../lib/upgrade.php:607 ../lib/upgrade.php:623 ../lib/upgrade.php:644
@@ -6639,7 +6639,7 @@
#: ../lib/upgrade.php:784
msgid ""
-"And on windows at least the privilege to SELECT FROM mysql, and possibly "
+"And on Windows at least the privilege to SELECT FROM mysql, and possibly "
"UPDATE mysql"
msgstr ""
Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po 2012-11-26 14:31:03 UTC (rev 8539)
+++ trunk/locale/po/it.po 2012-11-26 14:35:56 UTC (rev 8540)
@@ -6498,7 +6498,7 @@
msgstr ""
#: ../lib/upgrade.php:604
-msgid "Check for mysql 4.1.x/5.0.0 binary search on windows problem"
+msgid "Check for mysql 4.1.x/5.0.0 binary search on Windows problem"
msgstr ""
#: ../lib/upgrade.php:607 ../lib/upgrade.php:623 ../lib/upgrade.php:644
@@ -6535,7 +6535,7 @@
#: ../lib/upgrade.php:784
msgid ""
-"And on windows at least the privilege to SELECT FROM mysql, and possibly "
+"And on Windows at least the privilege to SELECT FROM mysql, and possibly "
"UPDATE mysql"
msgstr ""
Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po 2012-11-26 14:31:03 UTC (rev 8539)
+++ trunk/locale/po/ja.po 2012-11-26 14:35:56 UTC (rev 8540)
@@ -6635,7 +6635,7 @@
msgstr ""
#: ../lib/upgrade.php:604
-msgid "Check for mysql 4.1.x/5.0.0 binary search on windows problem"
+msgid "Check for mysql 4.1.x/5.0.0 binary search on Windows problem"
msgstr ""
#: ../lib/upgrade.php:607 ../lib/upgrade.php:623 ../lib/upgrade.php:644
@@ -6672,7 +6672,7 @@
#: ../lib/upgrade.php:784
msgid ""
-"And on windows at least the privilege to SELECT FROM mysql, and possibly "
+"And on Windows at least the privilege to SELECT FROM mysql, and possibly "
"UPDATE mysql"
msgstr ""
Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po 2012-11-26 14:31:03 UTC (rev 8539)
+++ trunk/locale/po/nl.po 2012-11-26 14:35:56 UTC (rev 8540)
@@ -6485,7 +6485,7 @@
msgstr ""
#: ../lib/upgrade.php:604
-msgid "Check for mysql 4.1.x/5.0.0 binary search on windows problem"
+msgid "Check for mysql 4.1.x/5.0.0 binary search on Windows problem"
msgstr ""
#: ../lib/upgrade.php:607 ../lib/upgrade.php:623 ../lib/upgrade.php:644
@@ -6522,7 +6522,7 @@
#: ../lib/upgrade.php:784
msgid ""
-"And on windows at least the privilege to SELECT FROM mysql, and possibly "
+"And on Windows at least the privilege to SELECT FROM mysql, and possibly "
"UPDATE mysql"
msgstr ""
Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot 2012-11-26 14:31:03 UTC (rev 8539)
+++ trunk/locale/po/phpwiki.pot 2012-11-26 14:35:56 UTC (rev 8540)
@@ -6476,7 +6476,7 @@
msgstr ""
#: ../lib/upgrade.php:604
-msgid "Check for mysql 4.1.x/5.0.0 binary search on windows problem"
+msgid "Check for mysql 4.1.x/5.0.0 binary search on Windows problem"
msgstr ""
#: ../lib/upgrade.php:607 ../lib/upgrade.php:623 ../lib/upgrade.php:644
@@ -6513,7 +6513,7 @@
#: ../lib/upgrade.php:784
msgid ""
-"And on windows at least the privilege to SELECT FROM mysql, and possibly "
+"And on Windows at least the privilege to SELECT FROM mysql, and possibly "
"UPDATE mysql"
msgstr ""
Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po 2012-11-26 14:31:03 UTC (rev 8539)
+++ trunk/locale/po/sv.po 2012-11-26 14:35:56 UTC (rev 8540)
@@ -6479,7 +6479,7 @@
msgstr ""
#: ../lib/upgrade.php:604
-msgid "Check for mysql 4.1.x/5.0.0 binary search on windows problem"
+msgid "Check for mysql 4.1.x/5.0.0 binary search on Windows problem"
msgstr ""
#: ../lib/upgrade.php:607 ../lib/upgrade.php:623 ../lib/upgrade.php:644
@@ -6516,7 +6516,7 @@
#: ../lib/upgrade.php:784
msgid ""
-"And on windows at least the privilege to SELECT FROM mysql, and possibly "
+"And on Windows at least the privilege to SELECT FROM mysql, and possibly "
"UPDATE mysql"
msgstr ""
Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po 2012-11-26 14:31:03 UTC (rev 8539)
+++ trunk/locale/po/zh.po 2012-11-26 14:35:56 UTC (rev 8540)
@@ -6774,7 +6774,7 @@
msgstr ""
#: ../lib/upgrade.php:604
-msgid "Check for mysql 4.1.x/5.0.0 binary search on windows problem"
+msgid "Check for mysql 4.1.x/5.0.0 binary search on Windows problem"
msgstr ""
#: ../lib/upgrade.php:607 ../lib/upgrade.php:623 ../lib/upgrade.php:644
@@ -6812,7 +6812,7 @@
#: ../lib/upgrade.php:784
msgid ""
-"And on windows at least the privilege to SELECT FROM mysql, and possibly "
+"And on Windows at least the privilege to SELECT FROM mysql, and possibly "
"UPDATE mysql"
msgstr ""
Modified: trunk/pgsrc/Help%2FPloticusPlugin
===================================================================
--- trunk/pgsrc/Help%2FPloticusPlugin 2012-11-26 14:31:03 UTC (rev 8539)
+++ trunk/pgsrc/Help%2FPloticusPlugin 2012-11-26 14:35:56 UTC (rev 8540)
@@ -81,7 +81,7 @@
== Optional Configuration ==
config.ini:
- PLOTICUS_EXE = pl.exe (on windows)
+ PLOTICUS_EXE = pl.exe (on Windows)
PLOTICUS_EXE = /usr/local/bin/pl (elsewhere)
prefabs need the environment variable PLOTICUS_PREFABS. Default: /usr/share/ploticus.
Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes 2012-11-26 14:31:03 UTC (rev 8539)
+++ trunk/pgsrc/ReleaseNotes 2012-11-26 14:35:56 UTC (rev 8540)
@@ -207,7 +207,7 @@
* fixed fortune error handling
* fixed limit handling with multiple pagelists: don't overwrite request arg
* change PageDump Content-Type header for download to application/octet-stream to avoid
- pesty .txt suffixes on windows clients
+ pesty .txt suffixes on Windows clients
* fixed wikilens with dba and RATING_STORAGE=SQL. RATING_STORAGE=WIKIPAGE not yet fixed.
* fixed action=diff error with external links
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2012-11-26 15:42:20
|
Revision: 8544
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8544&view=rev
Author: vargenau
Date: 2012-11-26 15:42:07 +0000 (Mon, 26 Nov 2012)
Log Message:
-----------
Be consistent: E-Mail --> e-mail
Modified Paths:
--------------
trunk/locale/de/LC_MESSAGES/phpwiki.mo
trunk/locale/de/LC_MESSAGES/phpwiki.php
trunk/locale/es/LC_MESSAGES/phpwiki.mo
trunk/locale/fr/LC_MESSAGES/phpwiki.mo
trunk/locale/fr/LC_MESSAGES/phpwiki.php
trunk/locale/it/LC_MESSAGES/phpwiki.mo
trunk/locale/ja/LC_MESSAGES/phpwiki.mo
trunk/locale/nl/LC_MESSAGES/phpwiki.mo
trunk/locale/po/de.po
trunk/locale/po/es.po
trunk/locale/po/fr.po
trunk/locale/po/it.po
trunk/locale/po/ja.po
trunk/locale/po/nl.po
trunk/locale/po/phpwiki.pot
trunk/locale/po/sv.po
trunk/locale/po/zh.po
trunk/locale/sv/LC_MESSAGES/phpwiki.mo
trunk/locale/zh/LC_MESSAGES/phpwiki.mo
trunk/themes/default/templates/userprefs.tmpl
Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/de/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/de/LC_MESSAGES/phpwiki.php 2012-11-26 15:21:04 UTC (rev 8543)
+++ trunk/locale/de/LC_MESSAGES/phpwiki.php 2012-11-26 15:42:07 UTC (rev 8544)
@@ -1202,7 +1202,6 @@
$locale["You must wait for moderator approval."] = "Sie müssen auf die Zustimmung des Moderators warten.";
$locale["You need to specify the userid!"] = "Sie müssen den Benutzernamen angeben!";
$locale["You stored an empty password in your '%s' page."] = "Sie haben ein leeres Passwort in Ihrer HomePage »%s« gespeichert.";
-$locale["Your E-Mail"] = "Ihre E-Mail-Adresse";
$locale["Your UserPreferences have been successfully reset to default."] = "Ihre BenutzerEinstellungen wurden erfolgreich gelöscht.";
$locale["Your WikiDB DB backend '%s' cannot be used for DbSession."] = "Ihr WikiDB DB backend '%s' wird von DbSession nicht unterstützt.";
$locale["Your access permissions are only for a BogoUser."] = "Ihre Zugriffsberechtigung entspricht lediglich einem BogoUser.";
@@ -1210,6 +1209,7 @@
$locale["Your careful attention to detail is much appreciated."] = "Die besondere Aufmerksamkeit, die Sie soeben der Bearbeitung dieser Seite gewidmet haben, wird von allen Benutzern dieses Wikis gern gesehen und hoch geschätzt.";
$locale["Your changes can not be saved as they are, since doing so would overwrite the other author's changes. So, your changes and those of the other author have been combined. The result is shown below."] = "Ihre Änderungen können so, wie sie sind, nicht gespeichert werden. Das hätte unzulässigerweise die bereits gesicherten Änderungen des anderen Autors überschrieben. Deshalb sind Ihre und die Änderungen des anderen Autors miteinander kombiniert worden. Das Ergebnis sehen Sie unten.";
$locale["Your current rating: "] = "Deine Bewertung: ";
+$locale["Your e-mail"] = "Ihre E-Mail-Adresse";
$locale["Your home page has not been created yet so your preferences cannot not be saved."] = "Sie haben Ihre persönliche HomePage Seite noch nicht erstellt, deshalb können Ihre Einstellungen nicht gespeichert werden.";
$locale["Your home page is locked so your preferences cannot not be saved."] = "Ihre persönliche HomePage Seite ist gesperrt, deshalb können Ihre Änderungen nicht gespeichert werden.";
$locale["Your rating was %.1f"] = "Deine Bewertung war %.1f";
Modified: trunk/locale/es/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/fr/LC_MESSAGES/phpwiki.php 2012-11-26 15:21:04 UTC (rev 8543)
+++ trunk/locale/fr/LC_MESSAGES/phpwiki.php 2012-11-26 15:42:07 UTC (rev 8544)
@@ -1256,7 +1256,6 @@
$locale["You must sign in to watch pages."] = "Vous devez vous identifier pour surveiller des pages.";
$locale["You must specify a directory to dump to"] = "Vous devez spécifier un répertoire pour l'archivage de la sauvegarde";
$locale["You stored an empty password in your '%s' page."] = "Vous n'avez pas saisi de mot de passe pour la page %s.";
-$locale["Your E-Mail"] = "Votre adresse électronique";
$locale["Your PHP version is too old. You must have at least PHP 5.2."] = "Votre version de PHP est trop ancienne. Il faut avoir au moins PHP 5.2.";
$locale["Your UserPreferences have been successfully reset to default."] = "Vos préférences ont été réinitialisées avec succès";
$locale["Your WikiDB DB backend '%s' cannot be used for DbSession."] = "Votre choix « %s » de WikiDB DB ne peut pas être utilisé pour DbSession.";
@@ -1267,6 +1266,7 @@
$locale["Your changes can not be saved as they are, since doing so would overwrite the other author's changes. So, your changes and those of the other author have been combined. The result is shown below."] = "Vos modifications ne peuvent être enegistrées, puisqu'elles écraseraient celles de l'autre utilisateur. Ainsi donc, vos modifications et celles de l'autre auteur ont été combinées. Le résultat est affiché ci-dessous.";
$locale["Your current rating: "] = "Votre note actuelle : ";
$locale["Your current watchlist: "] = "Votre liste de suivi actuelle : ";
+$locale["Your e-mail"] = "Votre adresse électronique";
$locale["Your home page has not been created yet so your preferences cannot not be saved."] = "Votre page personnelle n'a pas été créée et par conséquent vos préférences n'ont pas pu être enregistrées.";
$locale["Your home page is locked so your preferences cannot not be saved."] = "Votre page personnelle est verrouillée et par conséquent vos préférences n'ont pas pu être enregistrées.";
$locale["Your rating was %.1f"] = "Votre note est %.1f";
Modified: trunk/locale/it/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/ja/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/nl/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po 2012-11-26 15:21:04 UTC (rev 8543)
+++ trunk/locale/po/de.po 2012-11-26 15:42:07 UTC (rev 8544)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 15:28+0100\n"
+"POT-Creation-Date: 2012-11-26 16:38+0100\n"
"PO-Revision-Date: 2000-10-31 02:23+0200\n"
"Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
"<car...@us...>, Helmer Pardun <pardunpress@t-online."
@@ -1125,7 +1125,7 @@
msgstr "Seite gelöscht %s von Benutzer %s"
#: ../lib/MailNotify.php:406 ../lib/plugin/WikiAdminUtils.php:120
-#: ../lib/WikiUserNew.php:1803
+#: ../lib/WikiUserNew.php:1818
msgid "E-mail address confirmation"
msgstr "E-Mail Bestätigung"
@@ -7075,7 +7075,7 @@
msgid "Sign Out"
msgstr "Abmelden"
-#: ../lib/WikiTheme.php:1060 ../lib/WikiUserNew.php:531
+#: ../lib/WikiTheme.php:1060 ../lib/WikiUserNew.php:534
#: ../lib/WikiUser.php:243 ../themes/blog/themeinfo.php:75
#: ../themes/Crao/templates/signin.tmpl:51
#: ../themes/default/templates/login.tmpl:68
@@ -7137,7 +7137,7 @@
#: ../lib/WikiUser/AdoDb.php:49 ../lib/WikiUser/AdoDb.php:210
#: ../lib/WikiUser/Db.php:60 ../lib/WikiUser/File.php:78
#: ../lib/WikiUser/IMAP.php:35 ../lib/WikiUser/LDAP.php:147
-#: ../lib/WikiUserNew.php:649 ../lib/WikiUser/PdoDb.php:47
+#: ../lib/WikiUserNew.php:652 ../lib/WikiUser/PdoDb.php:47
#: ../lib/WikiUser/PdoDb.php:125 ../lib/WikiUser/PearDb.php:45
#: ../lib/WikiUser/PearDb.php:139 ../lib/WikiUser.php:209
#: ../lib/WikiUser.php:292 ../lib/WikiUser/POP3.php:35
@@ -7214,38 +7214,38 @@
msgid "Invalid username '%s' for LDAP Auth"
msgstr "Ungültiger Benutzername »%s« für LDAP Auth"
-#: ../lib/WikiUserNew.php:453
+#: ../lib/WikiUserNew.php:456
msgid ""
"Automatically created user homepage to be able to store UserPreferences."
msgstr ""
-#: ../lib/WikiUserNew.php:684
+#: ../lib/WikiUserNew.php:687
msgid "Invalid password."
msgstr "Ungültiges Passwort."
-#: ../lib/WikiUserNew.php:686 ../lib/WikiUser.php:213
+#: ../lib/WikiUserNew.php:689 ../lib/WikiUser.php:213
msgid "Invalid password or userid."
msgstr "Ungültiges Passwort oder falscher Benutzername."
# (wörtlich=unzureichende Erlaubnisse)
-#: ../lib/WikiUserNew.php:698 ../lib/WikiUser.php:215
+#: ../lib/WikiUserNew.php:701 ../lib/WikiUser.php:215
msgid "Insufficient permissions."
msgstr "Keine ausreichenden Zugangsrechte."
-#: ../lib/WikiUserNew.php:742
+#: ../lib/WikiUserNew.php:745
msgid "Empty Preferences or format of UserPreferences cookie not recognised."
msgstr ""
"Leere BenutzerEinstellungen oder BenutzerEinstellungs Cookie nicht erkannt."
-#: ../lib/WikiUserNew.php:746
+#: ../lib/WikiUserNew.php:749
msgid "Default preferences will be used."
msgstr "Die Vorgabe Benutzereinstellungen werden verwendent."
-#: ../lib/WikiUserNew.php:1291
+#: ../lib/WikiUserNew.php:1294
msgid "The length of the password is shorter than the system policy allows."
msgstr "Die Länge des Passwortes ist kürzer als vom System gefordert."
-#: ../lib/WikiUserNew.php:1318
+#: ../lib/WikiUserNew.php:1321
msgid ""
"The length of the stored password is shorter than the system policy allows. "
"Sorry, you cannot login.\n"
@@ -7255,11 +7255,11 @@
"Sie können sich leider nicht anmelden.\n"
" Sie müssen den System Administrator bitten, Ihr Passwort neu zu setzen."
-#: ../lib/WikiUserNew.php:1332
+#: ../lib/WikiUserNew.php:1335
msgid "The crypt function is not available in this version of PHP."
msgstr ""
-#: ../lib/WikiUserNew.php:1333
+#: ../lib/WikiUserNew.php:1336
msgid ""
"Please set ENCRYPTED_PASSWD to false in config/config.ini and probably "
"change ADMIN_PASSWD."
@@ -7267,12 +7267,12 @@
"Sie haben vergessen ENCRYPTED_PASSWD auf true zu setzen. Bitte aktualisieren "
"Sie config/config.ini und überprüfen sie auch ADMIN_PASSWD."
-#: ../lib/WikiUserNew.php:1345
+#: ../lib/WikiUserNew.php:1348
msgid "Please set ENCRYPTED_PASSWD to true in config/config.ini."
msgstr ""
"Sie haben vergessen ENCRYPTED_PASSWD auf true in config/config.ini zu setzen."
-#: ../lib/WikiUserNew.php:1804
+#: ../lib/WikiUserNew.php:1819
#, php-format
msgid ""
"Welcome to %s!\n"
@@ -7286,12 +7286,12 @@
"versenden.\n"
"Siehe %s"
-#: ../lib/WikiUserNew.php:1866
+#: ../lib/WikiUserNew.php:1881
#, php-format
msgid "E-mail address '%s' is not properly formatted"
msgstr ""
-#: ../lib/WikiUserNew.php:1870
+#: ../lib/WikiUserNew.php:1885
#, php-format
msgid "E-mail address '%s' is properly formatted"
msgstr ""
@@ -8324,7 +8324,7 @@
msgstr "Bitte hier wiederholen"
#: ../themes/default/templates/userprefs.tmpl:154
-msgid "Your E-Mail"
+msgid "Your e-mail"
msgstr "Ihre E-Mail-Adresse"
#: ../themes/default/templates/userprefs.tmpl:163
Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po 2012-11-26 15:21:04 UTC (rev 8543)
+++ trunk/locale/po/es.po 2012-11-26 15:42:07 UTC (rev 8544)
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 15:28+0100\n"
+"POT-Creation-Date: 2012-11-26 16:38+0100\n"
"PO-Revision-Date: 2000-02-01 00:50-0500\n"
"Last-Translator: Pablo Roca <pr...@cl...>\n"
"Language-Team: \n"
@@ -1106,7 +1106,7 @@
msgstr "El usuarios %s eliminado página %s"
#: ../lib/MailNotify.php:406 ../lib/plugin/WikiAdminUtils.php:120
-#: ../lib/WikiUserNew.php:1803
+#: ../lib/WikiUserNew.php:1818
msgid "E-mail address confirmation"
msgstr "Verificación Del Email"
@@ -6908,7 +6908,7 @@
msgid "Sign Out"
msgstr "Registro Hacia fuera"
-#: ../lib/WikiTheme.php:1060 ../lib/WikiUserNew.php:531
+#: ../lib/WikiTheme.php:1060 ../lib/WikiUserNew.php:534
#: ../lib/WikiUser.php:243 ../themes/blog/themeinfo.php:75
#: ../themes/Crao/templates/signin.tmpl:51
#: ../themes/default/templates/login.tmpl:68
@@ -6970,7 +6970,7 @@
#: ../lib/WikiUser/AdoDb.php:49 ../lib/WikiUser/AdoDb.php:210
#: ../lib/WikiUser/Db.php:60 ../lib/WikiUser/File.php:78
#: ../lib/WikiUser/IMAP.php:35 ../lib/WikiUser/LDAP.php:147
-#: ../lib/WikiUserNew.php:649 ../lib/WikiUser/PdoDb.php:47
+#: ../lib/WikiUserNew.php:652 ../lib/WikiUser/PdoDb.php:47
#: ../lib/WikiUser/PdoDb.php:125 ../lib/WikiUser/PearDb.php:45
#: ../lib/WikiUser/PearDb.php:139 ../lib/WikiUser.php:209
#: ../lib/WikiUser.php:292 ../lib/WikiUser/POP3.php:35
@@ -7047,40 +7047,40 @@
msgid "Invalid username '%s' for LDAP Auth"
msgstr "Username inválido ' %s' para LDAP Auth"
-#: ../lib/WikiUserNew.php:453
+#: ../lib/WikiUserNew.php:456
msgid ""
"Automatically created user homepage to be able to store UserPreferences."
msgstr ""
-#: ../lib/WikiUserNew.php:684
+#: ../lib/WikiUserNew.php:687
msgid "Invalid password."
msgstr "Contraseña inválido."
-#: ../lib/WikiUserNew.php:686 ../lib/WikiUser.php:213
+#: ../lib/WikiUserNew.php:689 ../lib/WikiUser.php:213
msgid "Invalid password or userid."
msgstr "Contraseña o userid inválida."
-#: ../lib/WikiUserNew.php:698 ../lib/WikiUser.php:215
+#: ../lib/WikiUserNew.php:701 ../lib/WikiUser.php:215
msgid "Insufficient permissions."
msgstr "Permisos escasos."
-#: ../lib/WikiUserNew.php:742
+#: ../lib/WikiUserNew.php:745
msgid "Empty Preferences or format of UserPreferences cookie not recognised."
msgstr ""
"Preferencias o formato vacías de la galleta de UsuarioPreferencias no "
"reconocido."
-#: ../lib/WikiUserNew.php:746
+#: ../lib/WikiUserNew.php:749
msgid "Default preferences will be used."
msgstr "Las preferencias del defecto serán utilizadas."
-#: ../lib/WikiUserNew.php:1291
+#: ../lib/WikiUserNew.php:1294
msgid "The length of the password is shorter than the system policy allows."
msgstr ""
"La longitud de la contraseña es más corta que la política del sistema "
"permite."
-#: ../lib/WikiUserNew.php:1318
+#: ../lib/WikiUserNew.php:1321
msgid ""
"The length of the stored password is shorter than the system policy allows. "
"Sorry, you cannot login.\n"
@@ -7091,11 +7091,11 @@
" Usted tiene que pedir que el administrador de sistema reajuste su "
"contraseña."
-#: ../lib/WikiUserNew.php:1332
+#: ../lib/WikiUserNew.php:1335
msgid "The crypt function is not available in this version of PHP."
msgstr "La función de la cripta no está disponible en esta versión de PHP."
-#: ../lib/WikiUserNew.php:1333
+#: ../lib/WikiUserNew.php:1336
msgid ""
"Please set ENCRYPTED_PASSWD to false in config/config.ini and probably "
"change ADMIN_PASSWD."
@@ -7103,11 +7103,11 @@
"En ENCRYPTED_PASSWD por favor fijado a falso config/config.ini y "
"probablemente cambio ADMIN_PASSWD."
-#: ../lib/WikiUserNew.php:1345
+#: ../lib/WikiUserNew.php:1348
msgid "Please set ENCRYPTED_PASSWD to true in config/config.ini."
msgstr "ENCRYPTED_PASSWD por favor fijado a verdad en config/config.ini."
-#: ../lib/WikiUserNew.php:1804
+#: ../lib/WikiUserNew.php:1819
#, php-format
msgid ""
"Welcome to %s!\n"
@@ -7120,12 +7120,12 @@
"para enviar notificaciones del cambio de la página.\n"
"Vea %s"
-#: ../lib/WikiUserNew.php:1866
+#: ../lib/WikiUserNew.php:1881
#, php-format
msgid "E-mail address '%s' is not properly formatted"
msgstr "La dirección '%s' del email no se ajusta a formato correctamente"
-#: ../lib/WikiUserNew.php:1870
+#: ../lib/WikiUserNew.php:1885
#, php-format
msgid "E-mail address '%s' is properly formatted"
msgstr "La dirección '%s' del email se ajusta a formato correctamente"
@@ -8131,7 +8131,7 @@
msgstr ""
#: ../themes/default/templates/userprefs.tmpl:154
-msgid "Your E-Mail"
+msgid "Your e-mail"
msgstr ""
#: ../themes/default/templates/userprefs.tmpl:163
Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po 2012-11-26 15:21:04 UTC (rev 8543)
+++ trunk/locale/po/fr.po 2012-11-26 15:42:07 UTC (rev 8544)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 15:28+0100\n"
+"POT-Creation-Date: 2012-11-26 16:38+0100\n"
"PO-Revision-Date: 2004-06-22 21:10+0200\n"
"Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
"Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -1101,7 +1101,7 @@
msgstr "L'utilisateur %s a supprimé la page %s"
#: ../lib/MailNotify.php:406 ../lib/plugin/WikiAdminUtils.php:120
-#: ../lib/WikiUserNew.php:1803
+#: ../lib/WikiUserNew.php:1818
msgid "E-mail address confirmation"
msgstr "Vérification de l'adresse électronique"
@@ -6983,7 +6983,7 @@
msgid "Sign Out"
msgstr "Se déconnecter"
-#: ../lib/WikiTheme.php:1060 ../lib/WikiUserNew.php:531
+#: ../lib/WikiTheme.php:1060 ../lib/WikiUserNew.php:534
#: ../lib/WikiUser.php:243 ../themes/blog/themeinfo.php:75
#: ../themes/Crao/templates/signin.tmpl:51
#: ../themes/default/templates/login.tmpl:68
@@ -7045,7 +7045,7 @@
#: ../lib/WikiUser/AdoDb.php:49 ../lib/WikiUser/AdoDb.php:210
#: ../lib/WikiUser/Db.php:60 ../lib/WikiUser/File.php:78
#: ../lib/WikiUser/IMAP.php:35 ../lib/WikiUser/LDAP.php:147
-#: ../lib/WikiUserNew.php:649 ../lib/WikiUser/PdoDb.php:47
+#: ../lib/WikiUserNew.php:652 ../lib/WikiUser/PdoDb.php:47
#: ../lib/WikiUser/PdoDb.php:125 ../lib/WikiUser/PearDb.php:45
#: ../lib/WikiUser/PearDb.php:139 ../lib/WikiUser.php:209
#: ../lib/WikiUser.php:292 ../lib/WikiUser/POP3.php:35
@@ -7122,36 +7122,36 @@
msgid "Invalid username '%s' for LDAP Auth"
msgstr "Utilisateur non valide « %s » dans l'annuaire LDAP"
-#: ../lib/WikiUserNew.php:453
+#: ../lib/WikiUserNew.php:456
msgid ""
"Automatically created user homepage to be able to store UserPreferences."
msgstr ""
-#: ../lib/WikiUserNew.php:684
+#: ../lib/WikiUserNew.php:687
msgid "Invalid password."
msgstr "Mot de passe invalide."
-#: ../lib/WikiUserNew.php:686 ../lib/WikiUser.php:213
+#: ../lib/WikiUserNew.php:689 ../lib/WikiUser.php:213
msgid "Invalid password or userid."
msgstr "Mot de passe ou utilisateur non valide :"
-#: ../lib/WikiUserNew.php:698 ../lib/WikiUser.php:215
+#: ../lib/WikiUserNew.php:701 ../lib/WikiUser.php:215
msgid "Insufficient permissions."
msgstr "Permissions insuffisantes."
-#: ../lib/WikiUserNew.php:742
+#: ../lib/WikiUserNew.php:745
msgid "Empty Preferences or format of UserPreferences cookie not recognised."
msgstr "PréférencesUtilisateurs vides, le cookie peut etre mal reconnu."
-#: ../lib/WikiUserNew.php:746
+#: ../lib/WikiUserNew.php:749
msgid "Default preferences will be used."
msgstr "Les préférences par défaut seront utilisées."
-#: ../lib/WikiUserNew.php:1291
+#: ../lib/WikiUserNew.php:1294
msgid "The length of the password is shorter than the system policy allows."
msgstr ""
-#: ../lib/WikiUserNew.php:1318
+#: ../lib/WikiUserNew.php:1321
msgid ""
"The length of the stored password is shorter than the system policy allows. "
"Sorry, you cannot login.\n"
@@ -7160,12 +7160,12 @@
"La taille de votre mot de passe est trop petite, vous ne pouvez pas vous "
"connecter. Veuillez contacter l'administrateur pour le changer."
-#: ../lib/WikiUserNew.php:1332
+#: ../lib/WikiUserNew.php:1335
msgid "The crypt function is not available in this version of PHP."
msgstr ""
"La fonction de cryptage n'est pas disponible dans cette version de PHP."
-#: ../lib/WikiUserNew.php:1333
+#: ../lib/WikiUserNew.php:1336
msgid ""
"Please set ENCRYPTED_PASSWD to false in config/config.ini and probably "
"change ADMIN_PASSWD."
@@ -7173,11 +7173,11 @@
"Veuillez définir ENCRYPTED_PASSWD à false dans config/config.ini et "
"probablement l'ADMIN_PASSWD."
-#: ../lib/WikiUserNew.php:1345
+#: ../lib/WikiUserNew.php:1348
msgid "Please set ENCRYPTED_PASSWD to true in config/config.ini."
msgstr "Veuillez définir ENCRYPTED_PASSWD à true dans config/config.ini."
-#: ../lib/WikiUserNew.php:1804
+#: ../lib/WikiUserNew.php:1819
#, php-format
msgid ""
"Welcome to %s!\n"
@@ -7190,12 +7190,12 @@
"sera utilisé pour les notifications de changements de pages.\n"
"Voir %s"
-#: ../lib/WikiUserNew.php:1866
+#: ../lib/WikiUserNew.php:1881
#, php-format
msgid "E-mail address '%s' is not properly formatted"
msgstr "L'adresse électronique « %s » ne semble pas être bien formée."
-#: ../lib/WikiUserNew.php:1870
+#: ../lib/WikiUserNew.php:1885
#, php-format
msgid "E-mail address '%s' is properly formatted"
msgstr "L'adresse électronique « %s » semble être bien formée."
@@ -8215,7 +8215,7 @@
msgstr "Retapez-le"
#: ../themes/default/templates/userprefs.tmpl:154
-msgid "Your E-Mail"
+msgid "Your e-mail"
msgstr "Votre adresse électronique"
#: ../themes/default/templates/userprefs.tmpl:163
Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po 2012-11-26 15:21:04 UTC (rev 8543)
+++ trunk/locale/po/it.po 2012-11-26 15:42:07 UTC (rev 8544)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 15:28+0100\n"
+"POT-Creation-Date: 2012-11-26 16:38+0100\n"
"PO-Revision-Date: 2005-02-12 16:23+0100\n"
"Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n"
"Language-Team: \n"
@@ -1092,7 +1092,7 @@
msgstr "Utente %s pagina %s rimossa"
#: ../lib/MailNotify.php:406 ../lib/plugin/WikiAdminUtils.php:120
-#: ../lib/WikiUserNew.php:1803
+#: ../lib/WikiUserNew.php:1818
msgid "E-mail address confirmation"
msgstr ""
@@ -6876,7 +6876,7 @@
msgid "Sign Out"
msgstr "Logout"
-#: ../lib/WikiTheme.php:1060 ../lib/WikiUserNew.php:531
+#: ../lib/WikiTheme.php:1060 ../lib/WikiUserNew.php:534
#: ../lib/WikiUser.php:243 ../themes/blog/themeinfo.php:75
#: ../themes/Crao/templates/signin.tmpl:51
#: ../themes/default/templates/login.tmpl:68
@@ -6938,7 +6938,7 @@
#: ../lib/WikiUser/AdoDb.php:49 ../lib/WikiUser/AdoDb.php:210
#: ../lib/WikiUser/Db.php:60 ../lib/WikiUser/File.php:78
#: ../lib/WikiUser/IMAP.php:35 ../lib/WikiUser/LDAP.php:147
-#: ../lib/WikiUserNew.php:649 ../lib/WikiUser/PdoDb.php:47
+#: ../lib/WikiUserNew.php:652 ../lib/WikiUser/PdoDb.php:47
#: ../lib/WikiUser/PdoDb.php:125 ../lib/WikiUser/PearDb.php:45
#: ../lib/WikiUser/PearDb.php:139 ../lib/WikiUser.php:209
#: ../lib/WikiUser.php:292 ../lib/WikiUser/POP3.php:35
@@ -7015,57 +7015,57 @@
msgid "Invalid username '%s' for LDAP Auth"
msgstr ""
-#: ../lib/WikiUserNew.php:453
+#: ../lib/WikiUserNew.php:456
msgid ""
"Automatically created user homepage to be able to store UserPreferences."
msgstr ""
-#: ../lib/WikiUserNew.php:684
+#: ../lib/WikiUserNew.php:687
msgid "Invalid password."
msgstr ""
-#: ../lib/WikiUserNew.php:686 ../lib/WikiUser.php:213
+#: ../lib/WikiUserNew.php:689 ../lib/WikiUser.php:213
msgid "Invalid password or userid."
msgstr "Password o nome utente errati."
-#: ../lib/WikiUserNew.php:698 ../lib/WikiUser.php:215
+#: ../lib/WikiUserNew.php:701 ../lib/WikiUser.php:215
msgid "Insufficient permissions."
msgstr "Permessi insufficienti."
-#: ../lib/WikiUserNew.php:742
+#: ../lib/WikiUserNew.php:745
msgid "Empty Preferences or format of UserPreferences cookie not recognised."
msgstr ""
-#: ../lib/WikiUserNew.php:746
+#: ../lib/WikiUserNew.php:749
msgid "Default preferences will be used."
msgstr ""
-#: ../lib/WikiUserNew.php:1291
+#: ../lib/WikiUserNew.php:1294
msgid "The length of the password is shorter than the system policy allows."
msgstr ""
-#: ../lib/WikiUserNew.php:1318
+#: ../lib/WikiUserNew.php:1321
msgid ""
"The length of the stored password is shorter than the system policy allows. "
"Sorry, you cannot login.\n"
" You have to ask the System Administrator to reset your password."
msgstr ""
-#: ../lib/WikiUserNew.php:1332
+#: ../lib/WikiUserNew.php:1335
msgid "The crypt function is not available in this version of PHP."
msgstr ""
-#: ../lib/WikiUserNew.php:1333
+#: ../lib/WikiUserNew.php:1336
msgid ""
"Please set ENCRYPTED_PASSWD to false in config/config.ini and probably "
"change ADMIN_PASSWD."
msgstr ""
-#: ../lib/WikiUserNew.php:1345
+#: ../lib/WikiUserNew.php:1348
msgid "Please set ENCRYPTED_PASSWD to true in config/config.ini."
msgstr ""
-#: ../lib/WikiUserNew.php:1804
+#: ../lib/WikiUserNew.php:1819
#, php-format
msgid ""
"Welcome to %s!\n"
@@ -7074,12 +7074,12 @@
"See %s"
msgstr ""
-#: ../lib/WikiUserNew.php:1866
+#: ../lib/WikiUserNew.php:1881
#, php-format
msgid "E-mail address '%s' is not properly formatted"
msgstr ""
-#: ../lib/WikiUserNew.php:1870
+#: ../lib/WikiUserNew.php:1885
#, php-format
msgid "E-mail address '%s' is properly formatted"
msgstr ""
@@ -8077,7 +8077,7 @@
msgstr ""
#: ../themes/default/templates/userprefs.tmpl:154
-msgid "Your E-Mail"
+msgid "Your e-mail"
msgstr ""
#: ../themes/default/templates/userprefs.tmpl:163
Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po 2012-11-26 15:21:04 UTC (rev 8543)
+++ trunk/locale/po/ja.po 2012-11-26 15:42:07 UTC (rev 8544)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 15:28+0100\n"
+"POT-Creation-Date: 2012-11-26 16:38+0100\n"
"PO-Revision-Date: 2003-06-07 09:01+0900\n"
"Last-Translator: Tadashi Jokagi <web...@el...>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
@@ -1082,7 +1082,7 @@
msgstr "ページをロックしました。"
#: ../lib/MailNotify.php:406 ../lib/plugin/WikiAdminUtils.php:120
-#: ../lib/WikiUserNew.php:1803
+#: ../lib/WikiUserNew.php:1818
msgid "E-mail address confirmation"
msgstr ""
@@ -7018,7 +7018,7 @@
msgid "Sign Out"
msgstr "サインサウト"
-#: ../lib/WikiTheme.php:1060 ../lib/WikiUserNew.php:531
+#: ../lib/WikiTheme.php:1060 ../lib/WikiUserNew.php:534
#: ../lib/WikiUser.php:243 ../themes/blog/themeinfo.php:75
#: ../themes/Crao/templates/signin.tmpl:51
#: ../themes/default/templates/login.tmpl:68
@@ -7080,7 +7080,7 @@
#: ../lib/WikiUser/AdoDb.php:49 ../lib/WikiUser/AdoDb.php:210
#: ../lib/WikiUser/Db.php:60 ../lib/WikiUser/File.php:78
#: ../lib/WikiUser/IMAP.php:35 ../lib/WikiUser/LDAP.php:147
-#: ../lib/WikiUserNew.php:649 ../lib/WikiUser/PdoDb.php:47
+#: ../lib/WikiUserNew.php:652 ../lib/WikiUser/PdoDb.php:47
#: ../lib/WikiUser/PdoDb.php:125 ../lib/WikiUser/PearDb.php:45
#: ../lib/WikiUser/PearDb.php:139 ../lib/WikiUser.php:209
#: ../lib/WikiUser.php:292 ../lib/WikiUser/POP3.php:35
@@ -7159,58 +7159,58 @@
msgid "Invalid username '%s' for LDAP Auth"
msgstr "ユーザーIDかパスワードが無効です。"
-#: ../lib/WikiUserNew.php:453
+#: ../lib/WikiUserNew.php:456
msgid ""
"Automatically created user homepage to be able to store UserPreferences."
msgstr ""
-#: ../lib/WikiUserNew.php:684
+#: ../lib/WikiUserNew.php:687
#, fuzzy
msgid "Invalid password."
msgstr "ユーザーIDかパスワードが無効です。"
-#: ../lib/WikiUserNew.php:686 ../lib/WikiUser.php:213
+#: ../lib/WikiUserNew.php:689 ../lib/WikiUser.php:213
msgid "Invalid password or userid."
msgstr "ユーザーIDかパスワードが無効です。"
-#: ../lib/WikiUserNew.php:698 ../lib/WikiUser.php:215
+#: ../lib/WikiUserNew.php:701 ../lib/WikiUser.php:215
msgid "Insufficient permissions."
msgstr ""
-#: ../lib/WikiUserNew.php:742
+#: ../lib/WikiUserNew.php:745
msgid "Empty Preferences or format of UserPreferences cookie not recognised."
msgstr ""
-#: ../lib/WikiUserNew.php:746
+#: ../lib/WikiUserNew.php:749
msgid "Default preferences will be used."
msgstr ""
-#: ../lib/WikiUserNew.php:1291
+#: ../lib/WikiUserNew.php:1294
msgid "The length of the password is shorter than the system policy allows."
msgstr ""
-#: ../lib/WikiUserNew.php:1318
+#: ../lib/WikiUserNew.php:1321
msgid ""
"The length of the stored password is shorter than the system policy allows. "
"Sorry, you cannot login.\n"
" You have to ask the System Administrator to reset your password."
msgstr ""
-#: ../lib/WikiUserNew.php:1332
+#: ../lib/WikiUserNew.php:1335
msgid "The crypt function is not available in this version of PHP."
msgstr ""
-#: ../lib/WikiUserNew.php:1333
+#: ../lib/WikiUserNew.php:1336
msgid ""
"Please set ENCRYPTED_PASSWD to false in config/config.ini and probably "
"change ADMIN_PASSWD."
msgstr ""
-#: ../lib/WikiUserNew.php:1345
+#: ../lib/WikiUserNew.php:1348
msgid "Please set ENCRYPTED_PASSWD to true in config/config.ini."
msgstr ""
-#: ../lib/WikiUserNew.php:1804
+#: ../lib/WikiUserNew.php:1819
#, php-format
msgid ""
"Welcome to %s!\n"
@@ -7219,12 +7219,12 @@
"See %s"
msgstr ""
-#: ../lib/WikiUserNew.php:1866
+#: ../lib/WikiUserNew.php:1881
#, php-format
msgid "E-mail address '%s' is not properly formatted"
msgstr ""
-#: ../lib/WikiUserNew.php:1870
+#: ../lib/WikiUserNew.php:1885
#, php-format
msgid "E-mail address '%s' is properly formatted"
msgstr ""
@@ -8251,7 +8251,7 @@
#: ../themes/default/templates/userprefs.tmpl:154
#, fuzzy
-msgid "Your E-Mail"
+msgid "Your e-mail"
msgstr "あなたのメールアドレス:"
#: ../themes/default/templates/userprefs.tmpl:163
Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po 2012-11-26 15:21:04 UTC (rev 8543)
+++ trunk/locale/po/nl.po 2012-11-26 15:42:07 UTC (rev 8544)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 15:28+0100\n"
+"POT-Creation-Date: 2012-11-26 16:38+0100\n"
"PO-Revision-Date: 2000-09-30 02:23+0200\n"
"Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
"Language-Team: Dutch <nl...@li...>\n"
@@ -1084,7 +1084,7 @@
msgstr ""
#: ../lib/MailNotify.php:406 ../lib/plugin/WikiAdminUtils.php:120
-#: ../lib/WikiUserNew.php:1803
+#: ../lib/WikiUserNew.php:1818
msgid "E-mail address confirmation"
msgstr ""
@@ -6863,7 +6863,7 @@
msgid "Sign Out"
msgstr ""
-#: ../lib/WikiTheme.php:1060 ../lib/WikiUserNew.php:531
+#: ../lib/WikiTheme.php:1060 ../lib/WikiUserNew.php:534
#: ../lib/WikiUser.php:243 ../themes/blog/themeinfo.php:75
#: ../themes/Crao/templates/signin.tmpl:51
#: ../themes/default/templates/login.tmpl:68
@@ -6925,7 +6925,7 @@
#: ../lib/WikiUser/AdoDb.php:49 ../lib/WikiUser/AdoDb.php:210
#: ../lib/WikiUser/Db.php:60 ../lib/WikiUser/File.php:78
#: ../lib/WikiUser/IMAP.php:35 ../lib/WikiUser/LDAP.php:147
-#: ../lib/WikiUserNew.php:649 ../lib/WikiUser/PdoDb.php:47
+#: ../lib/WikiUserNew.php:652 ../lib/WikiUser/PdoDb.php:47
#: ../lib/WikiUser/PdoDb.php:125 ../lib/WikiUser/PearDb.php:45
#: ../lib/WikiUser/PearDb.php:139 ../lib/WikiUser.php:209
#: ../lib/WikiUser.php:292 ../lib/WikiUser/POP3.php:35
@@ -7002,57 +7002,57 @@
msgid "Invalid username '%s' for LDAP Auth"
msgstr ""
-#: ../lib/WikiUserNew.php:453
+#: ../lib/WikiUserNew.php:456
msgid ""
"Automatically created user homepage to be able to store UserPreferences."
msgstr ""
-#: ../lib/WikiUserNew.php:684
+#: ../lib/WikiUserNew.php:687
msgid "Invalid password."
msgstr ""
-#: ../lib/WikiUserNew.php:686 ../lib/WikiUser.php:213
+#: ../lib/WikiUserNew.php:689 ../lib/WikiUser.php:213
msgid "Invalid password or userid."
msgstr ""
-#: ../lib/WikiUserNew.php:698 ../lib/WikiUser.php:215
+#: ../lib/WikiUserNew.php:701 ../lib/WikiUser.php:215
msgid "Insufficient permissions."
msgstr ""
-#: ../lib/WikiUserNew.php:742
+#: ../lib/WikiUserNew.php:745
msgid "Empty Preferences or format of UserPreferences cookie not recognised."
msgstr ""
-#: ../lib/WikiUserNew.php:746
+#: ../lib/WikiUserNew.php:749
msgid "Default preferences will be used."
msgstr ""
-#: ../lib/WikiUserNew.php:1291
+#: ../lib/WikiUserNew.php:1294
msgid "The length of the password is shorter than the system policy allows."
msgstr ""
-#: ../lib/WikiUserNew.php:1318
+#: ../lib/WikiUserNew.php:1321
msgid ""
"The length of the stored password is shorter than the system policy allows. "
"Sorry, you cannot login.\n"
" You have to ask the System Administrator to reset your password."
msgstr ""
-#: ../lib/WikiUserNew.php:1332
+#: ../lib/WikiUserNew.php:1335
msgid "The crypt function is not available in this version of PHP."
msgstr ""
-#: ../lib/WikiUserNew.php:1333
+#: ../lib/WikiUserNew.php:1336
msgid ""
"Please set ENCRYPTED_PASSWD to false in config/config.ini and probably "
"change ADMIN_PASSWD."
msgstr ""
-#: ../lib/WikiUserNew.php:1345
+#: ../lib/WikiUserNew.php:1348
msgid "Please set ENCRYPTED_PASSWD to true in config/config.ini."
msgstr ""
-#: ../lib/WikiUserNew.php:1804
+#: ../lib/WikiUserNew.php:1819
#, php-format
msgid ""
"Welcome to %s!\n"
@@ -7061,12 +7061,12 @@
"See %s"
msgstr ""
-#: ../lib/WikiUserNew.php:1866
+#: ../lib/WikiUserNew.php:1881
#, php-format
msgid "E-mail address '%s' is not properly formatted"
msgstr ""
-#: ../lib/WikiUserNew.php:1870
+#: ../lib/WikiUserNew.php:1885
#, php-format
msgid "E-mail address '%s' is properly formatted"
msgstr ""
@@ -8064,7 +8064,7 @@
msgstr ""
#: ../themes/default/templates/userprefs.tmpl:154
-msgid "Your E-Mail"
+msgid "Your e-mail"
msgstr ""
#: ../themes/default/templates/userprefs.tmpl:163
Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot 2012-11-26 15:21:04 UTC (rev 8543)
+++ trunk/locale/po/phpwiki.pot 2012-11-26 15:42:07 UTC (rev 8544)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki-1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 15:28+0100\n"
+"POT-Creation-Date: 2012-11-26 16:38+0100\n"
"PO-Revision-Date: 2002-12-14 17:51-0500\n"
"Last-Translator: Reini Urban <ru...@us...>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
@@ -1077,7 +1077,7 @@
msgstr ""
#: ../lib/MailNotify.php:406 ../lib/plugin/WikiAdminUtils.php:120
-#: ../lib/WikiUserNew.php:1803
+#: ../lib/WikiUserNew.php:1818
msgid "E-mail address confirmation"
msgstr ""
@@ -6854,7 +6854,7 @@
msgid "Sign Out"
msgstr ""
-#: ../lib/WikiTheme.php:1060 ../lib/WikiUserNew.php:531
+#: ../lib/WikiTheme.php:1060 ../lib/WikiUserNew.php:534
#: ../lib/WikiUser.php:243 ../themes/blog/themeinfo.php:75
#: ../themes/Crao/templates/signin.tmpl:51
#: ../themes/default/templates/login.tmpl:68
@@ -6916,7 +6916,7 @@
#: ../lib/WikiUser/AdoDb.php:49 ../lib/WikiUser/AdoDb.php:210
#: ../lib/WikiUser/Db.php:60 ../lib/WikiUser/File.php:78
#: ../lib/WikiUser/IMAP.php:35 ../lib/WikiUser/LDAP.php:147
-#: ../lib/WikiUserNew.php:649 ../lib/WikiUser/PdoDb.php:47
+#: ../lib/WikiUserNew.php:652 ../lib/WikiUser/PdoDb.php:47
#: ../lib/WikiUser/PdoDb.php:125 ../lib/WikiUser/PearDb.php:45
#: ../lib/WikiUser/PearDb.php:139 ../lib/WikiUser.php:209
#: ../lib/WikiUser.php:292 ../lib/WikiUser/POP3.php:35
@@ -6993,57 +6993,57 @@
msgid "Invalid username '%s' for LDAP Auth"
msgstr ""
-#: ../lib/WikiUserNew.php:453
+#: ../lib/WikiUserNew.php:456
msgid ""
"Automatically created user homepage to be able to store UserPreferences."
msgstr ""
-#: ../lib/WikiUserNew.php:684
+#: ../lib/WikiUserNew.php:687
msgid "Invalid password."
msgstr ""
-#: ../lib/WikiUserNew.php:686 ../lib/WikiUser.php:213
+#: ../lib/WikiUserNew.php:689 ../lib/WikiUser.php:213
msgid "Invalid password or userid."
msgstr ""
-#: ../lib/WikiUserNew.php:698 ../lib/WikiUser.php:215
+#: ../lib/WikiUserNew.php:701 ../lib/WikiUser.php:215
msgid "Insufficient permissions."
msgstr ""
-#: ../lib/WikiUserNew.php:742
+#: ../lib/WikiUserNew.php:745
msgid "Empty Preferences or format of UserPreferences cookie not recognised."
msgstr ""
-#: ../lib/WikiUserNew.php:746
+#: ../lib/WikiUserNew.php:749
msgid "Default preferences will be used."
msgstr ""
-#: ../lib/WikiUserNew.php:1291
+#: ../lib/WikiUserNew.php:1294
msgid "The length of the password is shorter than the system policy allows."
msgstr ""
-#: ../lib/WikiUserNew.php:1318
+#: ../lib/WikiUserNew.php:1321
msgid ""
"The length of the stored password is shorter than the system policy allows. "
"Sorry, you cannot login.\n"
" You have to ask the System Administrator to reset your password."
msgstr ""
-#: ../lib/WikiUserNew.php:1332
+#: ../lib/WikiUserNew.php:1335
msgid "The crypt function is not available in this version of PHP."
msgstr ""
-#: ../lib/WikiUserNew.php:1333
+#: ../lib/WikiUserNew.php:1336
msgid ""
"Please set ENCRYPTED_PASSWD to false in config/config.ini and probably "
"change ADMIN_PASSWD."
msgstr ""
-#: ../lib/WikiUserNew.php:1345
+#: ../lib/WikiUserNew.php:1348
msgid "Please set ENCRYPTED_PASSWD to true in config/config.ini."
msgstr ""
-#: ../lib/WikiUserNew.php:1804
+#: ../lib/WikiUserNew.php:1819
#, php-format
msgid ""
"Welcome to %s!\n"
@@ -7052,12 +7052,12 @@
"See %s"
msgstr ""
-#: ../lib/WikiUserNew.php:1866
+#: ../lib/WikiUserNew.php:1881
#, php-format
msgid "E-mail address '%s' is not properly formatted"
msgstr ""
-#: ../lib/WikiUserNew.php:1870
+#: ../lib/WikiUserNew.php:1885
#, php-format
msgid "E-mail address '%s' is properly formatted"
msgstr ""
@@ -8053,7 +8053,7 @@
msgstr ""
#: ../themes/default/templates/userprefs.tmpl:154
-msgid "Your E-Mail"
+msgid "Your e-mail"
msgstr ""
#: ../themes/default/templates/userprefs.tmpl:163
Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po 2012-11-26 15:21:04 UTC (rev 8543)
+++ trunk/locale/po/sv.po 2012-11-26 15:42:07 UTC (rev 8544)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 15:28+0100\n"
+"POT-Creation-Date: 2012-11-26 16:38+0100\n"
"PO-Revision-Date: 2001-01-27 01:58+0200\n"
"Last-Translator: Jon Åslund <jo...@he...>\n"
"Language-Team: \n"
@@ -1078,7 +1078,7 @@
msgstr ""
#: ../lib/MailNotify.php:406 ../lib/plugin/WikiAdminUtils.php:120
-#: ../lib/WikiUserNew.php:1803
+#: ../lib/WikiUserNew.php:1818
msgid "E-mail address confirmation"
msgstr ""
@@ -6857,7 +6857,7 @@
msgid "Sign Out"
msgstr "Logga ut"
-#: ../lib/WikiTheme.php:1060 ../lib/WikiUserNew.php:531
+#: ../lib/WikiTheme.php:1060 ../lib/WikiUserNew.php:534
#: ../lib/WikiUser.php:243 ../themes/blog/themeinfo.php:75
#: ../themes/Crao/templates/signin.tmpl:51
#: ../themes/default/templates/login.tmpl:68
@@ -6919,7 +6919,7 @@
#: ../lib/WikiUser/AdoDb.php:49 ../lib/WikiUser/AdoDb.php:210
#: ../lib/WikiUser/Db.php:60 ../lib/WikiUser/File.php:78
#: ../lib/WikiUser/IMAP.php:35 ../lib/WikiUser/LDAP.php:147
-#: ../lib/WikiUserNew.php:649 ../lib/WikiUser/PdoDb.php:47
+#: ../lib/WikiUserNew.php:652 ../lib/WikiUser/PdoDb.php:47
#: ../lib/WikiUser/PdoDb.php:125 ../lib/WikiUser/PearDb.php:45
#: ../lib/WikiUser/PearDb.php:139 ../lib/WikiUser.php:209
#: ../lib/WikiUser.php:292 ../lib/WikiUser/POP3.php:35
@@ -6996,57 +6996,57 @@
msgid "Invalid username '%s' for LDAP Auth"
msgstr ""
-#: ../lib/WikiUserNew.php:453
+#: ../lib/WikiUserNew.php:456
msgid ""
"Automatically created user homepage to be able to store UserPreferences."
msgstr ""
-#: ../lib/WikiUserNew.php:684
+#: ../lib/WikiUserNew.php:687
msgid "Invalid password."
msgstr ""
-#: ../lib/WikiUserNew.php:686 ../lib/WikiUser.php:213
+#: ../lib/WikiUserNew.php:689 ../lib/WikiUser.php:213
msgid "Invalid password or userid."
msgstr ""
-#: ../lib/WikiUserNew.php:698 ../lib/WikiUser.php:215
+#: ../lib/WikiUserNew.php:701 ../lib/WikiUser.php:215
msgid "Insufficient permissions."
msgstr ""
-#: ../lib/WikiUserNew.php:742
+#: ../lib/WikiUserNew.php:745
msgid "Empty Preferences or format of UserPreferences cookie not recognised."
msgstr ""
-#: ../lib/WikiUserNew.php:746
+#: ../lib/WikiUserNew.php:749
msgid "Default preferences will be used."
msgstr ""
-#: ../lib/WikiUserNew.php:1291
+#: ../lib/WikiUserNew.php:1294
msgid "The length of the password is shorter than the system policy allows."
msgstr ""
-#: ../lib/WikiUserNew.php:1318
+#: ../lib/WikiUserNew.php:1321
msgid ""
"The length of the stored password is shorter than the system policy allows. "
"Sorry, you cannot login.\n"
" You have to ask the System Administrator to reset your password."
msgstr ""
-#: ../lib/WikiUserNew.php:1332
+#: ../lib/WikiUserNew.php:1335
msgid "The crypt function is not available in this version of PHP."
msgstr ""
-#: ../lib/WikiUserNew.php:1333
+#: ../lib/WikiUserNew.php:1336
msgid ""
"Please set ENCRYPTED_PASSWD to false in config/config.ini and probably "
"change ADMIN_PASSWD."
msgstr ""
-#: ../lib/WikiUserNew.php:1345
+#: ../lib/WikiUserNew.php:1348
msgid "Please set ENCRYPTED_PASSWD to true in config/config.ini."
msgstr ""
-#: ../lib/WikiUserNew.php:1804
+#: ../lib/WikiUserNew.php:1819
#, php-format
msgid ""
"Welcome to %s!\n"
@@ -7055,12 +7055,12 @@
"See %s"
msgstr ""
-#: ../lib/WikiUserNew.php:1866
+#: ../lib/WikiUserNew.php:1881
#, php-format
msgid "E-mail address '%s' is not properly formatted"
msgstr ""
-#: ../lib/WikiUserNew.php:1870
+#: ../lib/WikiUserNew.php:1885
#, php-format
msgid "E-mail address '%s' is properly formatted"
msgstr ""
@@ -8056,7 +8056,7 @@
msgstr ""
#: ../themes/default/templates/userprefs.tmpl:154
-msgid "Your E-Mail"
+msgid "Your e-mail"
msgstr ""
#: ../themes/default/templates/userprefs.tmpl:163
Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po 2012-11-26 15:21:04 UTC (rev 8543)
+++ trunk/locale/po/zh.po 2012-11-26 15:42:07 UTC (rev 8544)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 15:28+0100\n"
+"POT-Creation-Date: 2012-11-26 16:38+0100\n"
"PO-Revision-Date: 2004-04-21 10:08+0800\n"
"Last-Translator: DruryL <dr...@us...>\n"
"Language-Team: DruryL <dr...@us...>\n"
@@ -1126,7 +1126,7 @@
msgstr "頁面已被鎖定"
#: ../lib/MailNotify.php:406 ../lib/plugin/WikiAdminUtils.php:120
-#: ../lib/WikiUserNew.php:1803
+#: ../lib/WikiUserNew.php:1818
#, fuzzy
msgid "E-mail address confirmation"
msgstr "Email 驗證."
@@ -7162,7 +7162,7 @@
msgid "Sign Out"
msgstr "簽出"
-#: ../lib/WikiTheme.php:1060 ../lib/WikiUserNew.php:531
+#: ../lib/WikiTheme.php:1060 ../lib/WikiUserNew.php:534
#: ../lib/WikiUser.php:243 ../themes/blog/themeinfo.php:75
#: ../themes/Crao/templates/signin.tmpl:51
#: ../themes/default/templates/login.tmpl:68
@@ -7224,7 +7224,7 @@
#: ../lib/WikiUser/AdoDb.php:49 ../lib/WikiUser/AdoDb.php:210
#: ../lib/WikiUser/Db.php:60 ../lib/WikiUser/File.php:78
#: ../lib/WikiUser/IMAP.php:35 ../lib/WikiUser/LDAP.php:147
-#: ../lib/WikiUserNew.php:649 ../lib/WikiUser/PdoDb.php:47
+#: ../lib/WikiUserNew.php:652 ../lib/WikiUser/PdoDb.php:47
#: ../lib/WikiUser/PdoDb.php:125 ../lib/WikiUser/PearDb.php:45
#: ../lib/WikiUser/PearDb.php:139 ../lib/WikiUser.php:209
#: ../lib/WikiUser.php:292 ../lib/WikiUser/POP3.php:35
@@ -7304,37 +7304,37 @@
msgid "Invalid username '%s' for LDAP Auth"
msgstr "錯誤的 acl"
-#: ../lib/WikiUserNew.php:453
+#: ../lib/WikiUserNew.php:456
msgid ""
"Automatically created user homepage to be able to store UserPreferences."
msgstr ""
-#: ../lib/WikiUserNew.php:684
+#: ../lib/WikiUserNew.php:687
#, fuzzy
msgid "Invalid password."
msgstr "錯誤的密碼或使用者帳號."
-#: ../lib/WikiUserNew.php:686 ../lib/WikiUser.php:213
+#: ../lib/WikiUserNew.php:689 ../lib/WikiUser.php:213
msgid "Invalid password or userid."
msgstr "錯誤的密碼或使用者帳號."
-#: ../lib/WikiUserNew.php:698 ../lib/WikiUser.php:215
+#: ../lib/WikiUserNew.php:701 ../lib/WikiUser.php:215
msgid "Insufficient permissions."
msgstr "權限不足."
-#: ../lib/WikiUserNew.php:742
+#: ../lib/WikiUserNew.php:745
msgid "Empty Preferences or format of UserPreferences cookie not recognised."
msgstr "空的偏好設定或 UserPreferences cookie 格式無法辨認."
-#: ../lib/WikiUserNew.php:746
+#: ../lib/WikiUserNew.php:749
msgid "Default preferences will be used."
msgstr "預設偏好設定將被使用."
-#: ../lib/WikiUserNew.php:1291
+#: ../lib/WikiUserNew.php:1294
msgid "The length of the password is shorter than the system policy allows."
msgstr ""
-#: ../lib/WikiUserNew.php:1318
+#: ../lib/WikiUserNew.php:1321
msgid ""
"The length of the stored password is shorter than the system policy allows. "
"Sorry, you cannot login.\n"
@@ -7343,11 +7343,11 @@
"密碼長度小於系統原則所允許的長度. 抱歉,你無法登入. \n"
" 你必須詢問系統管理者以重設密碼."
-#: ../lib/WikiUserNew.php:1332
+#: ../lib/WikiUserNew.php:1335
msgid "The crypt function is not available in this version of PHP."
msgstr "此版本的 PHP 沒有 crypt 函數."
-#: ../lib/WikiUserNew.php:1333
+#: ../lib/WikiUserNew.php:1336
#, fuzzy
msgid ""
"Please set ENCRYPTED_PASSWD to false in config/config.ini and probably "
@@ -7355,12 +7355,12 @@
msgstr ""
"請在 index.php 中設定 ENCRYPTED_PASSWD 為 false 或許也要變更 ADMIN_PASSWD."
-#: ../lib/WikiUserNew.php:1345
+#: ../lib/WikiUserNew.php:1348
#, fuzzy
msgid "Please set ENCRYPTED_PASSWD to true in config/config.ini."
msgstr "請在 index.php 中設定 ENCRYPTED_PASSWD 為 true."
-#: ../lib/WikiUserNew.php:1804
+#: ../lib/WikiUserNew.php:1819
#, fuzzy, php-format
msgid ""
"Welcome to %s!\n"
@@ -7372,12 +7372,12 @@
" 你的 email 帳號已經確認並且將會被用來寄送頁面變更通知. \n"
" 參閱 %s"
-#: ../lib/WikiUserNew.php:1866
+#: ../lib/WikiUserNew.php:1881
#, php-format
msgid "E-mail address '%s' is not properly formatted"
msgstr ""
-#: ../lib/WikiUserNew.php:1870
+#: ../lib/WikiUserNew.php:1885
#, php-format
msgid "E-mail address '%s' is properly formatted"
msgstr ""
@@ -8420,7 +8420,7 @@
#: ../themes/default/templates/userprefs.tmpl:154
#, fuzzy
-msgid "Your E-Mail"
+msgid "Your e-mail"
msgstr "你的 E-Mail:"
#: ../themes/default/templates/userprefs.tmpl:163
Modified: trunk/locale/sv/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/themes/default/templates/userprefs.tmpl
===================================================================
--- trunk/themes/default/templates/userprefs.tmpl 2012-11-26 15:21:04 UTC (rev 8543)
+++ trunk/themes/default/templates/userprefs.tmpl 2012-11-26 15:42:07 UTC (rev 8544)
@@ -151,7 +151,7 @@
<tr><td>
<p>
- <?php echo _("Your E-Mail"). _(":")?>
+ <?php echo _("Your e-mail"). _(":")?>
<?php if ($isForm) { ?>
<input type="text" name="pref[email]" size="30" maxlength="60"
value="<?php echo $pref->get('email')?>" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2012-11-26 15:56:33
|
Revision: 8545
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8545&view=rev
Author: vargenau
Date: 2012-11-26 15:56:20 +0000 (Mon, 26 Nov 2012)
Log Message:
-----------
Be consistent: use e-mail
Modified Paths:
--------------
trunk/config/config-dist.ini
trunk/locale/de/LC_MESSAGES/phpwiki.mo
trunk/locale/de/LC_MESSAGES/phpwiki.php
trunk/locale/es/LC_MESSAGES/phpwiki.mo
trunk/locale/fr/LC_MESSAGES/phpwiki.mo
trunk/locale/fr/LC_MESSAGES/phpwiki.php
trunk/locale/it/LC_MESSAGES/phpwiki.mo
trunk/locale/ja/LC_MESSAGES/phpwiki.mo
trunk/locale/ja/LC_MESSAGES/phpwiki.php
trunk/locale/nl/LC_MESSAGES/phpwiki.mo
trunk/locale/po/de.po
trunk/locale/po/es.po
trunk/locale/po/fr.po
trunk/locale/po/it.po
trunk/locale/po/ja.po
trunk/locale/po/nl.po
trunk/locale/po/phpwiki.pot
trunk/locale/po/sv.po
trunk/locale/po/zh.po
trunk/locale/sv/LC_MESSAGES/phpwiki.mo
trunk/locale/zh/LC_MESSAGES/phpwiki.mo
trunk/locale/zh/LC_MESSAGES/phpwiki.php
trunk/pgsrc/ReleaseNotes
trunk/themes/default/templates/userprefs.tmpl
trunk/themes/fusionforge/templates/userprefs.tmpl
Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini 2012-11-26 15:42:07 UTC (rev 8544)
+++ trunk/config/config-dist.ini 2012-11-26 15:56:20 UTC (rev 8545)
@@ -166,7 +166,7 @@
; Default: true
;ENABLE_SEARCHHIGHLIGHT = false
-; You can disable email notifications.
+; You can disable e-mail notifications.
; Default: true
;ENABLE_MAILNOTIFY = false
Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/de/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/de/LC_MESSAGES/phpwiki.php 2012-11-26 15:42:07 UTC (rev 8544)
+++ trunk/locale/de/LC_MESSAGES/phpwiki.php 2012-11-26 15:56:20 UTC (rev 8545)
@@ -387,8 +387,6 @@
$locale["Edited by: %s"] = "Bearbeitet von: %s";
$locale["Editing pages"] = "Ändern in diesem Wiki";
$locale["Elapsed time: %s s"] = "Dauer: %s s";
-$locale["Email not yet verified."] = "E-Mail noch nicht bestätigt.";
-$locale["Email verified."] = "E-Mail bestätigt.";
$locale["Embed hidden comments in WikiPages."] = "Kommentar in WikiText verstecken.";
$locale["Empty Preferences or format of UserPreferences cookie not recognised."] = "Leere BenutzerEinstellungen oder BenutzerEinstellungs Cookie nicht erkannt.";
$locale["Empty link to: %s"] = "Leerer Link zu: %s";
@@ -431,7 +429,7 @@
$locale["FullTextSearch"] = "VolltextSuche";
$locale["FuzzyPages"] = "FuzzySuche";
$locale["General Auth Settings"] = "Allgemeine Authentifizierungs-Einstellungen";
-$locale["Get an email notification at changes of the following pages:"] = "E-Mail Nachricht bei Änderung folgender Seiten:";
+$locale["Get an e-mail notification at changes of the following pages:"] = "E-Mail Nachricht bei Änderung folgender Seiten:";
$locale["Get debugging information for %s."] = "Debug-Informationen von %s.";
$locale["Get preferences information for current user %s."] = "Zeige Benutzereinstellungen für den aktuellen Benutzer %s.";
$locale["Given password ignored."] = "Passwort ignoriert.";
@@ -681,7 +679,7 @@
$locale["None"] = "Keine";
$locale["Not enough questions answered!"] = "Nicht genügend Fragen beantwortet!";
$locale["Note that many browsers will automatically adjust the width of the editing area so that it fills the browser window. In this case, the width preference will be ignored."] = "Beachten Sie bitte, dass viele Browser die Breite der Textbox automatisch an ihre Fensterbreite anpassen. In diesem Fall wird die hier eingegebene Breite ignoriert.";
-$locale["Note, that user accounts with bouncing emails will be disabled."] = "Beachten Sie bitte, dass Benutzer mit ungültigen E-Mail-Addressen gelöscht werden.";
+$locale["Note, that user accounts with bouncing e-mails will be disabled."] = "Beachten Sie bitte, dass Benutzer mit ungültigen E-Mail-Addressen gelöscht werden.";
$locale["Note:"] = "Hinweis:";
$locale["Note: Only if you create your personal HomePage with same the pagename as your user id, you will be able to store your UserPreferences. Otherwise not."] = "Beachte: Nur wenn Sie Ihre persönliche HomePage mit dem selben Seitennamen wie Ihre Benutzernamen erzeugen, werden Sie Ihre BenutzerEinstellungen speichern können.";
$locale["Nothing found"] = "Nichts gefunden";
@@ -1250,6 +1248,8 @@
$locale["download a zip dump from this wiki"] = "um eine gezippte Sicherung von allen Wiki Seiten herunterzuladen";
$locale["dump html pages"] = "um von diesem Wiki HTML-Dateien lokal abzuspeichern";
$locale["dump serial pages"] = "um von diesem Wiki die Seiten lokal abzuspeichern";
+$locale["e-mail not yet verified."] = "E-Mail noch nicht bestätigt.";
+$locale["e-mail verified."] = "E-Mail bestätigt.";
$locale["edit area"] = "Texteingabe Fenster";
$locale["edit this page"] = "um diese Seite zu bearbeiten";
$locale["edits"] = "Änderungen";
Modified: trunk/locale/es/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/fr/LC_MESSAGES/phpwiki.php 2012-11-26 15:42:07 UTC (rev 8544)
+++ trunk/locale/fr/LC_MESSAGES/phpwiki.php 2012-11-26 15:56:20 UTC (rev 8545)
@@ -401,8 +401,6 @@
$locale["Editing pages"] = "Modifier des pages";
$locale["Either %s is missing or DATABASE_TYPE != '%s'"] = "%s est manquant ou DATABASE_TYPE != '%s'";
$locale["Elapsed time: %s s"] = "Temps écoulé : %s s";
-$locale["Email not yet verified."] = "Adresse électronique pas encore vérifiée.";
-$locale["Email verified."] = "Adresse électronique vérifiée.";
$locale["Embed hidden comments in WikiPages."] = "Cacher des commentaires dans une page wiki.";
$locale["Empty Preferences or format of UserPreferences cookie not recognised."] = "PréférencesUtilisateurs vides, le cookie peut etre mal reconnu.";
$locale["Empty link to: %s"] = "Lien vide vers : %s";
@@ -447,7 +445,7 @@
$locale["FullTextSearch"] = "RechercheEnTexteIntégral";
$locale["FuzzyPages"] = "PagesFloues";
$locale["General Auth Settings"] = "Préférences générales d'auteur";
-$locale["Get an email notification at changes of the following pages:"] = "Recevoir une notification par courriel pour les modifications des pages suivantes :";
+$locale["Get an e-mail notification at changes of the following pages:"] = "Recevoir une notification par courriel pour les modifications des pages suivantes :";
$locale["Get debugging information for %s."] = "Obtenir des infos de déboguage pour %s.";
$locale["Get preferences information for current user %s."] = "Obtenir des infos de préférences pour l'utilisateur %s.";
$locale["Given password ignored."] = "Mot de passe ignoré.";
@@ -713,7 +711,7 @@
$locale["None"] = "Aucun(e)";
$locale["Not enough questions answered!"] = "Pas assez de réponses fournies !";
$locale["Note that many browsers will automatically adjust the width of the editing area so that it fills the browser window. In this case, the width preference will be ignored."] = "Notez que beaucoup de navigateurs ajusteront automatiquement la largeur de la zone d'édition de façon qu'elle remplisse la fenêtre. Le paramètre concernant la largeur sera ignoré dans ce cas.";
-$locale["Note, that user accounts with bouncing emails will be disabled."] = "Notez que les comptes avec une adresse électronique invalide seront désactivés.";
+$locale["Note, that user accounts with bouncing e-mails will be disabled."] = "Notez que les comptes avec une adresse électronique invalide seront désactivés.";
$locale["Note:"] = "Note :";
$locale["Note: Only if you create your personal HomePage with same the pagename as your user id, you will be able to store your UserPreferences. Otherwise not."] = "Note: Vous pourrez enregistrer vos PréférencesUtilisateurs uniquement si vous créez votre propre page d'accueil portant le nom de votre identifiant.";
$locale["Nothing found"] = "Aucun résultat";
@@ -1307,6 +1305,8 @@
$locale["download a zip dump from this wiki"] = "télécharger une sauvegarde ZIP de ce wiki";
$locale["dump html pages"] = "récupération des pages en HTML";
$locale["dump serial pages"] = "récupération des pages sérialisées";
+$locale["e-mail not yet verified."] = "Adresse électronique pas encore vérifiée.";
+$locale["e-mail verified."] = "Adresse électronique vérifiée.";
$locale["edit area"] = "zone d'édition";
$locale["edit this page"] = "modifier cette page";
$locale["edits"] = "modifications";
Modified: trunk/locale/it/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/ja/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/ja/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/ja/LC_MESSAGES/phpwiki.php 2012-11-26 15:42:07 UTC (rev 8544)
+++ trunk/locale/ja/LC_MESSAGES/phpwiki.php 2012-11-26 15:56:20 UTC (rev 8545)
@@ -68,8 +68,6 @@
$locale["EditMetaData"] = "METAデータの編集";
$locale["Edited by: %s"] = "編集: %s";
$locale["Editing pages"] = "ページを編集しています。";
-$locale["Email not yet verified."] = "メールアドレスを確認出来ませんでした。";
-$locale["Email verified."] = "メールアドレスを確認出来ました。";
$locale["Empty pagename!"] = "ページ名が未指定です!";
$locale["Enter your UserId to sign in"] = "ユーザーIDを入力してサインインしてください。";
$locale["Fatal PhpWiki Error"] = "致命的なPhpWikiのエラーです。";
@@ -226,6 +224,8 @@
$locale["compare revisions"] = "リビジョン比較";
$locale["current version"] = "現在のバージョン";
$locale["diff"] = "差分";
+$locale["e-mail not yet verified."] = "メールアドレスを確認出来ませんでした。";
+$locale["e-mail verified."] = "メールアドレスを確認出来ました。";
$locale["edit area"] = "編集エリア";
$locale["edit this page"] = "ページを編集しています。";
$locale["file %s not found"] = "%s: ファイルが見つかりません。";
Modified: trunk/locale/nl/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po 2012-11-26 15:42:07 UTC (rev 8544)
+++ trunk/locale/po/de.po 2012-11-26 15:56:20 UTC (rev 8545)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 16:38+0100\n"
+"POT-Creation-Date: 2012-11-26 16:54+0100\n"
"PO-Revision-Date: 2000-10-31 02:23+0200\n"
"Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
"<car...@us...>, Helmer Pardun <pardunpress@t-online."
@@ -712,6 +712,8 @@
#: ../lib/plugin/WikiAdminSetAcl.php:256 ../lib/upgrade.php:1128
#: ../lib/upgrade.php:1138 ../themes/blog/templates/blogform.tmpl:7
#: ../themes/default/templates/blogform.tmpl:7
+#: ../themes/default/templates/userprefs.tmpl:154
+#: ../themes/default/templates/userprefs.tmpl:163
#: ../themes/fusionforge/templates/blogform.tmpl:7
#: ../themes/fusionforge/themeinfo.php:52
msgid ": "
@@ -7965,8 +7967,6 @@
#: ../themes/default/templates/info.tmpl:163
#: ../themes/default/templates/userprefs.tmpl:141
#: ../themes/default/templates/userprefs.tmpl:144
-#: ../themes/default/templates/userprefs.tmpl:154
-#: ../themes/default/templates/userprefs.tmpl:163
#: ../themes/default/templates/userprefs.tmpl:243
#: ../themes/default/templates/userprefs.tmpl:250
#: ../themes/fusionforge/templates/userprefs.tmpl:342
@@ -8332,22 +8332,22 @@
msgstr "Gültigkeit"
#: ../themes/default/templates/userprefs.tmpl:165
-msgid "Email verified."
+msgid "e-mail verified."
msgstr "E-Mail bestätigt."
#: ../themes/default/templates/userprefs.tmpl:167
-msgid "Email not yet verified."
+msgid "e-mail not yet verified."
msgstr "E-Mail noch nicht bestätigt."
#: ../themes/default/templates/userprefs.tmpl:170
-msgid "Note, that user accounts with bouncing emails will be disabled."
+msgid "Note, that user accounts with bouncing e-mails will be disabled."
msgstr ""
"Beachten Sie bitte, dass Benutzer mit ungültigen E-Mail-Addressen gelöscht "
"werden."
#: ../themes/default/templates/userprefs.tmpl:173
#: ../themes/fusionforge/templates/userprefs.tmpl:194
-msgid "Get an email notification at changes of the following pages:"
+msgid "Get an e-mail notification at changes of the following pages:"
msgstr "E-Mail Nachricht bei Änderung folgender Seiten:"
#: ../themes/default/templates/userprefs.tmpl:178
Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po 2012-11-26 15:42:07 UTC (rev 8544)
+++ trunk/locale/po/es.po 2012-11-26 15:56:20 UTC (rev 8545)
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 16:38+0100\n"
+"POT-Creation-Date: 2012-11-26 16:54+0100\n"
"PO-Revision-Date: 2000-02-01 00:50-0500\n"
"Last-Translator: Pablo Roca <pr...@cl...>\n"
"Language-Team: \n"
@@ -705,6 +705,8 @@
#: ../lib/plugin/WikiAdminSetAcl.php:256 ../lib/upgrade.php:1128
#: ../lib/upgrade.php:1138 ../themes/blog/templates/blogform.tmpl:7
#: ../themes/default/templates/blogform.tmpl:7
+#: ../themes/default/templates/userprefs.tmpl:154
+#: ../themes/default/templates/userprefs.tmpl:163
#: ../themes/fusionforge/templates/blogform.tmpl:7
#: ../themes/fusionforge/themeinfo.php:52
msgid ": "
@@ -7788,8 +7790,6 @@
#: ../themes/default/templates/info.tmpl:163
#: ../themes/default/templates/userprefs.tmpl:141
#: ../themes/default/templates/userprefs.tmpl:144
-#: ../themes/default/templates/userprefs.tmpl:154
-#: ../themes/default/templates/userprefs.tmpl:163
#: ../themes/default/templates/userprefs.tmpl:243
#: ../themes/default/templates/userprefs.tmpl:250
#: ../themes/fusionforge/templates/userprefs.tmpl:342
@@ -8139,20 +8139,20 @@
msgstr ""
#: ../themes/default/templates/userprefs.tmpl:165
-msgid "Email verified."
+msgid "e-mail verified."
msgstr ""
#: ../themes/default/templates/userprefs.tmpl:167
-msgid "Email not yet verified."
+msgid "e-mail not yet verified."
msgstr ""
#: ../themes/default/templates/userprefs.tmpl:170
-msgid "Note, that user accounts with bouncing emails will be disabled."
+msgid "Note, that user accounts with bouncing e-mails will be disabled."
msgstr ""
#: ../themes/default/templates/userprefs.tmpl:173
#: ../themes/fusionforge/templates/userprefs.tmpl:194
-msgid "Get an email notification at changes of the following pages:"
+msgid "Get an e-mail notification at changes of the following pages:"
msgstr ""
#: ../themes/default/templates/userprefs.tmpl:178
Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po 2012-11-26 15:42:07 UTC (rev 8544)
+++ trunk/locale/po/fr.po 2012-11-26 15:56:20 UTC (rev 8545)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 16:38+0100\n"
+"POT-Creation-Date: 2012-11-26 16:54+0100\n"
"PO-Revision-Date: 2004-06-22 21:10+0200\n"
"Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
"Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -704,6 +704,8 @@
#: ../lib/plugin/WikiAdminSetAcl.php:256 ../lib/upgrade.php:1128
#: ../lib/upgrade.php:1138 ../themes/blog/templates/blogform.tmpl:7
#: ../themes/default/templates/blogform.tmpl:7
+#: ../themes/default/templates/userprefs.tmpl:154
+#: ../themes/default/templates/userprefs.tmpl:163
#: ../themes/fusionforge/templates/blogform.tmpl:7
#: ../themes/fusionforge/themeinfo.php:52
msgid ": "
@@ -7863,8 +7865,6 @@
#: ../themes/default/templates/info.tmpl:163
#: ../themes/default/templates/userprefs.tmpl:141
#: ../themes/default/templates/userprefs.tmpl:144
-#: ../themes/default/templates/userprefs.tmpl:154
-#: ../themes/default/templates/userprefs.tmpl:163
#: ../themes/default/templates/userprefs.tmpl:243
#: ../themes/default/templates/userprefs.tmpl:250
#: ../themes/fusionforge/templates/userprefs.tmpl:342
@@ -8223,22 +8223,22 @@
msgstr "État"
#: ../themes/default/templates/userprefs.tmpl:165
-msgid "Email verified."
+msgid "e-mail verified."
msgstr "Adresse électronique vérifiée."
#: ../themes/default/templates/userprefs.tmpl:167
-msgid "Email not yet verified."
+msgid "e-mail not yet verified."
msgstr "Adresse électronique pas encore vérifiée."
#: ../themes/default/templates/userprefs.tmpl:170
-msgid "Note, that user accounts with bouncing emails will be disabled."
+msgid "Note, that user accounts with bouncing e-mails will be disabled."
msgstr ""
"Notez que les comptes avec une adresse électronique invalide seront "
"désactivés."
#: ../themes/default/templates/userprefs.tmpl:173
#: ../themes/fusionforge/templates/userprefs.tmpl:194
-msgid "Get an email notification at changes of the following pages:"
+msgid "Get an e-mail notification at changes of the following pages:"
msgstr ""
"Recevoir une notification par courriel pour les modifications des pages "
"suivantes :"
Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po 2012-11-26 15:42:07 UTC (rev 8544)
+++ trunk/locale/po/it.po 2012-11-26 15:56:20 UTC (rev 8545)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 16:38+0100\n"
+"POT-Creation-Date: 2012-11-26 16:54+0100\n"
"PO-Revision-Date: 2005-02-12 16:23+0100\n"
"Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n"
"Language-Team: \n"
@@ -695,6 +695,8 @@
#: ../lib/plugin/WikiAdminSetAcl.php:256 ../lib/upgrade.php:1128
#: ../lib/upgrade.php:1138 ../themes/blog/templates/blogform.tmpl:7
#: ../themes/default/templates/blogform.tmpl:7
+#: ../themes/default/templates/userprefs.tmpl:154
+#: ../themes/default/templates/userprefs.tmpl:163
#: ../themes/fusionforge/templates/blogform.tmpl:7
#: ../themes/fusionforge/themeinfo.php:52
msgid ": "
@@ -7734,8 +7736,6 @@
#: ../themes/default/templates/info.tmpl:163
#: ../themes/default/templates/userprefs.tmpl:141
#: ../themes/default/templates/userprefs.tmpl:144
-#: ../themes/default/templates/userprefs.tmpl:154
-#: ../themes/default/templates/userprefs.tmpl:163
#: ../themes/default/templates/userprefs.tmpl:243
#: ../themes/default/templates/userprefs.tmpl:250
#: ../themes/fusionforge/templates/userprefs.tmpl:342
@@ -8085,20 +8085,20 @@
msgstr ""
#: ../themes/default/templates/userprefs.tmpl:165
-msgid "Email verified."
+msgid "e-mail verified."
msgstr ""
#: ../themes/default/templates/userprefs.tmpl:167
-msgid "Email not yet verified."
+msgid "e-mail not yet verified."
msgstr ""
#: ../themes/default/templates/userprefs.tmpl:170
-msgid "Note, that user accounts with bouncing emails will be disabled."
+msgid "Note, that user accounts with bouncing e-mails will be disabled."
msgstr ""
#: ../themes/default/templates/userprefs.tmpl:173
#: ../themes/fusionforge/templates/userprefs.tmpl:194
-msgid "Get an email notification at changes of the following pages:"
+msgid "Get an e-mail notification at changes of the following pages:"
msgstr ""
#: ../themes/default/templates/userprefs.tmpl:178
Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po 2012-11-26 15:42:07 UTC (rev 8544)
+++ trunk/locale/po/ja.po 2012-11-26 15:56:20 UTC (rev 8545)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 16:38+0100\n"
+"POT-Creation-Date: 2012-11-26 16:54+0100\n"
"PO-Revision-Date: 2003-06-07 09:01+0900\n"
"Last-Translator: Tadashi Jokagi <web...@el...>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
@@ -683,6 +683,8 @@
#: ../lib/plugin/WikiAdminSetAcl.php:256 ../lib/upgrade.php:1128
#: ../lib/upgrade.php:1138 ../themes/blog/templates/blogform.tmpl:7
#: ../themes/default/templates/blogform.tmpl:7
+#: ../themes/default/templates/userprefs.tmpl:154
+#: ../themes/default/templates/userprefs.tmpl:163
#: ../themes/fusionforge/templates/blogform.tmpl:7
#: ../themes/fusionforge/themeinfo.php:52
msgid ": "
@@ -7898,8 +7900,6 @@
#: ../themes/default/templates/info.tmpl:163
#: ../themes/default/templates/userprefs.tmpl:141
#: ../themes/default/templates/userprefs.tmpl:144
-#: ../themes/default/templates/userprefs.tmpl:154
-#: ../themes/default/templates/userprefs.tmpl:163
#: ../themes/default/templates/userprefs.tmpl:243
#: ../themes/default/templates/userprefs.tmpl:250
#: ../themes/fusionforge/templates/userprefs.tmpl:342
@@ -8260,20 +8260,20 @@
msgstr "状況:"
#: ../themes/default/templates/userprefs.tmpl:165
-msgid "Email verified."
+msgid "e-mail verified."
msgstr "メールアドレスを確認出来ました。"
#: ../themes/default/templates/userprefs.tmpl:167
-msgid "Email not yet verified."
+msgid "e-mail not yet verified."
msgstr "メールアドレスを確認出来ませんでした。"
#: ../themes/default/templates/userprefs.tmpl:170
-msgid "Note, that user accounts with bouncing emails will be disabled."
+msgid "Note, that user accounts with bouncing e-mails will be disabled."
msgstr ""
#: ../themes/default/templates/userprefs.tmpl:173
#: ../themes/fusionforge/templates/userprefs.tmpl:194
-msgid "Get an email notification at changes of the following pages:"
+msgid "Get an e-mail notification at changes of the following pages:"
msgstr ""
#: ../themes/default/templates/userprefs.tmpl:178
Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po 2012-11-26 15:42:07 UTC (rev 8544)
+++ trunk/locale/po/nl.po 2012-11-26 15:56:20 UTC (rev 8545)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 16:38+0100\n"
+"POT-Creation-Date: 2012-11-26 16:54+0100\n"
"PO-Revision-Date: 2000-09-30 02:23+0200\n"
"Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
"Language-Team: Dutch <nl...@li...>\n"
@@ -689,6 +689,8 @@
#: ../lib/plugin/WikiAdminSetAcl.php:256 ../lib/upgrade.php:1128
#: ../lib/upgrade.php:1138 ../themes/blog/templates/blogform.tmpl:7
#: ../themes/default/templates/blogform.tmpl:7
+#: ../themes/default/templates/userprefs.tmpl:154
+#: ../themes/default/templates/userprefs.tmpl:163
#: ../themes/fusionforge/templates/blogform.tmpl:7
#: ../themes/fusionforge/themeinfo.php:52
msgid ": "
@@ -7721,8 +7723,6 @@
#: ../themes/default/templates/info.tmpl:163
#: ../themes/default/templates/userprefs.tmpl:141
#: ../themes/default/templates/userprefs.tmpl:144
-#: ../themes/default/templates/userprefs.tmpl:154
-#: ../themes/default/templates/userprefs.tmpl:163
#: ../themes/default/templates/userprefs.tmpl:243
#: ../themes/default/templates/userprefs.tmpl:250
#: ../themes/fusionforge/templates/userprefs.tmpl:342
@@ -8072,20 +8072,20 @@
msgstr ""
#: ../themes/default/templates/userprefs.tmpl:165
-msgid "Email verified."
+msgid "e-mail verified."
msgstr ""
#: ../themes/default/templates/userprefs.tmpl:167
-msgid "Email not yet verified."
+msgid "e-mail not yet verified."
msgstr ""
#: ../themes/default/templates/userprefs.tmpl:170
-msgid "Note, that user accounts with bouncing emails will be disabled."
+msgid "Note, that user accounts with bouncing e-mails will be disabled."
msgstr ""
#: ../themes/default/templates/userprefs.tmpl:173
#: ../themes/fusionforge/templates/userprefs.tmpl:194
-msgid "Get an email notification at changes of the following pages:"
+msgid "Get an e-mail notification at changes of the following pages:"
msgstr ""
#: ../themes/default/templates/userprefs.tmpl:178
Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot 2012-11-26 15:42:07 UTC (rev 8544)
+++ trunk/locale/po/phpwiki.pot 2012-11-26 15:56:20 UTC (rev 8545)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki-1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 16:38+0100\n"
+"POT-Creation-Date: 2012-11-26 16:54+0100\n"
"PO-Revision-Date: 2002-12-14 17:51-0500\n"
"Last-Translator: Reini Urban <ru...@us...>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
@@ -683,6 +683,8 @@
#: ../lib/plugin/WikiAdminSetAcl.php:256 ../lib/upgrade.php:1128
#: ../lib/upgrade.php:1138 ../themes/blog/templates/blogform.tmpl:7
#: ../themes/default/templates/blogform.tmpl:7
+#: ../themes/default/templates/userprefs.tmpl:154
+#: ../themes/default/templates/userprefs.tmpl:163
#: ../themes/fusionforge/templates/blogform.tmpl:7
#: ../themes/fusionforge/themeinfo.php:52
msgid ": "
@@ -7710,8 +7712,6 @@
#: ../themes/default/templates/info.tmpl:163
#: ../themes/default/templates/userprefs.tmpl:141
#: ../themes/default/templates/userprefs.tmpl:144
-#: ../themes/default/templates/userprefs.tmpl:154
-#: ../themes/default/templates/userprefs.tmpl:163
#: ../themes/default/templates/userprefs.tmpl:243
#: ../themes/default/templates/userprefs.tmpl:250
#: ../themes/fusionforge/templates/userprefs.tmpl:342
@@ -8061,20 +8061,20 @@
msgstr ""
#: ../themes/default/templates/userprefs.tmpl:165
-msgid "Email verified."
+msgid "e-mail verified."
msgstr ""
#: ../themes/default/templates/userprefs.tmpl:167
-msgid "Email not yet verified."
+msgid "e-mail not yet verified."
msgstr ""
#: ../themes/default/templates/userprefs.tmpl:170
-msgid "Note, that user accounts with bouncing emails will be disabled."
+msgid "Note, that user accounts with bouncing e-mails will be disabled."
msgstr ""
#: ../themes/default/templates/userprefs.tmpl:173
#: ../themes/fusionforge/templates/userprefs.tmpl:194
-msgid "Get an email notification at changes of the following pages:"
+msgid "Get an e-mail notification at changes of the following pages:"
msgstr ""
#: ../themes/default/templates/userprefs.tmpl:178
Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po 2012-11-26 15:42:07 UTC (rev 8544)
+++ trunk/locale/po/sv.po 2012-11-26 15:56:20 UTC (rev 8545)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 16:38+0100\n"
+"POT-Creation-Date: 2012-11-26 16:54+0100\n"
"PO-Revision-Date: 2001-01-27 01:58+0200\n"
"Last-Translator: Jon Åslund <jo...@he...>\n"
"Language-Team: \n"
@@ -684,6 +684,8 @@
#: ../lib/plugin/WikiAdminSetAcl.php:256 ../lib/upgrade.php:1128
#: ../lib/upgrade.php:1138 ../themes/blog/templates/blogform.tmpl:7
#: ../themes/default/templates/blogform.tmpl:7
+#: ../themes/default/templates/userprefs.tmpl:154
+#: ../themes/default/templates/userprefs.tmpl:163
#: ../themes/fusionforge/templates/blogform.tmpl:7
#: ../themes/fusionforge/themeinfo.php:52
msgid ": "
@@ -7713,8 +7715,6 @@
#: ../themes/default/templates/info.tmpl:163
#: ../themes/default/templates/userprefs.tmpl:141
#: ../themes/default/templates/userprefs.tmpl:144
-#: ../themes/default/templates/userprefs.tmpl:154
-#: ../themes/default/templates/userprefs.tmpl:163
#: ../themes/default/templates/userprefs.tmpl:243
#: ../themes/default/templates/userprefs.tmpl:250
#: ../themes/fusionforge/templates/userprefs.tmpl:342
@@ -8064,20 +8064,20 @@
msgstr ""
#: ../themes/default/templates/userprefs.tmpl:165
-msgid "Email verified."
+msgid "e-mail verified."
msgstr ""
#: ../themes/default/templates/userprefs.tmpl:167
-msgid "Email not yet verified."
+msgid "e-mail not yet verified."
msgstr ""
#: ../themes/default/templates/userprefs.tmpl:170
-msgid "Note, that user accounts with bouncing emails will be disabled."
+msgid "Note, that user accounts with bouncing e-mails will be disabled."
msgstr ""
#: ../themes/default/templates/userprefs.tmpl:173
#: ../themes/fusionforge/templates/userprefs.tmpl:194
-msgid "Get an email notification at changes of the following pages:"
+msgid "Get an e-mail notification at changes of the following pages:"
msgstr ""
#: ../themes/default/templates/userprefs.tmpl:178
Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po 2012-11-26 15:42:07 UTC (rev 8544)
+++ trunk/locale/po/zh.po 2012-11-26 15:56:20 UTC (rev 8545)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 16:38+0100\n"
+"POT-Creation-Date: 2012-11-26 16:54+0100\n"
"PO-Revision-Date: 2004-04-21 10:08+0800\n"
"Last-Translator: DruryL <dr...@us...>\n"
"Language-Team: DruryL <dr...@us...>\n"
@@ -717,6 +717,8 @@
#: ../lib/plugin/WikiAdminSetAcl.php:256 ../lib/upgrade.php:1128
#: ../lib/upgrade.php:1138 ../themes/blog/templates/blogform.tmpl:7
#: ../themes/default/templates/blogform.tmpl:7
+#: ../themes/default/templates/userprefs.tmpl:154
+#: ../themes/default/templates/userprefs.tmpl:163
#: ../themes/fusionforge/templates/blogform.tmpl:7
#: ../themes/fusionforge/themeinfo.php:52
#, fuzzy
@@ -8059,8 +8061,6 @@
#: ../themes/default/templates/info.tmpl:163
#: ../themes/default/templates/userprefs.tmpl:141
#: ../themes/default/templates/userprefs.tmpl:144
-#: ../themes/default/templates/userprefs.tmpl:154
-#: ../themes/default/templates/userprefs.tmpl:163
#: ../themes/default/templates/userprefs.tmpl:243
#: ../themes/default/templates/userprefs.tmpl:250
#: ../themes/fusionforge/templates/userprefs.tmpl:342
@@ -8429,20 +8429,20 @@
msgstr "狀態:"
#: ../themes/default/templates/userprefs.tmpl:165
-msgid "Email verified."
+msgid "e-mail verified."
msgstr "Email 已被驗證."
#: ../themes/default/templates/userprefs.tmpl:167
-msgid "Email not yet verified."
+msgid "e-mail not yet verified."
msgstr "Email 尚未被驗證."
#: ../themes/default/templates/userprefs.tmpl:170
-msgid "Note, that user accounts with bouncing emails will be disabled."
-msgstr "注意, 使用者帳號的回信(bouncing emails)將被關閉."
+msgid "Note, that user accounts with bouncing e-mails will be disabled."
+msgstr "注意, 使用者帳號的回信(bouncing e-mails)將被關閉."
#: ../themes/default/templates/userprefs.tmpl:173
#: ../themes/fusionforge/templates/userprefs.tmpl:194
-msgid "Get an email notification at changes of the following pages:"
+msgid "Get an e-mail notification at changes of the following pages:"
msgstr "在變更下列頁面時取得 email 通知:"
#: ../themes/default/templates/userprefs.tmpl:178
Modified: trunk/locale/sv/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/zh/LC_MESSAGES/phpwiki.php 2012-11-26 15:42:07 UTC (rev 8544)
+++ trunk/locale/zh/LC_MESSAGES/phpwiki.php 2012-11-26 15:56:20 UTC (rev 8545)
@@ -217,8 +217,6 @@
$locale["Edited by: %s"] = "由 %s 編輯";
$locale["Editing pages"] = "編輯頁面";
$locale["Elapsed time: %s s"] = "經過時間: %s s";
-$locale["Email not yet verified."] = "Email 尚未被驗證.";
-$locale["Email verified."] = "Email 已被驗證.";
$locale["Embed hidden comments in WikiPages."] = "在 Wiki頁面嵌入隱藏意見.";
$locale["Empty Preferences or format of UserPreferences cookie not recognised."] = "空的偏好設定或 UserPreferences cookie 格式無法辨認.";
$locale["Empty link to: %s"] = "沒有連結到: %s";
@@ -244,7 +242,7 @@
$locale["FullTextSearch"] = "FullTextSearch";
$locale["FuzzyPages"] = "FuzzyPages";
$locale["General Auth Settings"] = "一般認證設定";
-$locale["Get an email notification at changes of the following pages:"] = "在變更下列頁面時取得 email 通知:";
+$locale["Get an e-mail notification at changes of the following pages:"] = "在變更下列頁面時取得 email 通知:";
$locale["Get debugging information for %s."] = "為 %s 取得除錯資訊.";
$locale["Get preferences information for current user %s."] = "為目前使用者 %s 取得偏好設定資訊.";
$locale["Go"] = "Go";
@@ -363,7 +361,7 @@
$locale["None"] = "無";
$locale["Not enough questions answered!"] = "沒有足夠的已回答問題!";
$locale["Note that many browsers will automatically adjust the width of the editing area so that it fills the browser window. In this case, the width preference will be ignored."] = "注意:許多瀏覽器會自動調整編輯區域的寬度以填滿瀏覽視窗. 在這種情況下,寬度設定將會被忽略.";
-$locale["Note, that user accounts with bouncing emails will be disabled."] = "注意, 使用者帳號的回信(bouncing emails)將被關閉.";
+$locale["Note, that user accounts with bouncing e-mails will be disabled."] = "注意, 使用者帳號的回信(bouncing e-mails)將被關閉.";
$locale["Note:"] = "注意:";
$locale["Old UserPage %s without stored password updated with empty password. Set a password in your UserPreferences."] = "Old UserPage %s without stored password updated with empty password. Set a password in your UserPreferences.";
$locale["OldStyleTable"] = "OldStyleTable";
@@ -713,6 +711,8 @@
$locale["download a zip dump from this wiki"] = "從此 wiki 下載 zip dump";
$locale["dump html pages"] = "傾印 html 頁面";
$locale["dump serial pages"] = "傾印連續頁面";
+$locale["e-mail not yet verified."] = "Email 尚未被驗證.";
+$locale["e-mail verified."] = "Email 已被驗證.";
$locale["edit area"] = "編輯區域";
$locale["edit this page"] = "編輯此頁面";
$locale["edits"] = "編輯";
Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes 2012-11-26 15:42:07 UTC (rev 8544)
+++ trunk/pgsrc/ReleaseNotes 2012-11-26 15:56:20 UTC (rev 8545)
@@ -400,7 +400,7 @@
* add a proper Content-Encoding: gzip if compressed, and omit Content-Length then.
Trick to send the correct gzipped Content-Length
* set dsn after SQL/ADODB switches in WikiDB backends for easier unit testing
-* email notifications: better From: header
+* e-mail notifications: better From: header
* add DBAUTH_PREF_INSERT: self-creating users. by John Stevens
* improved ~WikiUser/Ldap error description
* cache SystemInfo methods
Modified: trunk/themes/default/templates/userprefs.tmpl
===================================================================
--- trunk/themes/default/templates/userprefs.tmpl 2012-11-26 15:42:07 UTC (rev 8544)
+++ trunk/themes/default/templates/userprefs.tmpl 2012-11-26 15:56:20 UTC (rev 8545)
@@ -151,7 +151,7 @@
<tr><td>
<p>
- <?php echo _("Your e-mail"). _(":")?>
+ <?php echo _("Your e-mail"). _(": ")?>
<?php if ($isForm) { ?>
<input type="text" name="pref[email]" size="30" maxlength="60"
value="<?php echo $pref->get('email')?>" />
@@ -160,17 +160,17 @@
<?php } ?>
</p>
<p>
- <?php echo _("Status") . _(":") ?>
+ <?php echo _("Status") . _(": ") ?>
<?php if ($pref->get('emailVerified')) { ?>
- <?php echo _("Email verified.") ?>
+ <?php echo _("e-mail verified.") ?>
<?php } else { ?>
- <?php echo _("Email not yet verified.") ?>
+ <?php echo _("e-mail not yet verified.") ?>
<?php } ?>
</p>
- </td><td><p class="hint"><?php echo _("Note, that user accounts with bouncing emails will be disabled.")?></p></td></tr>
+ </td><td><p class="hint"><?php echo _("Note, that user accounts with bouncing e-mails will be disabled.")?></p></td></tr>
<tr><td colspan="2">
- <?php echo _("Get an email notification at changes of the following pages:")?>
+ <?php echo _("Get an e-mail notification at changes of the following pages:")?>
</td></tr>
<tr>
<?php if ($isForm) { ?>
Modified: trunk/themes/fusionforge/templates/userprefs.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/userprefs.tmpl 2012-11-26 15:42:07 UTC (rev 8544)
+++ trunk/themes/fusionforge/templates/userprefs.tmpl 2012-11-26 15:56:20 UTC (rev 8545)
@@ -191,7 +191,7 @@
<tr><td colspan="2"><h3><?php echo _("E-mail Notification")?></h3></td></tr>
<tr><td colspan="2">
- <?php echo _("Get an email notification at changes of the following pages:")?>
+ <?php echo _("Get an e-mail notification at changes of the following pages:")?>
</td></tr>
<tr>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2012-11-26 17:15:01
|
Revision: 8546
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8546&view=rev
Author: vargenau
Date: 2012-11-26 17:14:51 +0000 (Mon, 26 Nov 2012)
Log Message:
-----------
Be consistent: use e-mail
Modified Paths:
--------------
trunk/lib/WikiUserNew.php
trunk/lib/editpage.php
trunk/lib/plugin/ModeratedPage.php
trunk/lib/plugin/PasswordReset.php
trunk/lib/plugin/WatchPage.php
trunk/locale/de/LC_MESSAGES/phpwiki.mo
trunk/locale/de/LC_MESSAGES/phpwiki.php
trunk/locale/es/LC_MESSAGES/phpwiki.mo
trunk/locale/es/LC_MESSAGES/phpwiki.php
trunk/locale/fr/LC_MESSAGES/phpwiki.mo
trunk/locale/fr/LC_MESSAGES/phpwiki.php
trunk/locale/it/LC_MESSAGES/phpwiki.mo
trunk/locale/ja/LC_MESSAGES/phpwiki.mo
trunk/locale/nl/LC_MESSAGES/phpwiki.mo
trunk/locale/po/de.po
trunk/locale/po/es.po
trunk/locale/po/fr.po
trunk/locale/po/it.po
trunk/locale/po/ja.po
trunk/locale/po/nl.po
trunk/locale/po/phpwiki.pot
trunk/locale/po/sv.po
trunk/locale/po/zh.po
trunk/locale/sv/LC_MESSAGES/phpwiki.mo
trunk/locale/zh/LC_MESSAGES/phpwiki.mo
Modified: trunk/lib/WikiUserNew.php
===================================================================
--- trunk/lib/WikiUserNew.php 2012-11-26 15:56:20 UTC (rev 8545)
+++ trunk/lib/WikiUserNew.php 2012-11-26 17:14:51 UTC (rev 8546)
@@ -1816,7 +1816,7 @@
if (!empty($value) and !$verified) {
list($ok, $msg) = ValidateMail($value);
if ($ok and mail($value, "[" . WIKI_NAME . "] " . _("E-mail address confirmation"),
- sprintf(_("Welcome to %s!\nYour email account is verified and\nwill be used to send page change notifications.\nSee %s"),
+ sprintf(_("Welcome to %s!\nYour e-mail account is verified and\nwill be used to send page change notifications.\nSee %s"),
WIKI_NAME, WikiURL($GLOBALS['request']->getArg('pagename'), '', true)))
) {
$this->set('emailVerified', 1);
Modified: trunk/lib/editpage.php
===================================================================
--- trunk/lib/editpage.php 2012-11-26 15:56:20 UTC (rev 8545)
+++ trunk/lib/editpage.php 2012-11-26 17:14:51 UTC (rev 8546)
@@ -574,7 +574,7 @@
return
HTML(HTML::h2(WikiLink(_("ModeratedPage"))),
HTML::p(fmt("You can edit away, but your changes will have to be approved by the defined moderators at the definition in %s", WikiLink(_("ModeratedPage")))),
- HTML::p(fmt("The approval has a grace period of 5 days. If you have your E-Mail defined in your %s, you will get a notification of approval or rejection.",
+ HTML::p(fmt("The approval has a grace period of 5 days. If you have your e-mail defined in your %s, you will get a notification of approval or rejection.",
WikiLink(_("UserPreferences")))));
}
Modified: trunk/lib/plugin/ModeratedPage.php
===================================================================
--- trunk/lib/plugin/ModeratedPage.php 2012-11-26 15:56:20 UTC (rev 8545)
+++ trunk/lib/plugin/ModeratedPage.php 2012-11-26 17:14:51 UTC (rev 8546)
@@ -154,7 +154,7 @@
$status = $this->getSiteStatus($request, $action_page);
if (is_array($status)) {
if (empty($status['emails'])) {
- trigger_error(_("ModeratedPage: No emails for the moderators defined"),
+ trigger_error(_("ModeratedPage: No e-mails for the moderators defined"),
E_USER_WARNING);
return false;
}
@@ -180,7 +180,7 @@
if (is_array($status)) {
if (empty($status['emails'])) {
// We really should present such warnings prominently.
- trigger_error(_("ModeratedPage: No emails for the moderators defined"),
+ trigger_error(_("ModeratedPage: No e-mails for the moderators defined"),
E_USER_WARNING);
return false;
}
@@ -228,7 +228,7 @@
$moderated['status'] = $status;
}
if (empty($status['emails'])) {
- trigger_error(_("ModeratedPage: No emails for the moderators defined"),
+ trigger_error(_("ModeratedPage: No e-mails for the moderators defined"),
E_USER_WARNING);
return true;
}
@@ -261,7 +261,7 @@
$action,
join(", ", $status['moderators'])
));
- // Send email
+ // Send e-mail
require_once 'lib/MailNotify.php';
$pagename = $page->getName();
$mailer = new MailNotify($pagename);
@@ -283,7 +283,7 @@
//DELETEME!
$page->set('moderated', $moderated);
//FIXME: This msg gets lost on the edit redirect
- trigger_error(_("ModeratedPage Notification Error: Couldn't send email"),
+ trigger_error(_("ModeratedPage Notification Error: Couldn't send e-mail"),
E_USER_ERROR);
return true;
}
Modified: trunk/lib/plugin/PasswordReset.php
===================================================================
--- trunk/lib/plugin/PasswordReset.php 2012-11-26 15:56:20 UTC (rev 8545)
+++ trunk/lib/plugin/PasswordReset.php 2012-11-26 17:14:51 UTC (rev 8546)
@@ -25,7 +25,7 @@
* => action=email&user=username will send the password per email in plaintext.
*
* If no email is stored, because user might not exist,
- * => "No email stored for user %s.
+ * => "No e-mail stored for user %s.
* You need to ask an Administrator to reset this password."
* Problem: How to contact Admin? Present a link to ADMIN_USER
*
@@ -85,10 +85,10 @@
"From: $from")
)
$alert = new Alert(_("Message"),
- fmt("Email sent to the stored email address for user %s", $userid));
+ fmt("E-mail sent to the stored e-mail address for user %s", $userid));
else
$alert = new Alert(_("Error"),
- fmt("Error sending email with password for user %s.", $userid));
+ fmt("Error sending e-mail with password for user %s.", $userid));
$alert->show();
}
@@ -106,7 +106,7 @@
if (!$footer) {
$isadmin = $request->_user->isAdmin();
$footer = HTML::p(Button('submit:admin_reset[reset]',
- $isadmin ? _("Yes") : _("Send email"),
+ $isadmin ? _("Yes") : _("Send e-mail"),
$isadmin ? 'wikiadmin' : 'button'),
HTML::Raw(' '),
Button('submit:admin_reset[cancel]', _("Cancel"), 'button'));
@@ -150,7 +150,7 @@
//TODO: verify should check if the user exists, his prefs can be read/safed
// and the email is verified, even if admin.
$buttons = HTML::p(Button('submit:admin_reset[reset]',
- $isadmin ? _("Yes") : _("Send email"),
+ $isadmin ? _("Yes") : _("Send e-mail"),
$isadmin ? 'wikiadmin' : 'button'),
HTML::Raw(' '),
Button('submit:admin_reset[cancel]', _("Cancel"), 'button'));
@@ -168,7 +168,7 @@
$email = $prefs->get('email');
if (!$email) {
$alert = new Alert(_("Error"),
- HTML(fmt("No email stored for user %s.", $userid),
+ HTML(fmt("No e-mail stored for user %s.", $userid),
HTML::br(),
fmt("You need to ask an Administrator to reset this password. See below: "),
HTML::br(), WikiLink(ADMIN_USER)));
@@ -183,7 +183,7 @@
$header,
HTML(HTML::hr(),
fmt("Do you really want to reset the password of user %s?", $userid),
- $isadmin ? '' : _("An email will be sent."),
+ $isadmin ? '' : _("An e-mail will be sent."),
HiddenInputs(array('admin_reset[verify]' => 1, 'user' => $userid)),
$buttons));
} else { // verify ok, but no userid
Modified: trunk/lib/plugin/WatchPage.php
===================================================================
--- trunk/lib/plugin/WatchPage.php 2012-11-26 15:56:20 UTC (rev 8545)
+++ trunk/lib/plugin/WatchPage.php 2012-11-26 17:14:51 UTC (rev 8546)
@@ -22,7 +22,7 @@
*/
/**
- * Plugin to manage notifications emails per page. action=WatchPage
+ * Plugin to manage notifications e-mails per page. action=WatchPage
* mode = add or edit
* pagename = pagename to be added
*
@@ -39,7 +39,7 @@
function getDescription()
{
- return _("Manage notifications emails per page.");
+ return _("Manage notifications e-mails per page.");
}
function getDefaultArguments()
@@ -125,7 +125,7 @@
if (empty($email)) {
return HTML::p(
array('class' => 'error'),
- _("ERROR: No email defined! You need to do this in your "),
+ _("ERROR: No e-mail defined! You need to do this in your "),
WikiLink(_("UserPreferences")));
}
$emailVerified = $pref->get("emailVerified");
@@ -163,7 +163,7 @@
$request->_setUser($user);
$request->setArg("verify", false);
$request->setArg("add", false);
- $errmsg .= _("E-Mail Notification for the current page successfully stored in your preferences.");
+ $errmsg .= _("E-mail notification for the current page successfully stored in your preferences.");
$args['errmsg'] = HTML::div(array('class' => 'feedback'), HTML::p($errmsg));
return Template('userprefs', $args);
}
Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/de/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/de/LC_MESSAGES/phpwiki.php 2012-11-26 15:56:20 UTC (rev 8545)
+++ trunk/locale/de/LC_MESSAGES/phpwiki.php 2012-11-26 17:14:51 UTC (rev 8546)
@@ -396,7 +396,7 @@
$locale["Enter your UserId to sign in"] = "Tragen Sie bitte für die Anmeldung im Wiki Ihren Benutzernamen ein";
$locale["Entry on %s by %s."] = "Kommentar zu %s von %s.";
$locale["Enumeration"] = "Num. Liste";
-$locale["Error sending email with password for user %s."] = "Fehler beim Versenden der E-Mail mit dem neuen Passwort für Benutzer %s.";
+$locale["Error sending e-mail with password for user %s."] = "Fehler beim Versenden der E-Mail mit dem neuen Passwort für Benutzer %s.";
$locale["Error: Couldn't send %s to %s"] = "Fehler: Konnte nicht %s an %s senden";
$locale["Error: Empty search string."] = "Fehler: Leeres Suchwort.";
$locale["Error: The user HomePage must be a valid WikiWord. Sorry, UserPreferences cannot be saved."] = "Fehler: Ihre Homepage Seite muß ein gültiges WikiWord sein. Die BenutzerEinstellungen können deshalb leider nicht gespeichert werden.";
@@ -632,8 +632,8 @@
$locale["Missing PagePermission:"] = "Fehlende Zugriffsberechtigung:";
$locale["Missing ldap extension"] = "Fehlende php LDAP extension";
$locale["ModeratedPage"] = "ModerierteSeite";
-$locale["ModeratedPage Notification Error: Couldn't send email"] = "ModerierteSeite Benachrichtigungsfehler: Konnte kein E-Mail versenden";
-$locale["ModeratedPage: No emails for the moderators defined"] = "ModerierteSeite: Keine E-Mails für Moderatoren definiert";
+$locale["ModeratedPage Notification Error: Couldn't send e-mail"] = "ModerierteSeite Benachrichtigungsfehler: Konnte kein E-Mail versenden";
+$locale["ModeratedPage: No e-mails for the moderators defined"] = "ModerierteSeite: Keine E-Mails für Moderatoren definiert";
$locale["Modern"] = "Modern";
$locale["Modified"] = "Geändert";
$locale["Modified on %s by %s"] = "Kommentare am %s geändert von %s";
@@ -932,7 +932,7 @@
$locale["Semantic relations for %s"] = "Semantische Beziehungen für %s";
$locale["SemanticRelations"] = "SemantischeBeziehungen";
$locale["SemanticSearch"] = "SemantischeSuche";
-$locale["Send email"] = "Versende E-Mail";
+$locale["Send e-mail"] = "Versende E-Mail";
$locale["Serialized file %s"] = "Serialisierte Datei %s";
$locale["Set Password"] = "Setze Passwort";
$locale["Set USE_DB_SESSION to false."] = "Setzen Sie USE_DB_SESSION auf false.";
@@ -1151,7 +1151,7 @@
$locale["Watch Page"] = "Seite beobarchten";
$locale["WatchPage"] = "SeiteBeobarten";
$locale["We have a total of %d registered users."] = "Wir haben insgesamt %d registrierte Benutzer.";
-$locale["Welcome to %s!\nYour email account is verified and\nwill be used to send page change notifications.\nSee %s"] = "Willkommen bei %s!\nIhr E-Mail Konto ist bestätigt und\nwird benutzt, um SeitenÄnderungs Benachrichtigungen per E-Mail zu versenden.\nSiehe %s";
+$locale["Welcome to %s!\nYour e-mail account is verified and\nwill be used to send page change notifications.\nSee %s"] = "Willkommen bei %s!\nIhr E-Mail Konto ist bestätigt und\nwird benutzt, um SeitenÄnderungs Benachrichtigungen per E-Mail zu versenden.\nSiehe %s";
$locale["What links here"] = "Was verlinkt hierher";
$locale["Who Is Online"] = "Wer ist Online";
$locale["Who is Online"] = "Wer ist Online";
Modified: trunk/locale/es/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/es/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/es/LC_MESSAGES/phpwiki.php 2012-11-26 15:56:20 UTC (rev 8545)
+++ trunk/locale/es/LC_MESSAGES/phpwiki.php 2012-11-26 17:14:51 UTC (rev 8546)
@@ -497,7 +497,7 @@
$locale["View this page and all subpages"] = "Opinión esta página y todas las páginas secundaria";
$locale["W"] = "An";
$locale["WARNING: InterWikiMap page is unlocked, so not using those links."] = "ADVERTENCIA: Se abre la página de InterMapaDeWiki, tan no usando esos acoplamientos.";
-$locale["Welcome to %s!\nYour email account is verified and\nwill be used to send page change notifications.\nSee %s"] = "¡Recepción a %s!\nSe verifica y será utilizada su cuenta del email\npara enviar notificaciones del cambio de la página.\nVea %s";
+$locale["Welcome to %s!\nYour e-mail account is verified and\nwill be used to send page change notifications.\nSee %s"] = "¡Recepción a %s!\nSe verifica y será utilizada su cuenta del email\npara enviar notificaciones del cambio de la página.\nVea %s";
$locale["Width"] = "Anchura";
$locale["Wiki Admin"] = "Administración de Wiki";
$locale["Wiki Name"] = "Nombre de la Wiki";
Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/fr/LC_MESSAGES/phpwiki.php 2012-11-26 15:56:20 UTC (rev 8545)
+++ trunk/locale/fr/LC_MESSAGES/phpwiki.php 2012-11-26 17:14:51 UTC (rev 8546)
@@ -166,7 +166,7 @@
$locale["AppendText"] = "ApposezLeTexte";
$locale["Application name"] = "Nom de l'application";
$locale["Application size: %d KiB"] = "Taille de l'application : %d Kio";
-$locale["Apply changes"] = "Appliquer les changements.";
+$locale["Apply changes"] = "Appliquer les changements";
$locale["Approve"] = "Approuver";
$locale["Archives"] = "Archives";
$locale["Are you sure you want to change the owner of the selected pages?"] = "Êtes-vous sûr de vouloir changer le propriétaire des pages sélectionnées ?";
@@ -361,7 +361,7 @@
$locale["Do you %s want to add this page \"%s\" to your WatchList?"] = "Voulez-vous %s ajouter la page « %s » à votre liste de suivi ?";
$locale["Do you really want to create the page '%s'?"] = "Voulez-vous réellement créer la page « %s » ?";
$locale["Do you really want to reset all your UserPreferences?"] = "Voulez-vous réellement réinitialiser toutes vos préférences ?";
-$locale["Do you really want to reset the password of user %s?"] = "Voulez-vous réellement réinitialiser les mot de passe de %s ?";
+$locale["Do you really want to reset the password of user %s?"] = "Voulez-vous réellement réinitialiser le mot de passe de %s ?";
$locale["Don't cache this page."] = "Ne pas mettre en cache cette page.";
$locale["Double redirect not allowed."] = "La double redirection interdit.";
$locale["Download all revisions for backup"] = "Télécharger toutes les versions pour sauvegarder";
@@ -384,7 +384,7 @@
$locale["E-mail address '%s' is properly formatted"] = "L'adresse électronique « %s » semble être bien formée.";
$locale["E-mail address confirmation"] = "Vérification de l'adresse électronique";
$locale["ERROR uploading '%s'"] = "ERREUR en déposant « %s » : ";
-$locale["ERROR: No email defined! You need to do this in your "] = "ERREUR : pas d'adresse électronique définie! Vous devez le faire dans vos ";
+$locale["ERROR: No e-mail defined! You need to do this in your "] = "ERREUR : pas d'adresse électronique définie! Vous devez le faire dans vos ";
$locale["Easy navigation buttons for %s"] = "Boutons de navigation rapide pour %s";
$locale["Edit"] = "Modifier";
$locale["Edit %s"] = "Éditer %s";
@@ -653,8 +653,8 @@
$locale["Missing %s for %s"] = "Il manque %s pour %s";
$locale["Missing PagePermission:"] = "Permission de page individuelle absente :";
$locale["ModeratedPage"] = "PageModérée";
-$locale["ModeratedPage Notification Error: Couldn't send email"] = "Erreur lors des notifications de page: Impossible d'envoyer";
-$locale["ModeratedPage: No emails for the moderators defined"] = "PageModerée: No emails for the moderators defined";
+$locale["ModeratedPage Notification Error: Couldn't send e-mail"] = "Erreur lors des notifications de page: Impossible d'envoyer";
+$locale["ModeratedPage: No e-mails for the moderators defined"] = "PageModerée: No e-mails for the moderators defined";
$locale["Modern"] = "Moderne";
$locale["Modified"] = "Modifié";
$locale["Modified on %s by %s"] = "Modifié le %s par %s";
@@ -972,7 +972,7 @@
$locale["Selected Grant checkboxes allow access, unselected checkboxes deny access."] = "Les cases sélectionnées autorisent l'accès, sinon elles l'interdisent.";
$locale["Selected Pages: "] = "Pages sélectionnées : ";
$locale["Semantic relations for %s"] = "Relations sémantiques pour %s";
-$locale["Send email"] = "Envoyer message";
+$locale["Send e-mail"] = "Envoyer message";
$locale["Serialized file %s"] = "Fichier sérialisé %s";
$locale["Set Password"] = "Choisir un mot de passe";
$locale["Set USE_DB_SESSION to false."] = "Mettre USE_DB_SESSION à false.";
@@ -1213,7 +1213,7 @@
$locale["WatchPage"] = "Suivre";
$locale["WatchPage cancelled"] = "Surveillance de la page annulée";
$locale["We have a total of %d registered users."] = "Nous avons %d utilisateurs enregistrés.";
-$locale["Welcome to %s!\nYour email account is verified and\nwill be used to send page change notifications.\nSee %s"] = "Bienvenue sur %s!\nVotre compte email a été vérifié et\nsera utilisé pour les notifications de changements de pages.\nVoir %s";
+$locale["Welcome to %s!\nYour e-mail account is verified and\nwill be used to send page change notifications.\nSee %s"] = "Bienvenue sur %s!\nVotre adresse électronique a été vérifiée et\nsera utilisée pour les notifications de changements de pages.\nVoir %s";
$locale["What links here"] = "Pages liées";
$locale["Who Is Online"] = "Qui est en ligne";
$locale["Who is Online"] = "Qui est en ligne";
Modified: trunk/locale/it/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/ja/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/nl/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po 2012-11-26 15:56:20 UTC (rev 8545)
+++ trunk/locale/po/de.po 2012-11-26 17:14:51 UTC (rev 8546)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 16:54+0100\n"
+"POT-Creation-Date: 2012-11-26 18:11+0100\n"
"PO-Revision-Date: 2000-10-31 02:23+0200\n"
"Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
"<car...@us...>, Helmer Pardun <pardunpress@t-online."
@@ -389,7 +389,7 @@
#: ../lib/editpage.php:577
#, php-format
msgid ""
-"The approval has a grace period of 5 days. If you have your E-Mail defined "
+"The approval has a grace period of 5 days. If you have your e-mail defined "
"in your %s, you will get a notification of approval or rejection."
msgstr ""
@@ -3042,7 +3042,7 @@
#: ../lib/plugin/ModeratedPage.php:157 ../lib/plugin/ModeratedPage.php:183
#: ../lib/plugin/ModeratedPage.php:231
-msgid "ModeratedPage: No emails for the moderators defined"
+msgid "ModeratedPage: No e-mails for the moderators defined"
msgstr "ModerierteSeite: Keine E-Mails für Moderatoren definiert"
#: ../lib/plugin/ModeratedPage.php:163
@@ -3072,7 +3072,7 @@
msgstr ""
#: ../lib/plugin/ModeratedPage.php:286
-msgid "ModeratedPage Notification Error: Couldn't send email"
+msgid "ModeratedPage Notification Error: Couldn't send e-mail"
msgstr "ModerierteSeite Benachrichtigungsfehler: Konnte kein E-Mail versenden"
#: ../lib/plugin/ModeratedPage.php:366
@@ -3434,12 +3434,12 @@
#: ../lib/plugin/PasswordReset.php:88
#, php-format
-msgid "Email sent to the stored email address for user %s"
+msgid "E-mail sent to the stored e-mail address for user %s"
msgstr ""
#: ../lib/plugin/PasswordReset.php:91
#, php-format
-msgid "Error sending email with password for user %s."
+msgid "Error sending e-mail with password for user %s."
msgstr ""
"Fehler beim Versenden der E-Mail mit dem neuen Passwort für Benutzer %s."
@@ -3448,7 +3448,7 @@
msgstr "Setze Passwort für Benutzer zurück: "
#: ../lib/plugin/PasswordReset.php:109 ../lib/plugin/PasswordReset.php:153
-msgid "Send email"
+msgid "Send e-mail"
msgstr "Versende E-Mail"
#: ../lib/plugin/PasswordReset.php:139
@@ -3465,7 +3465,7 @@
#: ../lib/plugin/PasswordReset.php:171
#, php-format
-msgid "No email stored for user %s."
+msgid "No e-mail stored for user %s."
msgstr ""
#: ../lib/plugin/PasswordReset.php:173
@@ -3478,7 +3478,7 @@
msgstr ""
#: ../lib/plugin/PasswordReset.php:186
-msgid "An email will be sent."
+msgid "An e-mail will be sent."
msgstr ""
#: ../lib/plugin/PhotoAlbum.php:100 ../themes/blog/templates/actionbar.tmpl:8
@@ -5132,7 +5132,7 @@
msgstr "SeiteBeobarten"
#: ../lib/plugin/WatchPage.php:42
-msgid "Manage notifications emails per page."
+msgid "Manage notifications e-mails per page."
msgstr ""
#: ../lib/plugin/WatchPage.php:84
@@ -5179,7 +5179,7 @@
msgstr "Sie müssen sich anmelden um Seiten zu beobarchten."
#: ../lib/plugin/WatchPage.php:128
-msgid "ERROR: No email defined! You need to do this in your "
+msgid "ERROR: No e-mail defined! You need to do this in your "
msgstr ""
#: ../lib/plugin/WatchPage.php:145
@@ -5189,7 +5189,7 @@
#: ../lib/plugin/WatchPage.php:166
msgid ""
-"E-Mail Notification for the current page successfully stored in your "
+"E-mail notification for the current page successfully stored in your "
"preferences."
msgstr ""
@@ -7278,7 +7278,7 @@
#, php-format
msgid ""
"Welcome to %s!\n"
-"Your email account is verified and\n"
+"Your e-mail account is verified and\n"
"will be used to send page change notifications.\n"
"See %s"
msgstr ""
Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po 2012-11-26 15:56:20 UTC (rev 8545)
+++ trunk/locale/po/es.po 2012-11-26 17:14:51 UTC (rev 8546)
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 16:54+0100\n"
+"POT-Creation-Date: 2012-11-26 18:11+0100\n"
"PO-Revision-Date: 2000-02-01 00:50-0500\n"
"Last-Translator: Pablo Roca <pr...@cl...>\n"
"Language-Team: \n"
@@ -387,7 +387,7 @@
#: ../lib/editpage.php:577
#, php-format
msgid ""
-"The approval has a grace period of 5 days. If you have your E-Mail defined "
+"The approval has a grace period of 5 days. If you have your e-mail defined "
"in your %s, you will get a notification of approval or rejection."
msgstr ""
@@ -2994,7 +2994,7 @@
#: ../lib/plugin/ModeratedPage.php:157 ../lib/plugin/ModeratedPage.php:183
#: ../lib/plugin/ModeratedPage.php:231
-msgid "ModeratedPage: No emails for the moderators defined"
+msgid "ModeratedPage: No e-mails for the moderators defined"
msgstr ""
#: ../lib/plugin/ModeratedPage.php:163
@@ -3024,7 +3024,7 @@
msgstr ""
#: ../lib/plugin/ModeratedPage.php:286
-msgid "ModeratedPage Notification Error: Couldn't send email"
+msgid "ModeratedPage Notification Error: Couldn't send e-mail"
msgstr ""
#: ../lib/plugin/ModeratedPage.php:366
@@ -3358,12 +3358,12 @@
#: ../lib/plugin/PasswordReset.php:88
#, php-format
-msgid "Email sent to the stored email address for user %s"
+msgid "E-mail sent to the stored e-mail address for user %s"
msgstr ""
#: ../lib/plugin/PasswordReset.php:91
#, php-format
-msgid "Error sending email with password for user %s."
+msgid "Error sending e-mail with password for user %s."
msgstr ""
#: ../lib/plugin/PasswordReset.php:99
@@ -3371,7 +3371,7 @@
msgstr "Restablecimiento de la contraseña de usuario: "
#: ../lib/plugin/PasswordReset.php:109 ../lib/plugin/PasswordReset.php:153
-msgid "Send email"
+msgid "Send e-mail"
msgstr ""
#: ../lib/plugin/PasswordReset.php:139
@@ -3388,7 +3388,7 @@
#: ../lib/plugin/PasswordReset.php:171
#, php-format
-msgid "No email stored for user %s."
+msgid "No e-mail stored for user %s."
msgstr ""
#: ../lib/plugin/PasswordReset.php:173
@@ -3401,7 +3401,7 @@
msgstr ""
#: ../lib/plugin/PasswordReset.php:186
-msgid "An email will be sent."
+msgid "An e-mail will be sent."
msgstr ""
#: ../lib/plugin/PhotoAlbum.php:100 ../themes/blog/templates/actionbar.tmpl:8
@@ -5012,7 +5012,7 @@
msgstr ""
#: ../lib/plugin/WatchPage.php:42
-msgid "Manage notifications emails per page."
+msgid "Manage notifications e-mails per page."
msgstr ""
#: ../lib/plugin/WatchPage.php:84
@@ -5059,7 +5059,7 @@
msgstr ""
#: ../lib/plugin/WatchPage.php:128
-msgid "ERROR: No email defined! You need to do this in your "
+msgid "ERROR: No e-mail defined! You need to do this in your "
msgstr ""
#: ../lib/plugin/WatchPage.php:145
@@ -5069,7 +5069,7 @@
#: ../lib/plugin/WatchPage.php:166
msgid ""
-"E-Mail Notification for the current page successfully stored in your "
+"E-mail notification for the current page successfully stored in your "
"preferences."
msgstr ""
@@ -7113,7 +7113,7 @@
#, php-format
msgid ""
"Welcome to %s!\n"
-"Your email account is verified and\n"
+"Your e-mail account is verified and\n"
"will be used to send page change notifications.\n"
"See %s"
msgstr ""
Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po 2012-11-26 15:56:20 UTC (rev 8545)
+++ trunk/locale/po/fr.po 2012-11-26 17:14:51 UTC (rev 8546)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 16:54+0100\n"
+"POT-Creation-Date: 2012-11-26 18:11+0100\n"
"PO-Revision-Date: 2004-06-22 21:10+0200\n"
"Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
"Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -385,7 +385,7 @@
#: ../lib/editpage.php:577
#, php-format
msgid ""
-"The approval has a grace period of 5 days. If you have your E-Mail defined "
+"The approval has a grace period of 5 days. If you have your e-mail defined "
"in your %s, you will get a notification of approval or rejection."
msgstr ""
@@ -3004,8 +3004,8 @@
#: ../lib/plugin/ModeratedPage.php:157 ../lib/plugin/ModeratedPage.php:183
#: ../lib/plugin/ModeratedPage.php:231
-msgid "ModeratedPage: No emails for the moderators defined"
-msgstr "PageModerée: No emails for the moderators defined"
+msgid "ModeratedPage: No e-mails for the moderators defined"
+msgstr "PageModerée: No e-mails for the moderators defined"
#: ../lib/plugin/ModeratedPage.php:163
#, php-format
@@ -3034,7 +3034,7 @@
msgstr ""
#: ../lib/plugin/ModeratedPage.php:286
-msgid "ModeratedPage Notification Error: Couldn't send email"
+msgid "ModeratedPage Notification Error: Couldn't send e-mail"
msgstr "Erreur lors des notifications de page: Impossible d'envoyer"
#: ../lib/plugin/ModeratedPage.php:366
@@ -3375,12 +3375,12 @@
#: ../lib/plugin/PasswordReset.php:88
#, php-format
-msgid "Email sent to the stored email address for user %s"
+msgid "E-mail sent to the stored e-mail address for user %s"
msgstr ""
#: ../lib/plugin/PasswordReset.php:91
#, php-format
-msgid "Error sending email with password for user %s."
+msgid "Error sending e-mail with password for user %s."
msgstr ""
#: ../lib/plugin/PasswordReset.php:99
@@ -3388,7 +3388,7 @@
msgstr ""
#: ../lib/plugin/PasswordReset.php:109 ../lib/plugin/PasswordReset.php:153
-msgid "Send email"
+msgid "Send e-mail"
msgstr "Envoyer message"
#: ../lib/plugin/PasswordReset.php:139
@@ -3405,7 +3405,7 @@
#: ../lib/plugin/PasswordReset.php:171
#, php-format
-msgid "No email stored for user %s."
+msgid "No e-mail stored for user %s."
msgstr ""
#: ../lib/plugin/PasswordReset.php:173
@@ -3415,10 +3415,10 @@
#: ../lib/plugin/PasswordReset.php:185
#, php-format
msgid "Do you really want to reset the password of user %s?"
-msgstr "Voulez-vous réellement réinitialiser les mot de passe de %s ?"
+msgstr "Voulez-vous réellement réinitialiser le mot de passe de %s ?"
#: ../lib/plugin/PasswordReset.php:186
-msgid "An email will be sent."
+msgid "An e-mail will be sent."
msgstr ""
#: ../lib/plugin/PhotoAlbum.php:100 ../themes/blog/templates/actionbar.tmpl:8
@@ -5064,7 +5064,7 @@
msgstr "Suivre"
#: ../lib/plugin/WatchPage.php:42
-msgid "Manage notifications emails per page."
+msgid "Manage notifications e-mails per page."
msgstr ""
#: ../lib/plugin/WatchPage.php:84
@@ -5111,7 +5111,7 @@
msgstr "Vous devez vous identifier pour surveiller des pages."
#: ../lib/plugin/WatchPage.php:128
-msgid "ERROR: No email defined! You need to do this in your "
+msgid "ERROR: No e-mail defined! You need to do this in your "
msgstr ""
"ERREUR : pas d'adresse électronique définie! Vous devez le faire dans vos "
@@ -5121,7 +5121,7 @@
#: ../lib/plugin/WatchPage.php:166
msgid ""
-"E-Mail Notification for the current page successfully stored in your "
+"E-mail notification for the current page successfully stored in your "
"preferences."
msgstr ""
@@ -7183,13 +7183,13 @@
#, php-format
msgid ""
"Welcome to %s!\n"
-"Your email account is verified and\n"
+"Your e-mail account is verified and\n"
"will be used to send page change notifications.\n"
"See %s"
msgstr ""
"Bienvenue sur %s!\n"
-"Votre compte email a été vérifié et\n"
-"sera utilisé pour les notifications de changements de pages.\n"
+"Votre adresse électronique a été vérifiée et\n"
+"sera utilisée pour les notifications de changements de pages.\n"
"Voir %s"
#: ../lib/WikiUserNew.php:1881
@@ -7281,7 +7281,7 @@
#: ../lib/WysiwygEdit/Wikiwyg.php:72
msgid "Apply changes"
-msgstr "Appliquer les changements."
+msgstr "Appliquer les changements"
#: ../lib/WysiwygEdit/Wikiwyg.php:73
msgid "Exit toolbar"
Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po 2012-11-26 15:56:20 UTC (rev 8545)
+++ trunk/locale/po/it.po 2012-11-26 17:14:51 UTC (rev 8546)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 16:54+0100\n"
+"POT-Creation-Date: 2012-11-26 18:11+0100\n"
"PO-Revision-Date: 2005-02-12 16:23+0100\n"
"Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n"
"Language-Team: \n"
@@ -376,7 +376,7 @@
#: ../lib/editpage.php:577
#, php-format
msgid ""
-"The approval has a grace period of 5 days. If you have your E-Mail defined "
+"The approval has a grace period of 5 days. If you have your e-mail defined "
"in your %s, you will get a notification of approval or rejection."
msgstr ""
@@ -2974,7 +2974,7 @@
#: ../lib/plugin/ModeratedPage.php:157 ../lib/plugin/ModeratedPage.php:183
#: ../lib/plugin/ModeratedPage.php:231
-msgid "ModeratedPage: No emails for the moderators defined"
+msgid "ModeratedPage: No e-mails for the moderators defined"
msgstr ""
#: ../lib/plugin/ModeratedPage.php:163
@@ -3004,7 +3004,7 @@
msgstr ""
#: ../lib/plugin/ModeratedPage.php:286
-msgid "ModeratedPage Notification Error: Couldn't send email"
+msgid "ModeratedPage Notification Error: Couldn't send e-mail"
msgstr ""
#: ../lib/plugin/ModeratedPage.php:366
@@ -3338,12 +3338,12 @@
#: ../lib/plugin/PasswordReset.php:88
#, php-format
-msgid "Email sent to the stored email address for user %s"
+msgid "E-mail sent to the stored e-mail address for user %s"
msgstr ""
#: ../lib/plugin/PasswordReset.php:91
#, php-format
-msgid "Error sending email with password for user %s."
+msgid "Error sending e-mail with password for user %s."
msgstr ""
#: ../lib/plugin/PasswordReset.php:99
@@ -3351,7 +3351,7 @@
msgstr ""
#: ../lib/plugin/PasswordReset.php:109 ../lib/plugin/PasswordReset.php:153
-msgid "Send email"
+msgid "Send e-mail"
msgstr ""
#: ../lib/plugin/PasswordReset.php:139
@@ -3368,7 +3368,7 @@
#: ../lib/plugin/PasswordReset.php:171
#, php-format
-msgid "No email stored for user %s."
+msgid "No e-mail stored for user %s."
msgstr ""
#: ../lib/plugin/PasswordReset.php:173
@@ -3381,7 +3381,7 @@
msgstr ""
#: ../lib/plugin/PasswordReset.php:186
-msgid "An email will be sent."
+msgid "An e-mail will be sent."
msgstr ""
#: ../lib/plugin/PhotoAlbum.php:100 ../themes/blog/templates/actionbar.tmpl:8
@@ -4988,7 +4988,7 @@
msgstr ""
#: ../lib/plugin/WatchPage.php:42
-msgid "Manage notifications emails per page."
+msgid "Manage notifications e-mails per page."
msgstr ""
#: ../lib/plugin/WatchPage.php:84
@@ -5035,7 +5035,7 @@
msgstr ""
#: ../lib/plugin/WatchPage.php:128
-msgid "ERROR: No email defined! You need to do this in your "
+msgid "ERROR: No e-mail defined! You need to do this in your "
msgstr ""
#: ../lib/plugin/WatchPage.php:145
@@ -5045,7 +5045,7 @@
#: ../lib/plugin/WatchPage.php:166
msgid ""
-"E-Mail Notification for the current page successfully stored in your "
+"E-mail notification for the current page successfully stored in your "
"preferences."
msgstr ""
@@ -7071,7 +7071,7 @@
#, php-format
msgid ""
"Welcome to %s!\n"
-"Your email account is verified and\n"
+"Your e-mail account is verified and\n"
"will be used to send page change notifications.\n"
"See %s"
msgstr ""
Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po 2012-11-26 15:56:20 UTC (rev 8545)
+++ trunk/locale/po/ja.po 2012-11-26 17:14:51 UTC (rev 8546)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 16:54+0100\n"
+"POT-Creation-Date: 2012-11-26 18:11+0100\n"
"PO-Revision-Date: 2003-06-07 09:01+0900\n"
"Last-Translator: Tadashi Jokagi <web...@el...>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
@@ -373,7 +373,7 @@
#: ../lib/editpage.php:577
#, php-format
msgid ""
-"The approval has a grace period of 5 days. If you have your E-Mail defined "
+"The approval has a grace period of 5 days. If you have your e-mail defined "
"in your %s, you will get a notification of approval or rejection."
msgstr ""
@@ -3012,7 +3012,7 @@
#: ../lib/plugin/ModeratedPage.php:157 ../lib/plugin/ModeratedPage.php:183
#: ../lib/plugin/ModeratedPage.php:231
-msgid "ModeratedPage: No emails for the moderators defined"
+msgid "ModeratedPage: No e-mails for the moderators defined"
msgstr ""
#: ../lib/plugin/ModeratedPage.php:163
@@ -3042,7 +3042,7 @@
msgstr ""
#: ../lib/plugin/ModeratedPage.php:286
-msgid "ModeratedPage Notification Error: Couldn't send email"
+msgid "ModeratedPage Notification Error: Couldn't send e-mail"
msgstr ""
#: ../lib/plugin/ModeratedPage.php:366
@@ -3380,12 +3380,12 @@
#: ../lib/plugin/PasswordReset.php:88
#, php-format
-msgid "Email sent to the stored email address for user %s"
+msgid "E-mail sent to the stored e-mail address for user %s"
msgstr ""
#: ../lib/plugin/PasswordReset.php:91
#, fuzzy, php-format
-msgid "Error sending email with password for user %s."
+msgid "Error sending e-mail with password for user %s."
msgstr "ユーザーIDかパスワードが無効です。"
#: ../lib/plugin/PasswordReset.php:99
@@ -3394,7 +3394,7 @@
msgstr "ユーザーIDかパスワードが無効です。"
#: ../lib/plugin/PasswordReset.php:109 ../lib/plugin/PasswordReset.php:153
-msgid "Send email"
+msgid "Send e-mail"
msgstr ""
#: ../lib/plugin/PasswordReset.php:139
@@ -3411,7 +3411,7 @@
#: ../lib/plugin/PasswordReset.php:171
#, php-format
-msgid "No email stored for user %s."
+msgid "No e-mail stored for user %s."
msgstr ""
#: ../lib/plugin/PasswordReset.php:173
@@ -3424,7 +3424,7 @@
msgstr ""
#: ../lib/plugin/PasswordReset.php:186
-msgid "An email will be sent."
+msgid "An e-mail will be sent."
msgstr ""
#: ../lib/plugin/PhotoAlbum.php:100 ../themes/blog/templates/actionbar.tmpl:8
@@ -5064,7 +5064,7 @@
msgstr "幅"
#: ../lib/plugin/WatchPage.php:42
-msgid "Manage notifications emails per page."
+msgid "Manage notifications e-mails per page."
msgstr ""
#: ../lib/plugin/WatchPage.php:84
@@ -5113,7 +5113,7 @@
msgstr "%s としてサインインしました"
#: ../lib/plugin/WatchPage.php:128
-msgid "ERROR: No email defined! You need to do this in your "
+msgid "ERROR: No e-mail defined! You need to do this in your "
msgstr ""
#: ../lib/plugin/WatchPage.php:145
@@ -5123,7 +5123,7 @@
#: ../lib/plugin/WatchPage.php:166
msgid ""
-"E-Mail Notification for the current page successfully stored in your "
+"E-mail notification for the current page successfully stored in your "
"preferences."
msgstr ""
@@ -7216,7 +7216,7 @@
#, php-format
msgid ""
"Welcome to %s!\n"
-"Your email account is verified and\n"
+"Your e-mail account is verified and\n"
"will be used to send page change notifications.\n"
"See %s"
msgstr ""
Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po 2012-11-26 15:56:20 UTC (rev 8545)
+++ trunk/locale/po/nl.po 2012-11-26 17:14:51 UTC (rev 8546)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 16:54+0100\n"
+"POT-Creation-Date: 2012-11-26 18:11+0100\n"
"PO-Revision-Date: 2000-09-30 02:23+0200\n"
"Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
"Language-Team: Dutch <nl...@li...>\n"
@@ -379,7 +379,7 @@
#: ../lib/editpage.php:577
#, php-format
msgid ""
-"The approval has a grace period of 5 days. If you have your E-Mail defined "
+"The approval has a grace period of 5 days. If you have your e-mail defined "
"in your %s, you will get a notification of approval or rejection."
msgstr ""
@@ -2966,7 +2966,7 @@
#: ../lib/plugin/ModeratedPage.php:157 ../lib/plugin/ModeratedPage.php:183
#: ../lib/plugin/ModeratedPage.php:231
-msgid "ModeratedPage: No emails for the moderators defined"
+msgid "ModeratedPage: No e-mails for the moderators defined"
msgstr ""
#: ../lib/plugin/ModeratedPage.php:163
@@ -2996,7 +2996,7 @@
msgstr ""
#: ../lib/plugin/ModeratedPage.php:286
-msgid "ModeratedPage Notification Error: Couldn't send email"
+msgid "ModeratedPage Notification Error: Couldn't send e-mail"
msgstr ""
#: ../lib/plugin/ModeratedPage.php:366
@@ -3330,12 +3330,12 @@
#: ../lib/plugin/PasswordReset.php:88
#, php-format
-msgid "Email sent to the stored email address for user %s"
+msgid "E-mail sent to the stored e-mail address for user %s"
msgstr ""
#: ../lib/plugin/PasswordReset.php:91
#, php-format
-msgid "Error sending email with password for user %s."
+msgid "Error sending e-mail with password for user %s."
msgstr ""
#: ../lib/plugin/PasswordReset.php:99
@@ -3343,7 +3343,7 @@
msgstr ""
#: ../lib/plugin/PasswordReset.php:109 ../lib/plugin/PasswordReset.php:153
-msgid "Send email"
+msgid "Send e-mail"
msgstr ""
#: ../lib/plugin/PasswordReset.php:139
@@ -3360,7 +3360,7 @@
#: ../lib/plugin/PasswordReset.php:171
#, php-format
-msgid "No email stored for user %s."
+msgid "No e-mail stored for user %s."
msgstr ""
#: ../lib/plugin/PasswordReset.php:173
@@ -3373,7 +3373,7 @@
msgstr ""
#: ../lib/plugin/PasswordReset.php:186
-msgid "An email will be sent."
+msgid "An e-mail will be sent."
msgstr ""
#: ../lib/plugin/PhotoAlbum.php:100 ../themes/blog/templates/actionbar.tmpl:8
@@ -4980,7 +4980,7 @@
msgstr ""
#: ../lib/plugin/WatchPage.php:42
-msgid "Manage notifications emails per page."
+msgid "Manage notifications e-mails per page."
msgstr ""
#: ../lib/plugin/WatchPage.php:84
@@ -5027,7 +5027,7 @@
msgstr ""
#: ../lib/plugin/WatchPage.php:128
-msgid "ERROR: No email defined! You need to do this in your "
+msgid "ERROR: No e-mail defined! You need to do this in your "
msgstr ""
#: ../lib/plugin/WatchPage.php:145
@@ -5036,7 +5036,7 @@
#: ../lib/plugin/WatchPage.php:166
msgid ""
-"E-Mail Notification for the current page successfully stored in your "
+"E-mail notification for the current page successfully stored in your "
"preferences."
msgstr ""
@@ -7058,7 +7058,7 @@
#, php-format
msgid ""
"Welcome to %s!\n"
-"Your email account is verified and\n"
+"Your e-mail account is verified and\n"
"will be used to send page change notifications.\n"
"See %s"
msgstr ""
Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot 2012-11-26 15:56:20 UTC (rev 8545)
+++ trunk/locale/po/phpwiki.pot 2012-11-26 17:14:51 UTC (rev 8546)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki-1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 16:54+0100\n"
+"POT-Creation-Date: 2012-11-26 18:11+0100\n"
"PO-Revision-Date: 2002-12-14 17:51-0500\n"
"Last-Translator: Reini Urban <ru...@us...>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
@@ -373,7 +373,7 @@
#: ../lib/editpage.php:577
#, php-format
msgid ""
-"The approval has a grace period of 5 days. If you have your E-Mail defined "
+"The approval has a grace period of 5 days. If you have your e-mail defined "
"in your %s, you will get a notification of approval or rejection."
msgstr ""
@@ -2959,7 +2959,7 @@
#: ../lib/plugin/ModeratedPage.php:157 ../lib/plugin/ModeratedPage.php:183
#: ../lib/plugin/ModeratedPage.php:231
-msgid "ModeratedPage: No emails for the moderators defined"
+msgid "ModeratedPage: No e-mails for the moderators defined"
msgstr ""
#: ../lib/plugin/ModeratedPage.php:163
@@ -2989,7 +2989,7 @@
msgstr ""
#: ../lib/plugin/ModeratedPage.php:286
-msgid "ModeratedPage Notification Error: Couldn't send email"
+msgid "ModeratedPage Notification Error: Couldn't send e-mail"
msgstr ""
#: ../lib/plugin/ModeratedPage.php:366
@@ -3323,12 +3323,12 @@
#: ../lib/plugin/PasswordReset.php:88
#, php-format
-msgid "Email sent to the stored email address for user %s"
+msgid "E-mail sent to the stored e-mail address for user %s"
msgstr ""
#: ../lib/plugin/PasswordReset.php:91
#, php-format
-msgid "Error sending email with password for user %s."
+msgid "Error sending e-mail with password for user %s."
msgstr ""
#: ../lib/plugin/PasswordReset.php:99
@@ -3336,7 +3336,7 @@
msgstr ""
#: ../lib/plugin/PasswordReset.php:109 ../lib/plugin/PasswordReset.php:153
-msgid "Send email"
+msgid "Send e-mail"
msgstr ""
#: ../lib/plugin/PasswordReset.php:139
@@ -3353,7 +3353,7 @@
#: ../lib/plugin/PasswordReset.php:171
#, php-format
-msgid "No email stored for user %s."
+msgid "No e-mail stored for user %s."
msgstr ""
#: ../lib/plugin/PasswordReset.php:173
@@ -3366,7 +3366,7 @@
msgstr ""
#: ../lib/plugin/PasswordReset.php:186
-msgid "An email will be sent."
+msgid "An e-mail will be sent."
msgstr ""
#: ../lib/plugin/PhotoAlbum.php:100 ../themes/blog/templates/actionbar.tmpl:8
@@ -4973,7 +4973,7 @@
msgstr ""
#: ../lib/plugin/WatchPage.php:42
-msgid "Manage notifications emails per page."
+msgid "Manage notifications e-mails per page."
msgstr ""
#: ../lib/plugin/WatchPage.php:84
@@ -5020,7 +5020,7 @@
msgstr ""
#: ../lib/plugin/WatchPage.php:128
-msgid "ERROR: No email defined! You need to do this in your "
+msgid "ERROR: No e-mail defined! You need to do this in your "
msgstr ""
#: ../lib/plugin/WatchPage.php:145
@@ -5029,7 +5029,7 @@
#: ../lib/plugin/WatchPage.php:166
msgid ""
-"E-Mail Notification for the current page successfully stored in your "
+"E-mail notification for the current page successfully stored in your "
"preferences."
msgstr ""
@@ -7049,7 +7049,7 @@
#, php-format
msgid ""
"Welcome to %s!\n"
-"Your email account is verified and\n"
+"Your e-mail account is verified and\n"
"will be used to send page change notifications.\n"
"See %s"
msgstr ""
Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po 2012-11-26 15:56:20 UTC (rev 8545)
+++ trunk/locale/po/sv.po 2012-11-26 17:14:51 UTC (rev 8546)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 16:54+0100\n"
+"POT-Creation-Date: 2012-11-26 18:11+0100\n"
"PO-Revision-Date: 2001-01-27 01:58+0200\n"
"Last-Translator: Jon Åslund <jo...@he...>\n"
"Language-Team: \n"
@@ -374,7 +374,7 @@
#: ../lib/editpage.php:577
#, php-format
msgid ""
-"The approval has a grace period of 5 days. If you have your E-Mail defined "
+"The approval has a grace period of 5 days. If you have your e-mail defined "
"in your %s, you will get a notification of approval or rejection."
msgstr ""
@@ -2961,7 +2961,7 @@
#: ../lib/plugin/ModeratedPage.php:157 ../lib/plugin/ModeratedPage.php:183
#: ../lib/plugin/ModeratedPage.php:231
-msgid "ModeratedPage: No emails for the moderators defined"
+msgid "ModeratedPage: No e-mails for the moderators defined"
msgstr ""
#: ../lib/plugin/ModeratedPage.php:163
@@ -2991,7 +2991,7 @@
msgstr ""
#: ../lib/plugin/ModeratedPage.php:286
-msgid "ModeratedPage Notification Error: Couldn't send email"
+msgid "ModeratedPage Notification Error: Couldn't send e-mail"
msgstr ""
#: ../lib/plugin/ModeratedPage.php:366
@@ -3325,12 +3325,12 @@
#: ../lib/plugin/PasswordReset.php:88
#, php-format
-msgid "Email sent to the stored email address for user %s"
+msgid "E-mail sent to the stored e-mail address for user %s"
msgstr ""
#: ../lib/plugin/PasswordReset.php:91
#, php-format
-msgid "Error sending email with password for user %s."
+msgid "Error sending e-mail with password for user %s."
msgstr ""
#: ../lib/plugin/PasswordReset.php:99
@@ -3338,7 +3338,7 @@
msgstr ""
#: ../lib/plugin/PasswordReset.php:109 ../lib/plugin/PasswordReset.php:153
-msgid "Send email"
+msgid "Send e-mail"
msgstr ""
#: ../lib/plugin/PasswordReset.php:139
@@ -3355,7 +3355,7 @@
#: ../lib/plugin/PasswordReset.php:171
#, php-format
-msgid "No email stored for user %s."
+msgid "No e-mail stored for user %s."
msgstr ""
#: ../lib/plugin/PasswordReset.php:173
@@ -3368,7 +3368,7 @@
msgstr ""
#: ../lib/plugin/PasswordReset.php:186
-msgid "An email will be sent."
+msgid "An e-mail will be sent."
msgstr ""
#: ../lib/plugin/PhotoAlbum.php:100 ../themes/blog/templates/actionbar.tmpl:8
@@ -4975,7 +4975,7 @@
msgstr ""
#: ../lib/plugin/WatchPage.php:42
-msgid "Manage notifications emails per page."
+msgid "Manage notifications e-mails per page."
msgstr ""
#: ../lib/plugin/WatchPage.php:84
@@ -5022,7 +5022,7 @@
msgstr ""
#: ../lib/plugin/WatchPage.php:128
-msgid "ERROR: No email defined! You need to do this in your "
+msgid "ERROR: No e-mail defined! You need to do this in your "
msgstr ""
#: ../lib/plugin/WatchPage.php:145
@@ -5031,7 +5031,7 @@
#: ../lib/plugin/WatchPage.php:166
msgid ""
-"E-Mail Notification for the current page successfully stored in your "
+"E-mail notification for the current page successfully stored in your "
"preferences."
msgstr ""
@@ -7052,7 +7052,7 @@
#, php-format
msgid ""
"Welcome to %s!\n"
-"Your email account is verified and\n"
+"Your e-mail account is verified and\n"
"will be used to send page change notifications.\n"
"See %s"
msgstr ""
Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po 2012-11-26 15:56:20 UTC (rev 8545)
+++ trunk/locale/po/zh.po 2012-11-26 17:14:51 UTC (rev 8546)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 16:54+0100\n"
+"POT-Creation-Date: 2012-11-26 18:11+0100\n"
"PO-Revision-Date: 2004-04-21 10:08+0800\n"
"Last-Translator: DruryL <dr...@us...>\n"
"Language-Team: DruryL <dr...@us...>\n"
@@ -383,7 +383,7 @@
#: ../lib/editpage.php:577
#, php-format
msgid ""
-"The approval has a grace period of 5 days. If you have your E-Mail defined "
+"The approval has a grace period of 5 days. If you have your e-mail defined "
"in your %s, you will get a notification of approval or rejection."
msgstr ""
@@ -3081,7 +3081,7 @@
#: ../lib/plugin/ModeratedPage.php:157 ../lib/plugin/ModeratedPage.php:183
#: ../lib/plugin/ModeratedPage.php:231
-msgid "ModeratedPage: No emails for the moderators defined"
+msgid "ModeratedPage: No e-mails for the moderators defined"
msgstr ""
#: ../lib/plugin/ModeratedPage.php:163
@@ -3112,7 +3112,7 @@
#: ../lib/plugin/ModeratedPage.php:286
#, fuzzy
-msgid "ModeratedPage Notification Error: Couldn't send email"
+msgid "ModeratedPage Notification Error: Couldn't send e-mail"
msgstr "PageChange 通知錯誤: 無法送 %s 給 %s"
#: ../lib/plugin/ModeratedPage.php:366
@@ -3458,12 +3458,12 @@
#: ../lib/plugin/PasswordReset.php:88
#, php-format
-msgid "Email sent to the stored email address for user %s"
+msgid "E-mail sent to the stored e-mail address for user %s"
msgstr ""
#: ../lib/plugin/PasswordReset.php:91
#, fuzzy, php-format
-msgid "Error sending email with password for user %s."
+msgid "Error sending e-mail with password for user %s."
msgstr "錯誤的密碼或使用者帳號."
#: ../lib/plugin/PasswordReset.php:99
@@ -3472,7 +3472,7 @@
msgstr "錯誤的密碼或使用者帳號."
#: ../lib/plugin/PasswordReset.php:109 ../lib/plugin/PasswordReset.php:153
-msgid "Send email"
+msgid "Send e-mail"
msgstr ""
#: ../lib/plugin/PasswordReset.php:139
@@ -3489,7 +3489,7 @@
#: ../lib/plugin/PasswordReset.php:171
#, php-format
-msgid "No email stored for user %s."
+msgid "No e-mail stored for user %s."
msgstr ""
#: ../lib/plugin/PasswordReset.php:173
@@ -3503,7 +3503,7 @@
msgstr ""
#: ../lib/plugin/PasswordReset.php:186
-msgid "An email will be sent."
+msgid "An e-mail will be sent."
msgstr ""
#: ../lib/plugin/PhotoAlbum.php:100 ../themes/blog/templates/actionbar.tmpl:8
@@ -5187,7 +5187,7 @@
msgstr "寬度"
#: ../lib/plugin/WatchPage.php:42
-msgid "Manage notifications emails per page."
+msgid "Manage notifications e-mails per page."
msgstr ""
#: ../lib/plugin/WatchPage.php:84
@@ -5236,7 +5236,7 @@
msgstr "你必須簽入才能 %s."
#: ../lib/plugin/WatchPage.php:128
-msgid "ERROR: No email defined! You need to do this in your "
+msgid "ERROR: No e-mail defined! You need to do this in your "
msgstr ""
#: ../lib/plugin/WatchPage.php:145
@@ -5246,7 +5246,7 @@
#: ../lib/plugin/WatchPage.php:166
msgid ""
-"E-Mail Notification for the current page successfully stored in your "
+"E-mail notification for the current page successfully stored in your "
"preferences."
msgstr ""
@@ -7366,7 +7366,7 @@
#, fuzzy, php-format
msgid ""
"Welcome to %s!\n"
-"Your email account is verified and\n"
+"Your e-mail account is verified and\n"
"will be used to send page change notifications.\n"
"See %s"
msgstr ""
Modified: trunk/locale/sv/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <var...@us...> - 2012-11-26 19:37:57
|
Revision: 8548
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8548&view=rev
Author: vargenau
Date: 2012-11-26 19:37:47 +0000 (Mon, 26 Nov 2012)
Log Message:
-----------
Less messages
Modified Paths:
--------------
trunk/lib/plugin/ModeratedPage.php
trunk/lib/plugin/SystemInfo.php
trunk/lib/plugin/WikiAdminDeleteAcl.php
trunk/locale/de/LC_MESSAGES/phpwiki.mo
trunk/locale/de/LC_MESSAGES/phpwiki.php
trunk/locale/es/LC_MESSAGES/phpwiki.mo
trunk/locale/fr/LC_MESSAGES/phpwiki.mo
trunk/locale/fr/LC_MESSAGES/phpwiki.php
trunk/locale/it/LC_MESSAGES/phpwiki.mo
trunk/locale/ja/LC_MESSAGES/phpwiki.mo
trunk/locale/ja/LC_MESSAGES/phpwiki.php
trunk/locale/nl/LC_MESSAGES/phpwiki.mo
trunk/locale/po/de.po
trunk/locale/po/es.po
trunk/locale/po/fr.po
trunk/locale/po/it.po
trunk/locale/po/ja.po
trunk/locale/po/nl.po
trunk/locale/po/phpwiki.pot
trunk/locale/po/sv.po
trunk/locale/po/zh.po
trunk/locale/sv/LC_MESSAGES/phpwiki.mo
trunk/locale/zh/LC_MESSAGES/phpwiki.mo
trunk/locale/zh/LC_MESSAGES/phpwiki.php
trunk/themes/default/templates/userprefs.tmpl
Modified: trunk/lib/plugin/ModeratedPage.php
===================================================================
--- trunk/lib/plugin/ModeratedPage.php 2012-11-26 17:44:33 UTC (rev 8547)
+++ trunk/lib/plugin/ModeratedPage.php 2012-11-26 19:37:47 UTC (rev 8548)
@@ -63,7 +63,7 @@
{
$args = $this->getArgs($argstr, $request);
- // Handle moderation request from urls sent by email
+ // Handle moderation request from URLs sent by e-mail
if (!empty($args['id']) and !empty($args['pass'])) {
if (!$args['page']) {
return $this->error(sprintf(_("A required argument '%s' is missing."), 'page'));
@@ -154,8 +154,7 @@
$status = $this->getSiteStatus($request, $action_page);
if (is_array($status)) {
if (empty($status['emails'])) {
- trigger_error(_("ModeratedPage: No e-mails for the moderators defined"),
- E_USER_WARNING);
+ trigger_error(_("No e-mails for the moderators defined"), E_USER_WARNING);
return false;
}
$page->set('moderation', array('status' => $status));
@@ -180,8 +179,7 @@
if (is_array($status)) {
if (empty($status['emails'])) {
// We really should present such warnings prominently.
- trigger_error(_("ModeratedPage: No e-mails for the moderators defined"),
- E_USER_WARNING);
+ trigger_error(_("No e-mails for the moderators defined"), E_USER_WARNING);
return false;
}
$page->set('moderation', array('status' => $status));
@@ -228,8 +226,7 @@
$moderated['status'] = $status;
}
if (empty($status['emails'])) {
- trigger_error(_("ModeratedPage: No e-mails for the moderators defined"),
- E_USER_WARNING);
+ trigger_error(_("No e-mails for the moderators defined"), E_USER_WARNING);
return true;
}
// which action?
Modified: trunk/lib/plugin/SystemInfo.php
===================================================================
--- trunk/lib/plugin/SystemInfo.php 2012-11-26 17:44:33 UTC (rev 8547)
+++ trunk/lib/plugin/SystemInfo.php 2012-11-26 19:37:47 UTC (rev 8548)
@@ -468,7 +468,7 @@
return sprintf(_("Total of %d languages: "),
count($available_languages))
. implode(', ', $available_languages) . ". "
- . sprintf(_("Current language: '%s'"), $GLOBALS['LANG'])
+ . _("Current language") . _(": ") . $GLOBALS['LANG']
. ((DEFAULT_LANGUAGE != $GLOBALS['LANG'])
? ". " . sprintf(_("Default language: '%s'"), DEFAULT_LANGUAGE)
: '');
@@ -481,7 +481,7 @@
natcasesort($available_themes);
return sprintf(_("Total of %d themes: "), count($available_themes))
. implode(', ', $available_themes) . ". "
- . sprintf(_("Current theme: '%s'"), $WikiTheme->_name)
+ . _("Current theme") . _(": ") . $WikiTheme->_name
. ((THEME != $WikiTheme->_name)
? ". " . sprintf(_("Default theme: '%s'"), THEME)
: '');
Modified: trunk/lib/plugin/WikiAdminDeleteAcl.php
===================================================================
--- trunk/lib/plugin/WikiAdminDeleteAcl.php 2012-11-26 17:44:33 UTC (rev 8547)
+++ trunk/lib/plugin/WikiAdminDeleteAcl.php 2012-11-26 19:37:47 UTC (rev 8548)
@@ -63,7 +63,7 @@
$version = $current->getVersion();
$meta = $current->_data;
$text = $current->getPackedContent();
- $meta['summary'] = sprintf(_("ACL deleted for page '%s'."), $pagename);
+ $meta['summary'] = sprintf(_("ACL deleted for page '%s'"), $pagename);
$meta['is_minor_edit'] = 1;
$meta['author'] = $request->_user->UserName();
unset($meta['mtime']); // force new date
Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/de/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/de/LC_MESSAGES/phpwiki.php 2012-11-26 17:44:33 UTC (rev 8547)
+++ trunk/locale/de/LC_MESSAGES/phpwiki.php 2012-11-26 19:37:47 UTC (rev 8548)
@@ -312,10 +312,8 @@
$locale["Created directory '%s' for the page dump..."] = "Ein Verzeichnis »%s« wurde erzeugt, um die Dateien abzulegen...";
$locale["Creating pages"] = "Neue Seiten erzeugen";
$locale["Creator"] = "Erzeuger";
-$locale["Current Language"] = "Ausgewählte Sprache";
-$locale["Current Theme"] = "Ausgewählte Darstellung";
-$locale["Current language: '%s'"] = "Ihre Sprache: »%s«";
-$locale["Current theme: '%s'"] = "Ihre Benutzeroberfläche: »%s«";
+$locale["Current language"] = "Ausgewählte Sprache";
+$locale["Current theme"] = "Ausgewählte Darstellung";
$locale["CurrentTime"] = "AktuelleZeit";
$locale["DB admin password:"] = "DB Admin passwort:";
$locale["DB admin user:"] = "DB Admin Benutzername:";
@@ -633,7 +631,6 @@
$locale["Missing ldap extension"] = "Fehlende php LDAP extension";
$locale["ModeratedPage"] = "ModerierteSeite";
$locale["ModeratedPage Notification Error: Couldn't send e-mail"] = "ModerierteSeite Benachrichtigungsfehler: Konnte kein E-Mail versenden";
-$locale["ModeratedPage: No e-mails for the moderators defined"] = "ModerierteSeite: Keine E-Mails für Moderatoren definiert";
$locale["Modern"] = "Modern";
$locale["Modified"] = "Geändert";
$locale["Modified on %s by %s"] = "Kommentare am %s geändert von %s";
@@ -661,6 +658,7 @@
$locale["No changes found"] = "Keine Änderungen gefunden.";
$locale["No changes."] = "Keine Änderungen.";
$locale["No comments found"] = "Keine Kommentare gefunden.";
+$locale["No e-mails for the moderators defined"] = "Keine E-Mails für Moderatoren definiert";
$locale["No empty, unreferenced pages were found."] = "Keine leeren, unverlinkten Seiten gefunden.";
$locale["No metadata for %s"] = "Keine Meta-Daten für %s";
$locale["No or not enough GROUP_DB SQL statements defined"] = "Keine oder zu wenige GROUP_DB SQL Statements definiert";
Modified: trunk/locale/es/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/fr/LC_MESSAGES/phpwiki.php 2012-11-26 17:44:33 UTC (rev 8547)
+++ trunk/locale/fr/LC_MESSAGES/phpwiki.php 2012-11-26 19:37:47 UTC (rev 8548)
@@ -69,7 +69,7 @@
$locale["%s parameter missing"] = "%s paramètre manquant";
$locale["%s words"] = "%s mots";
$locale["%s: %s"] = "%s : %s";
-$locale["%s: Bad action"] = "%s : Mauvaise action";
+$locale["%s: Bad action"] = "%s : mauvaise action";
$locale["%s: Can't open dba database"] = "%s : impossible d'ouvrir la base de données dba";
$locale["%s: Date of new revision is %s"] = "%s : la date de la nouvelle version est %s";
$locale["%s: argument index out of range"] = "%s : index d'argument hors intervalle";
@@ -117,7 +117,6 @@
$locale["ACL"] = "ACL";
$locale["ACL changed for page '%s'"] = "ACL modifié pour la page %s.";
$locale["ACL deleted for page '%s'"] = "ACL supprimée pour la page %s";
-$locale["ACL deleted for page '%s'."] = "ACL supprimée pour la page %s.";
$locale["ACL not changed for page '%s'."] = "ACL inchangée pour la page %s.";
$locale["ACL type"] = "Type d'ACL";
$locale["ADDING"] = "AJOUT";
@@ -319,10 +318,8 @@
$locale["Created directory '%s' for the page dump..."] = "Répertoire « %s » créé pour la sauvegarde...";
$locale["Creating pages"] = "Créer des pages";
$locale["Creator"] = "Créateur";
-$locale["Current Language"] = "Ma langue";
-$locale["Current Theme"] = "Mon thème";
-$locale["Current language: '%s'"] = "Langage actuel : %s";
-$locale["Current theme: '%s'"] = "Thème actuel : '%s'";
+$locale["Current language"] = "Ma langue";
+$locale["Current theme"] = "Mon thème";
$locale["CurrentTime"] = "Heure actuelle";
$locale["DB admin password:"] = "DB admin mot de passe :";
$locale["DB admin user:"] = "DB admin nom de user :";
@@ -658,8 +655,7 @@
$locale["Missing %s for %s"] = "Il manque %s pour %s";
$locale["Missing PagePermission:"] = "Permission de page individuelle absente :";
$locale["ModeratedPage"] = "PageModérée";
-$locale["ModeratedPage Notification Error: Couldn't send e-mail"] = "Erreur lors des notifications de page: Impossible d'envoyer";
-$locale["ModeratedPage: No e-mails for the moderators defined"] = "PageModerée: No e-mails for the moderators defined";
+$locale["ModeratedPage Notification Error: Couldn't send e-mail"] = "Erreur lors des notifications de page: impossible d'envoyer";
$locale["Modern"] = "Moderne";
$locale["Modified"] = "Modifié";
$locale["Modified on %s by %s"] = "Modifié le %s par %s";
Modified: trunk/locale/it/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/ja/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/ja/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/ja/LC_MESSAGES/phpwiki.php 2012-11-26 17:44:33 UTC (rev 8547)
+++ trunk/locale/ja/LC_MESSAGES/phpwiki.php 2012-11-26 19:37:47 UTC (rev 8548)
@@ -41,9 +41,7 @@
$locale["Count"] = "カウント";
$locale["Create: %s"] = "作成: %s";
$locale["Creating pages"] = "ページを作成しています。";
-$locale["Current Language"] = "現在の言語";
-$locale["Current language: '%s'"] = "現在の言語: %s";
-$locale["Current theme: '%s'"] = "現在のテーマ: %s";
+$locale["Current language"] = "現在の言語";
$locale["Date Format"] = "データフォーマット";
$locale["DebugInfo"] = "デバグ情報";
$locale["Default theme: '%s'"] = "デフォルトテーマ: %s";
Modified: trunk/locale/nl/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po 2012-11-26 17:44:33 UTC (rev 8547)
+++ trunk/locale/po/de.po 2012-11-26 19:37:47 UTC (rev 8548)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 18:43+0100\n"
+"POT-Creation-Date: 2012-11-26 20:35+0100\n"
"PO-Revision-Date: 2000-10-31 02:23+0200\n"
"Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
"<car...@us...>, Helmer Pardun <pardunpress@t-online."
@@ -352,11 +352,11 @@
#: ../lib/editpage.php:575 ../lib/editpage.php:576 ../lib/main.php:832
#: ../lib/main.php:1218 ../lib/plugin/ModeratedPage.php:43
-#: ../lib/plugin/ModeratedPage.php:153 ../lib/plugin/ModeratedPage.php:226
-#: ../lib/plugin/ModeratedPage.php:268 ../lib/plugin/ModeratedPage.php:271
-#: ../lib/plugin/ModeratedPage.php:273 ../lib/plugin/ModeratedPage.php:275
-#: ../lib/plugin/ModeratedPage.php:360 ../lib/plugin/ModeratedPage.php:364
-#: ../lib/plugin/ModeratedPage.php:420 ../lib/plugin/ModeratedPage.php:446
+#: ../lib/plugin/ModeratedPage.php:153 ../lib/plugin/ModeratedPage.php:224
+#: ../lib/plugin/ModeratedPage.php:265 ../lib/plugin/ModeratedPage.php:268
+#: ../lib/plugin/ModeratedPage.php:270 ../lib/plugin/ModeratedPage.php:272
+#: ../lib/plugin/ModeratedPage.php:357 ../lib/plugin/ModeratedPage.php:361
+#: ../lib/plugin/ModeratedPage.php:417 ../lib/plugin/ModeratedPage.php:443
msgid "ModeratedPage"
msgstr "ModerierteSeite"
@@ -701,10 +701,11 @@
msgid "Invalid [] syntax ignored"
msgstr "Ungültige [] syntax ignoriert"
-#: ../lib/InlineParser.php:358 ../lib/plugin/ModeratedPage.php:268
-#: ../lib/plugin/ModeratedPage.php:271 ../lib/plugin/ModeratedPage.php:364
+#: ../lib/InlineParser.php:358 ../lib/plugin/ModeratedPage.php:265
+#: ../lib/plugin/ModeratedPage.php:268 ../lib/plugin/ModeratedPage.php:361
#: ../lib/plugin/SemanticSearch.php:163 ../lib/plugin/SemanticSearch.php:246
-#: ../lib/plugin/SpellCheck.php:187 ../lib/plugin/WikiAdminRename.php:277
+#: ../lib/plugin/SpellCheck.php:187 ../lib/plugin/SystemInfo.php:471
+#: ../lib/plugin/SystemInfo.php:484 ../lib/plugin/WikiAdminRename.php:277
#: ../lib/plugin/WikiAdminRename.php:283
#: ../lib/plugin/WikiAdminSearchReplace.php:240
#: ../lib/plugin/WikiAdminSearchReplace.php:244
@@ -1389,7 +1390,7 @@
msgid "You must wait for moderator approval."
msgstr "Sie müssen auf die Zustimmung des Moderators warten."
-#: ../lib/main.php:846 ../lib/plugin/ModeratedPage.php:319
+#: ../lib/main.php:846 ../lib/plugin/ModeratedPage.php:316
#, php-format
msgid "%s: Bad action"
msgstr "%s: Ungültige Aktion"
@@ -3040,12 +3041,12 @@
msgid "Support moderated pages"
msgstr "Unterstütze moderierte Seiten"
-#: ../lib/plugin/ModeratedPage.php:157 ../lib/plugin/ModeratedPage.php:183
-#: ../lib/plugin/ModeratedPage.php:231
-msgid "ModeratedPage: No e-mails for the moderators defined"
-msgstr "ModerierteSeite: Keine E-Mails für Moderatoren definiert"
+#: ../lib/plugin/ModeratedPage.php:157 ../lib/plugin/ModeratedPage.php:182
+#: ../lib/plugin/ModeratedPage.php:229
+msgid "No e-mails for the moderators defined"
+msgstr "Keine E-Mails für Moderatoren definiert"
-#: ../lib/plugin/ModeratedPage.php:163
+#: ../lib/plugin/ModeratedPage.php:162
#, php-format
msgid ""
"ModeratedPage status update:\n"
@@ -3053,12 +3054,12 @@
" require_access: '%s'"
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:168
+#: ../lib/plugin/ModeratedPage.php:167
#, php-format
msgid "'%s' is no ModeratedPage anymore."
msgstr "'%s' ist keine ModeratierteSeite mehr."
-#: ../lib/plugin/ModeratedPage.php:189
+#: ../lib/plugin/ModeratedPage.php:187
#, php-format
msgid ""
"ModeratedPage status update: '%s' is now a ModeratedPage.\n"
@@ -3066,42 +3067,42 @@
" require_access: '%s'"
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:260
+#: ../lib/plugin/ModeratedPage.php:257
#, php-format
msgid "%s: action forwarded to moderator %s"
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:286
+#: ../lib/plugin/ModeratedPage.php:283
msgid "ModeratedPage Notification Error: Couldn't send e-mail"
msgstr "ModerierteSeite Benachrichtigungsfehler: Konnte kein E-Mail versenden"
-#: ../lib/plugin/ModeratedPage.php:366
+#: ../lib/plugin/ModeratedPage.php:363
#, php-format
msgid "%s approved your wiki action from %s"
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:379
+#: ../lib/plugin/ModeratedPage.php:376
msgid "Please approve or reject this request:"
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:415
+#: ../lib/plugin/ModeratedPage.php:412
msgid "Reason: "
msgstr "Grund: "
-#: ../lib/plugin/ModeratedPage.php:416
+#: ../lib/plugin/ModeratedPage.php:413
msgid "Approve"
msgstr "Akzeptieren"
-#: ../lib/plugin/ModeratedPage.php:418
+#: ../lib/plugin/ModeratedPage.php:415
msgid "Reject"
msgstr "Ablehnen"
-#: ../lib/plugin/ModeratedPage.php:447 ../lib/plugin/ModeratedPage.php:454
+#: ../lib/plugin/ModeratedPage.php:444 ../lib/plugin/ModeratedPage.php:451
#, php-format
msgid "<<ModeratedPage ... >> not found in first line of %s"
msgstr "<<ModeratedPage ... >> nicht in erster Zeile von %s gefunden"
-#: ../lib/plugin/ModeratedPage.php:450
+#: ../lib/plugin/ModeratedPage.php:447
#, php-format
msgid "%s is not locked!"
msgstr "%s ist nicht gesperrt!"
@@ -4588,9 +4589,9 @@
msgstr "%d Sprache gesamt: "
#: ../lib/plugin/SystemInfo.php:471
-#, php-format
-msgid "Current language: '%s'"
-msgstr "Ihre Sprache: »%s«"
+#: ../themes/default/templates/userprefs.tmpl:133
+msgid "Current language"
+msgstr "Ausgewählte Sprache"
#: ../lib/plugin/SystemInfo.php:473
#, php-format
@@ -4603,9 +4604,9 @@
msgstr "%d Benutzeroberfläche gesamt: "
#: ../lib/plugin/SystemInfo.php:484
-#, php-format
-msgid "Current theme: '%s'"
-msgstr "Ihre Benutzeroberfläche: »%s«"
+#: ../themes/default/templates/userprefs.tmpl:132
+msgid "Current theme"
+msgstr "Ausgewählte Darstellung"
#: ../lib/plugin/SystemInfo.php:486
#, php-format
@@ -5364,15 +5365,11 @@
msgstr "Vorgabe Zugriffsrecht"
#: ../lib/plugin/WikiAdminDeleteAcl.php:61
+#: ../lib/plugin/WikiAdminDeleteAcl.php:66
#, fuzzy, php-format
msgid "ACL deleted for page '%s'"
msgstr "ACL für Seite '%s' geändert."
-#: ../lib/plugin/WikiAdminDeleteAcl.php:66
-#, fuzzy, php-format
-msgid "ACL deleted for page '%s'."
-msgstr "ACL für Seite '%s' nicht geändert."
-
# Any better translation? The locale/de/pgsrc/PhpWikiSystemverwalten
# must also be renamed to match what is here.
#: ../lib/plugin/WikiAdminDeleteAcl.php:89
@@ -8295,18 +8292,10 @@
msgid "Theme"
msgstr "Benutzeroberfläche"
-#: ../themes/default/templates/userprefs.tmpl:132
-msgid "Current Theme"
-msgstr "Ausgewählte Darstellung"
-
#: ../themes/default/templates/userprefs.tmpl:133
msgid "Language"
msgstr "Sprache"
-#: ../themes/default/templates/userprefs.tmpl:133
-msgid "Current Language"
-msgstr "Ausgewählte Sprache"
-
#: ../themes/default/templates/userprefs.tmpl:139
msgid "Change Password"
msgstr "Ändere Passwort"
@@ -8920,6 +8909,16 @@
msgid "View the current version"
msgstr "Die aktuelle Version ansehen"
+#~ msgid "Current language: '%s'"
+#~ msgstr "Ihre Sprache: »%s«"
+
+#~ msgid "Current theme: '%s'"
+#~ msgstr "Ihre Benutzeroberfläche: »%s«"
+
+#, fuzzy
+#~ msgid "ACL deleted for page '%s'."
+#~ msgstr "ACL für Seite '%s' nicht geändert."
+
#~ msgid "Chown"
#~ msgstr "Chown"
Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po 2012-11-26 17:44:33 UTC (rev 8547)
+++ trunk/locale/po/es.po 2012-11-26 19:37:47 UTC (rev 8548)
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 18:43+0100\n"
+"POT-Creation-Date: 2012-11-26 20:35+0100\n"
"PO-Revision-Date: 2000-02-01 00:50-0500\n"
"Last-Translator: Pablo Roca <pr...@cl...>\n"
"Language-Team: \n"
@@ -350,11 +350,11 @@
#: ../lib/editpage.php:575 ../lib/editpage.php:576 ../lib/main.php:832
#: ../lib/main.php:1218 ../lib/plugin/ModeratedPage.php:43
-#: ../lib/plugin/ModeratedPage.php:153 ../lib/plugin/ModeratedPage.php:226
-#: ../lib/plugin/ModeratedPage.php:268 ../lib/plugin/ModeratedPage.php:271
-#: ../lib/plugin/ModeratedPage.php:273 ../lib/plugin/ModeratedPage.php:275
-#: ../lib/plugin/ModeratedPage.php:360 ../lib/plugin/ModeratedPage.php:364
-#: ../lib/plugin/ModeratedPage.php:420 ../lib/plugin/ModeratedPage.php:446
+#: ../lib/plugin/ModeratedPage.php:153 ../lib/plugin/ModeratedPage.php:224
+#: ../lib/plugin/ModeratedPage.php:265 ../lib/plugin/ModeratedPage.php:268
+#: ../lib/plugin/ModeratedPage.php:270 ../lib/plugin/ModeratedPage.php:272
+#: ../lib/plugin/ModeratedPage.php:357 ../lib/plugin/ModeratedPage.php:361
+#: ../lib/plugin/ModeratedPage.php:417 ../lib/plugin/ModeratedPage.php:443
msgid "ModeratedPage"
msgstr "PáginaModerada"
@@ -694,10 +694,11 @@
msgid "Invalid [] syntax ignored"
msgstr "[] el sintaxis inválido no hizo caso"
-#: ../lib/InlineParser.php:358 ../lib/plugin/ModeratedPage.php:268
-#: ../lib/plugin/ModeratedPage.php:271 ../lib/plugin/ModeratedPage.php:364
+#: ../lib/InlineParser.php:358 ../lib/plugin/ModeratedPage.php:265
+#: ../lib/plugin/ModeratedPage.php:268 ../lib/plugin/ModeratedPage.php:361
#: ../lib/plugin/SemanticSearch.php:163 ../lib/plugin/SemanticSearch.php:246
-#: ../lib/plugin/SpellCheck.php:187 ../lib/plugin/WikiAdminRename.php:277
+#: ../lib/plugin/SpellCheck.php:187 ../lib/plugin/SystemInfo.php:471
+#: ../lib/plugin/SystemInfo.php:484 ../lib/plugin/WikiAdminRename.php:277
#: ../lib/plugin/WikiAdminRename.php:283
#: ../lib/plugin/WikiAdminSearchReplace.php:240
#: ../lib/plugin/WikiAdminSearchReplace.php:244
@@ -1367,7 +1368,7 @@
msgid "You must wait for moderator approval."
msgstr "Usted debe esperar la aprobación del asesor."
-#: ../lib/main.php:846 ../lib/plugin/ModeratedPage.php:319
+#: ../lib/main.php:846 ../lib/plugin/ModeratedPage.php:316
#, php-format
msgid "%s: Bad action"
msgstr "%s: Mala acción"
@@ -2992,12 +2993,12 @@
msgid "Support moderated pages"
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:157 ../lib/plugin/ModeratedPage.php:183
-#: ../lib/plugin/ModeratedPage.php:231
-msgid "ModeratedPage: No e-mails for the moderators defined"
+#: ../lib/plugin/ModeratedPage.php:157 ../lib/plugin/ModeratedPage.php:182
+#: ../lib/plugin/ModeratedPage.php:229
+msgid "No e-mails for the moderators defined"
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:163
+#: ../lib/plugin/ModeratedPage.php:162
#, php-format
msgid ""
"ModeratedPage status update:\n"
@@ -3005,12 +3006,12 @@
" require_access: '%s'"
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:168
+#: ../lib/plugin/ModeratedPage.php:167
#, php-format
msgid "'%s' is no ModeratedPage anymore."
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:189
+#: ../lib/plugin/ModeratedPage.php:187
#, php-format
msgid ""
"ModeratedPage status update: '%s' is now a ModeratedPage.\n"
@@ -3018,42 +3019,42 @@
" require_access: '%s'"
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:260
+#: ../lib/plugin/ModeratedPage.php:257
#, php-format
msgid "%s: action forwarded to moderator %s"
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:286
+#: ../lib/plugin/ModeratedPage.php:283
msgid "ModeratedPage Notification Error: Couldn't send e-mail"
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:366
+#: ../lib/plugin/ModeratedPage.php:363
#, php-format
msgid "%s approved your wiki action from %s"
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:379
+#: ../lib/plugin/ModeratedPage.php:376
msgid "Please approve or reject this request:"
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:415
+#: ../lib/plugin/ModeratedPage.php:412
msgid "Reason: "
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:416
+#: ../lib/plugin/ModeratedPage.php:413
msgid "Approve"
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:418
+#: ../lib/plugin/ModeratedPage.php:415
msgid "Reject"
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:447 ../lib/plugin/ModeratedPage.php:454
+#: ../lib/plugin/ModeratedPage.php:444 ../lib/plugin/ModeratedPage.php:451
#, php-format
msgid "<<ModeratedPage ... >> not found in first line of %s"
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:450
+#: ../lib/plugin/ModeratedPage.php:447
#, php-format
msgid "%s is not locked!"
msgstr "¡%s no está bloqueado!"
@@ -4483,8 +4484,8 @@
msgstr ""
#: ../lib/plugin/SystemInfo.php:471
-#, php-format
-msgid "Current language: '%s'"
+#: ../themes/default/templates/userprefs.tmpl:133
+msgid "Current language"
msgstr ""
#: ../lib/plugin/SystemInfo.php:473
@@ -4498,8 +4499,8 @@
msgstr ""
#: ../lib/plugin/SystemInfo.php:484
-#, php-format
-msgid "Current theme: '%s'"
+#: ../themes/default/templates/userprefs.tmpl:132
+msgid "Current theme"
msgstr ""
#: ../lib/plugin/SystemInfo.php:486
@@ -5242,15 +5243,11 @@
msgstr "Permisos escasos."
#: ../lib/plugin/WikiAdminDeleteAcl.php:61
+#: ../lib/plugin/WikiAdminDeleteAcl.php:66
#, php-format
msgid "ACL deleted for page '%s'"
msgstr ""
-#: ../lib/plugin/WikiAdminDeleteAcl.php:66
-#, php-format
-msgid "ACL deleted for page '%s'."
-msgstr ""
-
#: ../lib/plugin/WikiAdminDeleteAcl.php:89
#, fuzzy
msgid "PhpWikiAdministration/AdminAclDelete"
@@ -8102,18 +8099,10 @@
msgid "Theme"
msgstr ""
-#: ../themes/default/templates/userprefs.tmpl:132
-msgid "Current Theme"
-msgstr ""
-
#: ../themes/default/templates/userprefs.tmpl:133
msgid "Language"
msgstr ""
-#: ../themes/default/templates/userprefs.tmpl:133
-msgid "Current Language"
-msgstr ""
-
#: ../themes/default/templates/userprefs.tmpl:139
msgid "Change Password"
msgstr "Change Contraseña"
Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po 2012-11-26 17:44:33 UTC (rev 8547)
+++ trunk/locale/po/fr.po 2012-11-26 19:37:47 UTC (rev 8548)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 18:43+0100\n"
+"POT-Creation-Date: 2012-11-26 20:35+0100\n"
"PO-Revision-Date: 2004-06-22 21:10+0200\n"
"Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
"Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -348,11 +348,11 @@
#: ../lib/editpage.php:575 ../lib/editpage.php:576 ../lib/main.php:832
#: ../lib/main.php:1218 ../lib/plugin/ModeratedPage.php:43
-#: ../lib/plugin/ModeratedPage.php:153 ../lib/plugin/ModeratedPage.php:226
-#: ../lib/plugin/ModeratedPage.php:268 ../lib/plugin/ModeratedPage.php:271
-#: ../lib/plugin/ModeratedPage.php:273 ../lib/plugin/ModeratedPage.php:275
-#: ../lib/plugin/ModeratedPage.php:360 ../lib/plugin/ModeratedPage.php:364
-#: ../lib/plugin/ModeratedPage.php:420 ../lib/plugin/ModeratedPage.php:446
+#: ../lib/plugin/ModeratedPage.php:153 ../lib/plugin/ModeratedPage.php:224
+#: ../lib/plugin/ModeratedPage.php:265 ../lib/plugin/ModeratedPage.php:268
+#: ../lib/plugin/ModeratedPage.php:270 ../lib/plugin/ModeratedPage.php:272
+#: ../lib/plugin/ModeratedPage.php:357 ../lib/plugin/ModeratedPage.php:361
+#: ../lib/plugin/ModeratedPage.php:417 ../lib/plugin/ModeratedPage.php:443
msgid "ModeratedPage"
msgstr "PageModérée"
@@ -693,10 +693,11 @@
msgid "Invalid [] syntax ignored"
msgstr "Syntaxe [] invalide ignorée"
-#: ../lib/InlineParser.php:358 ../lib/plugin/ModeratedPage.php:268
-#: ../lib/plugin/ModeratedPage.php:271 ../lib/plugin/ModeratedPage.php:364
+#: ../lib/InlineParser.php:358 ../lib/plugin/ModeratedPage.php:265
+#: ../lib/plugin/ModeratedPage.php:268 ../lib/plugin/ModeratedPage.php:361
#: ../lib/plugin/SemanticSearch.php:163 ../lib/plugin/SemanticSearch.php:246
-#: ../lib/plugin/SpellCheck.php:187 ../lib/plugin/WikiAdminRename.php:277
+#: ../lib/plugin/SpellCheck.php:187 ../lib/plugin/SystemInfo.php:471
+#: ../lib/plugin/SystemInfo.php:484 ../lib/plugin/WikiAdminRename.php:277
#: ../lib/plugin/WikiAdminRename.php:283
#: ../lib/plugin/WikiAdminSearchReplace.php:240
#: ../lib/plugin/WikiAdminSearchReplace.php:244
@@ -1362,10 +1363,10 @@
msgid "You must wait for moderator approval."
msgstr ""
-#: ../lib/main.php:846 ../lib/plugin/ModeratedPage.php:319
+#: ../lib/main.php:846 ../lib/plugin/ModeratedPage.php:316
#, php-format
msgid "%s: Bad action"
-msgstr "%s : Mauvaise action"
+msgstr "%s : mauvaise action"
#: ../lib/main.php:864
msgid "Fatal PhpWiki Error"
@@ -3002,12 +3003,12 @@
msgid "Support moderated pages"
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:157 ../lib/plugin/ModeratedPage.php:183
-#: ../lib/plugin/ModeratedPage.php:231
-msgid "ModeratedPage: No e-mails for the moderators defined"
-msgstr "PageModerée: No e-mails for the moderators defined"
+#: ../lib/plugin/ModeratedPage.php:157 ../lib/plugin/ModeratedPage.php:182
+#: ../lib/plugin/ModeratedPage.php:229
+msgid "No e-mails for the moderators defined"
+msgstr ""
-#: ../lib/plugin/ModeratedPage.php:163
+#: ../lib/plugin/ModeratedPage.php:162
#, php-format
msgid ""
"ModeratedPage status update:\n"
@@ -3015,12 +3016,12 @@
" require_access: '%s'"
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:168
+#: ../lib/plugin/ModeratedPage.php:167
#, php-format
msgid "'%s' is no ModeratedPage anymore."
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:189
+#: ../lib/plugin/ModeratedPage.php:187
#, php-format
msgid ""
"ModeratedPage status update: '%s' is now a ModeratedPage.\n"
@@ -3028,42 +3029,42 @@
" require_access: '%s'"
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:260
+#: ../lib/plugin/ModeratedPage.php:257
#, php-format
msgid "%s: action forwarded to moderator %s"
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:286
+#: ../lib/plugin/ModeratedPage.php:283
msgid "ModeratedPage Notification Error: Couldn't send e-mail"
-msgstr "Erreur lors des notifications de page: Impossible d'envoyer"
+msgstr "Erreur lors des notifications de page: impossible d'envoyer"
-#: ../lib/plugin/ModeratedPage.php:366
+#: ../lib/plugin/ModeratedPage.php:363
#, php-format
msgid "%s approved your wiki action from %s"
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:379
+#: ../lib/plugin/ModeratedPage.php:376
msgid "Please approve or reject this request:"
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:415
+#: ../lib/plugin/ModeratedPage.php:412
msgid "Reason: "
msgstr "Raison : "
-#: ../lib/plugin/ModeratedPage.php:416
+#: ../lib/plugin/ModeratedPage.php:413
msgid "Approve"
msgstr "Approuver"
-#: ../lib/plugin/ModeratedPage.php:418
+#: ../lib/plugin/ModeratedPage.php:415
msgid "Reject"
msgstr "Rejeter"
-#: ../lib/plugin/ModeratedPage.php:447 ../lib/plugin/ModeratedPage.php:454
+#: ../lib/plugin/ModeratedPage.php:444 ../lib/plugin/ModeratedPage.php:451
#, php-format
msgid "<<ModeratedPage ... >> not found in first line of %s"
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:450
+#: ../lib/plugin/ModeratedPage.php:447
#, php-format
msgid "%s is not locked!"
msgstr "%s n'est pas verrouillé!"
@@ -4519,9 +4520,9 @@
msgstr "%d langages au total : "
#: ../lib/plugin/SystemInfo.php:471
-#, php-format
-msgid "Current language: '%s'"
-msgstr "Langage actuel : %s"
+#: ../themes/default/templates/userprefs.tmpl:133
+msgid "Current language"
+msgstr "Ma langue"
#: ../lib/plugin/SystemInfo.php:473
#, php-format
@@ -4534,9 +4535,9 @@
msgstr "%d thèmes au total: "
#: ../lib/plugin/SystemInfo.php:484
-#, php-format
-msgid "Current theme: '%s'"
-msgstr "Thème actuel : '%s'"
+#: ../themes/default/templates/userprefs.tmpl:132
+msgid "Current theme"
+msgstr "Mon thème"
#: ../lib/plugin/SystemInfo.php:486
#, php-format
@@ -5296,15 +5297,11 @@
msgstr "Supprimer les permissions de page."
#: ../lib/plugin/WikiAdminDeleteAcl.php:61
+#: ../lib/plugin/WikiAdminDeleteAcl.php:66
#, php-format
msgid "ACL deleted for page '%s'"
msgstr "ACL supprimée pour la page %s"
-#: ../lib/plugin/WikiAdminDeleteAcl.php:66
-#, php-format
-msgid "ACL deleted for page '%s'."
-msgstr "ACL supprimée pour la page %s."
-
#: ../lib/plugin/WikiAdminDeleteAcl.php:89
msgid "PhpWikiAdministration/AdminAclDelete"
msgstr ""
@@ -8180,18 +8177,10 @@
msgid "Theme"
msgstr "Thème"
-#: ../themes/default/templates/userprefs.tmpl:132
-msgid "Current Theme"
-msgstr "Mon thème"
-
#: ../themes/default/templates/userprefs.tmpl:133
msgid "Language"
msgstr "Langue"
-#: ../themes/default/templates/userprefs.tmpl:133
-msgid "Current Language"
-msgstr "Ma langue"
-
#: ../themes/default/templates/userprefs.tmpl:139
msgid "Change Password"
msgstr "Modifier mon mot de passe"
@@ -8791,6 +8780,15 @@
msgid "View the current version"
msgstr "Voir la version actuelle"
+#~ msgid "Current language: '%s'"
+#~ msgstr "Langage actuel : %s"
+
+#~ msgid "Current theme: '%s'"
+#~ msgstr "Thème actuel : '%s'"
+
+#~ msgid "ACL deleted for page '%s'."
+#~ msgstr "ACL supprimée pour la page %s."
+
#~ msgid "Chown"
#~ msgstr "Chown"
Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po 2012-11-26 17:44:33 UTC (rev 8547)
+++ trunk/locale/po/it.po 2012-11-26 19:37:47 UTC (rev 8548)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 18:43+0100\n"
+"POT-Creation-Date: 2012-11-26 20:35+0100\n"
"PO-Revision-Date: 2005-02-12 16:23+0100\n"
"Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n"
"Language-Team: \n"
@@ -339,11 +339,11 @@
#: ../lib/editpage.php:575 ../lib/editpage.php:576 ../lib/main.php:832
#: ../lib/main.php:1218 ../lib/plugin/ModeratedPage.php:43
-#: ../lib/plugin/ModeratedPage.php:153 ../lib/plugin/ModeratedPage.php:226
-#: ../lib/plugin/ModeratedPage.php:268 ../lib/plugin/ModeratedPage.php:271
-#: ../lib/plugin/ModeratedPage.php:273 ../lib/plugin/ModeratedPage.php:275
-#: ../lib/plugin/ModeratedPage.php:360 ../lib/plugin/ModeratedPage.php:364
-#: ../lib/plugin/ModeratedPage.php:420 ../lib/plugin/ModeratedPage.php:446
+#: ../lib/plugin/ModeratedPage.php:153 ../lib/plugin/ModeratedPage.php:224
+#: ../lib/plugin/ModeratedPage.php:265 ../lib/plugin/ModeratedPage.php:268
+#: ../lib/plugin/ModeratedPage.php:270 ../lib/plugin/ModeratedPage.php:272
+#: ../lib/plugin/ModeratedPage.php:357 ../lib/plugin/ModeratedPage.php:361
+#: ../lib/plugin/ModeratedPage.php:417 ../lib/plugin/ModeratedPage.php:443
msgid "ModeratedPage"
msgstr "PaginaModerata"
@@ -684,10 +684,11 @@
msgid "Invalid [] syntax ignored"
msgstr ""
-#: ../lib/InlineParser.php:358 ../lib/plugin/ModeratedPage.php:268
-#: ../lib/plugin/ModeratedPage.php:271 ../lib/plugin/ModeratedPage.php:364
+#: ../lib/InlineParser.php:358 ../lib/plugin/ModeratedPage.php:265
+#: ../lib/plugin/ModeratedPage.php:268 ../lib/plugin/ModeratedPage.php:361
#: ../lib/plugin/SemanticSearch.php:163 ../lib/plugin/SemanticSearch.php:246
-#: ../lib/plugin/SpellCheck.php:187 ../lib/plugin/WikiAdminRename.php:277
+#: ../lib/plugin/SpellCheck.php:187 ../lib/plugin/SystemInfo.php:471
+#: ../lib/plugin/SystemInfo.php:484 ../lib/plugin/WikiAdminRename.php:277
#: ../lib/plugin/WikiAdminRename.php:283
#: ../lib/plugin/WikiAdminSearchReplace.php:240
#: ../lib/plugin/WikiAdminSearchReplace.php:244
@@ -1351,7 +1352,7 @@
msgid "You must wait for moderator approval."
msgstr ""
-#: ../lib/main.php:846 ../lib/plugin/ModeratedPage.php:319
+#: ../lib/main.php:846 ../lib/plugin/ModeratedPage.php:316
#, php-format
msgid "%s: Bad action"
msgstr ""
@@ -2972,12 +2973,12 @@
msgid "Support moderated pages"
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:157 ../lib/plugin/ModeratedPage.php:183
-#: ../lib/plugin/ModeratedPage.php:231
-msgid "ModeratedPage: No e-mails for the moderators defined"
+#: ../lib/plugin/ModeratedPage.php:157 ../lib/plugin/ModeratedPage.php:182
+#: ../lib/plugin/ModeratedPage.php:229
+msgid "No e-mails for the moderators defined"
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:163
+#: ../lib/plugin/ModeratedPage.php:162
#, php-format
msgid ""
"ModeratedPage status update:\n"
@@ -2985,12 +2986,12 @@
" require_access: '%s'"
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:168
+#: ../lib/plugin/ModeratedPage.php:167
#, php-format
msgid "'%s' is no ModeratedPage anymore."
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:189
+#: ../lib/plugin/ModeratedPage.php:187
#, php-format
msgid ""
"ModeratedPage status update: '%s' is now a ModeratedPage.\n"
@@ -2998,42 +2999,42 @@
" require_access: '%s'"
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:260
+#: ../lib/plugin/ModeratedPage.php:257
#, php-format
msgid "%s: action forwarded to moderator %s"
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:286
+#: ../lib/plugin/ModeratedPage.php:283
msgid "ModeratedPage Notification Error: Couldn't send e-mail"
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:366
+#: ../lib/plugin/ModeratedPage.php:363
#, php-format
msgid "%s approved your wiki action from %s"
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:379
+#: ../lib/plugin/ModeratedPage.php:376
msgid "Please approve or reject this request:"
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:415
+#: ../lib/plugin/ModeratedPage.php:412
msgid "Reason: "
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:416
+#: ../lib/plugin/ModeratedPage.php:413
msgid "Approve"
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:418
+#: ../lib/plugin/ModeratedPage.php:415
msgid "Reject"
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:447 ../lib/plugin/ModeratedPage.php:454
+#: ../lib/plugin/ModeratedPage.php:444 ../lib/plugin/ModeratedPage.php:451
#, php-format
msgid "<<ModeratedPage ... >> not found in first line of %s"
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:450
+#: ../lib/plugin/ModeratedPage.php:447
#, php-format
msgid "%s is not locked!"
msgstr ""
@@ -4459,8 +4460,8 @@
msgstr ""
#: ../lib/plugin/SystemInfo.php:471
-#, php-format
-msgid "Current language: '%s'"
+#: ../themes/default/templates/userprefs.tmpl:133
+msgid "Current language"
msgstr ""
#: ../lib/plugin/SystemInfo.php:473
@@ -4474,8 +4475,8 @@
msgstr ""
#: ../lib/plugin/SystemInfo.php:484
-#, php-format
-msgid "Current theme: '%s'"
+#: ../themes/default/templates/userprefs.tmpl:132
+msgid "Current theme"
msgstr ""
#: ../lib/plugin/SystemInfo.php:486
@@ -5218,15 +5219,11 @@
msgstr "Permessi insufficienti."
#: ../lib/plugin/WikiAdminDeleteAcl.php:61
+#: ../lib/plugin/WikiAdminDeleteAcl.php:66
#, php-format
msgid "ACL deleted for page '%s'"
msgstr ""
-#: ../lib/plugin/WikiAdminDeleteAcl.php:66
-#, php-format
-msgid "ACL deleted for page '%s'."
-msgstr ""
-
#: ../lib/plugin/WikiAdminDeleteAcl.php:89
#, fuzzy
msgid "PhpWikiAdministration/AdminAclDelete"
@@ -8048,18 +8045,10 @@
msgid "Theme"
msgstr ""
-#: ../themes/default/templates/userprefs.tmpl:132
-msgid "Current Theme"
-msgstr ""
-
#: ../themes/default/templates/userprefs.tmpl:133
msgid "Language"
msgstr ""
-#: ../themes/default/templates/userprefs.tmpl:133
-msgid "Current Language"
-msgstr ""
-
#: ../themes/default/templates/userprefs.tmpl:139
msgid "Change Password"
msgstr ""
Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po 2012-11-26 17:44:33 UTC (rev 8547)
+++ trunk/locale/po/ja.po 2012-11-26 19:37:47 UTC (rev 8548)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 18:43+0100\n"
+"POT-Creation-Date: 2012-11-26 20:35+0100\n"
"PO-Revision-Date: 2003-06-07 09:01+0900\n"
"Last-Translator: Tadashi Jokagi <web...@el...>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
@@ -336,11 +336,11 @@
#: ../lib/editpage.php:575 ../lib/editpage.php:576 ../lib/main.php:832
#: ../lib/main.php:1218 ../lib/plugin/ModeratedPage.php:43
-#: ../lib/plugin/ModeratedPage.php:153 ../lib/plugin/ModeratedPage.php:226
-#: ../lib/plugin/ModeratedPage.php:268 ../lib/plugin/ModeratedPage.php:271
-#: ../lib/plugin/ModeratedPage.php:273 ../lib/plugin/ModeratedPage.php:275
-#: ../lib/plugin/ModeratedPage.php:360 ../lib/plugin/ModeratedPage.php:364
-#: ../lib/plugin/ModeratedPage.php:420 ../lib/plugin/ModeratedPage.php:446
+#: ../lib/plugin/ModeratedPage.php:153 ../lib/plugin/ModeratedPage.php:224
+#: ../lib/plugin/ModeratedPage.php:265 ../lib/plugin/ModeratedPage.php:268
+#: ../lib/plugin/ModeratedPage.php:270 ../lib/plugin/ModeratedPage.php:272
+#: ../lib/plugin/ModeratedPage.php:357 ../lib/plugin/ModeratedPage.php:361
+#: ../lib/plugin/ModeratedPage.php:417 ../lib/plugin/ModeratedPage.php:443
msgid "ModeratedPage"
msgstr ""
@@ -672,10 +672,11 @@
msgid "Invalid [] syntax ignored"
msgstr ""
-#: ../lib/InlineParser.php:358 ../lib/plugin/ModeratedPage.php:268
-#: ../lib/plugin/ModeratedPage.php:271 ../lib/plugin/ModeratedPage.php:364
+#: ../lib/InlineParser.php:358 ../lib/plugin/ModeratedPage.php:265
+#: ../lib/plugin/ModeratedPage.php:268 ../lib/plugin/ModeratedPage.php:361
#: ../lib/plugin/SemanticSearch.php:163 ../lib/plugin/SemanticSearch.php:246
-#: ../lib/plugin/SpellCheck.php:187 ../lib/plugin/WikiAdminRename.php:277
+#: ../lib/plugin/SpellCheck.php:187 ../lib/plugin/SystemInfo.php:471
+#: ../lib/plugin/SystemInfo.php:484 ../lib/plugin/WikiAdminRename.php:277
#: ../lib/plugin/WikiAdminRename.php:283
#: ../lib/plugin/WikiAdminSearchReplace.php:240
#: ../lib/plugin/WikiAdminSearchReplace.php:244
@@ -1350,7 +1351,7 @@
msgid "You must wait for moderator approval."
msgstr ""
-#: ../lib/main.php:846 ../lib/plugin/ModeratedPage.php:319
+#: ../lib/main.php:846 ../lib/plugin/ModeratedPage.php:316
#, php-format
msgid "%s: Bad action"
msgstr "%s: 正しくない操作です。"
@@ -3010,12 +3011,12 @@
msgid "Support moderated pages"
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:157 ../lib/plugin/ModeratedPage.php:183
-#: ../lib/plugin/ModeratedPage.php:231
-msgid "ModeratedPage: No e-mails for the moderators defined"
+#: ../lib/plugin/ModeratedPage.php:157 ../lib/plugin/ModeratedPage.php:182
+#: ../lib/plugin/ModeratedPage.php:229
+msgid "No e-mails for the moderators defined"
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:163
+#: ../lib/plugin/ModeratedPage.php:162
#, php-format
msgid ""
"ModeratedPage status update:\n"
@@ -3023,12 +3024,12 @@
" require_access: '%s'"
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:168
+#: ../lib/plugin/ModeratedPage.php:167
#, php-format
msgid "'%s' is no ModeratedPage anymore."
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:189
+#: ../lib/plugin/ModeratedPage.php:187
#, php-format
msgid ""
"ModeratedPage status update: '%s' is now a ModeratedPage.\n"
@@ -3036,42 +3037,42 @@
" require_access: '%s'"
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:260
+#: ../lib/plugin/ModeratedPage.php:257
#, php-format
msgid "%s: action forwarded to moderator %s"
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:286
+#: ../lib/plugin/ModeratedPage.php:283
msgid "ModeratedPage Notification Error: Couldn't send e-mail"
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:366
+#: ../lib/plugin/ModeratedPage.php:363
#, php-format
msgid "%s approved your wiki action from %s"
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:379
+#: ../lib/plugin/ModeratedPage.php:376
msgid "Please approve or reject this request:"
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:415
+#: ../lib/plugin/ModeratedPage.php:412
msgid "Reason: "
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:416
+#: ../lib/plugin/ModeratedPage.php:413
msgid "Approve"
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:418
+#: ../lib/plugin/ModeratedPage.php:415
msgid "Reject"
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:447 ../lib/plugin/ModeratedPage.php:454
+#: ../lib/plugin/ModeratedPage.php:444 ../lib/plugin/ModeratedPage.php:451
#, php-format
msgid "<<ModeratedPage ... >> not found in first line of %s"
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:450
+#: ../lib/plugin/ModeratedPage.php:447
#, php-format
msgid "%s is not locked!"
msgstr ""
@@ -4526,9 +4527,9 @@
msgstr ""
#: ../lib/plugin/SystemInfo.php:471
-#, php-format
-msgid "Current language: '%s'"
-msgstr "現在の言語: %s"
+#: ../themes/default/templates/userprefs.tmpl:133
+msgid "Current language"
+msgstr "現在の言語"
#: ../lib/plugin/SystemInfo.php:473
#, php-format
@@ -4541,9 +4542,9 @@
msgstr "総テーマ数: %d"
#: ../lib/plugin/SystemInfo.php:484
-#, php-format
-msgid "Current theme: '%s'"
-msgstr "現在のテーマ: %s"
+#: ../themes/default/templates/userprefs.tmpl:132
+msgid "Current theme"
+msgstr ""
#: ../lib/plugin/SystemInfo.php:486
#, php-format
@@ -5304,15 +5305,11 @@
msgstr ""
#: ../lib/plugin/WikiAdminDeleteAcl.php:61
+#: ../lib/plugin/WikiAdminDeleteAcl.php:66
#, fuzzy, php-format
msgid "ACL deleted for page '%s'"
msgstr "全ページ一覧"
-#: ../lib/plugin/WikiAdminDeleteAcl.php:66
-#, fuzzy, php-format
-msgid "ACL deleted for page '%s'."
-msgstr "全ページ一覧"
-
#: ../lib/plugin/WikiAdminDeleteAcl.php:89
msgid "PhpWikiAdministration/AdminAclDelete"
msgstr ""
@@ -8220,18 +8217,10 @@
msgid "Theme"
msgstr "テーマ"
-#: ../themes/default/templates/userprefs.tmpl:132
-msgid "Current Theme"
-msgstr ""
-
#: ../themes/default/templates/userprefs.tmpl:133
msgid "Language"
msgstr "言語"
-#: ../themes/default/templates/userprefs.tmpl:133
-msgid "Current Language"
-msgstr "現在の言語"
-
#: ../themes/default/templates/userprefs.tmpl:139
msgid "Change Password"
msgstr "パスワード変更"
@@ -8844,7 +8833,17 @@
msgid "View the current version"
msgstr "現在のバージョンを表示する"
+#~ msgid "Current language: '%s'"
+#~ msgstr "現在の言語: %s"
+
+#~ msgid "Current theme: '%s'"
+#~ msgstr "現在のテーマ: %s"
+
#, fuzzy
+#~ msgid "ACL deleted for page '%s'."
+#~ msgstr "全ページ一覧"
+
+#, fuzzy
#~ msgid "Chown"
#~ msgstr "カウント"
Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po 2012-11-26 17:44:33 UTC (rev 8547)
+++ trunk/locale/po/nl.po 2012-11-26 19:37:47 UTC (rev 8548)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 18:43+0100\n"
+"POT-Creation-Date: 2012-11-26 20:35+0100\n"
"PO-Revision-Date: 2000-09-30 02:23+0200\n"
"Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
"Language-Team: Dutch <nl...@li...>\n"
@@ -342,11 +342,11 @@
#: ../lib/editpage.php:575 ../lib/editpage.php:576 ../lib/main.php:832
#: ../lib/main.php:1218 ../lib/plugin/ModeratedPage.php:43
-#: ../lib/plugin/ModeratedPage.php:153 ../lib/plugin/ModeratedPage.php:226
-#: ../lib/plugin/ModeratedPage.php:268 ../lib/plugin/ModeratedPage.php:271
-#: ../lib/plugin/ModeratedPage.php:273 ../lib/plugin/ModeratedPage.php:275
-#: ../lib/plugin/ModeratedPage.php:360 ../lib/plugin/ModeratedPage.php:364
-#: ../lib/plugin/ModeratedPage.php:420 ../lib/plugin/ModeratedPage.php:446
+#: ../lib/plugin/ModeratedPage.php:153 ../lib/plugin/ModeratedPage.php:224
+#: ../lib/plugin/ModeratedPage.php:265 ../lib/plugin/ModeratedPage.php:268
+#: ../lib/plugin/ModeratedPage.php:270 ../lib/plugin/ModeratedPage.php:272
+#: ../lib/plugin/ModeratedPage.php:357 ../lib/plugin/ModeratedPage.php:361
+#: ../lib/plugin/ModeratedPage.php:417 ../lib/plugin/ModeratedPage.php:443
msgid "ModeratedPage"
msgstr ""
@@ -678,10 +678,11 @@
msgid "Invalid [] syntax ignored"
msgstr ""
-#: ../lib/InlineParser.php:358 ../lib/plugin/ModeratedPage.php:268
-#: ../lib/plugin/ModeratedPage.php:271 ../lib/plugin/ModeratedPage.php:364
+#: ../lib/InlineParser.php:358 ../lib/plugin/ModeratedPage.php:265
+#: ../lib/plugin/ModeratedPage.php:268 ../lib/plugin/ModeratedPage.php:361
#: ../lib/plugin/SemanticSearch.php:163 ../lib/plugin/SemanticSearch.php:246
-#: ../lib/plugin/SpellCheck.php:187 ../lib/plugin/WikiAdminRename.php:277
+#: ../lib/plugin/SpellCheck.php:187 ../lib/plugin/SystemInfo.php:471
+#: ../lib/plugin/SystemInfo.php:484 ../lib/plugin/WikiAdminRename.php:277
#: ../lib/plugin/WikiAdminRename.php:283
#: ../lib/plugin/WikiAdminSearchReplace.php:240
#: ../lib/plugin/WikiAdminSearchReplace.php:244
@@ -1343,7 +1344,7 @@
msgid "You must wait for moderator approval."
msgstr ""
-#: ../lib/main.php:846 ../lib/plugin/ModeratedPage.php:319
+#: ../lib/main.php:846 ../lib/plugin/ModeratedPage.php:316
#, php-format
msgid "%s: Bad action"
msgstr ""
@@ -2964,12 +2965,12 @@
msgid "Support moderated pages"
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:157 ../lib/plugin/ModeratedPage.php:183
-#: ../lib/plugin/ModeratedPage.php:231
-msgid "ModeratedPage: No e-mails for the moderators defined"
+#: ../lib/plugin/ModeratedPage.php:157 ../lib/plugin/ModeratedPage.php:182
+#: ../lib/plugin/ModeratedPage.php:229
+msgid "No e-mails for the moderators defined"
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:163
+#: ../lib/plugin/ModeratedPage.php:162
#, php-format
msgid ""
"ModeratedPage status update:\n"
@@ -2977,12 +2978,12 @@
" require_access: '%s'"
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:168
+#: ../lib/plugin/ModeratedPage.php:167
#, php-format
msgid "'%s' is no ModeratedPage anymore."
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:189
+#: ../lib/plugin/ModeratedPage.php:187
#, php-format
msgid ""
"ModeratedPage status update: '%s' is now a ModeratedPage.\n"
@@ -2990,42 +2991,42 @@
" require_access: '%s'"
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:260
+#: ../lib/plugin/ModeratedPage.php:257
#, php-format
msgid "%s: action forwarded to moderator %s"
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:286
+#: ../lib/plugin/ModeratedPage.php:283
msgid "ModeratedPage Notification Error: Couldn't send e-mail"
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:366
+#: ../lib/plugin/ModeratedPage.php:363
#, php-format
msgid "%s approved your wiki action from %s"
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:379
+#: ../lib/plugin/ModeratedPage.php:376
msgid "Please approve or reject this request:"
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:415
+#: ../lib/plugin/ModeratedPage.php:412
msgid "Reason: "
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:416
+#: ../lib/plugin/ModeratedPage.php:413
msgid "Approve"
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:418
+#: ../lib/plugin/ModeratedPage.php:415
msgid "Reject"
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:447 ../lib/plugin/ModeratedPage.php:454
+#: ../lib/plugin/ModeratedPage.php:444 ../lib/plugin/ModeratedPage.php:451
#, php-format
msgid "<<ModeratedPage ... >> not found in first line of %s"
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:450
+#: ../lib/plugin/ModeratedPage.php:447
#, php-format
msgid "%s is not locked!"
msgstr ""
@@ -4451,8 +4452,8 @@
msgstr ""
#: ../lib/plugin/SystemInfo.php:471
-#, php-format
-msgid "Current language: '%s'"
+#: ../themes/default/templates/userprefs.tmpl:133
+msgid "Current language"
msgstr ""
#: ../lib/plugin/SystemInfo.php:473
@@ -4466,8 +4467,8 @@
msgstr ""
#: ../lib/plugin/SystemInfo.php:484
-#, php-format
-msgid "Current theme: '%s'"
+#: ../themes/default/templates/userprefs.tmpl:132
+msgid "Current theme"
msgstr ""
#: ../lib/plugin/SystemInfo.php:486
@@ -5207,15 +5208,11 @@
msgstr ""
#: ../lib/plugin/WikiAdminDeleteAcl.php:61
+#: ../lib/plugin/WikiAdminDeleteAcl.php:66
#, php-format
msgid "ACL deleted for page '%s'"
msgstr ""
-#: ../lib/plugin/WikiAdminDeleteAcl.php:66
-#, php-format
-msgid "ACL deleted for page '%s'."
-msgstr ""
-
#: ../lib/plugin/WikiAdminDeleteAcl.php:89
#, fuzzy
msgid "PhpWikiAdministration/AdminAclDelete"
@@ -8035,18 +8032,10 @@
msgid "Theme"
msgstr ""
-#: ../themes/default/templates/userprefs.tmpl:132
-msgid "Current Theme"
-msgstr ""
-
#: ../themes/default/templates/userprefs.tmpl:133
msgid "Language"
msgstr ""
-#: ../themes/default/templates/userprefs.tmpl:133
-msgid "Current Language"
-msgstr ""
-
#: ../themes/default/templates/userprefs.tmpl:139
msgid "Change Password"
msgstr ""
Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot 2012-11-26 17:44:33 UTC (rev 8547)
+++ trunk/locale/po/phpwiki.pot 2012-11-26 19:37:47 UTC (rev 8548)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki-1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 18:43+0100\n"
+"POT-Creation-Date: 2012-11-26 20:35+0100\n"
"PO-Revision-Date: 2002-12-14 17:51-0500\n"
"Last-Translator: Reini Urban <ru...@us...>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
@@ -336,11 +336,11 @@
#: ../lib/editpage.php:575 ../lib/editpage.php:576 ../lib/main.php:832
#: ../lib/main.php:1218 ../lib/plugin/ModeratedPage.php:43
-#: ../lib/plugin/ModeratedPage.php:153 ../lib/plugin/ModeratedPage.php:226
-#: ../lib/plugin/ModeratedPage.php:268 ../lib/plugin/ModeratedPage.php:271
-#: ../lib/plugin/ModeratedPage.php:273 ../lib/plugin/ModeratedPage.php:275
-#: ../lib/plugin/ModeratedPage.php:360 ../lib/plugin/ModeratedPage.php:364
-#: ../lib/plugin/ModeratedPage.php:420 ../lib/plugin/ModeratedPage.php:446
+#: ../lib/plugin/ModeratedPage.php:153 ../lib/plugin/ModeratedPage.php:224
+#: ../lib/plugin/ModeratedPage.php:265 ../lib/plugin/ModeratedPage.php:268
+#: ../lib/plugin/ModeratedPage.php:270 ../lib/plugin/ModeratedPage.php:272
+#: ../lib/plugin/ModeratedPage.php:357 ../lib/plugin/ModeratedPage.php:361
+#: ../lib/plugin/ModeratedPage.php:417 ../lib/plugin/ModeratedPage.php:443
msgid "ModeratedPage"
msgstr ""
@@ -672,10 +672,11 @@
msgid "Invalid [] syntax ignored"
msgstr ""
-#: ../lib/InlineParser.php:358 ../lib/plugin/ModeratedPage.php:268
-#: ../lib/plugin/ModeratedPage.php:271 ../lib/plugin/ModeratedPage.php:364
+#: ../lib/InlineParser.php:358 ../lib/plugin/ModeratedPage.php:265
+#: ../lib/plugin/ModeratedPage.php:268 ../lib/plugin/ModeratedPage.php:361
#: ../lib/plugin/SemanticSearch.php:163 ../lib/plugin/SemanticSearch.php:246
-#: ../lib/plugin/SpellCheck.php:187 ../lib/plugin/WikiAdminRename.php:277
+#: ../lib/plugin/SpellCheck.php:187 ../lib/plugin/SystemInfo.php:471
+#: ../lib/plugin/SystemInfo.php:484 ../lib/plugin/WikiAdminRename.php:277
#: ../lib/plugin/WikiAdminRename.php:283
#: ../lib/plugin/WikiAdminSearchReplace.php:240
#: ../lib/plugin/WikiAdminSearchReplace.php:244
@@ -1336,7 +1337,7 @@
msgid "You must wait for moderator approval."
msgstr ""
-#: ../lib/main.php:846 ../lib/plugin/ModeratedPage.php:319
+#: ../lib/main.php:846 ../lib/plugin/ModeratedPage.php:316
#, php-format
msgid "%s: Bad action"
msgstr ""
@@ -2957,12 +2958,12 @@
msgid "Support moderated pages"
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:157 ../lib/plugin/ModeratedPage.php:183
-#: ../lib/plugin/ModeratedPage.php:231
-msgid "ModeratedPage: No e-mails for the moderators defined"
+#: ../lib/plugin/ModeratedPage.php:157 ../lib/plugin/ModeratedPage.php:182
+#: ../lib/plugin/ModeratedPage.php:229
+msgid "No e-mails for the moderators defined"
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:163
+#: ../lib/plugin/ModeratedPage.php:162
#, php-format
msgid ""
"ModeratedPage status update:\n"
@@ -2970,12 +2971,12 @@
" require_access: '%s'"
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:168
+#: ../lib/plugin/ModeratedPage.php:167
#, php-format
msgid "'%s' is no ModeratedPage anymore."
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:189
+#: ../lib/plugin/ModeratedPage.php:187
#, php-format
msgid ""
"ModeratedPage status update: '%s' is now a ModeratedPage.\n"
@@ -2983,42 +2984,42 @@
" require_access: '%s'"
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:260
+#: ../lib/plugin/ModeratedPage.php:257
#, php-format
msgid "%s: action forwarded to moderator %s"
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:286
+#: ../lib/plugin/ModeratedPage.php:283
msgid "ModeratedPage Notification Error: Couldn't send e-mail"
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:366
+#: ../lib/plugin/ModeratedPage.php:363
#, php-format
msgid "%s approved your wiki action from %s"
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:379
+#: ../lib/plugin/ModeratedPage.php:376
msgid "Please approve or reject this request:"
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:415
+#: ../lib/plugin/ModeratedPage.php:412
msgid "Reason: "
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:416
+#: ../lib/plugin/ModeratedPage.php:413
msgid "Approve"
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:418
+#: ../lib/plugin/ModeratedPage.php:415
msgid "Reject"
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:447 ../lib/plugin/ModeratedPage.php:454
+#: ../lib/plugin/ModeratedPage.php:444 ../lib/plugin/ModeratedPage.php:451
#, php-format
msgid "<<ModeratedPage ... >> not found in first line of %s"
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:450
+#: ../lib/plugin/ModeratedPage.php:447
#, php-format
msgid "%s is not locked!"
msgstr ""
@@ -4444,8 +4445,8 @@
msgstr ""
#: ../lib/plugin/SystemInfo.php:471
-#, php-format
-msgid "Current language: '%s'"
+#: ../themes/default/templates/userprefs.tmpl:133
+msgid "Current language"
msgstr ""
#: ../lib/plugin/SystemInfo.php:473
@@ -4459,8 +4460,8 @@
msgstr ""
#: ../lib/plugin/SystemInfo.php:484
-#, php-format
-msgid "Current theme: '%s'"
+#: ../themes/default/templates/userprefs.tmpl:132
+msgid "Current theme"
msgstr ""
#: ../lib/plugin/SystemInfo.php:486
@@ -5200,15 +5201,11 @@
msgstr ""
#: ../lib/plugin/WikiAdminDeleteAcl.php:61
+#: ../lib/plugin/WikiAdminDeleteAcl.php:66
#, php-format
msgid "ACL deleted for page '%s'"
msgstr ""
-#: ../lib/plugin/WikiAdminDeleteAcl.php:66
-#, php-format
-msgid "ACL deleted for page '%s'."
-msgstr ""
-
#: ../lib/plugin/WikiAdminDeleteAcl.php:89
msgid "PhpWikiAdministration/AdminAclDelete"
msgstr ""
@@ -8024,18 +8021,10 @@
msgid "Theme"
msgstr ""
-#: ../themes/default/templates/userprefs.tmpl:132
-msgid "Current Theme"
-msgstr ""
-
#: ../themes/default/templates/userprefs.tmpl:133
msgid "Language"
msgstr ""
-#: ../themes/default/templates/userprefs.tmpl:133
-msgid "Current Language"
-msgstr ""
-
#: ../themes/default/templates/userprefs.tmpl:139
msgid "Change Password"
msgstr ""
Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po 2012-11-26 17:44:33 UTC (rev 8547)
+++ trunk/locale/po/sv.po 2012-11-26 19:37:47 UTC (rev 8548)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 18:43+0100\n"
+"POT-Creation-Date: 2012-11-26 20:35+0100\n"
"PO-Revision-Date: 2001-01-27 01:58+0200\n"
"Last-Translator: Jon Åslund <jo...@he...>\n"
"Language-Team: \n"
@@ -337,11 +337,11 @@
#: ../lib/editpage.php:575 ../lib/editpage.php:576 ../lib/main.php:832
#: ../lib/main.php:1218 ../lib/plugin/ModeratedPage.php:43
-#: ../lib/plugin/ModeratedPage.php:153 ../lib/plugin/ModeratedPage.php:226
-#: ../lib/plugin/ModeratedPage.php:268 ../lib/plugin/ModeratedPage.php:271
-#: ../lib/plugin/ModeratedPage.php:273 ../lib/plugin/ModeratedPage.php:275
-#: ../lib/plugin/ModeratedPage.php:360 ../lib/plugin/ModeratedPage.php:364
-#: ../lib/plugin/ModeratedPage.php:420 ../lib/plugin/ModeratedPage.php:446
+#: ../lib/plugin/ModeratedPage.php:153 ../lib/plugin/ModeratedPage.php:224
+#: ../lib/plugin/ModeratedPage.php:265 ../lib/plugin/ModeratedPage.php:268
+#: ../lib/plugin/ModeratedPage.php:270 ../lib/plugin/ModeratedPage.php:272
+#: ../lib/plugin/ModeratedPage.php:357 ../lib/plugin/ModeratedPage.php:361
+#: ../lib/plugin/ModeratedPage.php:417 ../lib/plugin/ModeratedPage.php:443
msgid "ModeratedPage"
msgstr ""
@@ -673,10 +673,11 @@
msgid "Invalid [] syntax ignored"
msgstr ""
-#: ../lib/InlineParser.php:358 ../lib/plugin/ModeratedPage.php:268
-#: ../lib/plugin/ModeratedPage.php:271 ../lib/plugin/ModeratedPage.php:364
+#: ../lib/InlineParser.php:358 ../lib/plugin/ModeratedPage.php:265
+#: ../lib/plugin/ModeratedPage.php:268 ../lib/plugin/ModeratedPage.php:361
#: ../lib/plugin/SemanticSearch.php:163 ../lib/plugin/SemanticSearch.php:246
-#: ../lib/plugin/SpellCheck.php:187 ../lib/plugin/WikiAdminRename.php:277
+#: ../lib/plugin/SpellCheck.php:187 ../lib/plugin/SystemInfo.php:471
+#: ../lib/plugin/SystemInfo.php:484 ../lib/plugin/WikiAdminRename.php:277
#: ../lib/plugin/WikiAdminRename.php:283
#: ../lib/plugin/WikiAdminSearchReplace.php:240
#: ../lib/plugin/WikiAdminSearchReplace.php:244
@@ -1337,7 +1338,7 @@
msgid "You must wait for moderator approval."
msgstr ""
-#: ../lib/main.php:846 ../lib/plugin/ModeratedPage.php:319
+#: ../lib/main.php:846 ../lib/plugin/ModeratedPage.php:316
#, php-format
msgid "%s: Bad action"
msgstr ""
@@ -2959,12 +2960,12 @@
msgid "Support moderated pages"
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:157 ../lib/plugin/ModeratedPage.php:183
-#: ../lib/plugin/ModeratedPage.php:231
-msgid "ModeratedPage: No e-mails for the moderators defined"
+#: ../lib/plugin/ModeratedPage.php:157 ../lib/plugin/ModeratedPage.php:182
+#: ../lib/plugin/ModeratedPage.php:229
+msgid "No e-mails for the moderators defined"
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:163
+#: ../lib/plugin/ModeratedPage.php:162
#, php-format
msgid ""
"ModeratedPage status update:\n"
@@ -2972,12 +2973,12 @@
" require_access: '%s'"
msgstr ""
-#: ../lib/plugin/ModeratedPage.php:168
+#...
[truncated message content] |
|
From: <var...@us...> - 2012-11-30 14:49:18
|
Revision: 8577
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8577&view=rev
Author: vargenau
Date: 2012-11-30 14:49:10 +0000 (Fri, 30 Nov 2012)
Log Message:
-----------
GRAPHVIZ_EXE /usr/bin/dot
Modified Paths:
--------------
trunk/config/config-default.ini
trunk/config/config-dist.ini
trunk/configurator.php
trunk/lib/plugin/GraphViz.php
Modified: trunk/config/config-default.ini
===================================================================
--- trunk/config/config-default.ini 2012-11-29 17:42:12 UTC (rev 8576)
+++ trunk/config/config-default.ini 2012-11-30 14:49:10 UTC (rev 8577)
@@ -182,7 +182,7 @@
; USE_EXTERNAL_HTML2PDF = "htmldoc --quiet --format pdf14 --no-toc --no-title %s"
EXTERNAL_HTML2PDF_PAGELIST = "htmldoc --quiet --webpage --format pdf14"
BABYCART_PATH = /usr/local/bin/babycart
-; GRAPHVIZ_EXE = /usr/local/bin/dot
+; GRAPHVIZ_EXE = /usr/bin/dot
PLUGIN_CACHED_DATABASE = file
; PLUGIN_CACHED_CACHE_DIR = /tmp/cache
Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini 2012-11-29 17:42:12 UTC (rev 8576)
+++ trunk/config/config-dist.ini 2012-11-30 14:49:10 UTC (rev 8577)
@@ -1274,7 +1274,7 @@
; GraphViz plugin executable:
; http://www.graphviz.org/
-;GRAPHVIZ_EXE = /usr/local/bin/dot
+;GRAPHVIZ_EXE = /usr/bin/dot
; Default GD2 truetype font. For text2png, GraphViz, VisualWiki
; You might need the full path to the .ttf file
Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php 2012-11-29 17:42:12 UTC (rev 8576)
+++ trunk/configurator.php 2012-11-30 14:49:10 UTC (rev 8577)
@@ -1644,7 +1644,7 @@
$properties["RATEIT_IMGPREFIX"] =
new _define_commented_optional('RATEIT_IMGPREFIX'); //BStar
$properties["GRAPHVIZ_EXE"] =
- new _define_commented_optional('GRAPHVIZ_EXE'); // /usr/local/bin/dot
+ new _define_commented_optional('GRAPHVIZ_EXE', "/usr/bin/dot");
if (PHP_OS == "Darwin") // Mac OS X
$ttfont = "/System/Library/Frameworks/JavaVM.framework/Versions/1.3.1/Home/lib/fonts/LucidaSansRegular.ttf";
Modified: trunk/lib/plugin/GraphViz.php
===================================================================
--- trunk/lib/plugin/GraphViz.php 2012-11-29 17:42:12 UTC (rev 8576)
+++ trunk/lib/plugin/GraphViz.php 2012-11-30 14:49:10 UTC (rev 8577)
@@ -56,7 +56,7 @@
define('VISUALWIKIFONT', 'luximr');
} else { // other os
if (!defined("GRAPHVIZ_EXE"))
- define('GRAPHVIZ_EXE', '/usr/local/bin/dot');
+ define('GRAPHVIZ_EXE', '/usr/bin/dot');
// Name of the Truetypefont - Helvetica is probably easier to read
if (!defined('VISUALWIKIFONT'))
define('VISUALWIKIFONT', 'Helvetica');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
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 . "天道あかね";
}
- $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.
|
|
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.
|
|
From: <var...@us...> - 2012-12-07 11:49:25
|
Revision: 8623
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8623&view=rev
Author: vargenau
Date: 2012-12-07 11:49:09 +0000 (Fri, 07 Dec 2012)
Log Message:
-----------
<none> --> None
Modified Paths:
--------------
trunk/lib/plugin/WantedPagesOld.php
trunk/locale/de/LC_MESSAGES/phpwiki.mo
trunk/locale/de/LC_MESSAGES/phpwiki.php
trunk/locale/es/LC_MESSAGES/phpwiki.mo
trunk/locale/es/LC_MESSAGES/phpwiki.php
trunk/locale/fr/LC_MESSAGES/phpwiki.mo
trunk/locale/fr/LC_MESSAGES/phpwiki.php
trunk/locale/it/LC_MESSAGES/phpwiki.mo
trunk/locale/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/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/online.tmpl
Modified: trunk/lib/plugin/WantedPagesOld.php
===================================================================
--- trunk/lib/plugin/WantedPagesOld.php 2012-12-07 11:14:44 UTC (rev 8622)
+++ trunk/lib/plugin/WantedPagesOld.php 2012-12-07 11:49:09 UTC (rev 8623)
@@ -93,7 +93,7 @@
$this->_rows = HTML();
$caption = false;
- $this->_messageIfEmpty = _("<none>");
+ $this->_messageIfEmpty = _("None");
if ($page) {
// link count always seems to be 1 for a single page so
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-07 11:14:44 UTC (rev 8622)
+++ trunk/locale/de/LC_MESSAGES/phpwiki.php 2012-12-07 11:49:09 UTC (rev 8623)
@@ -101,7 +101,6 @@
$locale["<<ModeratedPage ... >> not found in first line of %s"] = "<<ModeratedPage ... >> nicht in erster Zeile von %s gefunden";
$locale["<empty>"] = "<leer>";
$locale["<no matches>"] = "<nichts gefunden>";
-$locale["<none>"] = "<Keine>";
$locale["<not displayed>"] = "<nicht angezeigt>";
$locale["<system language>"] = "<Sprache des Servers>";
$locale["<system theme>"] = "<Darstellung des Systems>";
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-07 11:14:44 UTC (rev 8622)
+++ trunk/locale/es/LC_MESSAGES/phpwiki.php 2012-12-07 11:49:09 UTC (rev 8623)
@@ -53,7 +53,6 @@
$locale[": "] = ": ";
$locale["<empty>"] = "<vacío>";
$locale["<no matches>"] = "<ningunos fósforos>";
-$locale["<none>"] = "<Ninguna>";
$locale["<unknown>"] = "<desconocido>";
$locale["ADMIN"] = "ADMIN";
$locale["ANON"] = "ANÓN";
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-07 11:14:44 UTC (rev 8622)
+++ trunk/locale/fr/LC_MESSAGES/phpwiki.php 2012-12-07 11:49:09 UTC (rev 8623)
@@ -104,7 +104,6 @@
$locale["<%s: no such section>"] = "<%s : pas de section de ce type>";
$locale["<empty>"] = "<vide>";
$locale["<no matches>"] = "<aucun résultat>";
-$locale["<none>"] = "<aucun>";
$locale["<not displayed>"] = "<non affiché>";
$locale["<system language>"] = "<langue du système>";
$locale["<system theme>"] = "<thème du système>";
@@ -707,7 +706,7 @@
$locale["No uploaded file to upload?"] = "Pas de fichier à déposer ?";
$locale["No userid"] = "Pas d'identifiant utilisateur";
$locale["NoCache"] = "PasDeCache";
-$locale["None"] = "Aucun(e)";
+$locale["None"] = "Aucun";
$locale["Not enough questions answered!"] = "Pas assez de réponses fournies !";
$locale["Note that many browsers will automatically adjust the width of the editing area so that it fills the browser window. In this case, the width preference will be ignored."] = "Notez que beaucoup de navigateurs ajusteront automatiquement la largeur de la zone d'édition de façon qu'elle remplisse la fenêtre. Le paramètre concernant la largeur sera ignoré dans ce cas.";
$locale["Note, that user accounts with bouncing e-mails will be disabled."] = "Notez que les comptes avec une adresse électronique invalide seront désactivés.";
Modified: trunk/locale/it/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/it/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/it/LC_MESSAGES/phpwiki.php 2012-12-07 11:14:44 UTC (rev 8622)
+++ trunk/locale/it/LC_MESSAGES/phpwiki.php 2012-12-07 11:49:09 UTC (rev 8623)
@@ -29,7 +29,6 @@
$locale["... not found"] = "... non trovato";
$locale["1 day"] = "1 giorno";
$locale["<no matches>"] = "<nessuna corrispondenza>";
-$locale["<none>"] = "<nessun>";
$locale["<unknown>"] = "<sconosciuto>";
$locale["Administrators"] = "Coordinatori";
$locale["Anonymous Users"] = "Utenti Anonimi";
Modified: trunk/locale/ja/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/ja/LC_MESSAGES/phpwiki.php
===================================================================
--- trunk/locale/ja/LC_MESSAGES/phpwiki.php 2012-12-07 11:14:44 UTC (rev 8622)
+++ trunk/locale/ja/LC_MESSAGES/phpwiki.php 2012-12-07 11:49:09 UTC (rev 8623)
@@ -9,7 +9,6 @@
$locale["%s: not defined"] = "%s: 未定義でした。";
$locale["(diff)"] = "(差分)";
$locale["<no matches>"] = "<一致しません>";
-$locale["<none>"] = "<なし>";
$locale["<system language>"] = "<システム言語>";
$locale["<system theme>"] = "<システムテーマ>";
$locale["Add %s"] = "ヒット数";
Modified: trunk/locale/nl/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po 2012-12-07 11:14:44 UTC (rev 8622)
+++ trunk/locale/po/de.po 2012-12-07 11:49:09 UTC (rev 8623)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-06 10:44+0100\n"
+"POT-Creation-Date: 2012-12-07 12:47+0100\n"
"PO-Revision-Date: 2000-10-31 02:23+0200\n"
"Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
"<car...@us...>, Helmer Pardun <pardunpress@t-online."
@@ -73,14 +73,15 @@
msgid "version %s"
msgstr "Version %s"
-#: ../lib/diff.php:224 ../lib/plugin/Diff.php:74 ../lib/WikiTheme.php:541
-#: ../lib/WikiTheme.php:543
+#: ../lib/diff.php:224 ../lib/plugin/Diff.php:74 ../lib/WikiTheme.php:543
+#: ../lib/WikiTheme.php:545
#, php-format
msgid "by %s"
msgstr "von %s"
#: ../lib/diff.php:228 ../lib/plugin/Diff.php:76
-#: ../lib/wikilens/PageListColumns.php:369
+#: ../lib/plugin/WantedPagesOld.php:96 ../lib/wikilens/PageListColumns.php:369
+#: ../themes/default/templates/online.tmpl:36
msgid "None"
msgstr "Keine"
@@ -895,7 +896,7 @@
msgid "Empty pagename!"
msgstr "Leerer Seitenname!"
-#: ../lib/loadsave.php:915 ../lib/WikiTheme.php:701
+#: ../lib/loadsave.php:915 ../lib/WikiTheme.php:703
#, php-format
msgid "“%s”: Bad page name"
msgstr "»%s«: Ungültiger Seitenname"
@@ -1145,7 +1146,7 @@
"will expire at %s."
msgstr ""
-#: ../lib/main.php:111 ../lib/WikiDB.php:1063
+#: ../lib/main.php:111 ../lib/WikiDB.php:1065
msgid "Optimizing database"
msgstr "Datenbank wird optimiert"
@@ -1415,7 +1416,7 @@
msgstr "VolltextSuche"
#: ../lib/main.php:1179 ../lib/plugin/RecentChanges.php:898
-#: ../lib/plugin/TitleSearch.php:45 ../lib/WikiTheme.php:1522
+#: ../lib/plugin/TitleSearch.php:45 ../lib/WikiTheme.php:1524
#: ../themes/Crao/templates/navbar.tmpl:2
#: ../themes/Crao/templates/navbar.tmpl:6
#: ../themes/Crao/templates/navbar.tmpl:49
@@ -2230,7 +2231,7 @@
msgstr "Bearbeite %s"
#: ../lib/plugin/Calendar.php:40 ../lib/plugin/Calendar.php:45
-#: ../lib/WikiTheme.php:1559 ../lib/WikiUser.php:501
+#: ../lib/WikiTheme.php:1561 ../lib/WikiUser.php:501
#: ../themes/blog/templates/sidebar.tmpl:15
#: ../themes/Crao/templates/head.tmpl:80
#: ../themes/Crao/templates/navbar.tmpl:26
@@ -2383,7 +2384,7 @@
msgid "DeadEndPages"
msgstr "VerwaisteSeiten"
-#: ../lib/plugin/Diff.php:38 ../lib/WikiTheme.php:1056
+#: ../lib/plugin/Diff.php:38 ../lib/WikiTheme.php:1058
#: ../themes/blog/themeinfo.php:71
msgid "Diff"
msgstr "Diff"
@@ -5084,12 +5085,6 @@
msgid "PgsrcTranslation"
msgstr "PgsrcTranslation"
-# ie. no pages found
-#: ../lib/plugin/WantedPagesOld.php:96
-#: ../themes/default/templates/online.tmpl:36
-msgid "<none>"
-msgstr "<Keine>"
-
#: ../lib/plugin/WantedPagesOld.php:111
#, php-format
msgid "Wanted Pages for %s (%d total):"
@@ -5150,7 +5145,7 @@
msgid "The page %s is already watched!"
msgstr "Diese Seite %s is schon beobachtet"
-#: ../lib/plugin/WatchPage.php:95 ../lib/WikiTheme.php:1054
+#: ../lib/plugin/WatchPage.php:95 ../lib/WikiTheme.php:1056
#: ../themes/blog/templates/actionbar.tmpl:15 ../themes/blog/themeinfo.php:69
#: ../themes/Crao/templates/actionbar.tmpl:4
#: ../themes/default/templates/actionbar.tmpl:12
@@ -5615,7 +5610,7 @@
"Sind Sie sicher, dass Sie die ausgewählen Seiten wirklich umbenennen wollen?"
#: ../lib/plugin/WikiAdminRename.php:222 ../lib/plugin/WikiAdminRename.php:248
-#: ../lib/WikiTheme.php:1062
+#: ../lib/WikiTheme.php:1064
msgid "Rename Page"
msgstr "Seite Umbenennen"
@@ -6323,7 +6318,7 @@
msgid "Sorry, this page does not exist."
msgstr "Leider, diese Seite ist nicht in der Datenbank."
-#: ../lib/purgepage.php:24 ../lib/purgepage.php:57 ../lib/WikiTheme.php:1070
+#: ../lib/purgepage.php:24 ../lib/purgepage.php:57 ../lib/WikiTheme.php:1072
msgid "Purge Page"
msgstr "Seiten endgültig löschen"
@@ -6351,7 +6346,7 @@
msgid "Remove cancelled"
msgstr "Löschen abgebrochen"
-#: ../lib/removepage.php:24 ../lib/removepage.php:57 ../lib/WikiTheme.php:1068
+#: ../lib/removepage.php:24 ../lib/removepage.php:57 ../lib/WikiTheme.php:1070
msgid "Remove Page"
msgstr "Seite Löschen"
@@ -6821,18 +6816,18 @@
msgid "WikiDB::renamePage() not yet implemented for this backend"
msgstr "WikiDB::renamePage() für dieses Backend noch nicht implementiert"
-#: ../lib/WikiDB.php:985
+#: ../lib/WikiDB.php:987
#, php-format
msgid "%s: Date of new revision is %s"
msgstr "%s: Datum dieser aktuellen Neubearbeitung ist %s"
-#: ../lib/WikiDB.php:1753 ../lib/WikiDB.php:1757
+#: ../lib/WikiDB.php:1755 ../lib/WikiDB.php:1759
#: ../themes/default/templates/homepage.tmpl:6
#, php-format
msgid "Describe %s here."
msgstr "Beschreiben Sie %s hier."
-#: ../lib/WikiDB.php:1792
+#: ../lib/WikiDB.php:1794
#, php-format
msgid "Oops! Revision %s of %s seems to have been deleted!"
msgstr "Hoppla! Es scheint, die Version %s von %s wurde gelöscht!"
@@ -6979,69 +6974,69 @@
msgid "Plugin %s disabled."
msgstr "Zusatzprogramm %s deaktiviert."
-#: ../lib/WikiPlugin.php:505 ../lib/WikiPlugin.php:522
+#: ../lib/WikiPlugin.php:506 ../lib/WikiPlugin.php:523
#, php-format
msgid "Plugin “%s” does not exist."
msgstr "Zusatzprogramm »%s« existiert nicht"
-#: ../lib/WikiPlugin.php:525
+#: ../lib/WikiPlugin.php:526
#, php-format
msgid "%s: no such class"
msgstr "Unbekannte Klasse: »%s«"
-#: ../lib/WikiPlugin.php:531
+#: ../lib/WikiPlugin.php:532
#, php-format
msgid "%s: not a subclass of WikiPlugin."
msgstr "%s scheint kein WikiPlugin zu sein."
-#: ../lib/WikiTheme.php:454
+#: ../lib/WikiTheme.php:455
msgid "Never edited"
msgstr "Noch nie bearbeitet."
-#: ../lib/WikiTheme.php:461
+#: ../lib/WikiTheme.php:462
#, php-format
msgid "%s at %s"
msgstr "%s um %s"
-#: ../lib/WikiTheme.php:465 ../lib/WikiTheme.php:476
+#: ../lib/WikiTheme.php:466 ../lib/WikiTheme.php:477
#, php-format
msgid "Version %s, saved on %s"
msgstr "Version %s. gespeichert am %s"
-#: ../lib/WikiTheme.php:467 ../lib/WikiTheme.php:478
+#: ../lib/WikiTheme.php:468 ../lib/WikiTheme.php:479
#, php-format
msgid "Last edited on %s"
msgstr "Zuletzt bearbeitet am %s"
-#: ../lib/WikiTheme.php:495
+#: ../lib/WikiTheme.php:496
msgid "today"
msgstr "heute"
-#: ../lib/WikiTheme.php:503
+#: ../lib/WikiTheme.php:504
msgid "yesterday"
msgstr "gestern"
-#: ../lib/WikiTheme.php:525 ../lib/WikiTheme.php:527
+#: ../lib/WikiTheme.php:526 ../lib/WikiTheme.php:528
#, php-format
msgid "Owner: %s"
msgstr "Besitzer: %s"
-#: ../lib/WikiTheme.php:642
+#: ../lib/WikiTheme.php:644
#, php-format
msgid "Empty link to: %s"
msgstr "Leerer Link zu: %s"
-#: ../lib/WikiTheme.php:657 ../themes/MacOSX/themeinfo.php:80
+#: ../lib/WikiTheme.php:659 ../themes/MacOSX/themeinfo.php:80
#, php-format
msgid "Create: %s"
msgstr "Erzeugen: %s"
-#: ../lib/WikiTheme.php:677
+#: ../lib/WikiTheme.php:679
#, php-format
msgid "Google:%s"
msgstr ""
-#: ../lib/WikiTheme.php:1058 ../themes/blog/themeinfo.php:73
+#: ../lib/WikiTheme.php:1060 ../themes/blog/themeinfo.php:73
#: ../themes/Crao/templates/signin.tmpl:12
#: ../themes/Crao/templates/signin.tmpl:28
#: ../themes/default/templates/signin.tmpl:14
@@ -7055,7 +7050,7 @@
msgid "Sign Out"
msgstr "Abmelden"
-#: ../lib/WikiTheme.php:1060 ../lib/WikiUserNew.php:534
+#: ../lib/WikiTheme.php:1062 ../lib/WikiUserNew.php:534
#: ../lib/WikiUser.php:243 ../themes/blog/themeinfo.php:75
#: ../themes/Crao/templates/signin.tmpl:51
#: ../themes/default/templates/login.tmpl:68
@@ -7066,20 +7061,20 @@
msgid "Sign In"
msgstr "Anmelden"
-#: ../lib/WikiTheme.php:1064 ../themes/MacOSX/themeinfo.php:138
+#: ../lib/WikiTheme.php:1066 ../themes/MacOSX/themeinfo.php:138
msgid "Lock Page"
msgstr "Seite Sperren"
-#: ../lib/WikiTheme.php:1066 ../themes/MacOSX/themeinfo.php:139
+#: ../lib/WikiTheme.php:1068 ../themes/MacOSX/themeinfo.php:139
msgid "Unlock Page"
msgstr "Seite Freigeben"
-#: ../lib/WikiTheme.php:1247
+#: ../lib/WikiTheme.php:1249
msgid ""
"Some action(page) wanted to add more headers, but they were already printed."
msgstr ""
-#: ../lib/WikiTheme.php:1348 ../themes/Hawaiian/themeinfo.php:35
+#: ../lib/WikiTheme.php:1350 ../themes/Hawaiian/themeinfo.php:35
#: ../themes/MacOSX/themeinfo.php:107 ../themes/MonoBook/themeinfo.php:111
#: ../themes/Portland/themeinfo.php:65 ../themes/shamino_com/themeinfo.php:60
#: ../themes/Sidebar/themeinfo.php:126 ../themes/SpaceWiki/themeinfo.php:48
@@ -7087,13 +7082,13 @@
msgid "Printer"
msgstr "Drucker"
-#: ../lib/WikiTheme.php:1349 ../themes/MacOSX/themeinfo.php:108
+#: ../lib/WikiTheme.php:1351 ../themes/MacOSX/themeinfo.php:108
#: ../themes/MonoBook/themeinfo.php:112 ../themes/shamino_com/themeinfo.php:61
#: ../themes/wikilens/themeinfo.php:33
msgid "Top & bottom toolbars"
msgstr "Obere u. untere Werkzeugleisten"
-#: ../lib/WikiTheme.php:1350 ../themes/Hawaiian/themeinfo.php:36
+#: ../lib/WikiTheme.php:1352 ../themes/Hawaiian/themeinfo.php:36
#: ../themes/MonoBook/themeinfo.php:113 ../themes/Portland/themeinfo.php:66
#: ../themes/shamino_com/themeinfo.php:62 ../themes/Sidebar/themeinfo.php:127
#: ../themes/SpaceWiki/themeinfo.php:49 ../themes/wikilens/themeinfo.php:34
@@ -7101,16 +7096,16 @@
msgid "Modern"
msgstr "Modern"
-#: ../lib/WikiTheme.php:1849
+#: ../lib/WikiTheme.php:1851
#, php-format
msgid "Plugin %s: undefined"
msgstr "Zusatzprogramm %s: undefiniert"
-#: ../lib/WikiTheme.php:1876
+#: ../lib/WikiTheme.php:1878
msgid "Related Links"
msgstr "Verwandte Links"
-#: ../lib/WikiTheme.php:1899
+#: ../lib/WikiTheme.php:1901
msgid "External Links"
msgstr "Externe Links"
@@ -8888,6 +8883,10 @@
msgid "View the current version"
msgstr "Die aktuelle Version ansehen"
+# ie. no pages found
+#~ msgid "<none>"
+#~ msgstr "<Keine>"
+
#~ msgid " Skipped"
#~ msgstr "Ausgelassen"
Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po 2012-12-07 11:14:44 UTC (rev 8622)
+++ trunk/locale/po/es.po 2012-12-07 11:49:09 UTC (rev 8623)
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-06 10:44+0100\n"
+"POT-Creation-Date: 2012-12-07 12:47+0100\n"
"PO-Revision-Date: 2000-02-01 00:50-0500\n"
"Last-Translator: Pablo Roca <pr...@cl...>\n"
"Language-Team: \n"
@@ -80,14 +80,15 @@
msgid "version %s"
msgstr "versión %s"
-#: ../lib/diff.php:224 ../lib/plugin/Diff.php:74 ../lib/WikiTheme.php:541
-#: ../lib/WikiTheme.php:543
+#: ../lib/diff.php:224 ../lib/plugin/Diff.php:74 ../lib/WikiTheme.php:543
+#: ../lib/WikiTheme.php:545
#, php-format
msgid "by %s"
msgstr "por %s"
#: ../lib/diff.php:228 ../lib/plugin/Diff.php:76
-#: ../lib/wikilens/PageListColumns.php:369
+#: ../lib/plugin/WantedPagesOld.php:96 ../lib/wikilens/PageListColumns.php:369
+#: ../themes/default/templates/online.tmpl:36
msgid "None"
msgstr "Ninguna"
@@ -881,7 +882,7 @@
msgid "Empty pagename!"
msgstr "¡Escriba un nombre de página!"
-#: ../lib/loadsave.php:915 ../lib/WikiTheme.php:701
+#: ../lib/loadsave.php:915 ../lib/WikiTheme.php:703
#, php-format
msgid "“%s”: Bad page name"
msgstr "“%s”: Mal nombre de la página"
@@ -1130,7 +1131,7 @@
"will expire at %s."
msgstr ""
-#: ../lib/main.php:111 ../lib/WikiDB.php:1063
+#: ../lib/main.php:111 ../lib/WikiDB.php:1065
msgid "Optimizing database"
msgstr "Base de datos óptima"
@@ -1397,7 +1398,7 @@
msgstr "BúsquedaDelTexto"
#: ../lib/main.php:1179 ../lib/plugin/RecentChanges.php:898
-#: ../lib/plugin/TitleSearch.php:45 ../lib/WikiTheme.php:1522
+#: ../lib/plugin/TitleSearch.php:45 ../lib/WikiTheme.php:1524
#: ../themes/Crao/templates/navbar.tmpl:2
#: ../themes/Crao/templates/navbar.tmpl:6
#: ../themes/Crao/templates/navbar.tmpl:49
@@ -2203,7 +2204,7 @@
msgstr "Editar %s"
#: ../lib/plugin/Calendar.php:40 ../lib/plugin/Calendar.php:45
-#: ../lib/WikiTheme.php:1559 ../lib/WikiUser.php:501
+#: ../lib/WikiTheme.php:1561 ../lib/WikiUser.php:501
#: ../themes/blog/templates/sidebar.tmpl:15
#: ../themes/Crao/templates/head.tmpl:80
#: ../themes/Crao/templates/navbar.tmpl:26
@@ -2356,7 +2357,7 @@
msgid "DeadEndPages"
msgstr ""
-#: ../lib/plugin/Diff.php:38 ../lib/WikiTheme.php:1056
+#: ../lib/plugin/Diff.php:38 ../lib/WikiTheme.php:1058
#: ../themes/blog/themeinfo.php:71
msgid "Diff"
msgstr "Diferencia"
@@ -4969,11 +4970,6 @@
msgid "PgsrcTranslation"
msgstr ""
-#: ../lib/plugin/WantedPagesOld.php:96
-#: ../themes/default/templates/online.tmpl:36
-msgid "<none>"
-msgstr "<Ninguna>"
-
#: ../lib/plugin/WantedPagesOld.php:111
#, php-format
msgid "Wanted Pages for %s (%d total):"
@@ -5034,7 +5030,7 @@
msgid "The page %s is already watched!"
msgstr ""
-#: ../lib/plugin/WatchPage.php:95 ../lib/WikiTheme.php:1054
+#: ../lib/plugin/WatchPage.php:95 ../lib/WikiTheme.php:1056
#: ../themes/blog/templates/actionbar.tmpl:15 ../themes/blog/themeinfo.php:69
#: ../themes/Crao/templates/actionbar.tmpl:4
#: ../themes/default/templates/actionbar.tmpl:12
@@ -5487,7 +5483,7 @@
msgstr ""
#: ../lib/plugin/WikiAdminRename.php:222 ../lib/plugin/WikiAdminRename.php:248
-#: ../lib/WikiTheme.php:1062
+#: ../lib/WikiTheme.php:1064
msgid "Rename Page"
msgstr ""
@@ -6169,7 +6165,7 @@
msgid "Sorry, this page does not exist."
msgstr "Apesadumbrada, esta página no está en la base de datos."
-#: ../lib/purgepage.php:24 ../lib/purgepage.php:57 ../lib/WikiTheme.php:1070
+#: ../lib/purgepage.php:24 ../lib/purgepage.php:57 ../lib/WikiTheme.php:1072
msgid "Purge Page"
msgstr ""
@@ -6195,7 +6191,7 @@
msgid "Remove cancelled"
msgstr "Borrar Página"
-#: ../lib/removepage.php:24 ../lib/removepage.php:57 ../lib/WikiTheme.php:1068
+#: ../lib/removepage.php:24 ../lib/removepage.php:57 ../lib/WikiTheme.php:1070
msgid "Remove Page"
msgstr "Borrar Página"
@@ -6661,18 +6657,18 @@
msgid "WikiDB::renamePage() not yet implemented for this backend"
msgstr "WikiDB::renamePage() no todavía puesto en ejecucio'n para este backend"
-#: ../lib/WikiDB.php:985
+#: ../lib/WikiDB.php:987
#, php-format
msgid "%s: Date of new revision is %s"
msgstr "%s: La fecha de la nueva revisión es %s"
-#: ../lib/WikiDB.php:1753 ../lib/WikiDB.php:1757
+#: ../lib/WikiDB.php:1755 ../lib/WikiDB.php:1759
#: ../themes/default/templates/homepage.tmpl:6
#, php-format
msgid "Describe %s here."
msgstr "Describe %s aquí."
-#: ../lib/WikiDB.php:1792
+#: ../lib/WikiDB.php:1794
#, php-format
msgid "Oops! Revision %s of %s seems to have been deleted!"
msgstr "¡Oops! ¡La revisión %s de %s se parece haber sido suprimida!"
@@ -6822,69 +6818,69 @@
msgid "Plugin %s disabled."
msgstr "Plugin “%s” lisiado."
-#: ../lib/WikiPlugin.php:505 ../lib/WikiPlugin.php:522
+#: ../lib/WikiPlugin.php:506 ../lib/WikiPlugin.php:523
#, php-format
msgid "Plugin “%s” does not exist."
msgstr "Plugin “%s” no existe."
-#: ../lib/WikiPlugin.php:525
+#: ../lib/WikiPlugin.php:526
#, php-format
msgid "%s: no such class"
msgstr "%s: ninguna tal clase"
-#: ../lib/WikiPlugin.php:531
+#: ../lib/WikiPlugin.php:532
#, php-format
msgid "%s: not a subclass of WikiPlugin."
msgstr "%s: no una subclase de WikiPlugin."
-#: ../lib/WikiTheme.php:454
+#: ../lib/WikiTheme.php:455
msgid "Never edited"
msgstr "Nunca corregido"
-#: ../lib/WikiTheme.php:461
+#: ../lib/WikiTheme.php:462
#, php-format
msgid "%s at %s"
msgstr "%s en %s"
-#: ../lib/WikiTheme.php:465 ../lib/WikiTheme.php:476
+#: ../lib/WikiTheme.php:466 ../lib/WikiTheme.php:477
#, php-format
msgid "Version %s, saved on %s"
msgstr "versión %s de %s"
-#: ../lib/WikiTheme.php:467 ../lib/WikiTheme.php:478
+#: ../lib/WikiTheme.php:468 ../lib/WikiTheme.php:479
#, php-format
msgid "Last edited on %s"
msgstr "Editada por última vez %s."
-#: ../lib/WikiTheme.php:495
+#: ../lib/WikiTheme.php:496
msgid "today"
msgstr "hoy"
-#: ../lib/WikiTheme.php:503
+#: ../lib/WikiTheme.php:504
msgid "yesterday"
msgstr "ayer"
-#: ../lib/WikiTheme.php:525 ../lib/WikiTheme.php:527
+#: ../lib/WikiTheme.php:526 ../lib/WikiTheme.php:528
#, php-format
msgid "Owner: %s"
msgstr "Dueño: %s"
-#: ../lib/WikiTheme.php:642
+#: ../lib/WikiTheme.php:644
#, php-format
msgid "Empty link to: %s"
msgstr "Acoplamiento vacío a: %s"
-#: ../lib/WikiTheme.php:657 ../themes/MacOSX/themeinfo.php:80
+#: ../lib/WikiTheme.php:659 ../themes/MacOSX/themeinfo.php:80
#, php-format
msgid "Create: %s"
msgstr "Cree: %s"
-#: ../lib/WikiTheme.php:677
+#: ../lib/WikiTheme.php:679
#, php-format
msgid "Google:%s"
msgstr ""
-#: ../lib/WikiTheme.php:1058 ../themes/blog/themeinfo.php:73
+#: ../lib/WikiTheme.php:1060 ../themes/blog/themeinfo.php:73
#: ../themes/Crao/templates/signin.tmpl:12
#: ../themes/Crao/templates/signin.tmpl:28
#: ../themes/default/templates/signin.tmpl:14
@@ -6898,7 +6894,7 @@
msgid "Sign Out"
msgstr "Registro Hacia fuera"
-#: ../lib/WikiTheme.php:1060 ../lib/WikiUserNew.php:534
+#: ../lib/WikiTheme.php:1062 ../lib/WikiUserNew.php:534
#: ../lib/WikiUser.php:243 ../themes/blog/themeinfo.php:75
#: ../themes/Crao/templates/signin.tmpl:51
#: ../themes/default/templates/login.tmpl:68
@@ -6909,20 +6905,20 @@
msgid "Sign In"
msgstr "Muestra Adentro"
-#: ../lib/WikiTheme.php:1064 ../themes/MacOSX/themeinfo.php:138
+#: ../lib/WikiTheme.php:1066 ../themes/MacOSX/themeinfo.php:138
msgid "Lock Page"
msgstr "Bloquear Página"
-#: ../lib/WikiTheme.php:1066 ../themes/MacOSX/themeinfo.php:139
+#: ../lib/WikiTheme.php:1068 ../themes/MacOSX/themeinfo.php:139
msgid "Unlock Page"
msgstr "Desbloquear Página"
-#: ../lib/WikiTheme.php:1247
+#: ../lib/WikiTheme.php:1249
msgid ""
"Some action(page) wanted to add more headers, but they were already printed."
msgstr ""
-#: ../lib/WikiTheme.php:1348 ../themes/Hawaiian/themeinfo.php:35
+#: ../lib/WikiTheme.php:1350 ../themes/Hawaiian/themeinfo.php:35
#: ../themes/MacOSX/themeinfo.php:107 ../themes/MonoBook/themeinfo.php:111
#: ../themes/Portland/themeinfo.php:65 ../themes/shamino_com/themeinfo.php:60
#: ../themes/Sidebar/themeinfo.php:126 ../themes/SpaceWiki/themeinfo.php:48
@@ -6930,13 +6926,13 @@
msgid "Printer"
msgstr "Impresora"
-#: ../lib/WikiTheme.php:1349 ../themes/MacOSX/themeinfo.php:108
+#: ../lib/WikiTheme.php:1351 ../themes/MacOSX/themeinfo.php:108
#: ../themes/MonoBook/themeinfo.php:112 ../themes/shamino_com/themeinfo.php:61
#: ../themes/wikilens/themeinfo.php:33
msgid "Top & bottom toolbars"
msgstr "Toolbars superiores y inferiores"
-#: ../lib/WikiTheme.php:1350 ../themes/Hawaiian/themeinfo.php:36
+#: ../lib/WikiTheme.php:1352 ../themes/Hawaiian/themeinfo.php:36
#: ../themes/MonoBook/themeinfo.php:113 ../themes/Portland/themeinfo.php:66
#: ../themes/shamino_com/themeinfo.php:62 ../themes/Sidebar/themeinfo.php:127
#: ../themes/SpaceWiki/themeinfo.php:49 ../themes/wikilens/themeinfo.php:34
@@ -6944,16 +6940,16 @@
msgid "Modern"
msgstr "Moderno"
-#: ../lib/WikiTheme.php:1849
+#: ../lib/WikiTheme.php:1851
#, php-format
msgid "Plugin %s: undefined"
msgstr "Plugin %s: indefinido"
-#: ../lib/WikiTheme.php:1876
+#: ../lib/WikiTheme.php:1878
msgid "Related Links"
msgstr "Acoplamientos Relacionados"
-#: ../lib/WikiTheme.php:1899
+#: ../lib/WikiTheme.php:1901
msgid "External Links"
msgstr "Acoplamientos Externos"
@@ -8672,6 +8668,9 @@
msgid "View the current version"
msgstr "Vea la versión actual"
+#~ msgid "<none>"
+#~ msgstr "<Ninguna>"
+
#~ msgid " Skipped"
#~ msgstr "Saltado"
Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po 2012-12-07 11:14:44 UTC (rev 8622)
+++ trunk/locale/po/fr.po 2012-12-07 11:49:09 UTC (rev 8623)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-06 10:44+0100\n"
+"POT-Creation-Date: 2012-12-07 12:47+0100\n"
"PO-Revision-Date: 2004-06-22 21:10+0200\n"
"Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
"Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -76,16 +76,17 @@
msgid "version %s"
msgstr "version %s"
-#: ../lib/diff.php:224 ../lib/plugin/Diff.php:74 ../lib/WikiTheme.php:541
-#: ../lib/WikiTheme.php:543
+#: ../lib/diff.php:224 ../lib/plugin/Diff.php:74 ../lib/WikiTheme.php:543
+#: ../lib/WikiTheme.php:545
#, php-format
msgid "by %s"
msgstr "par %s"
#: ../lib/diff.php:228 ../lib/plugin/Diff.php:76
-#: ../lib/wikilens/PageListColumns.php:369
+#: ../lib/plugin/WantedPagesOld.php:96 ../lib/wikilens/PageListColumns.php:369
+#: ../themes/default/templates/online.tmpl:36
msgid "None"
-msgstr "Aucun(e)"
+msgstr "Aucun"
#: ../lib/diff.php:251 ../lib/plugin/Diff.php:100
#: ../lib/plugin/PageHistory.php:347 ../lib/plugin/PageInfo.php:58
@@ -881,7 +882,7 @@
msgid "Empty pagename!"
msgstr "Nom de page vide !"
-#: ../lib/loadsave.php:915 ../lib/WikiTheme.php:701
+#: ../lib/loadsave.php:915 ../lib/WikiTheme.php:703
#, php-format
msgid "“%s”: Bad page name"
msgstr "« %s » : nom de page non valide"
@@ -1125,7 +1126,7 @@
"will expire at %s."
msgstr ""
-#: ../lib/main.php:111 ../lib/WikiDB.php:1063
+#: ../lib/main.php:111 ../lib/WikiDB.php:1065
msgid "Optimizing database"
msgstr "Optimisation de la base de données"
@@ -1392,7 +1393,7 @@
msgstr "RechercheEnTexteIntégral"
#: ../lib/main.php:1179 ../lib/plugin/RecentChanges.php:898
-#: ../lib/plugin/TitleSearch.php:45 ../lib/WikiTheme.php:1522
+#: ../lib/plugin/TitleSearch.php:45 ../lib/WikiTheme.php:1524
#: ../themes/Crao/templates/navbar.tmpl:2
#: ../themes/Crao/templates/navbar.tmpl:6
#: ../themes/Crao/templates/navbar.tmpl:49
@@ -2202,7 +2203,7 @@
msgstr "Éditer %s"
#: ../lib/plugin/Calendar.php:40 ../lib/plugin/Calendar.php:45
-#: ../lib/WikiTheme.php:1559 ../lib/WikiUser.php:501
+#: ../lib/WikiTheme.php:1561 ../lib/WikiUser.php:501
#: ../themes/blog/templates/sidebar.tmpl:15
#: ../themes/Crao/templates/head.tmpl:80
#: ../themes/Crao/templates/navbar.tmpl:26
@@ -2356,7 +2357,7 @@
msgid "DeadEndPages"
msgstr ""
-#: ../lib/plugin/Diff.php:38 ../lib/WikiTheme.php:1056
+#: ../lib/plugin/Diff.php:38 ../lib/WikiTheme.php:1058
#: ../themes/blog/themeinfo.php:71
msgid "Diff"
msgstr ""
@@ -5021,11 +5022,6 @@
msgid "PgsrcTranslation"
msgstr "TraductionPgsrc"
-#: ../lib/plugin/WantedPagesOld.php:96
-#: ../themes/default/templates/online.tmpl:36
-msgid "<none>"
-msgstr "<aucun>"
-
#: ../lib/plugin/WantedPagesOld.php:111
#, php-format
msgid "Wanted Pages for %s (%d total):"
@@ -5086,7 +5082,7 @@
msgid "The page %s is already watched!"
msgstr "Cette page %s fait déjà partie de votre liste de suivi !"
-#: ../lib/plugin/WatchPage.php:95 ../lib/WikiTheme.php:1054
+#: ../lib/plugin/WatchPage.php:95 ../lib/WikiTheme.php:1056
#: ../themes/blog/templates/actionbar.tmpl:15 ../themes/blog/themeinfo.php:69
#: ../themes/Crao/templates/actionbar.tmpl:4
#: ../themes/default/templates/actionbar.tmpl:12
@@ -5539,7 +5535,7 @@
msgstr "Êtes-vous sûr de vouloir renommer les pages sélectionnées ?"
#: ../lib/plugin/WikiAdminRename.php:222 ../lib/plugin/WikiAdminRename.php:248
-#: ../lib/WikiTheme.php:1062
+#: ../lib/WikiTheme.php:1064
msgid "Rename Page"
msgstr "Renommer la page"
@@ -6237,7 +6233,7 @@
msgid "Sorry, this page does not exist."
msgstr "Désolé, cette page n'existe pas."
-#: ../lib/purgepage.php:24 ../lib/purgepage.php:57 ../lib/WikiTheme.php:1070
+#: ../lib/purgepage.php:24 ../lib/purgepage.php:57 ../lib/WikiTheme.php:1072
msgid "Purge Page"
msgstr "Purger la page"
@@ -6265,7 +6261,7 @@
msgid "Remove cancelled"
msgstr "Suppression de la page annulée"
-#: ../lib/removepage.php:24 ../lib/removepage.php:57 ../lib/WikiTheme.php:1068
+#: ../lib/removepage.php:24 ../lib/removepage.php:57 ../lib/WikiTheme.php:1070
msgid "Remove Page"
msgstr "Supprimer la page"
@@ -6734,18 +6730,18 @@
msgid "WikiDB::renamePage() not yet implemented for this backend"
msgstr "WikiBD::renamePage() pas encore implémentée pour le Principal"
-#: ../lib/WikiDB.php:985
+#: ../lib/WikiDB.php:987
#, php-format
msgid "%s: Date of new revision is %s"
msgstr "%s : la date de la nouvelle version est %s"
-#: ../lib/WikiDB.php:1753 ../lib/WikiDB.php:1757
+#: ../lib/WikiDB.php:1755 ../lib/WikiDB.php:1759
#: ../themes/default/templates/homepage.tmpl:6
#, php-format
msgid "Describe %s here."
msgstr "Décrire %s ici."
-#: ../lib/WikiDB.php:1792
+#: ../lib/WikiDB.php:1794
#, php-format
msgid "Oops! Revision %s of %s seems to have been deleted!"
msgstr "Ouille ! La version %s de %s semble avoir été effacée !"
@@ -6891,69 +6887,69 @@
msgid "Plugin %s disabled."
msgstr "Greffon %s désactivé."
-#: ../lib/WikiPlugin.php:505 ../lib/WikiPlugin.php:522
+#: ../lib/WikiPlugin.php:506 ../lib/WikiPlugin.php:523
#, php-format
msgid "Plugin “%s” does not exist."
msgstr "Le greffon %s n'existe pas."
-#: ../lib/WikiPlugin.php:525
+#: ../lib/WikiPlugin.php:526
#, php-format
msgid "%s: no such class"
msgstr "%s : classe inexistante"
-#: ../lib/WikiPlugin.php:531
+#: ../lib/WikiPlugin.php:532
#, php-format
msgid "%s: not a subclass of WikiPlugin."
msgstr "%s n'est pas une sous-classe de WikiPlugin."
-#: ../lib/WikiTheme.php:454
+#: ../lib/WikiTheme.php:455
msgid "Never edited"
msgstr "Jamais éditée"
-#: ../lib/WikiTheme.php:461
+#: ../lib/WikiTheme.php:462
#, php-format
msgid "%s at %s"
msgstr "%s à %s"
-#: ../lib/WikiTheme.php:465 ../lib/WikiTheme.php:476
+#: ../lib/WikiTheme.php:466 ../lib/WikiTheme.php:477
#, php-format
msgid "Version %s, saved on %s"
msgstr "Version %s, enregistrée %s"
-#: ../lib/WikiTheme.php:467 ../lib/WikiTheme.php:478
+#: ../lib/WikiTheme.php:468 ../lib/WikiTheme.php:479
#, php-format
msgid "Last edited on %s"
msgstr "Dernière modification %s"
-#: ../lib/WikiTheme.php:495
+#: ../lib/WikiTheme.php:496
msgid "today"
msgstr "aujourd'hui"
-#: ../lib/WikiTheme.php:503
+#: ../lib/WikiTheme.php:504
msgid "yesterday"
msgstr "hier"
-#: ../lib/WikiTheme.php:525 ../lib/WikiTheme.php:527
+#: ../lib/WikiTheme.php:526 ../lib/WikiTheme.php:528
#, php-format
msgid "Owner: %s"
msgstr "Propriétaire : %s"
-#: ../lib/WikiTheme.php:642
+#: ../lib/WikiTheme.php:644
#, php-format
msgid "Empty link to: %s"
msgstr "Lien vide vers : %s"
-#: ../lib/WikiTheme.php:657 ../themes/MacOSX/themeinfo.php:80
+#: ../lib/WikiTheme.php:659 ../themes/MacOSX/themeinfo.php:80
#, php-format
msgid "Create: %s"
msgstr "Créer : %s"
-#: ../lib/WikiTheme.php:677
+#: ../lib/WikiTheme.php:679
#, php-format
msgid "Google:%s"
msgstr "Google: %s"
-#: ../lib/WikiTheme.php:1058 ../themes/blog/themeinfo.php:73
+#: ../lib/WikiTheme.php:1060 ../themes/blog/themeinfo.php:73
#: ../themes/Crao/templates/signin.tmpl:12
#: ../themes/Crao/templates/signin.tmpl:28
#: ../themes/default/templates/signin.tmpl:14
@@ -6967,7 +6963,7 @@
msgid "Sign Out"
msgstr "Se déconnecter"
-#: ../lib/WikiTheme.php:1060 ../lib/WikiUserNew.php:534
+#: ../lib/WikiTheme.php:1062 ../lib/WikiUserNew.php:534
#: ../lib/WikiUser.php:243 ../themes/blog/themeinfo.php:75
#: ../themes/Crao/templates/signin.tmpl:51
#: ../themes/default/templates/login.tmpl:68
@@ -6978,20 +6974,20 @@
msgid "Sign In"
msgstr "S'identifier"
-#: ../lib/WikiTheme.php:1064 ../themes/MacOSX/themeinfo.php:138
+#: ../lib/WikiTheme.php:1066 ../themes/MacOSX/themeinfo.php:138
msgid "Lock Page"
msgstr "Verrouiller la page"
-#: ../lib/WikiTheme.php:1066 ../themes/MacOSX/themeinfo.php:139
+#: ../lib/WikiTheme.php:1068 ../themes/MacOSX/themeinfo.php:139
msgid "Unlock Page"
msgstr "Déverrouiller la page"
-#: ../lib/WikiTheme.php:1247
+#: ../lib/WikiTheme.php:1249
msgid ""
"Some action(page) wanted to add more headers, but they were already printed."
msgstr ""
-#: ../lib/WikiTheme.php:1348 ../themes/Hawaiian/themeinfo.php:35
+#: ../lib/WikiTheme.php:1350 ../themes/Hawaiian/themeinfo.php:35
#: ../themes/MacOSX/themeinfo.php:107 ../themes/MonoBook/themeinfo.php:111
#: ../themes/Portland/themeinfo.php:65 ../themes/shamino_com/themeinfo.php:60
#: ../themes/Sidebar/themeinfo.php:126 ../themes/SpaceWiki/themeinfo.php:48
@@ -6999,13 +6995,13 @@
msgid "Printer"
msgstr "Imprimante"
-#: ../lib/WikiTheme.php:1349 ../themes/MacOSX/themeinfo.php:108
+#: ../lib/WikiTheme.php:1351 ../themes/MacOSX/themeinfo.php:108
#: ../themes/MonoBook/themeinfo.php:112 ../themes/shamino_com/themeinfo.php:61
#: ../themes/wikilens/themeinfo.php:33
msgid "Top & bottom toolbars"
msgstr ""
-#: ../lib/WikiTheme.php:1350 ../themes/Hawaiian/themeinfo.php:36
+#: ../lib/WikiTheme.php:1352 ../themes/Hawaiian/themeinfo.php:36
#: ../themes/MonoBook/themeinfo.php:113 ../themes/Portland/themeinfo.php:66
#: ../themes/shamino_com/themeinfo.php:62 ../themes/Sidebar/themeinfo.php:127
#: ../themes/SpaceWiki/themeinfo.php:49 ../themes/wikilens/themeinfo.php:34
@@ -7013,16 +7009,16 @@
msgid "Modern"
msgstr "Moderne"
-#: ../lib/WikiTheme.php:1849
+#: ../lib/WikiTheme.php:1851
#, php-format
msgid "Plugin %s: undefined"
msgstr "Plugin %s: non défini"
-#: ../lib/WikiTheme.php:1876
+#: ../lib/WikiTheme.php:1878
msgid "Related Links"
msgstr "Liens correspondants"
-#: ../lib/WikiTheme.php:1899
+#: ../lib/WikiTheme.php:1901
msgid "External Links"
msgstr "Liens externes"
@@ -8771,6 +8767,9 @@
msgid "View the current version"
msgstr "Voir la version actuelle"
+#~ msgid "<none>"
+#~ msgstr "<aucun>"
+
#~ msgid " Skipped"
#~ msgstr "Ignoré"
Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po 2012-12-07 11:14:44 UTC (rev 8622)
+++ trunk/locale/po/it.po 2012-12-07 11:49:09 UTC (rev 8623)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-06 10:44+0100\n"
+"POT-Creation-Date: 2012-12-07 12:47+0100\n"
"PO-Revision-Date: 2005-02-12 16:23+0100\n"
"Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n"
"Language-Team: \n"
@@ -72,14 +72,15 @@
msgid "version %s"
msgstr "versione %s"
-#: ../lib/diff.php:224 ../lib/plugin/Diff.php:74 ../lib/WikiTheme.php:541
-#: ../lib/WikiTheme.php:543
+#: ../lib/diff.php:224 ../lib/plugin/Diff.php:74 ../lib/WikiTheme.php:543
+#: ../lib/WikiTheme.php:545
#, php-format
msgid "by %s"
msgstr "di %s"
#: ../lib/diff.php:228 ../lib/plugin/Diff.php:76
-#: ../lib/wikilens/PageListColumns.php:369
+#: ../lib/plugin/WantedPagesOld.php:96 ../lib/wikilens/PageListColumns.php:369
+#: ../themes/default/templates/online.tmpl:36
msgid "None"
msgstr "Nessuno"
@@ -872,7 +873,7 @@
msgid "Empty pagename!"
msgstr ""
-#: ../lib/loadsave.php:915 ../lib/WikiTheme.php:701
+#: ../lib/loadsave.php:915 ../lib/WikiTheme.php:703
#, php-format
msgid "“%s”: Bad page name"
msgstr ""
@@ -1116,7 +1117,7 @@
"will expire at %s."
msgstr ""
-#: ../lib/main.php:111 ../lib/WikiDB.php:1063
+#: ../lib/main.php:111 ../lib/WikiDB.php:1065
msgid "Optimizing database"
msgstr "Base di dati d'ottimizzazione"
@@ -1381,7 +1382,7 @@
msgstr "RicercaDelTesto"
#: ../lib/main.php:1179 ../lib/plugin/RecentChanges.php:898
-#: ../lib/plugin/TitleSearch.php:45 ../lib/WikiTheme.php:1522
+#: ../lib/plugin/TitleSearch.php:45 ../lib/WikiTheme.php:1524
#: ../themes/Crao/templates/navbar.tmpl:2
#: ../themes/Crao/templates/navbar.tmpl:6
#: ../themes/Crao/templates/navbar.tmpl:49
@@ -2183,7 +2184,7 @@
msgstr "Modifica %s"
#: ../lib/plugin/Calendar.php:40 ../lib/plugin/Calendar.php:45
-#: ../lib/WikiTheme.php:1559 ../lib/WikiUser.php:501
+#: ../lib/WikiTheme.php:1561 ../lib/WikiUser.php:501
#: ../themes/blog/templates/sidebar.tmpl:15
#: ../themes/Crao/templates/head.tmpl:80
#: ../themes/Crao/templates/navbar.tmpl:26
@@ -2336,7 +2337,7 @@
msgid "DeadEndPages"
msgstr ""
-#: ../lib/plugin/Diff.php:38 ../lib/WikiTheme.php:1056
+#: ../lib/plugin/Diff.php:38 ../lib/WikiTheme.php:1058
#: ../themes/blog/themeinfo.php:71
msgid "Diff"
msgstr "Differenze"
@@ -4945,11 +4946,6 @@
msgid "PgsrcTranslation"
msgstr ""
-#: ../lib/plugin/WantedPagesOld.php:96
-#: ../themes/default/templates/online.tmpl:36
-msgid "<none>"
-msgstr "<nessun>"
-
#: ../lib/plugin/WantedPagesOld.php:111
#, php-format
msgid "Wanted Pages for %s (%d total):"
@@ -5010,7 +5006,7 @@
msgid "The page %s is already watched!"
msgstr ""
-#: ../lib/plugin/WatchPage.php:95 ../lib/WikiTheme.php:1054
+#: ../lib/plugin/WatchPage.php:95 ../lib/WikiTheme.php:1056
#: ../themes/blog/templates/actionbar.tmpl:15 ../themes/blog/themeinfo.php:69
#: ../themes/Crao/templates/actionbar.tmpl:4
#: ../themes/default/templates/actionbar.tmpl:12
@@ -5462,7 +5458,7 @@
msgstr ""
#: ../lib/plugin/WikiAdminRename.php:222 ../lib/plugin/WikiAdminRename.php:248
-#: ../lib/WikiTheme.php:1062
+#: ../lib/WikiTheme.php:1064
msgid "Rename Page"
msgstr ""
@@ -6144,7 +6140,7 @@
msgid "Sorry, this page does not exist."
msgstr ""
-#: ../lib/purgepage.php:24 ../lib/purgepage.php:57 ../lib/WikiTheme.php:1070
+#: ../lib/purgepage.php:24 ../lib/purgepage.php:57 ../lib/WikiTheme.php:1072
msgid "Purge Page"
msgstr ""
@@ -6170,7 +6166,7 @@
msgid "Remove cancelled"
msgstr "Cancella la Pagina"
-#: ../lib/removepage.php:24 ../lib/removepage.php:57 ../lib/WikiTheme.php:1068
+#: ../lib/removepage.php:24 ../lib/removepage.php:57 ../lib/WikiTheme.php:1070
msgid "Remove Page"
msgstr "Cancella la Pagina"
@@ -6633,18 +6629,18 @@
msgid "WikiDB::renamePage() not yet implemented for this backend"
msgstr ""
-#: ../lib/WikiDB.php:985
+#: ../lib/WikiDB.php:987
#, php-format
msgid "%s: Date of new revision is %s"
msgstr ""
-#: ../lib/WikiDB.php:1753 ../lib/WikiDB.php:1757
+#: ../lib/WikiDB.php:1755 ../lib/WikiDB.php:1759
#: ../themes/default/templates/homepage.tmpl:6
#, php-format
msgid "Describe %s here."
msgstr "Inserire qui il testo della pagina %s."
-#: ../lib/WikiDB.php:1792
+#: ../lib/WikiDB.php:1794
#, php-format
msgid "Oops! Revision %s of %s seems to have been deleted!"
msgstr ""
@@ -6790,69 +6786,69 @@
msgid "Plugin %s disabled."
msgstr "Plugin “%s” inabiliti."
-#: ../lib/WikiPlugin.php:505 ../lib/WikiPlugin.php:522
+#: ../lib/WikiPlugin.php:506 ../lib/WikiPlugin.php:523
#, php-format
msgid "Plugin “%s” does not exist."
msgstr "Plugin “%s” non esiste."
-#: ../lib/WikiPlugin.php:525
+#: ../lib/WikiPlugin.php:526
#, php-format
msgid "%s: no such class"
msgstr ""
-#: ../lib/WikiPlugin.php:531
+#: ../lib/WikiPlugin.php:532
#, php-format
msgid "%s: not a subclass of WikiPlugin."
msgstr ""
-#: ../lib/WikiTheme.php:454
+#: ../lib/WikiTheme.php:455
msgid "Never edited"
msgstr ""
-#: ../lib/WikiTheme.php:461
+#: ../lib/WikiTheme.php:462
#, php-format
msgid "%s at %s"
msgstr "%s a %s"
-#: ../lib/WikiTheme.php:465 ../lib/WikiTheme.php:476
+#: ../lib/WikiTheme.php:466 ../lib/WikiTheme.php:477
#, php-format
msgid "Version %s, saved on %s"
msgstr "Versione %s, salvata su %s"
-#: ../lib/WikiTheme.php:467 ../lib/WikiTheme.php:478
+#: ../lib/WikiTheme.php:468 ../lib/WikiTheme.php:479
#, php-format
msgid "Last edited on %s"
msgstr "Ultima modifica %s"
-#: ../lib/WikiTheme.php:495
+#: ../lib/WikiTheme.php:496
msgid "today"
msgstr "oggi"
-#: ../lib/WikiTheme.php:503
+#: ../lib/WikiTheme.php:504
msgid "yesterday"
msgstr "ieri"
-#: ../lib/WikiTheme.php:525 ../lib/WikiTheme.php:527
+#: ../lib/WikiTheme.php:526 ../lib/WikiTheme.php:528
#, php-format
msgid "Owner: %s"
msgstr "Owner: %s"
-#: ../lib/WikiTheme.php:642
+#: ../lib/WikiTheme.php:644
#, php-format
msgid "Empty link to: %s"
msgstr ""
-#: ../lib/WikiTheme.php:657 ../themes/MacOSX/themeinfo.php:80
+#: ../lib/WikiTheme.php:659 ../themes/MacOSX/themeinfo.php:80
#, php-format
msgid "Create: %s"
msgstr "Salvata: %s"
-#: ../lib/WikiTheme.php:677
+#: ../lib/WikiTheme.php:679
#, php-format
msgid "Google:%s"
msgstr ""
-#: ../lib/WikiTheme.php:1058 ../themes/blog/themeinfo.php:73
+#: ../lib/WikiTheme.php:1060 ../themes/blog/themeinfo.php:73
#: ../themes/Crao/templates/signin.tmpl:12
#: ../themes/Crao/templates/signin.tmpl:28
#: ../themes/default/templates/signin.tmpl:14
@@ -6866,7 +6862,7 @@
msgid "Sign Out"
msgstr "Logout"
-#: ../lib/WikiTheme.php:1060 ../lib/WikiUserNew.php:534
+#: ../lib/WikiTheme.php:1062 ../lib/WikiUserNew.php:534
#: ../lib/WikiUser.php:243 ../themes/blog/themeinfo.php:75
#: ../themes/Crao/templates/signin.tmpl:51
#: ../themes/default/templates/login.tmpl:68
@@ -6877,20 +6873,20 @@
msgid "Sign In"
msgstr "Login"
-#: ../lib/WikiTheme.php:1064 ../themes/MacOSX/themeinfo.php:138
+#: ../lib/WikiTheme.php:1066 ../themes/MacOSX/themeinfo.php:138
msgid "Lock Page"
msgstr "Blocca la Pagina"
-#: ../lib/WikiTheme.php:1066 ../themes/MacOSX/themeinfo.php:139
+#: ../lib/WikiTheme.php:1068 ../themes/MacOSX/themeinfo.php:139
msgid "Unlock Page"
msgstr "Sblocca la Pagina"
-#: ../lib/WikiTheme.php:1247
+#: ../lib/WikiTheme.php:1249
msgid ""
"Some action(page) wanted to add more headers, but they were already printed."
msgstr ""
-#: ../lib/WikiTheme.php:1348 ../themes/Hawaiian/themeinfo.php:35
+#: ../lib/WikiTheme.php:1350 ../themes/Hawaiian/themeinfo.php:35
#: ../themes/MacOSX/themeinfo.php:107 ../themes/MonoBook/themeinfo.php:111
#: ../themes/Portland/themeinfo.php:65 ../themes/shamino_com/themeinfo.php:60
#: ../themes/Sidebar/themeinfo.php:126 ../themes/SpaceWiki/themeinfo.php:48
@@ -6898,13 +6894,13 @@
msgid "Printer"
msgstr "Stampante"
-#: ../lib/WikiTheme.php:1349 ../themes/MacOSX/themeinfo.php:108
+#: ../lib/WikiTheme.php:1351 ../themes/MacOSX/themeinfo.php:108
#: ../themes/MonoBook/themeinfo.php:112 ../themes/shamino_com/themeinfo.php:61
#: ../themes/wikilens/themeinfo.php:33
msgid "Top & bottom toolbars"
msgstr ""
-#: ../lib/WikiTheme.php:1350 ../themes/Hawaiian/themeinfo.php:36
+#: ../lib/WikiTheme.php:1352 ../themes/Hawaiian/themeinfo.php:36
#: ../themes/MonoBook/themeinfo.php:113 ../themes/Portland/themeinfo.php:66
#: ../themes/shamino_com/themeinfo.php:62 ../themes/Sidebar/themeinfo.php:127
#: ../themes/SpaceWiki/themeinfo.php:49 ../themes/wikilens/themeinfo.php:34
@@ -6912,16 +6908,16 @@
msgid "Modern"
msgstr "Moderno"
-#: ../lib/WikiTheme.php:1849
+#: ../lib/WikiTheme.php:1851
#, php-format
msgid "Plugin %s: undefined"
msgstr "Plugin “%s”: non definito"
-#: ../lib/WikiTheme.php:1876
+#: ../lib/WikiTheme.php:1878
msgid "Related Links"
msgstr "Collegamenti Relativi"
-#: ../lib/WikiTheme.php:1899
+#: ../lib/WikiTheme.php:1901
msgid "External Links"
msgstr "Collegamenti Esterni"
@@ -8616,3 +8612,6 @@
#: ../themes/Wordpress/templates/browse.tmpl:6
msgid "View the current version"
msgstr "Mostra il versione corrente"
+
+#~ msgid "<none>"
+#~ msgstr "<nessun>"
Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po 2012-12-07 11:14:44 UTC (rev 8622)
+++ trunk/locale/po/ja.po 2012-12-07 11:49:09 UTC (rev 8623)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-06 10:44+0100\n"
+"POT-Creation-Date: 2012-12-07 12:47+0100\n"
"PO-Revision-Date: 2003-06-07 09:01+0900\n"
"Last-Translator: Tadashi Jokagi <web...@el...>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
@@ -71,14 +71,15 @@
msgid "version %s"
msgstr "バージョン %s"
-#: ../lib/diff.php:224 ../lib/plugin/Diff.php:74 ../lib/WikiTheme.php:541
-#: ../lib/WikiTheme.php:543
+#: ../lib/diff.php:224 ../lib/plugin/Diff.php:74 ../lib/WikiTheme.php:543
+#: ../lib/WikiTheme.php:545
#, php-format
msgid "by %s"
msgstr ""
#: ../lib/diff.php:228 ../lib/plugin/Diff.php:76
-#: ../lib/wikilens/PageListColumns.php:369
+#: ../lib/plugin/WantedPagesOld.php:96 ../lib/wikilens/PageListColumns.php:369
+#: ../themes/default/templates/online.tmpl:36
msgid "None"
msgstr "なし"
@@ -859,7 +860,7 @@
msgid "Empty pagename!"
msgstr "ページ名が未指定です!"
-#: ../lib/loadsave.php:915 ../lib/WikiTheme.php:701
+#: ../lib/loadsave.php:915 ../lib/WikiTheme.php:703
#, php-format
msgid "“%s”: Bad page name"
msgstr "“%s”: ページ名が正しくありません"
@@ -1106,7 +1107,7 @@
"will expire at %s."
msgstr ""
-#: ../lib/main.php:111 ../lib/WikiDB.php:1063
+#: ../lib/main.php:111 ../lib/WikiDB.php:1065
#, fuzzy
msgid "Optimizing database"
msgstr "%s を最適化中です"
@@ -1380,7 +1381,7 @@
msgstr "全文検索"
#: ../lib/main.php:1179 ../lib/plugin/RecentChanges.php:898
-#: ../lib/plugin/TitleSearch.php:45 ../lib/WikiTheme.php:1522
+#: ../lib/plugin/TitleSearch.php:45 ../lib/WikiTheme.php:1524
#: ../themes/Crao/templates/navbar.tmpl:2
#: ../themes/Crao/templates/navbar.tmpl:6
#: ../themes/Crao/templates/navbar.tmpl:49
@@ -2197,7 +2198,7 @@
msgstr "%s を編集"
#: ../lib/plugin/Calendar.php:40 ../lib/plugin/Calendar.php:45
-#: ../lib/WikiTheme.php:1559 ../lib/WikiUser.php:501
+#: ../lib/WikiTheme.php:1561 ../lib/WikiUser.php:501
#: ../themes/blog/templates/sidebar.tmpl:15
#: ../themes/Crao/templates/head.tmpl:80
#: ../themes/Crao/templates/navbar.tmpl:26
@@ -2359,7 +2360,7 @@
msgid "DeadEndPages"
msgstr "ランダムページ"
-#: ../lib/plugin/Diff.php:38 ../lib/WikiTheme.php:1056
+#: ../lib/plugin/Diff.php:38 ../lib/WikiTheme.php:1058
#: ../themes/blog/themeinfo.php:71
msgid "Diff"
msgstr "差分"
@@ -5018,11 +5019,6 @@
msgid "PgsrcTranslation"
msgstr ""
-#: ../lib/plugin/WantedPagesOld.php:96
-#: ../themes/default/templates/online.tmpl:36
-msgid "<none>"
-msgstr "<なし>"
-
#: ../lib/plugin/WantedPagesOld.php:111
#, fuzzy, php-format
msgid "Wanted Pages for %s (%d total):"
@@ -5085,7 +5081,7 @@
msgid "The page %s is already watched!"
msgstr ""
-#: ../lib/plugin/WatchPage.php:95 ../lib/WikiTheme.php:1054
+#: ../lib/plugin/WatchPage.php:95 ../lib/WikiTheme.php:1056
#: ../themes/blog/templates/actionbar.tmpl:15 ../themes/blog/themeinfo.php:69
#: ../themes/Crao/templates/actionbar.tmpl:4
#: ../themes/default/templates/actionbar.tmpl:12
@@ -5565,7 +5561,7 @@
msgstr ""
#: ../lib/plugin/WikiAdminRename.php:222 ../lib/plugin/WikiAdminRename.php:248
-#: ../lib/WikiTheme.php:1062
+#: ../lib/WikiTheme.php:1064
#, fuzzy
msgid "Rename Page"
msgstr "ページ削除"
@@ -6270,7 +6266,7 @@
msgid "Sorry, this page does not exist."
msgstr ""
-#: ../lib/purgepage.php:24 ../lib/purgepage.php:57 ../lib/WikiTheme.php:1070
+#: ../lib/purgepage.php:24 ../lib/purgepage.php:57 ../lib/WikiTheme.php:1072
#, fuzzy
msgid "Purge Page"
msgstr "変更しませんでした。"
@@ -6297,7 +6293,7 @@
msgid "Remove cancelled"
msgstr "ページ削除"
-#: ../lib/removepage.php:24 ../lib/removepage.php:57 ../lib/WikiTheme.php:1068
+#: ../lib/removepage.php:24 ../lib/removepage.php:57 ../lib/WikiTheme.php:1070
msgid "Remove Page"
msgstr "ページ削除"
@@ -6771,18 +6767,18 @@
msgid "WikiDB::renamePage() not yet implemented for this backend"
msgstr ""
-#: ../lib/WikiDB.php:985
+#: ../lib/WikiDB.php:987
#, php-format
msgid "%s: Date of new revision is %s"
msgstr ""
-#: ../lib/WikiDB.php:1753 ../lib/WikiDB.php:1757
+#: ../lib/WikiDB.php:1755 ../lib/WikiDB.php:1759
#: ../themes/default/templates/homepage.tmpl:6
#, php-format
msgid "Describe %s here."
msgstr "ここに%sを記述します。"
-#: ../lib/WikiDB.php:1792
+#: ../lib/WikiDB.php:1794
#, php-format
msgid "Oops! Revision %s of %s seems to have been deleted!"
msgstr ""
@@ -6930,69 +6926,69 @@
msgid "Plugin %s disabled."
msgstr "プラグイン %s は無効になっています。"
-#: ../lib/WikiPlugin.php:505 ../lib/WikiPlugin.php:522
+#: ../lib/WikiPlugin.php:506 ../lib/WikiPlugin.php:523
#, php-format
msgid "Plugin “%s” does not exist."
msgstr ""
-#: ../lib/WikiPlugin.php:525
+#: ../lib/WikiPlugin.php:526
#, php-format
msgid "%s: no such class"
msgstr ""
-#: ../lib/WikiPlugin.php:531
+#: ../lib/WikiPlugin.php:532
#, php-format
msgid "%s: not a subclass of WikiPlugin."
msgstr ""
-#: ../lib/WikiTheme.php:454
+#: ../lib/WikiTheme.php:455
msgid "Never edited"
msgstr ""
-#: ../lib/WikiTheme.php:461
+#: ../lib/WikiTheme.php:462
#, php-format
msgid "%s at %s"
msgstr ""
-#: ../lib/WikiTheme.php:465 ../lib/WikiTheme.php:476
+#: ../lib/WikiTheme.php:466 ../lib/WikiTheme.php:477
#, php-format
msgid "Version %s, saved on %s"
msgstr ""
-#: ../lib/WikiTheme.php:467 ../lib/WikiTheme.php:478
+#: ../lib/WikiTheme.php:468 ../lib/WikiTheme.php:479
#, fuzzy, php-format
msgid "Last edited on %s"
msgstr "最終編集日時: %s"
-#: ../lib/WikiTheme.php:495
+#: ../lib/WikiTheme.php:496
msgid "today"
msgstr "今日"
-#: ../lib/WikiTheme.php:503
+#: ../lib/WikiTheme.php:504
msgid "yesterday"
msgstr "昨日"
-#: ../lib/WikiTheme.php:525 ../lib/WikiTheme.php:527
+#: ../lib/WikiTheme.php:526 ../lib/WikiTheme.php:528
#, fuzzy, php-format
msgid "Owner: %s"
msgstr "ユーザーID:"
-#: ../lib/WikiTheme.php:642
+#: ../lib/WikiTheme.php:644
#, php-format
msgid "Empty link to: %s"
msgstr ""
-#: ../lib/WikiTheme.php:657 ../themes/MacOSX/themeinfo.php:80
+#: ../lib/WikiTheme.php:659 ../themes/MacOSX/themeinfo.php:80
#, php-format
msgid "Create: %s"
msgstr "作成: %s"
-#: ../lib/WikiTheme.php:677
+#: ../lib/WikiTheme.php:679
#, php-format
msgid "Google:%s"
msgstr ""
-#: ../lib/WikiTheme.php:1058 ../themes/blog/themeinfo.php:73
+#: ../lib/WikiTheme.php:1060 ../themes/blog/themeinfo.php:73
#: ../themes/Crao/templates/signin.tmpl:12
#: ../themes/Crao/templates/signin.tmpl:28
#: ../themes/default/templates/signin.tmpl:14
@@ -7006,7 +7002,7 @@
msgid "Sign Out"
msgstr "サインサウト"
-#: ../lib/WikiTheme.php:1060 ../lib/WikiUserNew.php:534
+#: ../lib/WikiTheme.php:1062 ../lib/WikiUserNew.php:534
#: ../lib/WikiUser.php:243 ../themes/blog/themeinfo.php:75
#: ../themes/Crao/templates/signin.tmpl:51
#: ../themes/default/templates/login.tmpl:68
@@ -7017,20 +7013,20 @@
msgid "Sign In"
msgstr "サインイン"
-#: ../lib/WikiTheme.php:1064 ../themes/MacOSX/themeinfo.php:138
+#: ../lib/WikiTheme.php:1066 ../themes/MacOSX/themeinfo.php:138
msgid "Lock Page"
msgstr "ページロック"
-#: ../lib/WikiTheme.php:1066 ../themes/MacOSX/themeinfo.php:139
+#: ../lib/WikiTheme.php:1068 ../themes/MacOSX/themeinfo.php:139
msgid "Unlock Page"
msgstr "ページロック解除"
-#: ../lib/WikiTheme.php:1247
+#: ../lib/WikiTheme.php:1249
msgid ""
"Some action(page) wanted to add more headers, but they were already printed."
msgstr ""
-#: ../lib/WikiTheme.php:1348 ../themes/Hawaiian/themeinfo.php:35
+#: ../lib/WikiTheme.php:1350 ../themes/Hawaiian/themeinfo.php:35
#: ../themes/MacOSX/themeinfo.php:107 ../themes/MonoBook/themeinfo.php:111
#: ../themes/Portland/themeinfo.php:65 ../themes/shamino_com/themeinfo.php:60
#: ../themes/Sidebar/themeinfo.php:126 ../themes/SpaceWiki/themeinfo.php:48
@@ -7038,13 +7034,13 @@
msgid "Printer"
msgstr "プリンター"
-#: ../lib/WikiTheme.php:1349 ../themes/MacOSX/themeinfo.php:108
+#: ../lib/WikiTheme.php:1351 ../themes/MacOSX/themeinfo.php:108
#: ../themes/MonoBook/themeinfo.php:112 ../themes/shamino_com/themeinfo.php:61
#: ../themes/wikilens/themeinfo.php:33
msgid "Top & bottom toolbars"
msgstr "上部と下部のツールバー"
-#: ../lib/WikiTheme.php:1350 ../themes/Hawaiian/themeinfo.php:36
+#: ../lib/WikiTheme.php:1352 ../themes/Hawaiian/themeinfo.php:36
#: ../themes/MonoBook/themeinfo.php:113 ../themes/Portland/themeinfo.php:66
#: ../themes/shamino_com/themeinfo.php:62 ../themes/Sidebar/themeinfo.php:127
#: ../themes/SpaceWiki/themeinfo.php:49 ../themes/wikilens/themeinfo.php:34
@@ -7052,16 +7048,16 @@
msgid "Modern"
msgstr ""
-#: ../lib/WikiTheme.php:1849
+#: ../lib/WikiTheme.php:1851
#, php-format
msgid "Plugin %s: undefined"
msgstr ""
-#: ../lib/WikiTheme.php:1876
+#: ../lib/WikiTheme.php:1878
msgid "Related Links"
msgstr ""
-#: ../lib/WikiTheme.php:1899
+#: ../lib/WikiTheme.php:1901
msgid "External Links"
msgstr ""
@@ -8819,6 +8815,9 @@
msgid "View the current version"
msgstr "現在のバージョンを表示する"
+#~ msgid "<none>"
+#~ msgstr "<なし>"
+
#~ msgid "Current language: “%s”"
#~ msgstr "現在の言語: %s"
Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po 2012-12-07 11:14:44 UTC (rev 8622)
+++ trunk/locale/po/nl.po 2012-12-07 11:49:09 UTC (rev 8623)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-06 10:44+0100\n"
+"POT-Creation-Date: 2012-12-07 12:47+0100\n"
"PO-Revision-Date: 2000-09-30 02:23+0200\n"
"Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
"Language-Team: Dutch <nl...@li...>\n"
@@ -75,14 +75,15 @@
msgid "version %s"
msgstr "versie %s"
-#: ../lib/diff.php:224 ../lib/plugin/Diff.php:74 ../lib/WikiTheme.php:541
-#: ../lib/WikiTheme.php:543
+#: ../lib/diff.php:224 ../lib/plugin/Diff.php:74 ../lib/WikiTheme.php:543
+#: ../lib/WikiTheme.php:545
#, php-format
msgid "by %s"
msgstr "door %s"
#: ../lib/diff.php:228 ../lib/plugin/Diff.php:76
-#: ../lib/wikilens/PageListColumns.php:369
+#: ../lib/plugin/WantedPagesOld.php:96 ../lib/wikilens/PageListColumns.php:369
+#: ../themes/default/templates/online.tmpl:36
msgid "None"
msgstr "Geen"
@@ -864,7 +865,7 @@
msgid "Empty pagename!"
msgstr ""
-#: ../lib/loadsave.php:915 ../lib/WikiTheme.php:701
+#: ../lib/loadsave.php:915 ../lib/WikiTheme.php:703
#, php-format
msgid "“%s”: Bad page name"
msgstr ""
@@ -1108,7 +1109,7 @@
"will expire at %s."
msgstr ""
-#: ../lib/main.php:111 ../lib/WikiDB.php:1063
+#: ../lib/main.php:111 ../lib/WikiDB.php:1065
msgid "Optimizing database"
msgstr ""
@@ -1373,7 +1374,7 @@
msgstr "VolledigeTekstZoek"
#: ../lib/main.php:1179 ../lib/plugin/RecentChanges.php:898
-#: ../lib/plugin/TitleSearch.php:45 ../lib/WikiTheme.php:1522
+#: ../lib/plugin/TitleSearch.php:45 ../lib/WikiTheme.php:1524
#: ../themes/Crao/templates/navbar.tmpl:2
#: ../themes/Crao/templates/navbar.tmpl:6
#: ../themes/Crao/templates/navbar.tmpl:49
@@ -2175,7 +2176,7 @@
msgstr "Verander %s"
#: ../lib/plugin/Calendar.php:40 ../lib/plugin/Calendar.php:45
-#: ../lib/WikiTheme.php:1559 ../lib/WikiUser.php:501
+#: ../lib/WikiTheme.php:1561 ../lib/WikiUser.php:501
#: ../themes/blog/templates/sidebar.tmpl:15
#: ../themes/Crao/templates/head.tmpl:80
#: ../themes/Crao/templates/navbar.tmpl:26
@@ -2328,7 +2329,7 @@
msgid "DeadEndPages"
msgstr ""
-#: ../lib/plugin/Diff.php:38 ../lib/WikiTheme.php:1056
+#: ../lib/plugin/Diff.php:38 ../lib/WikiTheme.php:1058
#: ../themes/blog/themeinfo.php:71
msgid "Diff"
msgstr "Diff"
@@ -4937,11 +4938,6 @@
msgid "PgsrcTranslation"
msgstr ""
-#: ../lib/plugin/WantedPagesOld.php:96
-#: ../themes/default/templates/online.tmpl:36
-msgid "<none>"
-msgstr ""
-
#: ../lib/plugin/WantedPagesOld.php:111
#, php-format
msgid "Wanted Pages for %s (%d total):"
@@ -5002,7 +4998,7 @@
msgid "The page %s is already watched!"
msgstr ""
-#: ../lib/plugin/WatchPage.php:95 ../lib/WikiTheme.php:1054
+#: ../lib/plugin/WatchPage.php:95 ../lib/WikiTheme.php:1056
#: ../themes/blog/templates/actionbar.tmpl:15 ../themes/blog/themeinfo.php:69
#: ../themes/Crao/templates/actionbar.tmpl:4
#: ../themes/default/templates/actionbar.tmpl:12
@@ -5450,7 +5446,7 @@
msgstr ""
#: ../lib/plugin/WikiAdminRename.php:222 ../lib/plugin/WikiAdminRename.php:248
-#: ../lib/WikiTheme.php:1062
+#: ../lib/WikiTheme.php:1064
msgid "Rename Page"
msgstr ""
@@ -6131,7 +6127,7 @@
msgid "Sorry, this page does not exist."
msgstr ""
-#: ../lib/purgepage.php:24 ../lib/purgepage.php:57 ../lib/WikiTheme.php:1070
+#: ../lib/purgepage.php:24 ../lib/purgepage.php:57 ../lib/WikiTheme.php:1072
msgid "Purge Page"
msgstr ""
@@ -6157,7 +6153,7 @@
msgid "Remove cancelled"
msgstr "Verwijder Pagina"
-#: ../lib/removepage.php:24 ../lib/removepage.php:57 ../lib/WikiTheme.php:1068
+#: ../lib/removepage.php:24 ../lib/removepage.php:57 ../lib/WikiTheme.php:1070
msgid "Remove Page"
msgstr "Verwijder Pagina"
@@ -6620,18 +6616,18 @@
msgid "WikiDB::renamePage() not yet implemented for this backend"
msgstr ""
-#: ../lib/WikiDB.php:985
+#: ../lib/WikiDB.php:987
#, php-format
msgid "%s: Date of new revision is %s"
msgstr ""
-#: ../lib/WikiDB.php:1753 ../lib/WikiDB.php:1757
+#: ../lib/WikiDB.php:1755 ../lib/WikiDB.php:1759
#: ../themes/default/templates/homepage.tmpl:6
#, php-format
msgid "Describe %s here."
msgstr "Beschrijf %s hier."
-#: ../lib/WikiDB.php:1792
+#: ../lib/WikiDB.php:1794
#, php-format
msgid "Oops! Revision %s of %s seems to have been deleted!"
msgstr ""
@@ -6777,69 +6773,69 @@
msgid "Plugin %s disabled."
msgstr ""
-#: ../lib/WikiPlugin.php:505 ../lib/WikiPlugin.php:522
+#: ../lib/WikiPlugin.php:506 ../lib/WikiPlugin.php:523
#, php-format
msgid "Plugin “%s” does not exist."
msgstr ""
-#: ../lib/WikiPlugin.php:525
+#: ../lib/WikiPlugin.php:526
#, php-format
msgid "%s: no such class"
msgstr ""
-#: ../lib/WikiPlugin.php:531
+#: ../lib/WikiPlugin.php:532
#, php-format
msgid "%s: not a subclass of WikiPlugin."
msgstr ""
-#: ../lib/WikiTheme.php:454
+#: ../lib/WikiTheme.php:455
msgid "Never edited"
msgstr ""
-#: ../lib/WikiTheme.php:461
+#: ../lib/WikiTheme.php:462
#, php-format
msgid "%s at %s"
msgstr ""
-#: ../lib/WikiTheme.php:465 ../lib/WikiTheme.php:476
+#: ../lib/WikiTheme.php:466 ../lib/WikiTheme.php:477
#, php-format
msgid "Version %s, saved on %s"
msgstr "Versie %s, bewarrd op %s"
-#: ../lib/WikiTheme.php:467 ../lib/WikiTheme.php:478
+#: ../lib/WikiTheme.php:468 ../lib/WikiTheme.php:479
#, php-format
msgid "Last edited on %s"
msgstr "Meest recente verandering op %s"
-#: ../lib/WikiTheme.php:495
+#: ../lib/WikiTheme.php:496
msgid "today"
msgstr ""
-#: ../lib/WikiTheme.php:503
+#: ../lib/WikiTheme.php:504
msgid "yesterday"
msgstr ""
-#: ../lib/WikiTheme.php:525 ../lib/WikiTheme.php:527
+#: ../lib/WikiTheme.php:526 ../lib/WikiTheme.php:528
#, php-format
msgid "Owner: %s"
msgstr ""
-#: ../lib/WikiTheme.php:642
+#: ../lib/WikiTheme.php:644
#, php-format
msgid "Empty link to: %s"
msgstr ""
-#: ../lib/WikiTheme.php:657 ../themes/MacOSX/themeinfo.php:80
+#: ../lib/WikiTheme.php:659 ../themes/MacOSX/themeinfo.php:80
#, php-format
msgid "Create: %s"
msgstr ""
-#: ../lib/WikiTheme.php:677
+#: ../lib/WikiTheme.php:679
#, php-format
msgid "Google:%s"
msgstr ""
-#: ../lib/WikiTheme.php:1058 ../theme...
[truncated message content] |
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X