From: <var...@us...> - 2012-12-11 16:00:21
|
Revision: 8648 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8648&view=rev Author: vargenau Date: 2012-12-11 16:00:10 +0000 (Tue, 11 Dec 2012) Log Message: ----------- Remove X-Rcs-Id Modified Paths: -------------- trunk/lib/plugin/PageDump.php trunk/pgsrc/PhpWikiAdministration%2FDeleteAcl Modified: trunk/lib/plugin/PageDump.php =================================================================== --- trunk/lib/plugin/PageDump.php 2012-12-11 15:54:41 UTC (rev 8647) +++ trunk/lib/plugin/PageDump.php 2012-12-11 16:00:10 UTC (rev 8648) @@ -98,10 +98,10 @@ // fixup_headers massages the page dump headers depending on // the 'format' argument, 'normal'(default) or 'forsvn'. // - // Normal: Don't add X-Rcs-Id, add unique Message-Id, don't + // Normal: add unique Message-Id, don't // strip any fields from Content-Type. // - // ForCVS: Add empty X-Rcs-Id, strip attributes from + // ForCVS: strip attributes from // Content-Type field: "author", "version", "lastmodified", // "author_id", "hits". @@ -279,12 +279,6 @@ $array = explode("\n", $mailified); // Massage headers to prepare for developer checkin to Subversion. - $item_to_insert = "X-Rcs-Id: \$Id\$"; - $insert_into_key_position = 2; - $returnval_ignored = array_splice($array, - $insert_into_key_position, - 0, $item_to_insert); - $item_to_insert = " pgsrc_version=\"2 \$Revision\$\";"; $insert_into_key_position = 5; $returnval_ignored = array_splice($array, Modified: trunk/pgsrc/PhpWikiAdministration%2FDeleteAcl =================================================================== --- trunk/pgsrc/PhpWikiAdministration%2FDeleteAcl 2012-12-11 15:54:41 UTC (rev 8647) +++ trunk/pgsrc/PhpWikiAdministration%2FDeleteAcl 2012-12-11 16:00:10 UTC (rev 8648) @@ -1,6 +1,5 @@ -Date: Fri, 10 Sep 2010 13:46:13 +0000 +Date: Tue, 11 Dec 2012 16:57:55 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1) -X-Rcs-Id: $Id: PhpWikiAdministration%2FDeleteAcl 7682 2010-09-10 12:03:36Z vargenau $ Content-Type: application/x-phpwiki; pagename=PhpWikiAdministration%2FDeleteAcl; flags=PAGE_LOCKED; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2012-12-11 16:13:50
|
Revision: 8649 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8649&view=rev Author: vargenau Date: 2012-12-11 16:13:43 +0000 (Tue, 11 Dec 2012) Log Message: ----------- Remove pgsrc_version Modified Paths: -------------- trunk/lib/editpage.php trunk/lib/loadsave.php trunk/lib/plugin/PageDump.php trunk/lib/upgrade.php trunk/themes/blog/pgsrc/HomePage Modified: trunk/lib/editpage.php =================================================================== --- trunk/lib/editpage.php 2012-12-11 16:00:10 UTC (rev 8648) +++ trunk/lib/editpage.php 2012-12-11 16:13:43 UTC (rev 8649) @@ -307,10 +307,7 @@ // Include any meta-data from original page version which // has not been explicitly updated. - // (Except don't propagate pgsrc_version --- moot for now, - // because at present it never gets into the db...) $meta = $this->selected->getMetaData(); - unset($meta['pgsrc_version']); $meta = array_merge($meta, $this->meta); // Save new revision Modified: trunk/lib/loadsave.php =================================================================== --- trunk/lib/loadsave.php 2012-12-11 16:00:10 UTC (rev 8648) +++ trunk/lib/loadsave.php 2012-12-11 16:13:43 UTC (rev 8649) @@ -926,10 +926,6 @@ // Try to merge if updated pgsrc contents are different. This // whole thing is hackish - // - // TODO: try merge unless: - // if (current contents = default contents && pgsrc_version >= - // pgsrc_version) then just upgrade this pgsrc $needs_merge = false; $merging = false; $overwrite = false; Modified: trunk/lib/plugin/PageDump.php =================================================================== --- trunk/lib/plugin/PageDump.php 2012-12-11 16:00:10 UTC (rev 8648) +++ trunk/lib/plugin/PageDump.php 2012-12-11 16:13:43 UTC (rev 8649) @@ -279,11 +279,6 @@ $array = explode("\n", $mailified); // Massage headers to prepare for developer checkin to Subversion. - $item_to_insert = " pgsrc_version=\"2 \$Revision\$\";"; - $insert_into_key_position = 5; - $returnval_ignored = array_splice($array, - $insert_into_key_position, - 0, $item_to_insert); /* Strip out all this junk: author=MeMe; Modified: trunk/lib/upgrade.php =================================================================== --- trunk/lib/upgrade.php 2012-12-11 16:00:10 UTC (rev 8648) +++ trunk/lib/upgrade.php 2012-12-11 16:13:43 UTC (rev 8649) @@ -63,9 +63,6 @@ $this->isSQL = $this->dbi->_backend->isSQL(); } - /** - * TODO: check for the pgsrc_version number, not the revision mtime only - */ function doPgsrcUpdate($pagename, $path, $filename) { // don't ever update the HomePage Modified: trunk/themes/blog/pgsrc/HomePage =================================================================== --- trunk/themes/blog/pgsrc/HomePage 2012-12-11 16:00:10 UTC (rev 8648) +++ trunk/themes/blog/pgsrc/HomePage 2012-12-11 16:13:43 UTC (rev 8649) @@ -1,8 +1,7 @@ -Date: Fri, 10 Sep 2010 13:47:27 +0000 +Date: Tue, 11 Dec 2012 17:12:31 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0) Content-Type: application/x-phpwiki; pagename=HomePage; - pgsrc_version="2 $Revision: 1.1 $"; flags=""; markup=2; charset=UTF-8 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2012-12-11 17:40:49
|
Revision: 8655 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8655&view=rev Author: vargenau Date: 2012-12-11 17:40:38 +0000 (Tue, 11 Dec 2012) Log Message: ----------- Less messages Modified Paths: -------------- trunk/lib/diff.php trunk/lib/loadsave.php trunk/lib/plugin/Diff.php trunk/lib/plugin/GraphViz.php trunk/lib/plugin/PageHistory.php trunk/lib/plugin/PageInfo.php trunk/lib/plugin/UnfoldSubpages.php trunk/lib/plugin/WikiPoll.php trunk/lib/plugin/_WikiTranslation.php trunk/lib/upgrade.php trunk/themes/Wordpress/templates/browse.tmpl trunk/themes/default/templates/online.tmpl Modified: trunk/lib/diff.php =================================================================== --- trunk/lib/diff.php 2012-12-11 17:08:39 UTC (rev 8654) +++ trunk/lib/diff.php 2012-12-11 17:40:38 UTC (rev 8655) @@ -248,8 +248,7 @@ $current = $page->getCurrentRevision(false); if ($current->getVersion() < 1) { $html = HTML::div(array('class' => 'wikitext', 'id' => 'difftext'), - HTML::p(fmt("I'm sorry, there is no such page as %s.", - WikiLink($pagename, 'unknown')))); + HTML::p(fmt("Page “%s” does not exist.", WikiLink($pagename, 'unknown')))); require_once 'lib/Template.php'; GeneratePage($html, sprintf(_("Diff: %s"), $pagename), false); return; //early return Modified: trunk/lib/loadsave.php =================================================================== --- trunk/lib/loadsave.php 2012-12-11 17:08:39 UTC (rev 8654) +++ trunk/lib/loadsave.php 2012-12-11 17:40:38 UTC (rev 8655) @@ -968,7 +968,7 @@ $mesg = HTML::p(); if ($source) - $mesg->pushContent(' ', fmt("from %s", $source)); + $mesg->pushContent(' ', fmt("from “%s”", $source)); if (!$current) { //FIXME: This should not happen! (empty vdata, corrupt cache or db) Modified: trunk/lib/plugin/Diff.php =================================================================== --- trunk/lib/plugin/Diff.php 2012-12-11 17:08:39 UTC (rev 8654) +++ trunk/lib/plugin/Diff.php 2012-12-11 17:40:38 UTC (rev 8655) @@ -97,7 +97,7 @@ $page = $request->getPage($pagename); $current = $page->getCurrentRevision(); if ($current->getVersion() < 1) { - $html = HTML(HTML::p(fmt("I'm sorry, there is no such page as %s.", + $html = HTML(HTML::p(fmt("Page “%s” does not exist.", WikiLink($pagename, 'unknown')))); return $html; //early return } Modified: trunk/lib/plugin/GraphViz.php =================================================================== --- trunk/lib/plugin/GraphViz.php 2012-12-11 17:08:39 UTC (rev 8654) +++ trunk/lib/plugin/GraphViz.php 2012-12-11 17:40:38 UTC (rev 8655) @@ -215,7 +215,7 @@ if (empty($this->source)) { // create digraph from pages if (empty($argarray['pages'])) { - trigger_error(sprintf(_("%s is empty"), 'GraphViz argument source'), E_USER_WARNING); + trigger_error(sprintf(_("%s is empty."), 'GraphViz argument source'), E_USER_WARNING); return ''; } $source = "digraph GraphViz {\n"; // } Modified: trunk/lib/plugin/PageHistory.php =================================================================== --- trunk/lib/plugin/PageHistory.php 2012-12-11 17:08:39 UTC (rev 8654) +++ trunk/lib/plugin/PageHistory.php 2012-12-11 17:40:38 UTC (rev 8655) @@ -344,8 +344,7 @@ $page = $dbi->getPage($pagename); $current = $page->getCurrentRevision(); if ($current->getVersion() < 1) { - return HTML(HTML::p(fmt("I'm sorry, there is no such page as %s.", - WikiLink($pagename, 'unknown'))), + return HTML(HTML::p(fmt("Page “%s” does not exist.", WikiLink($pagename, 'unknown'))), $this->makeForm("", $request)); } // Hack alert: format() is a NORETURN for rss formatters. Modified: trunk/lib/plugin/PageInfo.php =================================================================== --- trunk/lib/plugin/PageInfo.php 2012-12-11 17:08:39 UTC (rev 8654) +++ trunk/lib/plugin/PageInfo.php 2012-12-11 17:40:38 UTC (rev 8655) @@ -55,8 +55,7 @@ $current = $page->getCurrentRevision(); if ($current->getVersion() < 1) - return fmt("I'm sorry, there is no such page as %s.", - WikiLink($pagename, 'unknown')); + return fmt("Page “%s” does not exist.", WikiLink($pagename, 'unknown')); if (!empty($version)) { if (!($revision = $page->getRevision($version))) Modified: trunk/lib/plugin/UnfoldSubpages.php =================================================================== --- trunk/lib/plugin/UnfoldSubpages.php 2012-12-11 17:08:39 UTC (rev 8654) +++ trunk/lib/plugin/UnfoldSubpages.php 2012-12-11 17:40:38 UTC (rev 8655) @@ -166,8 +166,7 @@ if (!$smalltitle) { $content->pushContent(HTML::p(array('class' => $quiet ? '' : 'transclusion-title'), - fmt("Included from %s:", - WikiLink($cpagename)))); + fmt("Included from %s", WikiLink($cpagename)))); } $content->pushContent(HTML(HTML::div(array('class' => $quiet ? '' : 'transclusion'), Modified: trunk/lib/plugin/WikiPoll.php =================================================================== --- trunk/lib/plugin/WikiPoll.php 2012-12-11 17:08:39 UTC (rev 8654) +++ trunk/lib/plugin/WikiPoll.php 2012-12-11 17:40:38 UTC (rev 8655) @@ -109,7 +109,7 @@ foreach (array_merge($argstr_args, $argstr_defaults) as $arg => $val) { if (!preg_match("/^(answer_|question_)/", $arg)) - trigger_error(sprintf(_("argument “%s” not declared by plugin"), + trigger_error(sprintf(_("Argument “%s” not declared by plugin."), $arg), E_USER_NOTICE); } Modified: trunk/lib/plugin/_WikiTranslation.php =================================================================== --- trunk/lib/plugin/_WikiTranslation.php 2012-12-11 17:08:39 UTC (rev 8654) +++ trunk/lib/plugin/_WikiTranslation.php 2012-12-11 17:40:38 UTC (rev 8655) @@ -301,7 +301,7 @@ WikiURL($pagename, false, true), $to_lang)); } else { - return $this->error(fmt("%s is empty", $pagename)); + return $this->error(fmt("%s is empty.", $pagename)); } } Modified: trunk/lib/upgrade.php =================================================================== --- trunk/lib/upgrade.php 2012-12-11 17:08:39 UTC (rev 8654) +++ trunk/lib/upgrade.php 2012-12-11 17:40:38 UTC (rev 8655) @@ -962,7 +962,7 @@ if (!file_exists($filename)) $filename = FindFile($filename); if (!file_exists($filename)) - return array(false, sprintf(_("file %s not found"), $o_filename)); + return array(false, sprintf(_("File “%s” not found."), $o_filename)); $found = false; if (is_writable($filename)) { $in = fopen($filename, "rb"); Modified: trunk/themes/Wordpress/templates/browse.tmpl =================================================================== --- trunk/themes/Wordpress/templates/browse.tmpl 2012-12-11 17:08:39 UTC (rev 8654) +++ trunk/themes/Wordpress/templates/browse.tmpl 2012-12-11 17:40:38 UTC (rev 8655) @@ -3,7 +3,7 @@ <?php if ($revision and !$revision->isCurrent()) { ?> <p><strong><?php echo _("Note:")?></strong> <?php echo _("You are viewing an old revision of this page.")?> - <?php echo WikiLink($page, 'existing', _("View the current version"))?>.</p> + <?php echo WikiLink($page, 'existing', _("View the current version."))?>.</p> <hr class="ignore" /> <?php } ?> Modified: trunk/themes/default/templates/online.tmpl =================================================================== --- trunk/themes/default/templates/online.tmpl 2012-12-11 17:08:39 UTC (rev 8654) +++ trunk/themes/default/templates/online.tmpl 2012-12-11 17:40:38 UTC (rev 8655) @@ -3,7 +3,7 @@ // We have two modes: 1. a simple "summary" block, and // 2. "detail" with a table of online users, date and current actions -$header = _("Who Is Online"); +$header = _("Who is Online"); if ($MAX_ONLINE_TIME and $MAX_ONLINE_NUM) $MAX_ONLINE_TIME = $WikiTheme->formatDateTime($MAX_ONLINE_TIME); ?> @@ -11,7 +11,7 @@ <?php if ($mode == 'summary') { if ($allow_detail) { $url = WikiUrl($pagename,array("mode"=>"detail")); - $header = HTML::a(array('href'=>$url,'title'=>_("Switch to detailed list")),_("Who Is Online")); + $header = HTML::a(array('href'=>$url,'title'=>_("Switch to detailed list")),_("Who is Online")); } ?> <table width="100%" cellpadding="2" cellspacing="1" border="0" class="forumline"> @@ -54,7 +54,7 @@ <?php if ($mode == 'detail') { $url = WikiUrl($pagename,array("mode"=>"summary")); - $header = HTML::a(array('href'=>$url,'title'=>_("Switch to summary")),_("Who Is Online")); + $header = HTML::a(array('href'=>$url,'title'=>_("Switch to summary")),_("Who is Online")); ?> <table width="100%" cellpadding="2" cellspacing="1" border="0" class="forumline"> <tr><td class="cat" colspan="3"><?php echo $header ?></td></tr> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2012-12-14 17:03:05
|
Revision: 8661 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8661&view=rev Author: vargenau Date: 2012-12-14 17:02:51 +0000 (Fri, 14 Dec 2012) Log Message: ----------- Update getDescription Modified Paths: -------------- trunk/lib/plugin/AddComment.php trunk/lib/plugin/AsciiMath.php trunk/lib/plugin/AsciiSVG.php trunk/lib/plugin/AtomFeed.php trunk/lib/plugin/BlogArchives.php trunk/lib/plugin/BlogJournal.php trunk/lib/plugin/BoxRight.php trunk/lib/plugin/CategoryPage.php trunk/lib/plugin/Chart.php trunk/lib/plugin/CreateBib.php trunk/lib/plugin/CreateToc.php trunk/lib/plugin/CurrentTime.php trunk/lib/plugin/Diff.php trunk/lib/plugin/EditMetaData.php trunk/lib/plugin/ExternalSearch.php trunk/lib/plugin/FacebookLike.php trunk/lib/plugin/FoafViewer.php trunk/lib/plugin/GoogleMaps.php trunk/lib/plugin/GooglePlugin.php trunk/lib/plugin/GraphViz.php trunk/lib/plugin/HelloWorld.php trunk/lib/plugin/Imdb.php trunk/lib/plugin/IncludeSiteMap.php trunk/lib/plugin/IncludeTree.php trunk/lib/plugin/JabberPresence.php trunk/lib/plugin/LdapSearch.php trunk/lib/plugin/LinkDatabase.php trunk/lib/plugin/LinkSearch.php trunk/lib/plugin/ListRelations.php trunk/lib/plugin/ModeratedPage.php trunk/lib/plugin/NewPagesPerUser.php trunk/lib/plugin/PageGroup.php trunk/lib/plugin/PageHistory.php trunk/lib/plugin/PageTrail.php trunk/lib/plugin/PhotoAlbum.php trunk/lib/plugin/PhpHighlight.php trunk/lib/plugin/PhpWeather.php trunk/lib/plugin/Ploticus.php trunk/lib/plugin/PluginManager.php trunk/lib/plugin/PopUp.php trunk/lib/plugin/PreferenceApp.php trunk/lib/plugin/PrevNext.php trunk/lib/plugin/Processing.php trunk/lib/plugin/RateIt.php trunk/lib/plugin/RssFeed.php trunk/lib/plugin/SemanticSearch.php trunk/lib/plugin/SemanticSearchAdvanced.php trunk/lib/plugin/SiteMap.php trunk/lib/plugin/SpellCheck.php trunk/lib/plugin/SqlResult.php trunk/lib/plugin/SyncWiki.php trunk/lib/plugin/SyntaxHighlighter.php trunk/lib/plugin/TeX2png.php trunk/lib/plugin/TranslateText.php trunk/lib/plugin/UriResolver.php trunk/lib/plugin/Video.php trunk/lib/plugin/WikiAdminRename.php trunk/lib/plugin/WikiBlog.php trunk/lib/plugin/WikiForm.php trunk/lib/plugin/WikiFormRich.php trunk/lib/plugin/WikiForum.php trunk/lib/plugin/WikiPoll.php trunk/lib/plugin/YouTube.php trunk/lib/plugin/_GroupInfo.php trunk/lib/plugin/_WikiTranslation.php trunk/lib/plugin/text2png.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/ja/LC_MESSAGES/phpwiki.php trunk/locale/nl/LC_MESSAGES/phpwiki.mo trunk/locale/po/de.po trunk/locale/po/es.po trunk/locale/po/fr.po trunk/locale/po/it.po trunk/locale/po/ja.po trunk/locale/po/nl.po trunk/locale/po/phpwiki.pot trunk/locale/po/sv.po trunk/locale/po/zh.po trunk/locale/sv/LC_MESSAGES/phpwiki.mo trunk/locale/zh/LC_MESSAGES/phpwiki.mo trunk/locale/zh/LC_MESSAGES/phpwiki.php Modified: trunk/lib/plugin/AddComment.php =================================================================== --- trunk/lib/plugin/AddComment.php 2012-12-12 16:56:34 UTC (rev 8660) +++ trunk/lib/plugin/AddComment.php 2012-12-14 17:02:51 UTC (rev 8661) @@ -42,7 +42,7 @@ function getDescription() { - return sprintf(_("Show and add comments for %s"), '[pagename]'); + return sprintf(_("Show and add comments for %s."), '[pagename]'); } // Arguments: Modified: trunk/lib/plugin/AsciiMath.php =================================================================== --- trunk/lib/plugin/AsciiMath.php 2012-12-12 16:56:34 UTC (rev 8660) +++ trunk/lib/plugin/AsciiMath.php 2012-12-14 17:02:51 UTC (rev 8661) @@ -48,7 +48,7 @@ function getDescription() { - return _("Render ASCII Math as MathML"); + return _("Render ASCII Math as MathML."); } function getDefaultArguments() Modified: trunk/lib/plugin/AsciiSVG.php =================================================================== --- trunk/lib/plugin/AsciiSVG.php 2012-12-12 16:56:34 UTC (rev 8660) +++ trunk/lib/plugin/AsciiSVG.php 2012-12-14 17:02:51 UTC (rev 8661) @@ -35,7 +35,7 @@ function getDescription() { - return _("Render inline ASCII SVG"); + return _("Render inline ASCII SVG."); } function getDefaultArguments() Modified: trunk/lib/plugin/AtomFeed.php =================================================================== --- trunk/lib/plugin/AtomFeed.php 2012-12-12 16:56:34 UTC (rev 8660) +++ trunk/lib/plugin/AtomFeed.php 2012-12-14 17:02:51 UTC (rev 8661) @@ -35,7 +35,7 @@ function getDescription() { - return _('Atom Aggregator Plugin'); + return _('Atom Aggregator Plugin.'); } function getDefaultArguments() Modified: trunk/lib/plugin/BlogArchives.php =================================================================== --- trunk/lib/plugin/BlogArchives.php 2012-12-12 16:56:34 UTC (rev 8660) +++ trunk/lib/plugin/BlogArchives.php 2012-12-14 17:02:51 UTC (rev 8661) @@ -42,7 +42,7 @@ function getDescription() { - return _("List blog months links for the current or ADMIN user"); + return _("List blog months links for the current or ADMIN user."); } function getDefaultArguments() Modified: trunk/lib/plugin/BlogJournal.php =================================================================== --- trunk/lib/plugin/BlogJournal.php 2012-12-12 16:56:34 UTC (rev 8660) +++ trunk/lib/plugin/BlogJournal.php 2012-12-14 17:02:51 UTC (rev 8661) @@ -41,7 +41,7 @@ function getDescription() { - return _("Include latest blog entries for the current or ADMIN user"); + return _("Include latest blog entries for the current or ADMIN user."); } function getDefaultArguments() Modified: trunk/lib/plugin/BoxRight.php =================================================================== --- trunk/lib/plugin/BoxRight.php 2012-12-12 16:56:34 UTC (rev 8660) +++ trunk/lib/plugin/BoxRight.php 2012-12-14 17:02:51 UTC (rev 8661) @@ -33,7 +33,7 @@ function getDescription() { - return _("A simple plugin for <div class=boxright> with wikimarkup"); + return _("A simple plugin for <div class=boxright> with wikimarkup."); } function getDefaultArguments() Modified: trunk/lib/plugin/CategoryPage.php =================================================================== --- trunk/lib/plugin/CategoryPage.php 2012-12-12 16:56:34 UTC (rev 8660) +++ trunk/lib/plugin/CategoryPage.php 2012-12-14 17:02:51 UTC (rev 8661) @@ -47,7 +47,7 @@ function getDescription() { - return _("Create a Wiki page."); + return _("Create a Wiki Category Page."); } function getDefaultArguments() Modified: trunk/lib/plugin/Chart.php =================================================================== --- trunk/lib/plugin/Chart.php 2012-12-12 16:56:34 UTC (rev 8660) +++ trunk/lib/plugin/Chart.php 2012-12-14 17:02:51 UTC (rev 8661) @@ -53,7 +53,7 @@ function getDescription() { - return _("Render SVG charts"); + return _("Render SVG charts."); } function getDefaultArguments() Modified: trunk/lib/plugin/CreateBib.php =================================================================== --- trunk/lib/plugin/CreateBib.php 2012-12-12 16:56:34 UTC (rev 8660) +++ trunk/lib/plugin/CreateBib.php 2012-12-14 17:02:51 UTC (rev 8661) @@ -40,7 +40,7 @@ function getDescription() { - return _("Automatically create a Bibtex file from linked pages"); + return _("Automatically create a Bibtex file from linked pages."); } function getDefaultArguments() Modified: trunk/lib/plugin/CreateToc.php =================================================================== --- trunk/lib/plugin/CreateToc.php 2012-12-12 16:56:34 UTC (rev 8660) +++ trunk/lib/plugin/CreateToc.php 2012-12-14 17:02:51 UTC (rev 8661) @@ -48,7 +48,7 @@ function getDescription() { - return _("Create a Table of Contents and automatically link to headers"); + return _("Create a Table of Contents and automatically link to headers."); } function getDefaultArguments() Modified: trunk/lib/plugin/CurrentTime.php =================================================================== --- trunk/lib/plugin/CurrentTime.php 2012-12-12 16:56:34 UTC (rev 8660) +++ trunk/lib/plugin/CurrentTime.php 2012-12-14 17:02:51 UTC (rev 8661) @@ -60,7 +60,7 @@ function getDescription() { - return _("A simple plugin that displays current time and date"); + return _("Displays current time and date."); } Modified: trunk/lib/plugin/Diff.php =================================================================== --- trunk/lib/plugin/Diff.php 2012-12-12 16:56:34 UTC (rev 8660) +++ trunk/lib/plugin/Diff.php 2012-12-14 17:02:51 UTC (rev 8661) @@ -40,7 +40,7 @@ function getDescription() { - return _("Display differences between revisions"); + return _("Display differences between revisions."); } // Establish default values for each of this plugin's arguments. Modified: trunk/lib/plugin/EditMetaData.php =================================================================== --- trunk/lib/plugin/EditMetaData.php 2012-12-12 16:56:34 UTC (rev 8660) +++ trunk/lib/plugin/EditMetaData.php 2012-12-14 17:02:51 UTC (rev 8661) @@ -51,7 +51,7 @@ function getDescription() { - return sprintf(_("Edit metadata for %s"), '[pagename]'); + return sprintf(_("Edit metadata for %s."), '[pagename]'); } function getDefaultArguments() Modified: trunk/lib/plugin/ExternalSearch.php =================================================================== --- trunk/lib/plugin/ExternalSearch.php 2012-12-12 16:56:34 UTC (rev 8660) +++ trunk/lib/plugin/ExternalSearch.php 2012-12-14 17:02:51 UTC (rev 8661) @@ -43,7 +43,7 @@ function getDescription() { - return _("Redirects to an external web site based on form input"); + return _("Redirects to an external web site based on form input."); //fixme: better description } Modified: trunk/lib/plugin/FacebookLike.php =================================================================== --- trunk/lib/plugin/FacebookLike.php 2012-12-12 16:56:34 UTC (rev 8660) +++ trunk/lib/plugin/FacebookLike.php 2012-12-14 17:02:51 UTC (rev 8661) @@ -33,7 +33,7 @@ { function getDescription() { - return _("Display a Facebook Like button. See http://developers.facebook.com/docs/reference/plugins/like"); + return _("Display a Facebook Like button."); } function getDefaultArguments() Modified: trunk/lib/plugin/FoafViewer.php =================================================================== --- trunk/lib/plugin/FoafViewer.php 2012-12-12 16:56:34 UTC (rev 8660) +++ trunk/lib/plugin/FoafViewer.php 2012-12-14 17:02:51 UTC (rev 8661) @@ -73,7 +73,7 @@ function getDescription() { - return _("Parse an RDF FOAF file and extract information to render as HTML"); + return _("Parse an RDF FOAF file and extract information to render as HTML."); } function getDefaultArguments() Modified: trunk/lib/plugin/GoogleMaps.php =================================================================== --- trunk/lib/plugin/GoogleMaps.php 2012-12-12 16:56:34 UTC (rev 8660) +++ trunk/lib/plugin/GoogleMaps.php 2012-12-14 17:02:51 UTC (rev 8661) @@ -65,7 +65,7 @@ function getDescription() { - return _("Displays a marker with further infos (when clicking) on given coordinates"); + return _("Displays a marker with further infos (when clicking) on given coordinates."); } function getDefaultArguments() Modified: trunk/lib/plugin/GooglePlugin.php =================================================================== --- trunk/lib/plugin/GooglePlugin.php 2012-12-12 16:56:34 UTC (rev 8660) +++ trunk/lib/plugin/GooglePlugin.php 2012-12-14 17:02:51 UTC (rev 8661) @@ -46,7 +46,7 @@ function getDescription() { - return _("Make use of the Google API"); + return _("Make use of the Google API."); } function getDefaultArguments() Modified: trunk/lib/plugin/GraphViz.php =================================================================== --- trunk/lib/plugin/GraphViz.php 2012-12-12 16:56:34 UTC (rev 8660) +++ trunk/lib/plugin/GraphViz.php 2012-12-14 17:02:51 UTC (rev 8661) @@ -112,7 +112,7 @@ function getDescription() { - return _("GraphViz image or imagemap creation of directed graphs"); + return _("GraphViz image or imagemap creation of directed graphs."); } function managesValidators() Modified: trunk/lib/plugin/HelloWorld.php =================================================================== --- trunk/lib/plugin/HelloWorld.php 2012-12-12 16:56:34 UTC (rev 8660) +++ trunk/lib/plugin/HelloWorld.php 2012-12-14 17:02:51 UTC (rev 8661) @@ -49,7 +49,7 @@ function getDescription() { - return _("Simple Sample Plugin"); + return _("Simple Sample Plugin."); } Modified: trunk/lib/plugin/Imdb.php =================================================================== --- trunk/lib/plugin/Imdb.php 2012-12-12 16:56:34 UTC (rev 8660) +++ trunk/lib/plugin/Imdb.php 2012-12-14 17:02:51 UTC (rev 8661) @@ -58,7 +58,7 @@ function getDescription() { - return _("Query a local imdb database"); + return _("Query a local imdb database."); } function getDefaultArguments() Modified: trunk/lib/plugin/IncludeSiteMap.php =================================================================== --- trunk/lib/plugin/IncludeSiteMap.php 2012-12-12 16:56:34 UTC (rev 8660) +++ trunk/lib/plugin/IncludeSiteMap.php 2012-12-14 17:02:51 UTC (rev 8661) @@ -55,7 +55,7 @@ function getDescription() { - return sprintf(_("Include recursively all linked pages starting at %s"), + return sprintf(_("Include recursively all linked pages starting at %s."), $this->_pagename); } Modified: trunk/lib/plugin/IncludeTree.php =================================================================== --- trunk/lib/plugin/IncludeTree.php 2012-12-12 16:56:34 UTC (rev 8660) +++ trunk/lib/plugin/IncludeTree.php 2012-12-14 17:02:51 UTC (rev 8661) @@ -42,7 +42,7 @@ function getDescription() { - return _("Dynamic Category Tree"); + return _("Display Dynamic Category Tree."); } function getDefaultArguments() Modified: trunk/lib/plugin/JabberPresence.php =================================================================== --- trunk/lib/plugin/JabberPresence.php 2012-12-12 16:56:34 UTC (rev 8660) +++ trunk/lib/plugin/JabberPresence.php 2012-12-14 17:02:51 UTC (rev 8661) @@ -45,7 +45,7 @@ function getDescription() { - return _("Simple jabber presence plugin"); + return _("Display Jabber presence."); } // Establish default values for each of this plugin's arguments. Modified: trunk/lib/plugin/LdapSearch.php =================================================================== --- trunk/lib/plugin/LdapSearch.php 2012-12-12 16:56:34 UTC (rev 8660) +++ trunk/lib/plugin/LdapSearch.php 2012-12-14 17:02:51 UTC (rev 8661) @@ -56,7 +56,7 @@ function getDescription() { - return _("Search an LDAP directory"); + return _("Search an LDAP directory."); } function getDefaultArguments() Modified: trunk/lib/plugin/LinkDatabase.php =================================================================== --- trunk/lib/plugin/LinkDatabase.php 2012-12-12 16:56:34 UTC (rev 8660) +++ trunk/lib/plugin/LinkDatabase.php 2012-12-14 17:02:51 UTC (rev 8661) @@ -50,7 +50,7 @@ function getDescription() { - return _("List all pages with all links in various formats for some Java Visualization tools"); + return _("List all pages with all links in various formats for some Java Visualization tools."); } function getExpire($dbi, $argarray, $request) Modified: trunk/lib/plugin/LinkSearch.php =================================================================== --- trunk/lib/plugin/LinkSearch.php 2012-12-12 16:56:34 UTC (rev 8660) +++ trunk/lib/plugin/LinkSearch.php 2012-12-14 17:02:51 UTC (rev 8661) @@ -38,7 +38,7 @@ function getDescription() { - return _("Search page and link names"); + return _("Search page and link names."); } function getDefaultArguments() Modified: trunk/lib/plugin/ListRelations.php =================================================================== --- trunk/lib/plugin/ListRelations.php 2012-12-12 16:56:34 UTC (rev 8660) +++ trunk/lib/plugin/ListRelations.php 2012-12-14 17:02:51 UTC (rev 8661) @@ -37,7 +37,7 @@ function getDescription() { - return _("Display the list of all defined relations and optionnally attributes in this entire wiki"); + return _("Display the list of all defined relations and optionnally attributes in this entire wiki."); } function getDefaultArguments() Modified: trunk/lib/plugin/ModeratedPage.php =================================================================== --- trunk/lib/plugin/ModeratedPage.php 2012-12-12 16:56:34 UTC (rev 8660) +++ trunk/lib/plugin/ModeratedPage.php 2012-12-14 17:02:51 UTC (rev 8661) @@ -45,7 +45,7 @@ function getDescription() { - return _("Support moderated pages"); + return _("Support moderated pages."); } function getDefaultArguments() Modified: trunk/lib/plugin/NewPagesPerUser.php =================================================================== --- trunk/lib/plugin/NewPagesPerUser.php 2012-12-12 16:56:34 UTC (rev 8660) +++ trunk/lib/plugin/NewPagesPerUser.php 2012-12-14 17:02:51 UTC (rev 8661) @@ -44,7 +44,7 @@ function getDescription() { - return _("List all new pages per month per user"); + return _("List all new pages per month per user."); } function getDefaultArguments() Modified: trunk/lib/plugin/PageGroup.php =================================================================== --- trunk/lib/plugin/PageGroup.php 2012-12-12 16:56:34 UTC (rev 8660) +++ trunk/lib/plugin/PageGroup.php 2012-12-14 17:02:51 UTC (rev 8661) @@ -48,7 +48,7 @@ function getDescription() { - return sprintf(_("PageGroup for %s"), '[pagename]'); + return sprintf(_("PageGroup for %s."), '[pagename]'); } function getDefaultArguments() Modified: trunk/lib/plugin/PageHistory.php =================================================================== --- trunk/lib/plugin/PageHistory.php 2012-12-12 16:56:34 UTC (rev 8660) +++ trunk/lib/plugin/PageHistory.php 2012-12-14 17:02:51 UTC (rev 8661) @@ -280,7 +280,7 @@ function getDescription() { - return sprintf(_("List PageHistory for %s"), '[pagename]'); + return sprintf(_("List PageHistory for %s."), '[pagename]'); } function getDefaultArguments() Modified: trunk/lib/plugin/PageTrail.php =================================================================== --- trunk/lib/plugin/PageTrail.php 2012-12-12 16:56:34 UTC (rev 8660) +++ trunk/lib/plugin/PageTrail.php 2012-12-14 17:02:51 UTC (rev 8661) @@ -38,7 +38,6 @@ class WikiPlugin_PageTrail extends WikiPlugin { - // Four required functions in a WikiPlugin. var $def_numberlinks = 5; function getName() @@ -48,7 +47,7 @@ function getDescription() { - return _("PageTrail Plugin"); + return _("Display PageTrail."); } // default values Modified: trunk/lib/plugin/PhotoAlbum.php =================================================================== --- trunk/lib/plugin/PhotoAlbum.php 2012-12-12 16:56:34 UTC (rev 8660) +++ trunk/lib/plugin/PhotoAlbum.php 2012-12-14 17:02:51 UTC (rev 8661) @@ -102,7 +102,7 @@ function getDescription() { - return _("Displays a set of photos listed in a text file with optional descriptions"); + return _("Displays a set of photos listed in a text file with optional descriptions."); } // Avoid nameclash, so it's disabled. We allow any url. Modified: trunk/lib/plugin/PhpHighlight.php =================================================================== --- trunk/lib/plugin/PhpHighlight.php 2012-12-12 16:56:34 UTC (rev 8660) +++ trunk/lib/plugin/PhpHighlight.php 2012-12-14 17:02:51 UTC (rev 8661) @@ -63,7 +63,7 @@ function getDescription() { - return _("PHP syntax highlighting"); + return _("PHP syntax highlighting."); } // Establish default values for each of this plugin's arguments. Modified: trunk/lib/plugin/PhpWeather.php =================================================================== --- trunk/lib/plugin/PhpWeather.php 2012-12-12 16:56:34 UTC (rev 8660) +++ trunk/lib/plugin/PhpWeather.php 2012-12-14 17:02:51 UTC (rev 8661) @@ -66,7 +66,7 @@ function getDescription() { - return _("The PhpWeather plugin provides weather reports from the Internet."); + return _("Provide weather reports from the Internet."); } function getDefaultArguments() Modified: trunk/lib/plugin/Ploticus.php =================================================================== --- trunk/lib/plugin/Ploticus.php 2012-12-12 16:56:34 UTC (rev 8660) +++ trunk/lib/plugin/Ploticus.php 2012-12-14 17:02:51 UTC (rev 8661) @@ -97,7 +97,7 @@ function getDescription() { - return _("Ploticus image creation"); + return _("Ploticus image creation."); } function managesValidators() Modified: trunk/lib/plugin/PluginManager.php =================================================================== --- trunk/lib/plugin/PluginManager.php 2012-12-12 16:56:34 UTC (rev 8660) +++ trunk/lib/plugin/PluginManager.php 2012-12-14 17:02:51 UTC (rev 8661) @@ -35,7 +35,7 @@ function getDescription() { - return _("List of plugins on this wiki"); + return _("List of plugins on this wiki."); } function getDefaultArguments() Modified: trunk/lib/plugin/PopUp.php =================================================================== --- trunk/lib/plugin/PopUp.php 2012-12-12 16:56:34 UTC (rev 8660) +++ trunk/lib/plugin/PopUp.php 2012-12-14 17:02:51 UTC (rev 8661) @@ -53,7 +53,7 @@ function getDescription() { - return _("Used to create a clickable popup link."); + return _("Create a clickable popup link."); } function getDefaultArguments() Modified: trunk/lib/plugin/PreferenceApp.php =================================================================== --- trunk/lib/plugin/PreferenceApp.php 2012-12-12 16:56:34 UTC (rev 8660) +++ trunk/lib/plugin/PreferenceApp.php 2012-12-14 17:02:51 UTC (rev 8661) @@ -40,7 +40,6 @@ require_once 'lib/PageList.php'; require_once 'lib/InlineParser.php'; - require_once 'lib/wikilens/Utils.php'; require_once 'lib/WikiTheme.php'; require_once 'lib/wikilens/Buddy.php'; @@ -56,7 +55,7 @@ function getDescription() { - return _("Analyzes preferences based on voting budget and ratings."); + return _("Analyze preferences based on voting budget and ratings."); } function getDefaultArguments() Modified: trunk/lib/plugin/PrevNext.php =================================================================== --- trunk/lib/plugin/PrevNext.php 2012-12-12 16:56:34 UTC (rev 8660) +++ trunk/lib/plugin/PrevNext.php 2012-12-14 17:02:51 UTC (rev 8661) @@ -36,7 +36,7 @@ function getDescription() { - return sprintf(_("Easy navigation buttons for %s"), '[pagename]'); + return sprintf(_("Easy navigation buttons for %s."), '[pagename]'); } function getDefaultArguments() Modified: trunk/lib/plugin/Processing.php =================================================================== --- trunk/lib/plugin/Processing.php 2012-12-12 16:56:34 UTC (rev 8660) +++ trunk/lib/plugin/Processing.php 2012-12-14 17:02:51 UTC (rev 8661) @@ -34,7 +34,7 @@ function getDescription() { - return _("Render inline Processing"); + return _("Render inline Processing."); } function getDefaultArguments() Modified: trunk/lib/plugin/RateIt.php =================================================================== --- trunk/lib/plugin/RateIt.php 2012-12-12 16:56:34 UTC (rev 8660) +++ trunk/lib/plugin/RateIt.php 2012-12-14 17:02:51 UTC (rev 8661) @@ -94,7 +94,7 @@ function getDescription() { - return _("Rating system. Store user ratings per page"); + return _("Rating system. Store user ratings per page."); } function RatingWidgetJavascript() Modified: trunk/lib/plugin/RssFeed.php =================================================================== --- trunk/lib/plugin/RssFeed.php 2012-12-12 16:56:34 UTC (rev 8660) +++ trunk/lib/plugin/RssFeed.php 2012-12-14 17:02:51 UTC (rev 8661) @@ -34,7 +34,7 @@ function getDescription() { - return _("Simple RSS Feed aggregator Plugin"); + return _("Simple RSS Feed aggregator."); } Modified: trunk/lib/plugin/SemanticSearch.php =================================================================== --- trunk/lib/plugin/SemanticSearch.php 2012-12-12 16:56:34 UTC (rev 8660) +++ trunk/lib/plugin/SemanticSearch.php 2012-12-14 17:02:51 UTC (rev 8661) @@ -61,7 +61,7 @@ function getDescription() { - return _("Search relations and attributes"); + return _("Search relations and attributes."); } function getDefaultArguments() Modified: trunk/lib/plugin/SemanticSearchAdvanced.php =================================================================== --- trunk/lib/plugin/SemanticSearchAdvanced.php 2012-12-12 16:56:34 UTC (rev 8660) +++ trunk/lib/plugin/SemanticSearchAdvanced.php 2012-12-14 17:02:51 UTC (rev 8661) @@ -65,7 +65,7 @@ function getDescription() { - return _("Parse and execute a full query expression"); + return _("Parse and execute a full query expression."); } function getDefaultArguments() Modified: trunk/lib/plugin/SiteMap.php =================================================================== --- trunk/lib/plugin/SiteMap.php 2012-12-12 16:56:34 UTC (rev 8660) +++ trunk/lib/plugin/SiteMap.php 2012-12-14 17:02:51 UTC (rev 8661) @@ -54,7 +54,7 @@ function getDescription() { - return _("Recursively get BackLinks or links"); + return _("Recursively get BackLinks or links."); } function getDefaultArguments() Modified: trunk/lib/plugin/SpellCheck.php =================================================================== --- trunk/lib/plugin/SpellCheck.php 2012-12-12 16:56:34 UTC (rev 8660) +++ trunk/lib/plugin/SpellCheck.php 2012-12-14 17:02:51 UTC (rev 8661) @@ -71,7 +71,7 @@ function getDescription() { - return _("Check the spelling of a page and make suggestions"); + return _("Check the spelling of a page and make suggestions."); } function managesValidators() Modified: trunk/lib/plugin/SqlResult.php =================================================================== --- trunk/lib/plugin/SqlResult.php 2012-12-12 16:56:34 UTC (rev 8660) +++ trunk/lib/plugin/SqlResult.php 2012-12-14 17:02:51 UTC (rev 8661) @@ -70,7 +70,7 @@ function getDescription() { - return _("Display arbitrary SQL result tables"); + return _("Display arbitrary SQL result tables."); } function getDefaultArguments() Modified: trunk/lib/plugin/SyncWiki.php =================================================================== --- trunk/lib/plugin/SyncWiki.php 2012-12-12 16:56:34 UTC (rev 8660) +++ trunk/lib/plugin/SyncWiki.php 2012-12-14 17:02:51 UTC (rev 8661) @@ -49,7 +49,7 @@ function getDescription() { - return _("Synchronize pages with external PhpWiki"); + return _("Synchronize pages with external PhpWiki."); } function getDefaultArguments() Modified: trunk/lib/plugin/SyntaxHighlighter.php =================================================================== --- trunk/lib/plugin/SyntaxHighlighter.php 2012-12-12 16:56:34 UTC (rev 8660) +++ trunk/lib/plugin/SyntaxHighlighter.php 2012-12-14 17:02:51 UTC (rev 8661) @@ -47,7 +47,7 @@ function getDescription() { - return _("Source code syntax highlighter (via http://www.andre-simon.de)"); + return _("Source code syntax highlighter (via http://www.andre-simon.de)."); } function managesValidators() Modified: trunk/lib/plugin/TeX2png.php =================================================================== --- trunk/lib/plugin/TeX2png.php 2012-12-12 16:56:34 UTC (rev 8660) +++ trunk/lib/plugin/TeX2png.php 2012-12-14 17:02:51 UTC (rev 8661) @@ -48,8 +48,7 @@ function getDescription() { - return _("Convert Tex mathematicals expressions to cached png files." . - " This is for small text"); + return _("Convert Tex mathematicals expressions to cached PNG files. This is for small text."); } function getDefaultArguments() Modified: trunk/lib/plugin/TranslateText.php =================================================================== --- trunk/lib/plugin/TranslateText.php 2012-12-12 16:56:34 UTC (rev 8660) +++ trunk/lib/plugin/TranslateText.php 2012-12-14 17:02:51 UTC (rev 8661) @@ -47,7 +47,7 @@ function getDescription() { - return _("Define a translation for a specified text"); + return _("Define a translation for a specified text."); } function getDefaultArguments() Modified: trunk/lib/plugin/UriResolver.php =================================================================== --- trunk/lib/plugin/UriResolver.php 2012-12-12 16:56:34 UTC (rev 8660) +++ trunk/lib/plugin/UriResolver.php 2012-12-14 17:02:51 UTC (rev 8661) @@ -39,7 +39,7 @@ function getDescription() { - return _("Converts an uri-escaped identifier back to an unique XML-ID"); + return _("Converts an URI-escaped identifier back to an unique XML-ID."); } function getDefaultArguments() Modified: trunk/lib/plugin/Video.php =================================================================== --- trunk/lib/plugin/Video.php 2012-12-12 16:56:34 UTC (rev 8660) +++ trunk/lib/plugin/Video.php 2012-12-14 17:02:51 UTC (rev 8661) @@ -52,7 +52,7 @@ function getDescription() { - return _("Display video in Flash"); + return _("Display video in Flash or HTML5."); } function getDefaultArguments() Modified: trunk/lib/plugin/WikiAdminRename.php =================================================================== --- trunk/lib/plugin/WikiAdminRename.php 2012-12-12 16:56:34 UTC (rev 8660) +++ trunk/lib/plugin/WikiAdminRename.php 2012-12-14 17:02:51 UTC (rev 8661) @@ -39,7 +39,7 @@ function getDescription() { - return _("Rename selected pages"); + return _("Rename selected pages."); } function getDefaultArguments() Modified: trunk/lib/plugin/WikiBlog.php =================================================================== --- trunk/lib/plugin/WikiBlog.php 2012-12-12 16:56:34 UTC (rev 8660) +++ trunk/lib/plugin/WikiBlog.php 2012-12-14 17:02:51 UTC (rev 8661) @@ -90,7 +90,7 @@ function getDescription() { - return sprintf(_("Show and add blogs for %s"), '[pagename]'); + return sprintf(_("Show and add blogs for %s."), '[pagename]'); } // Arguments: Modified: trunk/lib/plugin/WikiForm.php =================================================================== --- trunk/lib/plugin/WikiForm.php 2012-12-12 16:56:34 UTC (rev 8660) +++ trunk/lib/plugin/WikiForm.php 2012-12-14 17:02:51 UTC (rev 8661) @@ -35,7 +35,7 @@ function getDescription() { - return _("Provide generic WikiForm input buttons"); + return _("Provide generic WikiForm input buttons."); } function getDefaultArguments() Modified: trunk/lib/plugin/WikiFormRich.php =================================================================== --- trunk/lib/plugin/WikiFormRich.php 2012-12-12 16:56:34 UTC (rev 8660) +++ trunk/lib/plugin/WikiFormRich.php 2012-12-14 17:02:51 UTC (rev 8661) @@ -104,7 +104,7 @@ function getDescription() { - return _("Provide generic WikiForm input buttons"); + return _("Provide generic WikiForm input buttons."); } function getDefaultArguments() Modified: trunk/lib/plugin/WikiForum.php =================================================================== --- trunk/lib/plugin/WikiForum.php 2012-12-12 16:56:34 UTC (rev 8660) +++ trunk/lib/plugin/WikiForum.php 2012-12-14 17:02:51 UTC (rev 8661) @@ -55,7 +55,7 @@ function getDescription() { - return _("Handles threaded topics with comments/news and provide a input form"); + return _("Handles threaded topics with comments/news and provide a input form."); } function getDefaultArguments() Modified: trunk/lib/plugin/WikiPoll.php =================================================================== --- trunk/lib/plugin/WikiPoll.php 2012-12-12 16:56:34 UTC (rev 8660) +++ trunk/lib/plugin/WikiPoll.php 2012-12-14 17:02:51 UTC (rev 8661) @@ -63,7 +63,7 @@ function getDescription() { - return _("Enable configurable polls"); + return _("Enable configurable polls."); } function getDefaultArguments() Modified: trunk/lib/plugin/YouTube.php =================================================================== --- trunk/lib/plugin/YouTube.php 2012-12-12 16:56:34 UTC (rev 8660) +++ trunk/lib/plugin/YouTube.php 2012-12-14 17:02:51 UTC (rev 8661) @@ -44,7 +44,7 @@ function getDescription() { - return _("Embed YouTube videos"); + return _("Embed YouTube videos."); } function getDefaultArguments() Modified: trunk/lib/plugin/_GroupInfo.php =================================================================== --- trunk/lib/plugin/_GroupInfo.php 2012-12-12 16:56:34 UTC (rev 8660) +++ trunk/lib/plugin/_GroupInfo.php 2012-12-14 17:02:51 UTC (rev 8661) @@ -33,7 +33,7 @@ function getDescription() { - return sprintf(_("Show Group Information")); + return sprintf(_("Show Group Information.")); } function getDefaultArguments() Modified: trunk/lib/plugin/_WikiTranslation.php =================================================================== --- trunk/lib/plugin/_WikiTranslation.php 2012-12-12 16:56:34 UTC (rev 8660) +++ trunk/lib/plugin/_WikiTranslation.php 2012-12-14 17:02:51 UTC (rev 8661) @@ -118,7 +118,7 @@ function getDescription() { - return _("Show translations of various words or pages"); + return _("Show translations of various words or pages."); } function getDefaultArguments() Modified: trunk/lib/plugin/text2png.php =================================================================== --- trunk/lib/plugin/text2png.php 2012-12-12 16:56:34 UTC (rev 8660) +++ trunk/lib/plugin/text2png.php 2012-12-14 17:02:51 UTC (rev 8661) @@ -54,7 +54,7 @@ function getDescription() { - return _("Convert text into a png image using GD."); + return _("Convert text into a PNG image using GD."); } function getDefaultArguments() 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-12 16:56:34 UTC (rev 8660) +++ trunk/locale/de/LC_MESSAGES/phpwiki.php 2012-12-14 17:02:51 UTC (rev 8661) @@ -145,7 +145,7 @@ $locale["Already logged in"] = "Bereits eingeloggt"; $locale["Also pages which have been deleted at least %s days."] = "Auch Seiten, die in den letzten %s Tagen gelöscht wurden."; $locale["An unnamed PhpWiki"] = "Unbenanntes PhpWiki"; -$locale["Analyzes preferences based on voting budget and ratings."] = "Analysiere Empfehlungen auf Grund von Bewertungen."; +$locale["Analyze preferences based on voting budget and ratings."] = "Analysiere Empfehlungen auf Grund von Bewertungen."; $locale["Anonymous Users"] = "Anonyme Benutzer"; $locale["Appearance"] = "Darstellung"; $locale["Append text to any page in this wiki."] = "Füge Text zu einer Seite in diesem Wiki hinzu."; @@ -280,7 +280,7 @@ $locale["ContributedTranslations"] = "MeineÜbersetzungen"; $locale["Control characters not allowed"] = "Steuerzeichen nicht erlaubt"; $locale["Convert"] = "Konvertieren"; -$locale["Convert text into a png image using GD."] = "Text mit der GD Bibliothek in ein PNG Bild konvertieren."; +$locale["Convert text into a PNG image using GD."] = "Text mit der GD Bibliothek in ein PNG Bild konvertieren."; $locale["Converted successfully %d pages"] = "%d Seiten erfolgreich konvertiert"; $locale["Converts TeX to an image. May be used to embed formulas in PhpWiki."] = "(La)TeX-Dokument nach ein Bild erstellen. Dadurch konnte eine Formel in PhpWiki eingebettet worden."; $locale["Copyrights"] = "Urheberrechte"; @@ -293,8 +293,8 @@ $locale["Couldn't start commandline “%s”"] = "Konnte Programm »%s« nicht starten"; $locale["Count"] = "Anzahl"; $locale["Create Page"] = "Neue Seite"; +$locale["Create a Wiki Category Page."] = "Erzeuge eine neue Wiki-Seite."; $locale["Create a Wiki page by the provided name."] = "Erzeuge neue Wiki-Seite mit dem angegebenem Namen."; -$locale["Create a Wiki page."] = "Erzeuge eine neue Wiki-Seite."; $locale["Create a new (sub)page"] = "Erzeuge eine neue (Unter)Seite"; $locale["Create: %s"] = "Erzeugen: %s"; $locale["CreatePage"] = "NeueSeite"; @@ -318,7 +318,7 @@ $locale["Default language: “%s”"] = "Standardsprache für dieses Wiki: »%s«"; $locale["Default preferences will be used."] = "Die Vorgabe Benutzereinstellungen werden verwendent."; $locale["Default theme: “%s”"] = "Darstellung des Systems: »%s«"; -$locale["Define a translation for a specified text"] = "Definiere die Übersetzung für einen gegebenen Text"; +$locale["Define a translation for a specified text."] = "Definiere die Übersetzung für einen gegebenen Text."; $locale["Define the translation for %s in %s"] = "Definiere die Übersetzung für %s nach %s"; $locale["Del/+"] = "Lö/+"; $locale["Delete ACL"] = "Lösche diese ACL"; @@ -338,10 +338,10 @@ $locale["Differences between %s and %s of %s."] = "Zeilenweiser Vergleich von %3\$s, von %1\$s mit %2\$s."; $locale["Diffing pages"] = "Die Inhalts-Differenz-Seiten dieses Wikis"; $locale["Discussion"] = "Diskussion"; -$locale["Display arbitrary SQL result tables"] = "Zeige Tabelle von SQL Abfragen an"; -$locale["Display differences between revisions"] = "Zeilenweiser Vergleich der Versionen"; +$locale["Display arbitrary SQL result tables."] = "Zeige Tabelle von SQL Abfragen an."; +$locale["Display differences between revisions."] = "Zeilenweiser Vergleich der Versionen."; $locale["Displays a list of randomly chosen pages or redirects to a random page."] = "Eine liste der zufälliger ausgewählter Seiten zeigen oder nach einer zufälliger ausgewählter Seite weiterleiten."; -$locale["Displays a set of photos listed in a text file with optional descriptions"] = "Zeigt die Liste der Bilder in einer Textdatei an, mit optionalen Beschreibungen"; +$locale["Displays a set of photos listed in a text file with optional descriptions."] = "Zeigt die Liste der Bilder in einer Textdatei an, mit optionalen Beschreibungen."; $locale["Displays a url in a seperate frame inside our body. Only one frame allowed."] = "Zeigt eine URL in einem eigenen (oder gesonderten) Frame innerhalb der Seite. Nur ein Frame ist erlaubt."; $locale["Don't cache this page."] = "Cache diese Seite nicht."; $locale["Double redirect not allowed."] = "Rekursive Redirektion verboten."; @@ -362,13 +362,13 @@ $locale["E-mail Notification"] = "E-Mail Bestätigung"; $locale["E-mail address confirmation"] = "E-Mail Bestätigung"; $locale["ERROR uploading “%s”"] = "FEHLER beim Hochladen von »%s«"; -$locale["Easy navigation buttons for %s"] = "Einfache Navgiationsknöpfe für %s"; +$locale["Easy navigation buttons for %s."] = "Einfache Navgiationsknöpfe für %s."; $locale["Edit"] = "Bearbeiten"; $locale["Edit %s"] = "Bearbeite %s"; $locale["Edit Area Size"] = "Texteingabe Fenstergröße"; $locale["Edit Old Revision"] = "Alte Version Bearbeiten"; $locale["Edit aborted."] = "Bearbeiten abgebrochen."; -$locale["Edit metadata for %s"] = "Meta-Daten für %s bearbeiten"; +$locale["Edit metadata for %s."] = "Meta-Daten für %s bearbeiten."; $locale["Edit this page"] = "Diese Seite bearbeiten"; $locale["Edit this page and all subpages"] = "Bearbeiten aller Seiten und Unterseiten"; $locale["Edit: %s"] = "Bearbeite: %s"; @@ -381,7 +381,7 @@ $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"; $locale["Empty pagename!"] = "Leerer Seitenname!"; -$locale["Enable configurable polls"] = "Erlaubt konfigurierbare Umfragen"; +$locale["Enable configurable polls."] = "Erlaubt konfigurierbare Umfragen."; $locale["Enter pages seperated by space or comma. Wildcards (fileglobbing) allowed."] = "Liste aller Seiten durch Leerzeichen oder Komma getrennt. Reguläre Ausdrücke (fileglobbing) erlaubt."; $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."; @@ -501,7 +501,7 @@ $locale["In total there are %d user sessions online. :: Unique %d Registered and %d Guests"] = "Insgesamt sind %d Benutzersessions online. :: %d verschiedene Registrierte und %d Gäste"; $locale["Include an external web page within the body of a wiki page."] = "Einbetten einer externen Webseite im Body dieser Wiki Seite."; $locale["Include multiple pages."] = "Füge mehrere Seiten ein."; -$locale["Include recursively all linked pages starting at %s"] = "Bette rekursiv alle verlinkten Seiten ein, angefangen mit %s"; +$locale["Include recursively all linked pages starting at %s."] = "Bette rekursiv alle verlinkten Seiten ein, angefangen mit %s."; $locale["Include text from another wiki page."] = "Text von einer andere Seite einfügen."; $locale["IncludePage"] = "SeiteEinfügen"; $locale["IncludePages"] = "SeitenEinfügen"; @@ -564,8 +564,8 @@ $locale["LinkSearch"] = "LinkSuche"; $locale["Links"] = "Links"; $locale["List"] = "Liste"; -$locale["List PageHistory for %s"] = "Das Änderungsprotokoll für %s auflisten"; -$locale["List all new pages per month per user"] = "Liste aller neuen Seiten pro Monat und Benutzer"; +$locale["List PageHistory for %s."] = "Das Änderungsprotokoll für %s auflisten."; +$locale["List all new pages per month per user."] = "Liste aller neuen Seiten pro Monat und Benutzer."; $locale["List all once authenticated users."] = "Liste alle eingetragenen Benutzer."; $locale["List all page revisions edited by one user with diff links, or show a PageHistory-like list of a single page for only one user."] = "Liste aller Versionen eines Autors mit Diff-Links, oder eine SeitenProtokoll-ähnliche Liste einer Seite nur für einen Autor."; $locale["List all pages in this wiki."] = "Alle Seiten in diesem Wiki auflisten."; @@ -576,7 +576,7 @@ $locale["List of pages created by [%s] (%d total):"] = "Liste der Seiten erzeugt von [%s] (%d insgesamt):"; $locale["List of pages last edited by [%s] (%d total):"] = "Liste der Seiten last edited by [%s] (%d insgesamt):"; $locale["List of pages owned by [%s] (%d total):"] = "Liste der Seiten owned by [%s] (%d insgesamt):"; -$locale["List of plugins on this wiki"] = "Alle Zusatzprogrammen in diesem Wiki auflisten."; +$locale["List of plugins on this wiki."] = "Alle Zusatzprogrammen in diesem Wiki auflisten."; $locale["List of user-created pages (%d total):"] = "Liste der Benutzer erzeugten Seiten (%d insgesamt):"; $locale["List page names which share an initial or final title word with “%s”."] = "Diese Seiten teilen sich einen Wordteil am Anfang oder Ende mit »%s«."; $locale["List pages which are not linked to by any other page."] = "Liste aller Seiten, die von keiner anderen Seite verlinkt sind."; @@ -604,7 +604,7 @@ $locale["Locking pages"] = "Seiten sperren"; $locale["MIME file %s"] = "MIME-Datei %s"; $locale["MISSING"] = "FEHLEND"; -$locale["Make use of the Google API"] = "Benutze die Google API"; +$locale["Make use of the Google API."] = "Benutze die Google API."; $locale["Markup"] = "Quelltext"; $locale["Markup cache purged!"] = "HTML-Cachedaten entfernt!"; $locale["Members:"] = "Mitglieder:"; @@ -696,7 +696,7 @@ $locale["Our users created a total of %d pages."] = "Unsere Benutzer erzeugten insgesamt %d Seiten."; $locale["Owner"] = "Besitzer"; $locale["Owner: %s"] = "Besitzer: %s"; -$locale["PHP syntax highlighting"] = "Hervorhebung der PHP-Syntax (Syntax highlighting)"; +$locale["PHP syntax highlighting."] = "Hervorhebung der PHP-Syntax (Syntax highlighting)."; $locale["PHP was unable to create a new GD image stream. Read 'lib/plugin/text2png.php' for details."] = "PHP konnte keinen neues GD Bild erzeugen. Lesen Sie 'lib/plugin/text2png.php' für Details."; $locale["Page"] = "Seite"; $locale["Page Content: "] = "Inhalt: "; @@ -727,12 +727,11 @@ $locale["PageChange Notification of %s sent to %s"] = "SeitenÄnderung Benachrichtigung von %s an %s gesendet"; $locale["PageDump"] = "SeiteSpeichern"; $locale["PageGroup"] = "SeitenGruppe"; -$locale["PageGroup for %s"] = "SeitenGruppe für »%s«"; +$locale["PageGroup for %s."] = "SeitenGruppe für »%s«"; $locale["PageHistory"] = "SeitenProtokoll"; $locale["PageHistory for %s"] = "Verlaufsprotokoll für Seite %s"; $locale["PageInfo"] = "SeitenInfo"; $locale["PageName|optional label"] = "SeitenName|optionaler Name"; -$locale["PageTrail Plugin"] = "PageTrail Plugin"; $locale["Pagedata size: %d KiB"] = "Größe der Seitendaten: %d KiB"; $locale["Pagename(s): "] = "Seitenname(n): "; $locale["Pages which have been deleted at least %s days are already checked."] = "Seiten, die in den letzten %s Tagen gelöscht wurden, sind bereits ausgewählt"; @@ -801,6 +800,7 @@ $locale["Previous Revision"] = "Vorige Neubearbeitung"; $locale["Printer"] = "Drucker"; $locale["Propagate new permissions to all subpages?"] = "Aktiviere Vererbung dieser Zugriffsrechte auf alle Unterseiten?"; +$locale["Provide weather reports from the Internet."] = "Der PhpWetter plugin gibt Auskunft zur Wetterlage vom Internet."; $locale["Purge HTML cache"] = "HTML-Cachedatei Säubern"; $locale["Purge HTML cache for this page. Regenerate from WikiMarkup when next accessed."] = "Gespeicherten HTML Cache dieser Seite löschen und beim nächsten Aufruf neu generieren."; $locale["Purge Markup Cache"] = "HTML-Cachedatei Säubern"; @@ -820,7 +820,7 @@ $locale["Rate It"] = "Bewerte es"; $locale["RateIt"] = "BewerteEs"; $locale["Rating"] = "BenutzerBewertungen"; -$locale["Rating system. Store user ratings per page"] = "Bewertungssystem. Speichere Benutzerbewertungen pro Seite"; +$locale["Rating system. Store user ratings per page."] = "Bewertungssystem. Speichere Benutzerbewertungen pro Seite."; $locale["Raw HTML"] = "Reine HTML-Befehle"; $locale["Raw HTML is disabled in this wiki."] = "HTML-Befehle sind in diesem Wiki außer Kraft gesetzt."; $locale["Reason: "] = "Grund: "; @@ -837,11 +837,11 @@ $locale["Recursive inclusion of page %s ignored"] = "Rekursiver Selbstaufruf der Seite %s ignoriert"; $locale["Recursive inclusion of url %s"] = "Rekursiver Selbstaufruf der URL %s"; $locale["Recursive redirect to self: “%s”"] = "Eigenbezogene Selbstrückleitung: »%s«"; -$locale["Recursively get BackLinks or links"] = "Alle BackLinks für %s (rekursiv)"; +$locale["Recursively get BackLinks or links."] = "Alle BackLinks für %s (rekursiv)."; $locale["Redirect"] = "Weiterleiten"; $locale["Redirect to an external URL is only allowed in locked pages."] = "Weiterleitung zu einer externen URL ist nur in gesperrten Seiten erlaubt."; $locale["RedirectTo"] = "WeiterLeiten"; -$locale["Redirects to an external web site based on form input"] = "Weiterleitung der Suche zu einer externen Webseite aufgrund einer Formulareingabe"; +$locale["Redirects to an external web site based on form input."] = "Weiterleitung der Suche zu einer externen Webseite aufgrund einer Formulareingabe."; $locale["References"] = "Fußnoten"; $locale["Regex?"] = "Regulärer Ausdruck?"; $locale["Registered Users"] = "Angemeldete Benutzer"; @@ -895,7 +895,7 @@ $locale["Score"] = "Gewichtung"; $locale["Search"] = "Suche"; $locale["Search & Replace"] = "Suchen & Ersetzen"; -$locale["Search an LDAP directory"] = "Durchsuche ein LDAP Verzeichnis"; +$locale["Search an LDAP directory."] = "Durchsuche ein LDAP Verzeichnis."; $locale["Search and replace text in selected wiki pages."] = "Suche und ersetze Text in den gewählten Seiten."; $locale["Search for"] = "Suche nach"; $locale["Search for page titles similar to %s."] = "Suche nach Seitentitel die ähnlich klingen wie %s."; @@ -928,22 +928,21 @@ $locale["Set Password"] = "Setze Passwort"; $locale["Set USE_DB_SESSION to false."] = "Setzen Sie USE_DB_SESSION auf false."; $locale["Set individual page permissions."] = "Setze individuelle Zugangsrechte."; -$locale["Show and add blogs for %s"] = "Blogs für %s zeigen und hinzufügen"; -$locale["Show and add comments for %s"] = "Kommentare für %s zeigen und hinzufügen"; +$locale["Show and add blogs for %s."] = "Blogs für %s zeigen und hinzufügen."; +$locale["Show and add comments for %s."] = "Kommentare für %s zeigen und hinzufügen."; $locale["Show changes for:"] = "Zeige Änderungen innerhalb von:"; $locale["Show extra page Info and statistics for %s."] = "Zusätzliche Seiten-Info und Statistiken über %s zeigen."; $locale["Show relative dates using 'Today' and 'Yesterday'"] = "Datum mit relativen Bezeichnungen, wie »Heute« und »Gestern«"; $locale["Show summary information from the access log table."] = "Zeige Überblick über die Access LOG-Tabelle."; $locale["Show summary information of the current user sessions."] = "Zeige Überblick über alle aktuellen Benutzersessions."; -$locale["Show translations of various words or pages"] = "Zeige Übersetzungen für verschiedene Wörter oder Seiten"; +$locale["Show translations of various words or pages."] = "Zeige Übersetzungen für verschiedene Wörter oder Seiten."; $locale["Sidebar"] = "Sidebar"; $locale["Sign In"] = "Anmelden"; $locale["Sign Out"] = "Abmelden"; $locale["Sign in as:"] = "Anmelden als:"; $locale["Signed Users"] = "Angemeldete Benutzer"; -$locale["Simple RSS Feed aggregator Plugin"] = "Einfaches RSS Feed Plugin"; -$locale["Simple Sample Plugin"] = "Zusatzprogramm Minimalbeispiel"; -$locale["Simple jabber presence plugin"] = "Einfaches Jabber-Anwesenheits Zusatzprogramm"; +$locale["Simple RSS Feed aggregator."] = "Einfaches RSS Feed Plugin."; +$locale["Simple Sample Plugin."] = "Zusatzprogramm Minimalbeispiel."; $locale["Since you started the deletion process, someone has saved a new version of %s. Please check to make sure you still want to permanently remove the page from the database."] = "Während Sie den Löschungsprozess begonnen haben, hat jemand anderer eine neue Version von %s gespeichert. Bitte entscheiden Sie ob Sie die Seite noch von der Datenbank permanent löschen wollen."; $locale["Since you started the purge process, someone has saved a new version of %s. Please check to make sure you still want to permanently purge the page from the database."] = "Während Sie den Löschungsprozess begonnen haben, hat jemand anderer eine neue Version von %s gespeichert. Bitte entscheiden Sie ob Sie die Seite noch von der Datenbank permanent löschen wollen."; $locale["SiteMap"] = "SeitenÜbersicht"; @@ -979,7 +978,7 @@ $locale["Summary"] = "Zusammenfassung"; $locale["Summary: %s"] = "Zusammenfassung: %s"; $locale["Supplanted on"] = "Ersetzt am"; -$locale["Support moderated pages"] = "Unterstütze moderierte Seiten"; +$locale["Support moderated pages."] = "Unterstütze moderierte Seiten."; $locale["Supported handlers are: %s"] = "Unterstützte DBA Methoden sind: %s"; $locale["Supported languages"] = "Unterstützte Sprachen"; $locale["Supported themes"] = "Unterstützte Benutzeroberfläche"; @@ -1009,7 +1008,6 @@ $locale["The %s subpage enables simple weblogging."] = "Die %s UnterSeite ermöglicht ein einfaches Weblog."; $locale["The DBA handler %s is unsupported!"] = "Die DBA Methode %s wird nicht unterstützt!"; $locale["The ICAO “%s” wasn't recognized."] = "Die angegebene ICAO »%s« war nicht bekannt."; -$locale["The PhpWeather plugin provides weather reports from the Internet."] = "Der PhpWetter plugin gibt Auskunft zur Wetterlage vom Internet."; $locale["The PhpWiki access log file"] = "Die PhpWiki Zugriffslog Datei"; $locale["The SQL_ACCESS_LOG is not enabled."] = "SQL_ACCESS_LOG ist nicht aktiviert."; $locale["The current page has no subpages defined."] = "Diese Seite hat keine zugewiesenen Unterseiten."; 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-12 16:56:34 UTC (rev 8660) +++ trunk/locale/es/LC_MESSAGES/phpwiki.php 2012-12-14 17:02:51 UTC (rev 8661) @@ -114,7 +114,7 @@ $locale["Could not connect to LDAP host %s"] = "No podía conectar con LDAP %s"; $locale["Couldn't connect to %s"] = "No podía conectar con %s"; $locale["Create Page"] = "Cree la Página"; -$locale["Create a Wiki page."] = "Cree una página de Wiki."; +$locale["Create a Wiki Category Page."] = "Cree una página de Wiki."; $locale["Create a new (sub)page"] = "Cree una página (secundaria) nueva"; $locale["Create: %s"] = "Cree: %s"; $locale["CreatePage"] = "CreeLaPágina"; @@ -372,7 +372,7 @@ $locale["Search"] = "Buscar"; $locale["Search & Replace"] = "Busque Y Substituya"; $locale["Search for"] = "Buscar"; -$locale["Search relations and attributes"] = "Buscar relaciones y atributos"; +$locale["Search relations and attributes."] = "Buscar relaciones y atributos."; $locale["Search:"] = "Buscar:"; $locale["SearchReplace"] = "Busque Y Substituya"; $locale["See %s tips for editing."] = "%s tips para editar."; 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-12 16:56:34 UTC (rev 8660) +++ trunk/locale/fr/LC_MESSAGES/phpwiki.php 2012-12-14 17:02:51 UTC (rev 8661) @@ -287,8 +287,8 @@ $locale["Contents"] = "Contenu"; $locale["ContributedTranslations"] = "TraductionsContribuées"; $locale["Convert"] = "Convertir"; -$locale["Convert Tex mathematicals expressions to cached png files. This is for small text"] = "Convertit des expressions mathématiques au format TeX en des fichiers png mis en cache."; -$locale["Convert text into a png image using GD."] = "Converti le texte en une image png utilisant GD."; +$locale["Convert Tex mathematicals expressions to cached PNG files. This is for small text."] = "Convertit des expressions mathématiques au format TeX en des fichiers PNG mis en cache."; +$locale["Convert text into a PNG image using GD."] = "Convertir le texte en une image PNG en utilisant GD."; $locale["Converted successfully %d pages"] = "%d pages converties avec succès"; $locale["Converts TeX to an image. May be used to embed formulas in PhpWiki."] = "Pour convertir des formules TeX en image."; $locale["Copyrights"] = "Copyrights"; @@ -299,8 +299,8 @@ $locale["Couldn't start commandline “%s”"] = "Impossible de lancer la ligne de commande « %s »"; $locale["Count"] = "Nombre"; $locale["Create Page"] = "Créer la page"; +$locale["Create a Wiki Category Page."] = "Créer une page wiki de catégorie."; $locale["Create a Wiki page by the provided name."] = "Créer une page wiki avec le nom demandé."; -$locale["Create a Wiki page."] = "Créer une page wiki"; $locale["Create a new (sub)page"] = "Créer une nouvelle (sous-)page"; $locale["Create redirect from old to new name?"] = "Créer une redirection de l'ancien nom vers le nouveau ?"; $locale["Create: %s"] = "Créer : %s"; @@ -324,7 +324,7 @@ $locale["Default language: “%s”"] = "Langage par défaut : %s"; $locale["Default preferences will be used."] = "Les préférences par défaut seront utilisées."; $locale["Default theme: “%s”"] = "Thème par défaut : “%s”"; -$locale["Define a translation for a specified text"] = "Traduire du texte"; +$locale["Define a translation for a specified text."] = "Définir la traduction d'un texte spécifique."; $locale["Define the translation for %s in %s"] = "Définir la traduction pour %s en %s"; $locale["Del/+"] = "Suppr/+"; $locale["Delete ACL"] = "Supprimer l'ACL"; @@ -343,13 +343,13 @@ $locale["Differences between %s and %s of %s."] = "Différences entre %s et %s de %s."; $locale["Diffing pages"] = "Comparaison des pages"; $locale["Discussion"] = "Discussion"; -$locale["Display arbitrary SQL result tables"] = "Affiche le résultat de requêtes SQL simples"; +$locale["Display arbitrary SQL result tables."] = "Affiche le résultat de requêtes SQL simples."; $locale["Display as Pdf"] = "Afficher en PDF"; -$locale["Display differences between revisions"] = "Affiche les différences entre versions"; +$locale["Display differences between revisions."] = "Affiche les différences entre versions."; $locale["Display general and user specific auth information."] = "Afficher les informations générales de l'utilisateur."; -$locale["Display video in Flash"] = "Afficher une vidéo en Flash"; +$locale["Display video in Flash or HTML5."] = "Afficher une vidéo en Flash ou HTML5."; $locale["Displays a list of randomly chosen pages or redirects to a random page."] = "Affiche une liste de pages prises au hasard sur ce wiki."; -$locale["Displays a set of photos listed in a text file with optional descriptions"] = "Affiche un groupe de photos listées dans un fichier texte avec des descriptions facultatives."; +$locale["Displays a set of photos listed in a text file with optional descriptions."] = "Affiche un groupe de photos listées dans un fichier texte avec des descriptions facultatives."; $locale["Displays a url in a seperate frame inside our body. Only one frame allowed."] = "Affiche une url dans une cadre interne à la page. Un seul cadre autorisé."; $locale["Do not send minor modifications"] = "Ne pas envoyer les modifications mineures"; $locale["Do not send my own modifications"] = "Ne pas envoyer mes propres modifications"; @@ -379,13 +379,13 @@ $locale["E-mail address “%s” is properly formatted"] = "L'adresse électronique « %s » semble être bien formée."; $locale["ERROR uploading “%s”"] = "ERREUR en déposant « %s » : "; $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["Easy navigation buttons for %s."] = "Boutons de navigation rapide pour %s."; $locale["Edit"] = "Modifier"; $locale["Edit %s"] = "Éditer %s"; $locale["Edit Area Size"] = "Modifier la taille de la zone"; $locale["Edit Old Revision"] = "Modifier l'ancienne version"; $locale["Edit aborted."] = "Modification annulée."; -$locale["Edit metadata for %s"] = "Éditer les métadonnées pour %s"; +$locale["Edit metadata for %s."] = "Éditer les métadonnées pour %s."; $locale["Edit this page"] = "Modifier cette page"; $locale["Edit this page and all subpages"] = "Modifier cette page et toutes ses sous-pages"; $locale["Edit: %s"] = "Modifier : %s"; @@ -400,7 +400,7 @@ $locale["Empty link to:... [truncated message content] |
From: <var...@us...> - 2012-12-17 12:53:04
|
Revision: 8665 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8665&view=rev Author: vargenau Date: 2012-12-17 12:52:50 +0000 (Mon, 17 Dec 2012) Log Message: ----------- Update getDescription Modified Paths: -------------- trunk/lib/plugin/AuthorHistory.php trunk/lib/plugin/CurrentTime.php trunk/lib/plugin/ExternalSearch.php trunk/lib/plugin/FrameInclude.php trunk/lib/plugin/GoogleMaps.php trunk/lib/plugin/PhotoAlbum.php trunk/lib/plugin/RandomPage.php trunk/lib/plugin/RecentChangesCached.php trunk/lib/plugin/RedirectTo.php trunk/lib/plugin/SystemInfo.php trunk/lib/plugin/UnfoldSubpages.php trunk/lib/plugin/WantedPages.php 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/fr/LC_MESSAGES/phpwiki.mo trunk/locale/fr/LC_MESSAGES/phpwiki.php trunk/locale/it/LC_MESSAGES/phpwiki.mo trunk/locale/ja/LC_MESSAGES/phpwiki.mo trunk/locale/ja/LC_MESSAGES/phpwiki.php trunk/locale/nl/LC_MESSAGES/phpwiki.mo trunk/locale/po/de.po trunk/locale/po/es.po trunk/locale/po/fr.po trunk/locale/po/it.po trunk/locale/po/ja.po trunk/locale/po/nl.po trunk/locale/po/phpwiki.pot trunk/locale/po/sv.po trunk/locale/po/zh.po trunk/locale/sv/LC_MESSAGES/phpwiki.mo trunk/locale/zh/LC_MESSAGES/phpwiki.mo trunk/locale/zh/LC_MESSAGES/phpwiki.php Modified: trunk/lib/plugin/AuthorHistory.php =================================================================== --- trunk/lib/plugin/AuthorHistory.php 2012-12-17 09:58:45 UTC (rev 8664) +++ trunk/lib/plugin/AuthorHistory.php 2012-12-17 12:52:50 UTC (rev 8665) @@ -36,7 +36,7 @@ <?plugin AuthorHistory page=all includeminor=true ?> -* Displays a list of revision edits by one particular user, for the +* Display a list of revision edits by one particular user, for the * current page, a specified page, or all pages. * This is a big hack to create a PageList like table. (PageList Modified: trunk/lib/plugin/CurrentTime.php =================================================================== --- trunk/lib/plugin/CurrentTime.php 2012-12-17 09:58:45 UTC (rev 8664) +++ trunk/lib/plugin/CurrentTime.php 2012-12-17 12:52:50 UTC (rev 8665) @@ -60,7 +60,7 @@ function getDescription() { - return _("Displays current time and date."); + return _("Display current time and date."); } Modified: trunk/lib/plugin/ExternalSearch.php =================================================================== --- trunk/lib/plugin/ExternalSearch.php 2012-12-17 09:58:45 UTC (rev 8664) +++ trunk/lib/plugin/ExternalSearch.php 2012-12-17 12:52:50 UTC (rev 8665) @@ -21,7 +21,7 @@ */ /** - * Redirects to an external web site based on form input. + * Redirect to an external web site based on form input. * See http://phpwiki.sourceforge.net/phpwiki/ExternalSearchPlugin * * useimage sample: @@ -43,7 +43,7 @@ function getDescription() { - return _("Redirects to an external web site based on form input."); + return _("Redirect to an external web site based on form input."); //fixme: better description } Modified: trunk/lib/plugin/FrameInclude.php =================================================================== --- trunk/lib/plugin/FrameInclude.php 2012-12-17 09:58:45 UTC (rev 8664) +++ trunk/lib/plugin/FrameInclude.php 2012-12-17 12:52:50 UTC (rev 8665) @@ -21,7 +21,7 @@ */ /** - * FrameInclude: Displays a url or page in a seperate frame inside our body. + * FrameInclude: Display a url or page in a seperate frame inside our body. * * Usage: * <<FrameInclude src=http://www.internet-technology.de/fourwins_de.htm >> @@ -55,7 +55,7 @@ function getDescription() { - return _("Displays a url in a seperate frame inside our body. Only one frame allowed."); + return _("Display a url in a seperate frame inside our body. Only one frame allowed."); } function getDefaultArguments() Modified: trunk/lib/plugin/GoogleMaps.php =================================================================== --- trunk/lib/plugin/GoogleMaps.php 2012-12-17 09:58:45 UTC (rev 8664) +++ trunk/lib/plugin/GoogleMaps.php 2012-12-17 12:52:50 UTC (rev 8665) @@ -65,7 +65,7 @@ function getDescription() { - return _("Displays a marker with further infos (when clicking) on given coordinates."); + return _("Display a marker with further infos (when clicking) on given coordinates."); } function getDefaultArguments() Modified: trunk/lib/plugin/PhotoAlbum.php =================================================================== --- trunk/lib/plugin/PhotoAlbum.php 2012-12-17 09:58:45 UTC (rev 8664) +++ trunk/lib/plugin/PhotoAlbum.php 2012-12-17 12:52:50 UTC (rev 8665) @@ -102,7 +102,7 @@ function getDescription() { - return _("Displays a set of photos listed in a text file with optional descriptions."); + return _("Display a set of photos listed in a text file with optional descriptions."); } // Avoid nameclash, so it's disabled. We allow any url. Modified: trunk/lib/plugin/RandomPage.php =================================================================== --- trunk/lib/plugin/RandomPage.php 2012-12-17 09:58:45 UTC (rev 8664) +++ trunk/lib/plugin/RandomPage.php 2012-12-17 12:52:50 UTC (rev 8665) @@ -36,7 +36,7 @@ function getDescription() { - return _("Displays a list of randomly chosen pages or redirects to a random page."); + return _("Display a list of randomly chosen pages or redirects to a random page."); } function getDefaultArguments() Modified: trunk/lib/plugin/RecentChangesCached.php =================================================================== --- trunk/lib/plugin/RecentChangesCached.php 2012-12-17 09:58:45 UTC (rev 8664) +++ trunk/lib/plugin/RecentChangesCached.php 2012-12-17 12:52:50 UTC (rev 8665) @@ -46,7 +46,7 @@ function getDescription() { - return 'Caches output of RecentChanges called with default arguments.'; + return 'Cache output of RecentChanges called with default arguments.'; } function getDefaultArguments() Modified: trunk/lib/plugin/RedirectTo.php =================================================================== --- trunk/lib/plugin/RedirectTo.php 2012-12-17 09:58:45 UTC (rev 8664) +++ trunk/lib/plugin/RedirectTo.php 2012-12-17 12:52:50 UTC (rev 8665) @@ -46,7 +46,7 @@ function getDescription() { - return _("Redirects to another URL or page."); + return _("Redirect to another URL or page."); } function getDefaultArguments() Modified: trunk/lib/plugin/SystemInfo.php =================================================================== --- trunk/lib/plugin/SystemInfo.php 2012-12-17 09:58:45 UTC (rev 8664) +++ trunk/lib/plugin/SystemInfo.php 2012-12-17 12:52:50 UTC (rev 8665) @@ -57,7 +57,7 @@ function getDescription() { - return _("Provides access to PhpWiki's lower level system information."); + return _("Provide access to PhpWiki's lower level system information."); } /* From lib/WikiPlugin.php: Modified: trunk/lib/plugin/UnfoldSubpages.php =================================================================== --- trunk/lib/plugin/UnfoldSubpages.php 2012-12-17 09:58:45 UTC (rev 8664) +++ trunk/lib/plugin/UnfoldSubpages.php 2012-12-17 12:52:50 UTC (rev 8665) @@ -43,7 +43,7 @@ function getDescription() { - return _("Includes the content of all SubPages of the current page."); + return _("Include the content of all SubPages of the current page."); } function getDefaultArguments() Modified: trunk/lib/plugin/WantedPages.php =================================================================== --- trunk/lib/plugin/WantedPages.php 2012-12-17 09:58:45 UTC (rev 8664) +++ trunk/lib/plugin/WantedPages.php 2012-12-17 12:52:50 UTC (rev 8665) @@ -42,7 +42,7 @@ function getDescription() { - return _("Lists referenced page names which do not exist yet."); + return _("List referenced page names which do not exist yet."); } function getDefaultArguments() Modified: trunk/lib/plugin/WantedPagesOld.php =================================================================== --- trunk/lib/plugin/WantedPagesOld.php 2012-12-17 09:58:45 UTC (rev 8664) +++ trunk/lib/plugin/WantedPagesOld.php 2012-12-17 12:52:50 UTC (rev 8665) @@ -33,7 +33,7 @@ function getDescription() { - return _("Lists referenced page names which do not exist yet."); + return _("List referenced page names which do not exist yet."); } function getDefaultArguments() 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-17 09:58:45 UTC (rev 8664) +++ trunk/locale/de/LC_MESSAGES/phpwiki.php 2012-12-17 12:52:50 UTC (rev 8665) @@ -337,11 +337,11 @@ $locale["Differences between %s and %s of %s."] = "Zeilenweiser Vergleich von %3\$s, von %1\$s mit %2\$s."; $locale["Diffing pages"] = "Die Inhalts-Differenz-Seiten dieses Wikis"; $locale["Discussion"] = "Diskussion"; +$locale["Display a list of randomly chosen pages or redirects to a random page."] = "Eine liste der zufälliger ausgewählter Seiten zeigen oder nach einer zufälliger ausgewählter Seite weiterleiten."; +$locale["Display a set of photos listed in a text file with optional descriptions."] = "Zeigt die Liste der Bilder in einer Textdatei an, mit optionalen Beschreibungen."; +$locale["Display a url in a seperate frame inside our body. Only one frame allowed."] = "Zeigt eine URL in einem eigenen (oder gesonderten) Frame innerhalb der Seite. Nur ein Frame ist erlaubt."; $locale["Display arbitrary SQL result tables."] = "Zeige Tabelle von SQL Abfragen an."; $locale["Display differences between revisions."] = "Zeilenweiser Vergleich der Versionen."; -$locale["Displays a list of randomly chosen pages or redirects to a random page."] = "Eine liste der zufälliger ausgewählter Seiten zeigen oder nach einer zufälliger ausgewählter Seite weiterleiten."; -$locale["Displays a set of photos listed in a text file with optional descriptions."] = "Zeigt die Liste der Bilder in einer Textdatei an, mit optionalen Beschreibungen."; -$locale["Displays a url in a seperate frame inside our body. Only one frame allowed."] = "Zeigt eine URL in einem eigenen (oder gesonderten) Frame innerhalb der Seite. Nur ein Frame ist erlaubt."; $locale["Don't cache this page."] = "Cache diese Seite nicht."; $locale["Double redirect not allowed."] = "Rekursive Redirektion verboten."; $locale["Download all revisions for backup"] = "Alle Versionen für Backup herunterladen"; @@ -502,12 +502,12 @@ $locale["Include multiple pages."] = "Füge mehrere Seiten ein."; $locale["Include recursively all linked pages starting at %s."] = "Bette rekursiv alle verlinkten Seiten ein, angefangen mit %s."; $locale["Include text from another wiki page."] = "Text von einer andere Seite einfügen."; +$locale["Include the content of all SubPages of the current page."] = "Enthält den Inhalt alle UnterSeiten der aktuellen Seite."; $locale["IncludePage"] = "SeiteEinfügen"; $locale["IncludePages"] = "SeitenEinfügen"; $locale["IncludeSiteMap"] = "SeitenBaumEingefügt"; $locale["Included from %s"] = "Eingefügter Text von %s"; $locale["Included from %s (revision %d)"] = "Eingefügter Text von %s (Version %d)"; -$locale["Includes the content of all SubPages of the current page."] = "Enthält den Inhalt alle UnterSeiten der aktuellen Seite."; $locale["Info"] = "Info"; $locale["Inline images"] = "Eingebundene Bilder"; $locale["Insert"] = "Einfügen"; @@ -579,6 +579,7 @@ $locale["List of user-created pages (%d total):"] = "Liste der Benutzer erzeugten Seiten (%d insgesamt):"; $locale["List page names which share an initial or final title word with “%s”."] = "Diese Seiten teilen sich einen Wordteil am Anfang oder Ende mit »%s«."; $locale["List pages which are not linked to by any other page."] = "Liste aller Seiten, die von keiner anderen Seite verlinkt sind."; +$locale["List referenced page names which do not exist yet."] = "Zeige verlinkte Seiten, die noch nicht bearbeitet bzw. erzeugt wurden."; $locale["List the most popular pages nearby."] = "Liste die meistbesuchten Seiten in der Nähe."; $locale["List the most popular pages."] = "Die meistbesucht Seiten werden aufgelistet."; $locale["List the most popular tags."] = "Die meistbesucht Tags werden aufgelistet."; @@ -587,7 +588,6 @@ $locale["ListPages"] = "ListeSeiten"; $locale["ListRelations"] = "ListeRelationen"; $locale["ListSubpages"] = "ListeUnterseiten"; -$locale["Lists referenced page names which do not exist yet."] = "Zeige verlinkte Seiten, die noch nicht bearbeitet bzw. erzeugt wurden."; $locale["Lists the names of all SubPages of the current page."] = "Listet die Namen aller Unterseiten der aktuellen Seite."; $locale["LiveSearch"] = "LiveSuche"; $locale["Load File"] = "Datei Laden"; @@ -779,7 +779,6 @@ $locale["Plugin %s: undefined"] = "Zusatzprogramm %s: undefiniert"; $locale["Plugin “%s” does not exist."] = "Zusatzprogramm »%s« existiert nicht"; $locale["PluginManager"] = "ZusatzprogrammManager"; -$locale["Plugins"] = "Zusatzprogramme"; $locale["PopularNearby"] = "MeistBesuchtNahe"; $locale["Post new"] = "Neuer Eintrag"; $locale["Posted: %s"] = "Gepostet: %s"; @@ -840,8 +839,8 @@ $locale["Recursively get BackLinks or links."] = "Alle BackLinks für %s (rekursiv)."; $locale["Redirect"] = "Weiterleiten"; $locale["Redirect to an external URL is only allowed in locked pages."] = "Weiterleitung zu einer externen URL ist nur in gesperrten Seiten erlaubt."; +$locale["Redirect to an external web site based on form input."] = "Weiterleitung der Suche zu einer externen Webseite aufgrund einer Formulareingabe."; $locale["RedirectTo"] = "WeiterLeiten"; -$locale["Redirects to an external web site based on form input."] = "Weiterleitung der Suche zu einer externen Webseite aufgrund einer Formulareingabe."; $locale["References"] = "Fußnoten"; $locale["Regex?"] = "Regulärer Ausdruck?"; $locale["Registered Users"] = "Angemeldete Benutzer"; 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-17 09:58:45 UTC (rev 8664) +++ trunk/locale/fr/LC_MESSAGES/phpwiki.php 2012-12-17 12:52:50 UTC (rev 8665) @@ -342,14 +342,14 @@ $locale["Differences between %s and %s of %s."] = "Différences entre %s et %s de %s."; $locale["Diffing pages"] = "Comparaison des pages"; $locale["Discussion"] = "Discussion"; +$locale["Display a list of randomly chosen pages or redirects to a random page."] = "Affiche une liste de pages prises au hasard sur ce wiki."; +$locale["Display a set of photos listed in a text file with optional descriptions."] = "Affiche un groupe de photos listées dans un fichier texte avec des descriptions facultatives."; +$locale["Display a url in a seperate frame inside our body. Only one frame allowed."] = "Affiche une url dans une cadre interne à la page. Un seul cadre autorisé."; $locale["Display arbitrary SQL result tables."] = "Affiche le résultat de requêtes SQL simples."; $locale["Display as Pdf"] = "Afficher en PDF"; $locale["Display differences between revisions."] = "Affiche les différences entre versions."; $locale["Display general and user specific auth information."] = "Afficher les informations générales de l'utilisateur."; $locale["Display video in Flash or HTML5."] = "Afficher une vidéo en Flash ou HTML5."; -$locale["Displays a list of randomly chosen pages or redirects to a random page."] = "Affiche une liste de pages prises au hasard sur ce wiki."; -$locale["Displays a set of photos listed in a text file with optional descriptions."] = "Affiche un groupe de photos listées dans un fichier texte avec des descriptions facultatives."; -$locale["Displays a url in a seperate frame inside our body. Only one frame allowed."] = "Affiche une url dans une cadre interne à la page. Un seul cadre autorisé."; $locale["Do not send minor modifications"] = "Ne pas envoyer les modifications mineures"; $locale["Do not send my own modifications"] = "Ne pas envoyer mes propres modifications"; $locale["Do you %s want to add this page \"%s\" to your WatchList?"] = "Voulez-vous %s ajouter la page « %s » à votre liste de suivi ?"; @@ -530,12 +530,12 @@ $locale["Include an external web page within the body of a wiki page."] = "Inclure une page externe dans le corps de la WikiPage."; $locale["Include recursively all linked pages starting at %s."] = "Créer une carte du site commençant à %s."; $locale["Include text from another wiki page."] = "Inclure le texte d'une autre page wiki."; +$locale["Include the content of all SubPages of the current page."] = "Pour inclure le contenu de toutes les sous pages de la page actuelle."; $locale["IncludePage"] = "InclureUnePage"; $locale["IncludePages"] = "InclurePages"; $locale["IncludeSiteMap"] = "CarteDuSite"; $locale["Included from %s"] = "Inséré de %s"; $locale["Included from %s (revision %d)"] = "Inséré de %s (version %d)"; -$locale["Includes the content of all SubPages of the current page."] = "Pour inclure le contenu de toutes les sous pages de la page actuelle."; $locale["Index"] = "Index"; $locale["Inline images"] = "Images intégrées"; $locale["Insert"] = "Insérer"; @@ -605,11 +605,11 @@ $locale["List page names which share an initial or final title word with “%s”."] = "Affiche la liste des pages qui partagent un mot initial ou final dans leur titre avec %s."; $locale["List pages that are explicitly given as the pages argument."] = "Liste des pages qui sont explicitement données en argument."; $locale["List pages which are not linked to by any other page."] = "Liste des pages qui ne sont liées à aucune autre."; +$locale["List referenced page names which do not exist yet."] = "Afficher toutes les pages référencées qui n'existent pas."; $locale["List the most popular pages."] = "Voir les pages les plus populaires."; $locale["List this page and all subpages"] = "Lister cette page et ses sous-pages"; $locale["ListPages"] = "ListeDePages"; $locale["ListSubpages"] = "ListeDesSousPages"; -$locale["Lists referenced page names which do not exist yet."] = "Afficher toutes les pages référencées qui n'existent pas."; $locale["Lists the names of all SubPages of the current page."] = "Affiche la liste des noms de toutes les sous-pages de la page courante."; $locale["LiveSearch"] = "RechercheLive"; $locale["Load File"] = "Importer un fichier"; @@ -815,7 +815,6 @@ $locale["Plugin not run: not in browse mode"] = "Greffon non exécuté (hors navigation)"; $locale["Plugin “%s” does not exist."] = "Le greffon %s n'existe pas."; $locale["PluginManager"] = "GestionsDesPlugins"; -$locale["Plugins"] = "Greffons"; $locale["PopularNearby"] = "PopulairesAlentour"; $locale["Post new"] = "Poster une annonce"; $locale["Posted: %s"] = "Posté le %s"; @@ -839,9 +838,9 @@ $locale["Printable version"] = "Version imprimable"; $locale["Printer"] = "Imprimante"; $locale["Propagate new permissions to all subpages?"] = "Propager les nouvelles permissions aux sous-pages ?"; +$locale["Provide access to PhpWiki's lower level system information."] = "Affiche les informations de bas niveau pour PhpWiki."; $locale["Provide for raw HTML within wiki pages."] = "Un Plugin pour intégrer du code HTML dans les WikiPages."; $locale["Provide weather reports from the Internet."] = "Météo importée d'internet."; -$locale["Provides access to PhpWiki's lower level system information."] = "Affiche les informations de bas niveau pour PhpWiki."; $locale["Public"] = "Public"; $locale["Purge"] = "Purger"; $locale["Purge HTML cache"] = "Vider le cache HTML"; @@ -882,9 +881,9 @@ $locale["Recursive redirect to self: “%s”"] = "Redirection récursive vers soi-même: %s"; $locale["Recursively get BackLinks or links."] = "Obtenir récursivement des rétroLiens ou liens."; $locale["Redirect"] = "Redirection"; +$locale["Redirect to an external web site based on form input."] = "Redirige vers un site externe basé sur un formulaire."; +$locale["Redirect to another URL or page."] = "Redirige vers une autre url ou page."; $locale["RedirectTo"] = "RedirigerVers"; -$locale["Redirects to an external web site based on form input."] = "Redirige vers un site externe basé sur un formulaire."; -$locale["Redirects to another URL or page."] = "Redirige vers une autre url ou page."; $locale["References"] = "Références"; $locale["Regex?"] = "expression régulière ?"; $locale["Registered Users"] = "Utilisateurs inscrits"; 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-12-17 09:58:45 UTC (rev 8664) +++ trunk/locale/ja/LC_MESSAGES/phpwiki.php 2012-12-17 12:52:50 UTC (rev 8665) @@ -134,7 +134,6 @@ $locale["Plugin %s disabled."] = "プラグイン %s は無効になっています。"; $locale["Plugin %s failed."] = "プラグイン %s が失敗しました。"; $locale["PluginManager"] = "プラグイン管理"; -$locale["Plugins"] = "プラグイン一覧"; $locale["PrevNext"] = "前後"; $locale["Preview"] = "プレビューする"; $locale["Preview only! Changes not saved."] = "プレビューしているだけです! まだ保存はされていません。"; Modified: trunk/locale/nl/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/po/de.po =================================================================== --- trunk/locale/po/de.po 2012-12-17 09:58:45 UTC (rev 8664) +++ trunk/locale/po/de.po 2012-12-17 12:52:50 UTC (rev 8665) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-17 10:49+0100\n" +"POT-Creation-Date: 2012-12-17 13:51+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." @@ -1211,7 +1211,7 @@ msgid "Access for you is forbidden to %s." msgstr "" -#: ../lib/main.php:564 ../lib/plugin/PluginManager.php:61 +#: ../lib/main.php:564 ../lib/plugin/PluginManager.php:59 #, php-format msgid "You must be an administrator to %s." msgstr "Sie müssen Administratorrechte haben %s." @@ -1697,7 +1697,7 @@ msgid "Del/+" msgstr "Lö/+" -#: ../lib/PagePerm.php:607 ../lib/plugin/PluginManager.php:76 +#: ../lib/PagePerm.php:607 ../lib/plugin/PluginManager.php:74 #: ../lib/plugin/WikiAdminSetAcl.php:256 msgid "Description" msgstr "Beschreibung" @@ -2375,7 +2375,7 @@ msgstr "AktuelleZeit" #: ../lib/plugin/CurrentTime.php:63 -msgid "Displays current time and date." +msgid "Display current time and date." msgstr "" #: ../lib/plugin/DeadEndPages.php:32 @@ -2466,7 +2466,7 @@ msgstr "FremdSuche" #: ../lib/plugin/ExternalSearch.php:46 -msgid "Redirects to an external web site based on form input." +msgid "Redirect to an external web site based on form input." msgstr "" "Weiterleitung der Suche zu einer externen Webseite aufgrund einer " "Formulareingabe." @@ -2546,7 +2546,7 @@ #: ../lib/plugin/FrameInclude.php:58 msgid "" -"Displays a url in a seperate frame inside our body. Only one frame allowed." +"Display a url in a seperate frame inside our body. Only one frame allowed." msgstr "" "Zeigt eine URL in einem eigenen (oder gesonderten) Frame innerhalb der " "Seite. Nur ein Frame ist erlaubt." @@ -2652,7 +2652,7 @@ #: ../lib/plugin/GoogleMaps.php:68 msgid "" -"Displays a marker with further infos (when clicking) on given coordinates." +"Display a marker with further infos (when clicking) on given coordinates." msgstr "" #: ../lib/plugin/GoogleMaps.php:112 ../lib/plugin/YouTube.php:108 @@ -3474,7 +3474,7 @@ #: ../lib/plugin/PhotoAlbum.php:105 msgid "" -"Displays a set of photos listed in a text file with optional descriptions." +"Display a set of photos listed in a text file with optional descriptions." msgstr "" "Zeigt die Liste der Bilder in einer Textdatei an, mit optionalen " "Beschreibungen." @@ -3572,28 +3572,24 @@ msgid "List of plugins on this wiki." msgstr "Alle Zusatzprogrammen in diesem Wiki auflisten." -#: ../lib/plugin/PluginManager.php:54 -msgid "Plugins" -msgstr "Zusatzprogramme" - -#: ../lib/plugin/PluginManager.php:62 +#: ../lib/plugin/PluginManager.php:60 msgid "use this plugin" msgstr "um diese Zusatzprogramme zu verwenden" -#: ../lib/plugin/PluginManager.php:76 +#: ../lib/plugin/PluginManager.php:74 msgid "Plugin" msgstr "Zusatzprogramm" -#: ../lib/plugin/PluginManager.php:78 +#: ../lib/plugin/PluginManager.php:76 msgid "Arguments" msgstr "Parameter" -#: ../lib/plugin/PluginManager.php:117 +#: ../lib/plugin/PluginManager.php:115 #, php-format msgid "%s does not appear to be a WikiPlugin." msgstr "%s scheint kein Zusatzprogramm zu sein." -#: ../lib/plugin/PluginManager.php:128 ../lib/plugin/PluginManager.php:130 +#: ../lib/plugin/PluginManager.php:126 ../lib/plugin/PluginManager.php:128 #: ../lib/upgrade.php:206 ../themes/MonoBook/templates/navbar.tmpl:18 msgid "Help" msgstr "Hilfe" @@ -3716,7 +3712,7 @@ msgstr "ZufallsSeite" #: ../lib/plugin/RandomPage.php:39 -msgid "Displays a list of randomly chosen pages or redirects to a random page." +msgid "Display a list of randomly chosen pages or redirects to a random page." msgstr "" "Eine liste der zufälliger ausgewählter Seiten zeigen oder nach einer " "zufälliger ausgewählter Seite weiterleiten." @@ -4061,7 +4057,7 @@ msgstr "WeiterLeiten" #: ../lib/plugin/RedirectTo.php:49 -msgid "Redirects to another URL or page." +msgid "Redirect to another URL or page." msgstr "" #: ../lib/plugin/RedirectTo.php:72 @@ -4456,7 +4452,7 @@ msgstr "" #: ../lib/plugin/SystemInfo.php:60 -msgid "Provides access to PhpWiki's lower level system information." +msgid "Provide access to PhpWiki's lower level system information." msgstr "" #: ../lib/plugin/SystemInfo.php:131 @@ -4837,7 +4833,7 @@ msgstr "UnterseitenEntfalten" #: ../lib/plugin/UnfoldSubpages.php:46 -msgid "Includes the content of all SubPages of the current page." +msgid "Include the content of all SubPages of the current page." msgstr "Enthält den Inhalt alle UnterSeiten der aktuellen Seite." #: ../lib/plugin/UnfoldSubpages.php:177 @@ -5061,7 +5057,7 @@ msgstr "WunschZettelSeiten" #: ../lib/plugin/WantedPagesOld.php:36 ../lib/plugin/WantedPages.php:45 -msgid "Lists referenced page names which do not exist yet." +msgid "List referenced page names which do not exist yet." msgstr "Zeige verlinkte Seiten, die noch nicht bearbeitet bzw. erzeugt wurden." #: ../lib/plugin/WantedPagesOld.php:42 @@ -8828,6 +8824,9 @@ msgid "Edit this page" msgstr "Diese Seite bearbeiten" +#~ msgid "Plugins" +#~ msgstr "Zusatzprogramme" + #~ msgid "Simple jabber presence plugin" #~ msgstr "Einfaches Jabber-Anwesenheits Zusatzprogramm" Modified: trunk/locale/po/es.po =================================================================== --- trunk/locale/po/es.po 2012-12-17 09:58:45 UTC (rev 8664) +++ trunk/locale/po/es.po 2012-12-17 12:52:50 UTC (rev 8665) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-17 10:49+0100\n" +"POT-Creation-Date: 2012-12-17 13:51+0100\n" "PO-Revision-Date: 2000-02-01 00:50-0500\n" "Last-Translator: Pablo Roca <pr...@cl...>\n" "Language-Team: \n" @@ -1194,7 +1194,7 @@ msgid "Access for you is forbidden to %s." msgstr "Tenga acceso para usted se prohíbe %s." -#: ../lib/main.php:564 ../lib/plugin/PluginManager.php:61 +#: ../lib/main.php:564 ../lib/plugin/PluginManager.php:59 #, php-format msgid "You must be an administrator to %s." msgstr "Usted debe ser administrador %s." @@ -1678,7 +1678,7 @@ msgid "Del/+" msgstr "-/+" -#: ../lib/PagePerm.php:607 ../lib/plugin/PluginManager.php:76 +#: ../lib/PagePerm.php:607 ../lib/plugin/PluginManager.php:74 #: ../lib/plugin/WikiAdminSetAcl.php:256 msgid "Description" msgstr "Descripción" @@ -2347,7 +2347,7 @@ msgstr "" #: ../lib/plugin/CurrentTime.php:63 -msgid "Displays current time and date." +msgid "Display current time and date." msgstr "" #: ../lib/plugin/DeadEndPages.php:32 @@ -2438,7 +2438,7 @@ msgstr "" #: ../lib/plugin/ExternalSearch.php:46 -msgid "Redirects to an external web site based on form input." +msgid "Redirect to an external web site based on form input." msgstr "" #: ../lib/plugin/ExternalSearch.php:140 ../lib/plugin/PhotoAlbum.php:482 @@ -2514,7 +2514,7 @@ #: ../lib/plugin/FrameInclude.php:58 msgid "" -"Displays a url in a seperate frame inside our body. Only one frame allowed." +"Display a url in a seperate frame inside our body. Only one frame allowed." msgstr "" #: ../lib/plugin/FrameInclude.php:85 ../lib/plugin/RandomPage.php:63 @@ -2617,7 +2617,7 @@ #: ../lib/plugin/GoogleMaps.php:68 msgid "" -"Displays a marker with further infos (when clicking) on given coordinates." +"Display a marker with further infos (when clicking) on given coordinates." msgstr "" #: ../lib/plugin/GoogleMaps.php:112 ../lib/plugin/YouTube.php:108 @@ -3403,7 +3403,7 @@ #: ../lib/plugin/PhotoAlbum.php:105 msgid "" -"Displays a set of photos listed in a text file with optional descriptions." +"Display a set of photos listed in a text file with optional descriptions." msgstr "" #: ../lib/plugin/PhotoAlbum.php:546 ../lib/plugin/PhotoAlbum.php:573 @@ -3498,28 +3498,24 @@ msgid "List of plugins on this wiki." msgstr "%s se rechaza en este wiki." -#: ../lib/plugin/PluginManager.php:54 -msgid "Plugins" -msgstr "" - -#: ../lib/plugin/PluginManager.php:62 +#: ../lib/plugin/PluginManager.php:60 msgid "use this plugin" msgstr "" -#: ../lib/plugin/PluginManager.php:76 +#: ../lib/plugin/PluginManager.php:74 msgid "Plugin" msgstr "" -#: ../lib/plugin/PluginManager.php:78 +#: ../lib/plugin/PluginManager.php:76 msgid "Arguments" msgstr "" -#: ../lib/plugin/PluginManager.php:117 +#: ../lib/plugin/PluginManager.php:115 #, php-format msgid "%s does not appear to be a WikiPlugin." msgstr "" -#: ../lib/plugin/PluginManager.php:128 ../lib/plugin/PluginManager.php:130 +#: ../lib/plugin/PluginManager.php:126 ../lib/plugin/PluginManager.php:128 #: ../lib/upgrade.php:206 ../themes/MonoBook/templates/navbar.tmpl:18 msgid "Help" msgstr "Ayuda" @@ -3642,7 +3638,7 @@ msgstr "PáginaAlAzar" #: ../lib/plugin/RandomPage.php:39 -msgid "Displays a list of randomly chosen pages or redirects to a random page." +msgid "Display a list of randomly chosen pages or redirects to a random page." msgstr "" #: ../lib/plugin/RateIt.php:92 ../lib/plugin/RateIt.php:305 @@ -3977,7 +3973,7 @@ msgstr "" #: ../lib/plugin/RedirectTo.php:49 -msgid "Redirects to another URL or page." +msgid "Redirect to another URL or page." msgstr "" #: ../lib/plugin/RedirectTo.php:72 @@ -4364,7 +4360,7 @@ msgstr "" #: ../lib/plugin/SystemInfo.php:60 -msgid "Provides access to PhpWiki's lower level system information." +msgid "Provide access to PhpWiki's lower level system information." msgstr "" #: ../lib/plugin/SystemInfo.php:131 @@ -4731,7 +4727,7 @@ msgstr "IncluyaPáginasSecundaria" #: ../lib/plugin/UnfoldSubpages.php:46 -msgid "Includes the content of all SubPages of the current page." +msgid "Include the content of all SubPages of the current page." msgstr "" #: ../lib/plugin/UnfoldSubpages.php:177 @@ -4949,7 +4945,7 @@ msgstr "" #: ../lib/plugin/WantedPagesOld.php:36 ../lib/plugin/WantedPages.php:45 -msgid "Lists referenced page names which do not exist yet." +msgid "List referenced page names which do not exist yet." msgstr "" #: ../lib/plugin/WantedPagesOld.php:42 Modified: trunk/locale/po/fr.po =================================================================== --- trunk/locale/po/fr.po 2012-12-17 09:58:45 UTC (rev 8664) +++ trunk/locale/po/fr.po 2012-12-17 12:52:50 UTC (rev 8665) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-17 10:49+0100\n" +"POT-Creation-Date: 2012-12-17 13:51+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." @@ -1189,7 +1189,7 @@ msgid "Access for you is forbidden to %s." msgstr "L'accès à %s vous est interdit." -#: ../lib/main.php:564 ../lib/plugin/PluginManager.php:61 +#: ../lib/main.php:564 ../lib/plugin/PluginManager.php:59 #, php-format msgid "You must be an administrator to %s." msgstr "Vous devez être un administrateur pour %s." @@ -1674,7 +1674,7 @@ msgid "Del/+" msgstr "Suppr/+" -#: ../lib/PagePerm.php:607 ../lib/plugin/PluginManager.php:76 +#: ../lib/PagePerm.php:607 ../lib/plugin/PluginManager.php:74 #: ../lib/plugin/WikiAdminSetAcl.php:256 msgid "Description" msgstr "Description" @@ -2348,7 +2348,7 @@ msgstr "Heure actuelle" #: ../lib/plugin/CurrentTime.php:63 -msgid "Displays current time and date." +msgid "Display current time and date." msgstr "" #: ../lib/plugin/DeadEndPages.php:32 @@ -2443,7 +2443,7 @@ msgstr "RechercheExterne" #: ../lib/plugin/ExternalSearch.php:46 -msgid "Redirects to an external web site based on form input." +msgid "Redirect to an external web site based on form input." msgstr "Redirige vers un site externe basé sur un formulaire." #: ../lib/plugin/ExternalSearch.php:140 ../lib/plugin/PhotoAlbum.php:482 @@ -2519,7 +2519,7 @@ #: ../lib/plugin/FrameInclude.php:58 msgid "" -"Displays a url in a seperate frame inside our body. Only one frame allowed." +"Display a url in a seperate frame inside our body. Only one frame allowed." msgstr "" "Affiche une url dans une cadre interne à la page. Un seul cadre autorisé." @@ -2623,7 +2623,7 @@ #: ../lib/plugin/GoogleMaps.php:68 msgid "" -"Displays a marker with further infos (when clicking) on given coordinates." +"Display a marker with further infos (when clicking) on given coordinates." msgstr "" #: ../lib/plugin/GoogleMaps.php:112 ../lib/plugin/YouTube.php:108 @@ -3422,7 +3422,7 @@ #: ../lib/plugin/PhotoAlbum.php:105 msgid "" -"Displays a set of photos listed in a text file with optional descriptions." +"Display a set of photos listed in a text file with optional descriptions." msgstr "" "Affiche un groupe de photos listées dans un fichier texte avec des " "descriptions facultatives." @@ -3520,28 +3520,24 @@ msgid "List of plugins on this wiki." msgstr "Liste des greffons de ce wiki." -#: ../lib/plugin/PluginManager.php:54 -msgid "Plugins" -msgstr "Greffons" - -#: ../lib/plugin/PluginManager.php:62 +#: ../lib/plugin/PluginManager.php:60 msgid "use this plugin" msgstr "utiliser ce greffon" -#: ../lib/plugin/PluginManager.php:76 +#: ../lib/plugin/PluginManager.php:74 msgid "Plugin" msgstr "Greffon" -#: ../lib/plugin/PluginManager.php:78 +#: ../lib/plugin/PluginManager.php:76 msgid "Arguments" msgstr "Arguments" -#: ../lib/plugin/PluginManager.php:117 +#: ../lib/plugin/PluginManager.php:115 #, php-format msgid "%s does not appear to be a WikiPlugin." msgstr "%s ne semble pas être un greffon." -#: ../lib/plugin/PluginManager.php:128 ../lib/plugin/PluginManager.php:130 +#: ../lib/plugin/PluginManager.php:126 ../lib/plugin/PluginManager.php:128 #: ../lib/upgrade.php:206 ../themes/MonoBook/templates/navbar.tmpl:18 msgid "Help" msgstr "Aide" @@ -3668,7 +3664,7 @@ msgstr "PageAléatoire" #: ../lib/plugin/RandomPage.php:39 -msgid "Displays a list of randomly chosen pages or redirects to a random page." +msgid "Display a list of randomly chosen pages or redirects to a random page." msgstr "Affiche une liste de pages prises au hasard sur ce wiki." #: ../lib/plugin/RateIt.php:92 ../lib/plugin/RateIt.php:305 @@ -4009,7 +4005,7 @@ msgstr "RedirigerVers" #: ../lib/plugin/RedirectTo.php:49 -msgid "Redirects to another URL or page." +msgid "Redirect to another URL or page." msgstr "Redirige vers une autre url ou page." #: ../lib/plugin/RedirectTo.php:72 @@ -4397,7 +4393,7 @@ msgstr "InfosSystème" #: ../lib/plugin/SystemInfo.php:60 -msgid "Provides access to PhpWiki's lower level system information." +msgid "Provide access to PhpWiki's lower level system information." msgstr "Affiche les informations de bas niveau pour PhpWiki." #: ../lib/plugin/SystemInfo.php:131 @@ -4781,7 +4777,7 @@ msgstr "ListeDesSousPages" #: ../lib/plugin/UnfoldSubpages.php:46 -msgid "Includes the content of all SubPages of the current page." +msgid "Include the content of all SubPages of the current page." msgstr "Pour inclure le contenu de toutes les sous pages de la page actuelle." #: ../lib/plugin/UnfoldSubpages.php:177 @@ -5003,7 +4999,7 @@ msgstr "PagesRecherchées" #: ../lib/plugin/WantedPagesOld.php:36 ../lib/plugin/WantedPages.php:45 -msgid "Lists referenced page names which do not exist yet." +msgid "List referenced page names which do not exist yet." msgstr "Afficher toutes les pages référencées qui n'existent pas." #: ../lib/plugin/WantedPagesOld.php:42 @@ -8717,6 +8713,9 @@ msgid "Edit this page" msgstr "Modifier cette page" +#~ msgid "Plugins" +#~ msgstr "Greffons" + #~ msgid "PageTrail Plugin" #~ msgstr "Pour suivre les pages à la trace" Modified: trunk/locale/po/it.po =================================================================== --- trunk/locale/po/it.po 2012-12-17 09:58:45 UTC (rev 8664) +++ trunk/locale/po/it.po 2012-12-17 12:52:50 UTC (rev 8665) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-17 10:49+0100\n" +"POT-Creation-Date: 2012-12-17 13:51+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" @@ -1179,7 +1179,7 @@ msgid "Access for you is forbidden to %s." msgstr "" -#: ../lib/main.php:564 ../lib/plugin/PluginManager.php:61 +#: ../lib/main.php:564 ../lib/plugin/PluginManager.php:59 #, php-format msgid "You must be an administrator to %s." msgstr "" @@ -1660,7 +1660,7 @@ msgid "Del/+" msgstr "" -#: ../lib/PagePerm.php:607 ../lib/plugin/PluginManager.php:76 +#: ../lib/PagePerm.php:607 ../lib/plugin/PluginManager.php:74 #: ../lib/plugin/WikiAdminSetAcl.php:256 msgid "Description" msgstr "" @@ -2327,7 +2327,7 @@ msgstr "" #: ../lib/plugin/CurrentTime.php:63 -msgid "Displays current time and date." +msgid "Display current time and date." msgstr "" #: ../lib/plugin/DeadEndPages.php:32 @@ -2418,7 +2418,7 @@ msgstr "" #: ../lib/plugin/ExternalSearch.php:46 -msgid "Redirects to an external web site based on form input." +msgid "Redirect to an external web site based on form input." msgstr "" #: ../lib/plugin/ExternalSearch.php:140 ../lib/plugin/PhotoAlbum.php:482 @@ -2494,7 +2494,7 @@ #: ../lib/plugin/FrameInclude.php:58 msgid "" -"Displays a url in a seperate frame inside our body. Only one frame allowed." +"Display a url in a seperate frame inside our body. Only one frame allowed." msgstr "" #: ../lib/plugin/FrameInclude.php:85 ../lib/plugin/RandomPage.php:63 @@ -2597,7 +2597,7 @@ #: ../lib/plugin/GoogleMaps.php:68 msgid "" -"Displays a marker with further infos (when clicking) on given coordinates." +"Display a marker with further infos (when clicking) on given coordinates." msgstr "" #: ../lib/plugin/GoogleMaps.php:112 ../lib/plugin/YouTube.php:108 @@ -3381,7 +3381,7 @@ #: ../lib/plugin/PhotoAlbum.php:105 msgid "" -"Displays a set of photos listed in a text file with optional descriptions." +"Display a set of photos listed in a text file with optional descriptions." msgstr "" #: ../lib/plugin/PhotoAlbum.php:546 ../lib/plugin/PhotoAlbum.php:573 @@ -3475,28 +3475,24 @@ msgid "List of plugins on this wiki." msgstr "" -#: ../lib/plugin/PluginManager.php:54 -msgid "Plugins" -msgstr "" - -#: ../lib/plugin/PluginManager.php:62 +#: ../lib/plugin/PluginManager.php:60 msgid "use this plugin" msgstr "" -#: ../lib/plugin/PluginManager.php:76 +#: ../lib/plugin/PluginManager.php:74 msgid "Plugin" msgstr "" -#: ../lib/plugin/PluginManager.php:78 +#: ../lib/plugin/PluginManager.php:76 msgid "Arguments" msgstr "" -#: ../lib/plugin/PluginManager.php:117 +#: ../lib/plugin/PluginManager.php:115 #, php-format msgid "%s does not appear to be a WikiPlugin." msgstr "" -#: ../lib/plugin/PluginManager.php:128 ../lib/plugin/PluginManager.php:130 +#: ../lib/plugin/PluginManager.php:126 ../lib/plugin/PluginManager.php:128 #: ../lib/upgrade.php:206 ../themes/MonoBook/templates/navbar.tmpl:18 msgid "Help" msgstr "Aiuto" @@ -3619,7 +3615,7 @@ msgstr "" #: ../lib/plugin/RandomPage.php:39 -msgid "Displays a list of randomly chosen pages or redirects to a random page." +msgid "Display a list of randomly chosen pages or redirects to a random page." msgstr "" #: ../lib/plugin/RateIt.php:92 ../lib/plugin/RateIt.php:305 @@ -3950,7 +3946,7 @@ msgstr "" #: ../lib/plugin/RedirectTo.php:49 -msgid "Redirects to another URL or page." +msgid "Redirect to another URL or page." msgstr "" #: ../lib/plugin/RedirectTo.php:72 @@ -4338,7 +4334,7 @@ msgstr "" #: ../lib/plugin/SystemInfo.php:60 -msgid "Provides access to PhpWiki's lower level system information." +msgid "Provide access to PhpWiki's lower level system information." msgstr "" #: ../lib/plugin/SystemInfo.php:131 @@ -4705,7 +4701,7 @@ msgstr "" #: ../lib/plugin/UnfoldSubpages.php:46 -msgid "Includes the content of all SubPages of the current page." +msgid "Include the content of all SubPages of the current page." msgstr "" #: ../lib/plugin/UnfoldSubpages.php:177 @@ -4923,7 +4919,7 @@ msgstr "" #: ../lib/plugin/WantedPagesOld.php:36 ../lib/plugin/WantedPages.php:45 -msgid "Lists referenced page names which do not exist yet." +msgid "List referenced page names which do not exist yet." msgstr "" #: ../lib/plugin/WantedPagesOld.php:42 Modified: trunk/locale/po/ja.po =================================================================== --- trunk/locale/po/ja.po 2012-12-17 09:58:45 UTC (rev 8664) +++ trunk/locale/po/ja.po 2012-12-17 12:52:50 UTC (rev 8665) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-17 10:49+0100\n" +"POT-Creation-Date: 2012-12-17 13:51+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" @@ -1170,7 +1170,7 @@ msgid "Access for you is forbidden to %s." msgstr "" -#: ../lib/main.php:564 ../lib/plugin/PluginManager.php:61 +#: ../lib/main.php:564 ../lib/plugin/PluginManager.php:59 #, php-format msgid "You must be an administrator to %s." msgstr "" @@ -1665,7 +1665,7 @@ msgid "Del/+" msgstr "" -#: ../lib/PagePerm.php:607 ../lib/plugin/PluginManager.php:76 +#: ../lib/PagePerm.php:607 ../lib/plugin/PluginManager.php:74 #: ../lib/plugin/WikiAdminSetAcl.php:256 msgid "Description" msgstr "説明" @@ -2349,7 +2349,7 @@ msgstr "" #: ../lib/plugin/CurrentTime.php:63 -msgid "Displays current time and date." +msgid "Display current time and date." msgstr "" #: ../lib/plugin/DeadEndPages.php:32 @@ -2442,7 +2442,7 @@ msgstr "" #: ../lib/plugin/ExternalSearch.php:46 -msgid "Redirects to an external web site based on form input." +msgid "Redirect to an external web site based on form input." msgstr "" #: ../lib/plugin/ExternalSearch.php:140 ../lib/plugin/PhotoAlbum.php:482 @@ -2520,7 +2520,7 @@ #: ../lib/plugin/FrameInclude.php:58 msgid "" -"Displays a url in a seperate frame inside our body. Only one frame allowed." +"Display a url in a seperate frame inside our body. Only one frame allowed." msgstr "" #: ../lib/plugin/FrameInclude.php:85 ../lib/plugin/RandomPage.php:63 @@ -2623,7 +2623,7 @@ #: ../lib/plugin/GoogleMaps.php:68 msgid "" -"Displays a marker with further infos (when clicking) on given coordinates." +"Display a marker with further infos (when clicking) on given coordinates." msgstr "" #: ../lib/plugin/GoogleMaps.php:112 ../lib/plugin/YouTube.php:108 @@ -3425,7 +3425,7 @@ #: ../lib/plugin/PhotoAlbum.php:105 msgid "" -"Displays a set of photos listed in a text file with optional descriptions." +"Display a set of photos listed in a text file with optional descriptions." msgstr "" #: ../lib/plugin/PhotoAlbum.php:546 ../lib/plugin/PhotoAlbum.php:573 @@ -3520,28 +3520,24 @@ msgid "List of plugins on this wiki." msgstr "" -#: ../lib/plugin/PluginManager.php:54 -msgid "Plugins" -msgstr "プラグイン一覧" - -#: ../lib/plugin/PluginManager.php:62 +#: ../lib/plugin/PluginManager.php:60 msgid "use this plugin" msgstr "このプラグインを使う" -#: ../lib/plugin/PluginManager.php:76 +#: ../lib/plugin/PluginManager.php:74 msgid "Plugin" msgstr "プラグイン" -#: ../lib/plugin/PluginManager.php:78 +#: ../lib/plugin/PluginManager.php:76 msgid "Arguments" msgstr "引数一覧" -#: ../lib/plugin/PluginManager.php:117 +#: ../lib/plugin/PluginManager.php:115 #, php-format msgid "%s does not appear to be a WikiPlugin." msgstr "" -#: ../lib/plugin/PluginManager.php:128 ../lib/plugin/PluginManager.php:130 +#: ../lib/plugin/PluginManager.php:126 ../lib/plugin/PluginManager.php:128 #: ../lib/upgrade.php:206 ../themes/MonoBook/templates/navbar.tmpl:18 msgid "Help" msgstr "" @@ -3666,7 +3662,7 @@ msgstr "ランダムページ" #: ../lib/plugin/RandomPage.php:39 -msgid "Displays a list of randomly chosen pages or redirects to a random page." +msgid "Display a list of randomly chosen pages or redirects to a random page." msgstr "" #: ../lib/plugin/RateIt.php:92 ../lib/plugin/RateIt.php:305 @@ -4013,7 +4009,7 @@ msgstr "" #: ../lib/plugin/RedirectTo.php:49 -msgid "Redirects to another URL or page." +msgid "Redirect to another URL or page." msgstr "" #: ../lib/plugin/RedirectTo.php:72 @@ -4406,7 +4402,7 @@ msgstr "システム情報" #: ../lib/plugin/SystemInfo.php:60 -msgid "Provides access to PhpWiki's lower level system information." +msgid "Provide access to PhpWiki's lower level system information." msgstr "" #: ../lib/plugin/SystemInfo.php:131 @@ -4773,7 +4769,7 @@ msgstr "" #: ../lib/plugin/UnfoldSubpages.php:46 -msgid "Includes the content of all SubPages of the current page." +msgid "Include the content of all SubPages of the current page." msgstr "" #: ../lib/plugin/UnfoldSubpages.php:177 @@ -4998,7 +4994,7 @@ msgstr "" #: ../lib/plugin/WantedPagesOld.php:36 ../lib/plugin/WantedPages.php:45 -msgid "Lists referenced page names which do not exist yet." +msgid "List referenced page names which do not exist yet." msgstr "" #: ../lib/plugin/WantedPagesOld.php:42 @@ -8762,6 +8758,9 @@ msgid "Edit this page" msgstr "ページを編集しています。" +#~ msgid "Plugins" +#~ msgstr "プラグイン一覧" + #~ msgid "from %s" #~ msgstr "%s から" Modified: trunk/locale/po/nl.po =================================================================== --- trunk/locale/po/nl.po 2012-12-17 09:58:45 UTC (rev 8664) +++ trunk/locale/po/nl.po 2012-12-17 12:52:50 UTC (rev 8665) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-17 10:49+0100\n" +"POT-Creation-Date: 2012-12-17 13:51+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" @@ -1171,7 +1171,7 @@ msgid "Access for you is forbidden to %s." msgstr "" -#: ../lib/main.php:564 ../lib/plugin/PluginManager.php:61 +#: ../lib/main.php:564 ../lib/plugin/PluginManager.php:59 #, php-format msgid "You must be an administrator to %s." msgstr "" @@ -1652,7 +1652,7 @@ msgid "Del/+" msgstr "" -#: ../lib/PagePerm.php:607 ../lib/plugin/PluginManager.php:76 +#: ../lib/PagePerm.php:607 ../lib/plugin/PluginManager.php:74 #: ../lib/plugin/WikiAdminSetAcl.php:256 msgid "Description" msgstr "" @@ -2319,7 +2319,7 @@ msgstr "" #: ../lib/plugin/CurrentTime.php:63 -msgid "Displays current time and date." +msgid "Display current time and date." msgstr "" #: ../lib/plugin/DeadEndPages.php:32 @@ -2410,7 +2410,7 @@ msgstr "" #: ../lib/plugin/ExternalSearch.php:46 -msgid "Redirects to an external web site based on form input." +msgid "Redirect to an external web site based on form input." msgstr "" #: ../lib/plugin/ExternalSearch.php:140 ../lib/plugin/PhotoAlbum.php:482 @@ -2486,7 +2486,7 @@ #: ../lib/plugin/FrameInclude.php:58 msgid "" -"Displays a url in a seperate frame inside our body. Only one frame allowed." +"Display a url in a seperate frame inside our body. Only one frame allowed." msgstr "" #: ../lib/plugin/FrameInclude.php:85 ../lib/plugin/RandomPage.php:63 @@ -2589,7 +2589,7 @@ #: ../lib/plugin/GoogleMaps.php:68 msgid "" -"Displays a marker with further infos (when clicking) on given coordinates." +"Display a marker with further infos (when clicking) on given coordinates." msgstr "" #: ../lib/plugin/GoogleMaps.php:112 ../lib/plugin/YouTube.php:108 @@ -3372,7 +3372,7 @@ #: ../lib/plugin/PhotoAlbum.php:105 msgid "" -"Displays a set of photos listed in a text file with optional descriptions." +"Display a set of photos listed in a text file with optional descriptions." msgstr "" #: ../lib/plugin/PhotoAlbum.php:546 ../lib/plugin/PhotoAlbum.php:573 @@ -3466,28 +3466,24 @@ msgid "List of plugins on this wiki." msgstr "" -#: ../lib/plugin/PluginManager.php:54 -msgid "Plugins" -msgstr "" - -#: ../lib/plugin/PluginManager.php:62 +#: ../lib/plugin/PluginManager.php:60 msgid "use this plugin" msgstr "" -#: ../lib/plugin/PluginManager.php:76 +#: ../lib/plugin/PluginManager.php:74 msgid "Plugin" msgstr "" -#: ../lib/plugin/PluginManager.php:78 +#: ../lib/plugin/PluginManager.php:76 msgid "Arguments" msgstr "" -#: ../lib/plugin/PluginManager.php:117 +#: ../lib/plugin/PluginManager.php:115 #, php-format msgid "%s does not appear to be a WikiPlugin." msgstr "" -#: ../lib/plugin/PluginManager.php:128 ../lib/plugin/PluginManager.php:130 +#: ../lib/plugin/PluginManager.php:126 ../lib/plugin/PluginManager.php:128 #: ../lib/upgrade.php:206 ../themes/MonoBook/templates/navbar.tmpl:18 msgid "Help" msgstr "Help" @@ -3610,7 +3606,7 @@ msgstr "" #: ../lib/plugin/RandomPage.php:39 -msgid "Displays a list of randomly chosen pages or redirects to a random page." +msgid "Display a list of randomly chosen pages or redirects to a random page." msgstr "" #: ../lib/plugin/RateIt.php:92 ../lib/plugin/RateIt.php:305 @@ -3941,7 +3937,7 @@ msgstr "" #: ../lib/plugin/RedirectTo.php:49 -msgid "Redirects to another URL or page." +msgid "Redirect to another URL or page." msgstr "" #: ../lib/plugin/RedirectTo.php:72 @@ -4328,7 +4324,7 @@ msgstr "" #: ../lib/plugin/SystemInfo.php:60 -msgid "Provides access to PhpWiki's lower level system information." +msgid "Provide access to PhpWiki's lower level system information." msgstr "" #: ../lib/plugin/SystemInfo.php:131 @@ -4695,7 +4691,7 @@ msgstr "" #: ../lib/plugin/UnfoldSubpages.php:46 -msgid "Includes the content of all SubPages of the current page." +msgid "Include the content of all SubPages of the current page." msgstr "" #: ../lib/plugin/UnfoldSubpages.php:177 @@ -4913,7 +4909,7 @@ msgstr "" #: ../lib/plugin/WantedPagesOld.php:36 ../lib/plugin/WantedPages.php:45 -msgid "Lists referenced page names which do not exist yet." +msgid "List referenced page names which do not exist yet." msgstr "" #: ../lib/plugin/WantedPagesOld.php:42 Modified: trunk/locale/po/phpwiki.pot =================================================================== --- trunk/locale/po/phpwiki.pot 2012-12-17 09:58:45 UTC (rev 8664) +++ trunk/locale/po/phpwiki.pot 2012-12-17 12:52:50 UTC (rev 8665) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki-1.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-17 10:49+0100\n" +"POT-Creation-Date: 2012-12-17 13:51+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" @@ -1164,7 +1164,7 @@ msgid "Access for you is forbidden to %s." msgstr "" -#: ../lib/main.php:564 ../lib/plugin/PluginManager.php:61 +#: ../lib/main.php:564 ../lib/plugin/PluginManager.php:59 #, php-format msgid "You must be an administrator to %s." msgstr "" @@ -1645,7 +1645,7 @@ msgid "Del/+" msgstr "" -#: ../lib/PagePerm.php:607 ../lib/plugin/PluginManager.php:76 +#: ../lib/PagePerm.php:607 ../lib/plugin/PluginManager.php:74 #: ../lib/plugin/WikiAdminSetAcl.php:256 msgid "Description" msgstr "" @@ -2312,7 +2312,7 @@ msgstr "" #: ../lib/plugin/CurrentTime.php:63 -msgid "Displays current time and date." +msgid "Display current time and date." msgstr "" #: ../lib/plugin/DeadEndPages.php:32 @@ -2403,7 +2403,7 @@ msgstr "" #: ../lib/plugin/ExternalSearch.php:46 -msgid "Redirects to an external web site based on form input." +msgid "Redirect to an external web site based on form input." msgstr "" #: ../lib/plugin/ExternalSearch.php:140 ../lib/plugin/PhotoAlbum.php:482 @@ -2479,7 +2479,7 @@ #: ../lib/plugin/FrameInclude.php:58 msgid "" -"Displays a url in a seperate frame inside our body. Only one frame allowed." +"Display a url in a seperate frame inside our body. Only one frame allowed." msgstr "" #: ../lib/plugin/FrameInclude.php:85 ../lib/plugin/RandomPage.php:63 @@ -2582,7 +2582,7 @@ #: ../lib/plugin/GoogleMaps.php:68 msgid "" -"Displays a marker with further infos (when clicking) on given coordinates." +"Display a marker with further infos (when clicking) on given coordinates." msgstr "" #: ../lib/plugin/GoogleMaps.php:112 ../lib/plugin/YouTube.php:108 @@ -3365,7 +3365,7 @@ #: ../lib/plugin/PhotoAlbum.php:105 msgid "" -"Displays a set of photos listed in a text file with optional descriptions." +"Display a set of photos listed in a text file with optional descriptions." msgstr "" #: ../lib/plugin/PhotoAlbum.php:546 ../lib/plugin/PhotoAlbum.php:573 @@ -3458,28 +3458,24 @@ msgid "List of plugins on this wiki." msgstr "" -#: ../lib/plugin/PluginManager.php:54 -msgid "Plugins" -msgstr "" - -#: ../lib/plugin/PluginManager.php:62 +#: ../lib/plugin/PluginManager.php:60 msgid "use this plugin" msgstr "" -#: ../lib/plugin/PluginManager.php:76 +#: ../lib/plugin/PluginManager.php:74 msgid "Plugin" msgstr "" -#: ../lib/plugin/PluginManager.php:78 +#: ../lib/plugin/PluginManager.php:76 msgid "Arguments" msgstr "" -#: ../lib/plugin/PluginManager.php:117 +#: ../lib/plugin/PluginManager.php:115 #, php-format msgid "%s does not appear to be a WikiPlugin." msgstr "" -#: ../lib/plugin/PluginManager.php:128 ../lib/plugin/PluginManager.php:130 +#: ../lib/plugin/PluginManager.php:126 ../lib/plugin/PluginManager.php:128 #: ../lib/upgrade.php:206 ../themes/MonoBook/templates/navbar.tmpl:18 msgid "Help" msgstr "" @@ -3602,7 +3598,7 @@ msgstr "" #: ../lib/plugin/RandomPage.php:39 -msgid "Displays a list of randomly chosen pages or redirects to a random page." +msgid "Display a list of randomly chosen pages or redirects to a random page." msgstr "" #: ../lib/plugin/RateIt.php:92 ../lib/plugin/RateIt.php:305 @@ -3933,7 +3929,7 @@ msgstr "" #: ../lib/plugin/RedirectTo.php:49 -msgid "Redirects to another URL or page." +msgid "Redirect to another URL or page." msgstr "" #: ../lib/plugin/RedirectTo.php:72 @@ -4320,7 +4316,7 @@ msgstr "" #: ../lib/plugin/SystemInfo.php:60 -msgid "Provides access to PhpWiki's lower level system information." +msgid "Provide access to PhpWiki's lower level system information." msgstr "" #: ../lib/plugin/SystemInfo.php:131 @@ -4687,7 +4683,7 @@ msgstr "" #: ../lib/plugin/UnfoldSubpages.php:46 -msgid "Includes the content of all SubPages of the current page." +msgid "Include the content of all SubPages of the current page." msgstr "" #: ../lib/plugin/UnfoldSubpages.php:177 @@ -4905,7 +4901,7 @@ msgstr "" #: ../lib/plugin/WantedPagesOld.php:36 ../lib/plugin/WantedPages.php:45 -msgid "Lists referenced page names which do not exist yet." +msgid "List referenced page names which do not exist yet." msgstr "" #: ../lib/plugin/WantedPagesOld.php:42 Modified: trunk/locale/po/sv.po =================================================================== --- trunk/locale/po/sv.po 2012-12-17 09:58:45 UTC (rev 8664) +++ trunk/locale/po/sv.po 2012-12-17 12:52:50 UTC (rev 8665) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-17 10:49+0100\n" +"POT-Creation-Date: 2012-12-17 13:51+0100\n" "PO-Revision-Date: 2001-01-27 01:58+0200\n" "Last-Translator: Jon Åslund <jo...@he...>\n" "Language-Team: \n" @@ -1165,7 +1165,7 @@ msgid "Access for you is forbidden to %s." msgstr "" -#: ../lib/main.php:564 ../lib/plugin/PluginManager.php:61 +#: ../lib/main.php:564 ../lib/plugin/PluginManager.php:59 #, php-format msgid "You must be an administrator to %s." msgstr "" @@ -1646,7 +1646,7 @@ msgid "Del/+" msgstr "" -#: ../lib/PagePerm.php:607 ../lib/plugin/PluginManager.php:76 +#: ../lib/PagePerm.php:607 ../lib/plugin/PluginManager.php:74 #: ../lib/plugin/WikiAdminSetAcl.php:256 msgid "Description" msgstr "" @@ -2313,7 +2313,7 @@ msgstr "" #: ../lib/plugin/CurrentTime.php:63 -msgid "Displays current time and date." +msgid "Display current time and date." msgstr "" #: ../lib/plugin/DeadEndPages.php:32 @@ -2404,7 +2404,7 @@ msgstr "" #: ../lib/plugin/ExternalSearch.php:46 -msgid "Redirects to an external web site based on form input." +msgid "Redirect to an external web site based on form input." msgstr "" #: ../lib/plugin/ExternalSearch.php:140 ../lib/plugin/PhotoAlbum.php:482 @@ -2480,7 +2480,7 @@ #: ../lib/plugin/FrameInclude.php:58 msgid "" -"Displays a url in a seperate frame inside our body. Only one frame allowed." +"Display a url in a seperate frame inside our body. Only one frame allowed." msgstr "" #: ../lib/plugin/FrameInclude.php:85 ../lib/plugin/RandomPage.php:63 @@ -2584,7 +2584,7 @@ #: ../lib/plugin/GoogleMaps.php:68 msgid "" -"Displays a marker with further infos (when clicking) on given coordinates." +"Display a marker with further infos (when clicking) on given coordinates." msgstr "" #: ../lib/plugin/GoogleMaps.php:112 ../lib/plugin/YouTube.php:108 @@ -3367,7 +3367,7 @@ #: ../lib/plugin/PhotoAlbum.php:105 msgid "" -"Displays a set of photos listed in a text file with optional descriptions." +"Display a set of photos listed in a text file with optional descriptions." msgstr "" #: ../lib/plugin/PhotoAlbum.php:546 ../lib/plugin/PhotoAlbum.php:573 @@ -3460,28 +3460,24 @@ msgid "List of plugins on this wiki." msgstr "" -#: ../lib/plugin/PluginManager.php:54 -msgid "Plugins" -msgstr "" - -#: ../lib/plugin/PluginManager.php:62 +#: ../lib/plugin/PluginManager.php:60 msgid "use this plugin" msgstr "" -#: ../lib/plugin/PluginManager.php:76 +#: ../lib/plugin/PluginManager.php:74 msgid "Plugin" msgstr "" -#: ../lib/plugin/PluginManager.php:78 +#: ../lib/plugin/PluginManager.php:76 msgid "Arguments" msgstr "" -#: ../lib/plugin/PluginManager.php:117 +#: ../lib/plugin/PluginManager.php:115 #, php-format msgid "%s does not appear to be a WikiPlugin." msgstr "" -#: ../lib/plugin/PluginManager.php:128 ../lib/plugin/PluginManager.php:130 +#: ../lib/plugin/PluginManager.php:126 ../lib/plugin/PluginManager.php:128 #: ../lib/upgrade.php:206 ../themes/MonoBook/templates/navbar.tmpl:18 msgid "Help" msgstr "Hjälp" @@ -3604,7 +3600,7 @@ msgstr "" #: ../lib/plugin/RandomPage.php:... [truncated message content] |
From: <var...@us...> - 2012-12-19 09:26:49
|
Revision: 8672 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8672&view=rev Author: vargenau Date: 2012-12-19 09:26:43 +0000 (Wed, 19 Dec 2012) Log Message: ----------- Remove SteveWainstead from untranslated Modified Paths: -------------- trunk/configurator.php trunk/lib/plugin/_WikiTranslation.php Modified: trunk/configurator.php =================================================================== --- trunk/configurator.php 2012-12-19 09:02:42 UTC (rev 8671) +++ trunk/configurator.php 2012-12-19 09:26:43 UTC (rev 8672) @@ -1392,7 +1392,7 @@ "); $properties["Generic Pages"] = - new array_variable('DEFAULT_WIKI_PAGES', array('ReleaseNotes', 'SteveWainstead', 'TestPage'), " + new array_variable('DEFAULT_WIKI_PAGES', array('ReleaseNotes', 'TestPage'), " These are ':'-seperated pages which will get loaded untranslated from DEFAULT_WIKI_PGSRC. "); Modified: trunk/lib/plugin/_WikiTranslation.php =================================================================== --- trunk/lib/plugin/_WikiTranslation.php 2012-12-19 09:02:42 UTC (rev 8671) +++ trunk/lib/plugin/_WikiTranslation.php 2012-12-19 09:26:43 UTC (rev 8672) @@ -101,7 +101,6 @@ _("RecentVisitors") . ',' . _("ReleaseNotes") . ',' . // _("SpellCheck") .','. - _("SteveWainstead") . ',' . _("TranslateText") . ',' . _("UpLoad") . ',' . This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2012-12-19 12:22:07
|
Revision: 8681 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8681&view=rev Author: vargenau Date: 2012-12-19 12:22:00 +0000 (Wed, 19 Dec 2012) Log Message: ----------- Fix URL for png.png Modified Paths: -------------- trunk/locale/de/pgsrc/Hilfe%2FAlteTextFormatierungsRegeln trunk/locale/de/pgsrc/Hilfe%2FTextFormatierungsRegeln trunk/locale/fr/pgsrc/Aide%2FAnciennesR%C3%A8glesDeFormatage trunk/locale/fr/pgsrc/Aide%2FPluginBeauTableau trunk/locale/fr/pgsrc/Aide%2FR%C3%A8glesDeFormatageDesTextes trunk/locale/it/pgsrc/Aiuto%2FRegoleFormattazioneTesto trunk/locale/nl/pgsrc/Help%2FOudTekstFormatteringsRegels trunk/locale/nl/pgsrc/Help%2FTekstFormatteringsRegels trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FTextformateringsregler trunk/pgsrc/Help%2FRichTablePlugin trunk/pgsrc/Help%2FTextFormattingRules Modified: trunk/locale/de/pgsrc/Hilfe%2FAlteTextFormatierungsRegeln =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FAlteTextFormatierungsRegeln 2012-12-19 11:30:23 UTC (rev 8680) +++ trunk/locale/de/pgsrc/Hilfe%2FAlteTextFormatierungsRegeln 2012-12-19 12:22:00 UTC (rev 8681) @@ -1,4 +1,4 @@ -Date: Fri, 10 Sep 2010 13:48:42 +0000 +Date: Wed, 19 Dec 2012 13:19:42 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0) Content-Type: application/x-phpwiki; pagename=Hilfe%2FAlteTextFormatierungsRegeln; @@ -72,7 +72,7 @@ * Du kannst das Erstellen eines Links verhindern, indem du vor das Wort ein Ausrufungszeichen setzt, zum Beispiel ~DasIstKeinLink. * You can create footnotes by using ~[1], ~[2], ~[3], ... like this here #[|ftnt_ref_1]<sup>~[[1|#ftnt_1]~]</sup>. See footnote for counterpart. (If the ~[ is in the first column, it is a footnote <em>definition</em> rather than a footnote <em>reference</em> #[|ftnt_ref_1]<sup>~[[1|#ftnt_1]~]</sup>.) * Wenn du im Text Adressen eingibst, die mit <strong>http:</strong>, <strong>ftp:</strong> oder <strong>mailto:</strong> beginnen, werden diese auch automatisch in Links umgewandelt, zum Beispiel http://c2.com/ -* Adressen, die mit <strong>.png</strong> oder <strong>.jpg</strong> enden (d.h. Bilder) werden in die Seite eingefügt, wenn sie in eckige Klammern gesetzt werden, z. B.: [http://phpwiki.sourceforge.net/demo/themes/default/images/png.png] +* Adressen, die mit <strong>.png</strong> oder <strong>.jpg</strong> enden (d.h. Bilder) werden in die Seite eingefügt, wenn sie in eckige Klammern gesetzt werden, z. B.: [http://phpwiki.svn.sourceforge.net/viewvc/phpwiki/trunk/themes/default/images/png.png] ! Tables * Einfache Tabellen werden unterstützt. A table row is introduced by a <strong>|</strong> in the first column. It is best described by example: Modified: trunk/locale/de/pgsrc/Hilfe%2FTextFormatierungsRegeln =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FTextFormatierungsRegeln 2012-12-19 11:30:23 UTC (rev 8680) +++ trunk/locale/de/pgsrc/Hilfe%2FTextFormatierungsRegeln 2012-12-19 12:22:00 UTC (rev 8681) @@ -1,4 +1,4 @@ -Date: Tue, 4 Jan 2011 11:59:41 +0000 +Date: Wed, 19 Dec 2012 13:19:42 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0) Content-Type: application/x-phpwiki; pagename=Hilfe%2FTextFormatierungsRegeln; @@ -122,7 +122,7 @@ * Wenn du im Text Adressen eingibst, die mit **http:**, **ftp:** oder **mailto:** beginnen, werden diese auch automatisch in Links umgewandelt, zum Beispiel http://c2.com/ * Adressen, die mit **.png** oder **.jpg** enden (d.h. Bilder) werden in die Seite - eingefügt, wenn sie in eckige Klammern gesetzt werden, z. B.: [http://phpwiki.sourceforge.net/demo/themes/default/images/png.png] + eingefügt, wenn sie in eckige Klammern gesetzt werden, z. B.: [http://phpwiki.svn.sourceforge.net/viewvc/phpwiki/trunk/themes/default/images/png.png] !!! Tabellen Modified: trunk/locale/fr/pgsrc/Aide%2FAnciennesR%C3%A8glesDeFormatage =================================================================== --- trunk/locale/fr/pgsrc/Aide%2FAnciennesR%C3%A8glesDeFormatage 2012-12-19 11:30:23 UTC (rev 8680) +++ trunk/locale/fr/pgsrc/Aide%2FAnciennesR%C3%A8glesDeFormatage 2012-12-19 12:22:00 UTC (rev 8681) @@ -1,4 +1,4 @@ -Date: Tue, 4 Jan 2011 11:58:32 +0000 +Date: Wed, 19 Dec 2012 13:19:42 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0) Content-Type: application/x-phpwiki; pagename=Aide%2FAnciennesR%C3%A8glesDeFormatage; @@ -74,7 +74,7 @@ * Vous pouvez supprimer les liens dans l'ancien style et les URI en précédant le mot d'un '!', i. e. !NePasLierCommeUnWikiMot, !http://ne.pas.lier/ * Vous pouvez créer des notes de bas de page avec [[1], [[2], [[3], ... comme ici [1] (voir le bas de la page). Si le [[ est dans la première colonne, c'est une ''définition'' plutôt qu'une ''référence'' [1]. * L'ancien moyen de lier les URLs est encore accepté : précéder l'URL de "http:", "ftp:" oo "mailto:" pour créer un lien automatique comme pour : http://c2.com/ -* Les URLs finissant par .png, .gif, ou .jpg sont remplacées par leur contenu si elles sont entre crochets : [http://phpwiki.sourceforge.net/demo/themes/default/images/png.png] +* Les URLs finissant par .png, .gif, ou .jpg sont remplacées par leur contenu si elles sont entre crochets : [http://phpwiki.svn.sourceforge.net/viewvc/phpwiki/trunk/themes/default/images/png.png] ! Tableaux Modified: trunk/locale/fr/pgsrc/Aide%2FPluginBeauTableau =================================================================== --- trunk/locale/fr/pgsrc/Aide%2FPluginBeauTableau 2012-12-19 11:30:23 UTC (rev 8680) +++ trunk/locale/fr/pgsrc/Aide%2FPluginBeauTableau 2012-12-19 12:22:00 UTC (rev 8681) @@ -1,4 +1,4 @@ -Date: Tue, 25 Jan 2011 17:50:09 +0000 +Date: Wed, 19 Dec 2012 13:19:42 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0) Content-Type: application/x-phpwiki; pagename=Aide%2FPluginBeauTableau; @@ -47,7 +47,7 @@ PageAccueil - |* colspan=2 -[http://phpwiki.sourceforge.net/demo/themes/default/images/png.png] +[http://phpwiki.svn.sourceforge.net/viewvc/phpwiki/trunk/themes/default/images/png.png] |* rowspan=2 Cette cellule fait appel à un plugin ! <?plugin @@ -82,7 +82,7 @@ PageAccueil - |* colspan=2 -[http://phpwiki.sourceforge.net/demo/themes/default/images/png.png] +[http://phpwiki.svn.sourceforge.net/viewvc/phpwiki/trunk/themes/default/images/png.png] |* rowspan=2 Cette cellule fait appel à un plugin ! <?plugin Modified: trunk/locale/fr/pgsrc/Aide%2FR%C3%A8glesDeFormatageDesTextes =================================================================== --- trunk/locale/fr/pgsrc/Aide%2FR%C3%A8glesDeFormatageDesTextes 2012-12-19 11:30:23 UTC (rev 8680) +++ trunk/locale/fr/pgsrc/Aide%2FR%C3%A8glesDeFormatageDesTextes 2012-12-19 12:22:00 UTC (rev 8681) @@ -1,4 +1,4 @@ -Date: Thu, 27 Jan 2011 18:00:26 +0000 +Date: Wed, 19 Dec 2012 13:19:42 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0) Content-Type: application/x-phpwiki; pagename=Aide%2FR%C3%A8glesDeFormatageDesTextes; @@ -133,7 +133,7 @@ "<tt>http:</tt>", "<tt>ftp:</tt>" ou "<tt>mailto:</tt>" pour créer automatiquement des liens comme dans : http://c2.com/ * Les URL se terminant par .png, .gif, ou .jpg sont inclus s'ils sont isolés entre - crochets : [http://phpwiki.sourceforge.net/demo/themes/default/images/png.png] + crochets : [http://phpwiki.svn.sourceforge.net/viewvc/phpwiki/trunk/themes/default/images/png.png] * les #[hyperliens] dans la page sont réalisés en plaçant le nom d'une ancre et en se référant à l'andre par un lien : * ancres nommés : Modified: trunk/locale/it/pgsrc/Aiuto%2FRegoleFormattazioneTesto =================================================================== --- trunk/locale/it/pgsrc/Aiuto%2FRegoleFormattazioneTesto 2012-12-19 11:30:23 UTC (rev 8680) +++ trunk/locale/it/pgsrc/Aiuto%2FRegoleFormattazioneTesto 2012-12-19 12:22:00 UTC (rev 8681) @@ -1,4 +1,4 @@ -Date: Tue, 4 Jan 2011 11:58:08 +0000 +Date: Wed, 19 Dec 2012 13:19:42 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0) Content-Type: application/x-phpwiki; pagename=Aiuto%2FRegoleFormattazioneTesto; @@ -73,7 +73,7 @@ * Puoi eliminare i link in vecchi stile facendo precedere un URI da un punto esclamativo, come ad esempio !NotEUnWikiName, oppure !http://non.e.linkato * [1], [2], [3], [4] refer to remote references. Click EditLinks on the edit form to enter URLs. These differ from the newer linking scheme; references are unique to a page. * In ogni caso il vecchio modo di fare collegamenti è ancora supportato, quindi si potranno usare "http:", "ftp:", o "mailto:" per creare automaticamente link, come in http://c2.com -* Gli URL che finiscono in .png, .gif o .jpg sono racchiuse da parentesi quadre e permettono di inserire un'immagine, as esempio: [http://phpwiki.sourceforge.net/demo/themes/default/images/png.png] +* Gli URL che finiscono in .png, .gif o .jpg sono racchiuse da parentesi quadre e permettono di inserire un'immagine, as esempio: [http://phpwiki.svn.sourceforge.net/viewvc/phpwiki/trunk/themes/default/images/png.png] ! Linguaggio di marcatura HTML Modified: trunk/locale/nl/pgsrc/Help%2FOudTekstFormatteringsRegels =================================================================== --- trunk/locale/nl/pgsrc/Help%2FOudTekstFormatteringsRegels 2012-12-19 11:30:23 UTC (rev 8680) +++ trunk/locale/nl/pgsrc/Help%2FOudTekstFormatteringsRegels 2012-12-19 12:22:00 UTC (rev 8681) @@ -1,4 +1,4 @@ -Date: Tue, 4 Jan 2011 11:57:15 +0000 +Date: Wed, 19 Dec 2012 13:19:42 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0) Content-Type: application/x-phpwiki; pagename=Help%2FOudTekstFormatteringsRegels; @@ -79,7 +79,7 @@ * Je kunt koppelen naar oude stijl verwijzingen onderdrukken door een '~!' voor de woorden te tiepen: ~NietGekoppeldAlsWikiNaam. * You can create footnotes by using ~[1], ~[2], ~[3], ... like this here #[|ftnt_ref_1]<sup>~[[1|#ftnt_1]~]</sup>. See footnote for counterpart. (If the ~[ is in the first column, it is a footnote <em>definition</em> rather than a footnote <em>reference</em> #[|ftnt_ref_1]<sup>~[[1|#ftnt_1]~]</sup>.) * De oude manier van URL koppeling wordt nog steeds ondersteund: tiep voor de URLs "http:", "ftp:" of "mailto:" ome een automatiese koppeling te maken, als in: http://c2.com/. -* URLs die eindigen op .png, .gif of .jpg worden ingebed <em>wanneer ingevoerd als een externe verwijzing</em>: [http://phpwiki.sourceforge.net/demo/themes/default/images/png.png] +* URLs die eindigen op .png, .gif of .jpg worden ingebed <em>wanneer ingevoerd als een externe verwijzing</em>: [http://phpwiki.svn.sourceforge.net/viewvc/phpwiki/trunk/themes/default/images/png.png] ! Tables Modified: trunk/locale/nl/pgsrc/Help%2FTekstFormatteringsRegels =================================================================== --- trunk/locale/nl/pgsrc/Help%2FTekstFormatteringsRegels 2012-12-19 11:30:23 UTC (rev 8680) +++ trunk/locale/nl/pgsrc/Help%2FTekstFormatteringsRegels 2012-12-19 12:22:00 UTC (rev 8681) @@ -1,4 +1,4 @@ -Date: Fri, 10 Sep 2010 13:48:48 +0000 +Date: Wed, 19 Dec 2012 13:19:42 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0) Content-Type: application/x-phpwiki; pagename=Help%2FTekstFormatteringsRegels; @@ -79,7 +79,7 @@ * Je kunt koppelen naar oude stijl verwijzingen onderdrukken door een '~~' voor de woorden te tiepen: ~NietGekoppeldAlsWikiNaam. * You can create footnotes by using ~[1], ~[2], ~[3], ... like this here #[|ftnt_ref_1]<sup>~[[1|#ftnt_1]~]</sup>. See footnote for counterpart. (If the ~[ is in the first column, it is a footnote <em>definition</em> rather than a footnote <em>reference</em> #[|ftnt_ref_1]<sup>~[[1|#ftnt_1]~]</sup>.) * De oude manier van URL koppeling wordt nog steeds ondersteund: tiep voor de URLs "http:", "ftp:" of "mailto:" ome een automatiese koppeling te maken, als in: http://c2.com/. -* URLs die eindigen op .png, .gif of .jpg worden ingebed <em>wanneer ingevoerd als een externe verwijzing</em>: [http://phpwiki.sourceforge.net/demo/themes/default/images/png.png] +* URLs die eindigen op .png, .gif of .jpg worden ingebed <em>wanneer ingevoerd als een externe verwijzing</em>: [http://phpwiki.svn.sourceforge.net/viewvc/phpwiki/trunk/themes/default/images/png.png] ! Tables Modified: trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FTextformateringsregler =================================================================== --- trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FTextformateringsregler 2012-12-19 11:30:23 UTC (rev 8680) +++ trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FTextformateringsregler 2012-12-19 12:22:00 UTC (rev 8681) @@ -1,4 +1,4 @@ -Date: Fri, 10 Sep 2010 13:48:48 +0000 +Date: Wed, 19 Dec 2012 13:19:42 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0) Content-Type: application/x-phpwiki; pagename=Hj%C3%A4lp%2FTextformateringsregler; @@ -73,7 +73,7 @@ * Du kan undvika att länkar skapas genom att sätta "!" framför ordet som du inte vill vara en länk, t.ex. !InteEnWikilänk, !http://inte.heller.en.länk/ * You can create footnotes by using [[1], [[2], [[3], ... like this here [1]. See footnote for counterpart. (If the [[ is in the first column, it is a footnote ''definition'' rather than a footnote ''reference'' [1].) * Det gamla sättet att skapa länkar av URL:er stöds fortfarande: Föregå varje URL med "http:", "ftp:" eller "mailto:" för att skapa länkar automatiskt, så här: http://c2.com/ -* Bilder med URL:er som slutar med .png, .gif eller .jpg innanför hakparenteser läggs in i dokumentet av sig själv: [http://phpwiki.sourceforge.net/demo/themes/default/images/png.png] +* Bilder med URL:er som slutar med .png, .gif eller .jpg innanför hakparenteser läggs in i dokumentet av sig själv: [http://phpwiki.svn.sourceforge.net/viewvc/phpwiki/trunk/themes/default/images/png.png] ! Tables Modified: trunk/pgsrc/Help%2FRichTablePlugin =================================================================== --- trunk/pgsrc/Help%2FRichTablePlugin 2012-12-19 11:30:23 UTC (rev 8680) +++ trunk/pgsrc/Help%2FRichTablePlugin 2012-12-19 12:22:00 UTC (rev 8681) @@ -1,4 +1,4 @@ -Date: Wed, 13 Apr 2011 16:54:29 +0000 +Date: Wed, 19 Dec 2012 13:19:04 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0) Content-Type: application/x-phpwiki; pagename=Help%2FRichTablePlugin; @@ -65,7 +65,7 @@ HomePage - |* colspan=2 -[http://phpwiki.sourceforge.net/demo/themes/default/images/png.png] +[http://phpwiki.svn.sourceforge.net/viewvc/phpwiki/trunk/themes/default/images/png.png] |* rowspan=2 This cell actually has a plugin invocation inside it! <?plugin @@ -100,7 +100,7 @@ HomePage - |* colspan=2 -[http://phpwiki.sourceforge.net/demo/themes/default/images/png.png] +[http://phpwiki.svn.sourceforge.net/viewvc/phpwiki/trunk/themes/default/images/png.png] |* rowspan=2 This cell actually has a plugin invocation inside it! <?plugin Modified: trunk/pgsrc/Help%2FTextFormattingRules =================================================================== --- trunk/pgsrc/Help%2FTextFormattingRules 2012-12-19 11:30:23 UTC (rev 8680) +++ trunk/pgsrc/Help%2FTextFormattingRules 2012-12-19 12:22:00 UTC (rev 8681) @@ -1,4 +1,4 @@ -Date: Wed, 19 Dec 2012 11:55:47 +0000 +Date: Wed, 19 Dec 2012 13:19:04 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0) Content-Type: application/x-phpwiki; pagename=Help%2FTextFormattingRules; @@ -276,7 +276,7 @@ with "##~http:##", "##~ftp:##" or "##~mailto:##" to create links automatically as in: http://c2.com/ * URLs ending with ##.png##, ##.gif##, or ##.jpg## are inlined if in square brackets, by themselves: - [[http://phpwiki.sourceforge.net/demo/themes/default/images/png.png]] + [[http://phpwiki.svn.sourceforge.net/viewvc/phpwiki/trunk/themes/default/images/png.png]] * In-page #[[hyperlinks]] are made by placing a named anchor and referring to the anchor in a hyperlink: ** Named anchors: *** ##~#~[~[foo]]##: An anchor around the text "foo" with id "foo". This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2012-12-29 19:58:11
|
Revision: 8705 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8705&view=rev Author: vargenau Date: 2012-12-29 19:58:05 +0000 (Sat, 29 Dec 2012) Log Message: ----------- format=printable does not exist Modified Paths: -------------- trunk/TODO trunk/themes/MonoBook/templates/navbar.tmpl trunk/themes/Sidebar/templates/navbar.tmpl Modified: trunk/TODO =================================================================== --- trunk/TODO 2012-12-29 19:43:02 UTC (rev 8704) +++ trunk/TODO 2012-12-29 19:58:05 UTC (rev 8705) @@ -68,7 +68,6 @@ * SQL textsearch with multiple words: AND (the two new failing unit tests) * fix textsearch optimize with "word -word -word" -* format=printable (?) for non js/dom OLDER TODO's: Maybe (probably defer): Modified: trunk/themes/MonoBook/templates/navbar.tmpl =================================================================== --- trunk/themes/MonoBook/templates/navbar.tmpl 2012-12-29 19:43:02 UTC (rev 8704) +++ trunk/themes/MonoBook/templates/navbar.tmpl 2012-12-29 19:58:05 UTC (rev 8705) @@ -57,15 +57,10 @@ <?php if ($user->isSignedIn()) { ?> <li><?php $link = WikiLink(_("UpLoad"),"",_("Upload File")); $link->setAttr("accesskey","u"); $link->addTooltip(_("Upload images or media files")." [$p-u]"); ?><?php echo $link ?></li> <?php } ?> - <li> <?php $PrintableLink = $WikiTheme->makeButton(_("Printable version"), "javascript:PrinterStylesheet();", 'wikiaction'); ?> <script type="text/javascript"><!-- -document.write('<?php echo $PrintableLink ?>'); // --> +document.write('<li><?php echo $PrintableLink ?></li>'); // --> </script> -<noscript> - <?php echo $WikiTheme->makeButton(_("Printable version"), "?format=printable", 'wikiaction') ?> -</noscript> -</li> <?php if (defined('USE_EXTERNAL_HTML2PDF') and USE_EXTERNAL_HTML2PDF) { // Do not display the pdf icon $btn = new Button(_("Display as Pdf"), WikiURL($page->getName(), array('action' => 'pdf')), 'wikiaction'); @@ -77,4 +72,3 @@ </div> </div> <!-- end of the left (by default at least) column --> - Modified: trunk/themes/Sidebar/templates/navbar.tmpl =================================================================== --- trunk/themes/Sidebar/templates/navbar.tmpl 2012-12-29 19:43:02 UTC (rev 8704) +++ trunk/themes/Sidebar/templates/navbar.tmpl 2012-12-29 19:58:05 UTC (rev 8705) @@ -48,15 +48,10 @@ <li><?php $link = WikiLink(_("UpLoad"),"",_("Upload File")); $link->setAttr("accesskey","u"); $link->addTooltip(_("Upload images or media files")." [$p-u]"); ?><?php echo $link ?></li> <li><?php echo WikiLink(_("UserPreferences"), "",_("Preferences")) ?></li> <?php } ?> - <li> <?php $PrintableLink = $WikiTheme->makeButton(_("Printable version"), "javascript:PrinterStylesheet();", 'wikiaction'); ?> <script type="text/javascript"><!-- -document.write('<?php echo $PrintableLink ?>'); // --> +document.write('<li><?php echo $PrintableLink ?></li>'); // --> </script> -<noscript> - <?php echo $WikiTheme->makeButton(_("Printable version"), "?format=printable", 'wikiaction') ?> -</noscript> -</li> <?php if (defined('USE_EXTERNAL_HTML2PDF') and USE_EXTERNAL_HTML2PDF) { // Do not display the pdf icon $btn = new Button(_("Display as Pdf"), WikiURL($page->getName(), array('action' => 'pdf')), 'wikiaction'); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2013-01-08 14:27:29
|
Revision: 8709 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8709&view=rev Author: vargenau Date: 2013-01-08 14:27:18 +0000 (Tue, 08 Jan 2013) Log Message: ----------- Wiki page --> wiki page Modified Paths: -------------- trunk/lib/plugin/CreatePage.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/nl/LC_MESSAGES/phpwiki.mo trunk/locale/po/de.po trunk/locale/po/es.po trunk/locale/po/fr.po trunk/locale/po/it.po trunk/locale/po/ja.po trunk/locale/po/nl.po trunk/locale/po/phpwiki.pot trunk/locale/po/sv.po trunk/locale/po/zh.po trunk/locale/sv/LC_MESSAGES/phpwiki.mo trunk/locale/zh/LC_MESSAGES/phpwiki.mo trunk/locale/zh/LC_MESSAGES/phpwiki.php Modified: trunk/lib/plugin/CreatePage.php =================================================================== --- trunk/lib/plugin/CreatePage.php 2012-12-29 20:51:48 UTC (rev 8708) +++ trunk/lib/plugin/CreatePage.php 2013-01-08 14:27:18 UTC (rev 8709) @@ -45,7 +45,7 @@ function getDescription() { - return _("Create a Wiki page by the provided name."); + return _("Create a wiki page by the provided name."); } function getDefaultArguments() 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-29 20:51:48 UTC (rev 8708) +++ trunk/locale/de/LC_MESSAGES/phpwiki.php 2013-01-08 14:27:18 UTC (rev 8709) @@ -293,8 +293,8 @@ $locale["Count"] = "Anzahl"; $locale["Create Page"] = "Neue Seite"; $locale["Create a Wiki Category Page."] = "Erzeuge eine neue Wiki-Seite."; -$locale["Create a Wiki page by the provided name."] = "Erzeuge neue Wiki-Seite mit dem angegebenem Namen."; $locale["Create a new (sub)page"] = "Erzeuge eine neue (Unter)Seite"; +$locale["Create a wiki page by the provided name."] = "Erzeuge neue Wiki-Seite mit dem angegebenem Namen."; $locale["Create: %s"] = "Erzeugen: %s"; $locale["CreatePage"] = "NeueSeite"; $locale["CreateToc"] = "InhaltsVerzeichnis"; 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-29 20:51:48 UTC (rev 8708) +++ trunk/locale/fr/LC_MESSAGES/phpwiki.php 2013-01-08 14:27:18 UTC (rev 8709) @@ -299,8 +299,8 @@ $locale["Count"] = "Nombre"; $locale["Create Page"] = "Créer la page"; $locale["Create a Wiki Category Page."] = "Créer une page wiki de catégorie."; -$locale["Create a Wiki page by the provided name."] = "Créer une page wiki avec le nom demandé."; $locale["Create a new (sub)page"] = "Créer une nouvelle (sous-)page"; +$locale["Create a wiki page by the provided name."] = "Créer une page wiki avec le nom demandé."; $locale["Create redirect from old to new name?"] = "Créer une redirection de l'ancien nom vers le nouveau ?"; $locale["Create: %s"] = "Créer : %s"; $locale["CreatePage"] = "CréerUnePage"; 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-29 20:51:48 UTC (rev 8708) +++ trunk/locale/po/de.po 2013-01-08 14:27:18 UTC (rev 8709) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-19 11:03+0100\n" +"POT-Creation-Date: 2013-01-08 15:25+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." @@ -187,10 +187,10 @@ # (Im Wortsinne heißt das eigentlich: "jüngste = eben gemachte # Änderungen"; in terms of newspapers or journalism it's traditionally # "NeuesteNachrichten" or much more better "DasNeueste"). -#: ../lib/display.php:172 ../lib/display.php:413 ../lib/loadsave.php:1572 +#: ../lib/display.php:172 ../lib/display.php:413 ../lib/loadsave.php:1573 #: ../lib/plugin/RecentChanges.php:64 ../lib/plugin/RecentChanges.php:229 #: ../lib/plugin/RecentChanges.php:236 ../lib/plugin/RecentChanges.php:439 -#: ../lib/plugin/RecentChanges.php:749 ../lib/plugin/RecentChanges.php:1278 +#: ../lib/plugin/RecentChanges.php:749 ../lib/plugin/RecentChanges.php:1277 #: ../lib/RSSWriter091.php:110 ../themes/blog/templates/actionbar.tmpl:10 #: ../themes/Crao/templates/head.tmpl:53 #: ../themes/Crao/templates/navbar.tmpl:11 @@ -369,7 +369,7 @@ "moderators at the definition in %s" msgstr "" -#: ../lib/editpage.php:575 ../lib/plugin/PasswordReset.php:162 +#: ../lib/editpage.php:575 ../lib/plugin/PasswordReset.php:163 #: ../lib/plugin/UserPreferences.php:40 ../lib/plugin/WatchPage.php:129 #: ../lib/plugin/WatchPage.php:151 ../themes/blog/templates/navbar.tmpl:14 #: ../themes/Crao/templates/head.tmpl:76 ../themes/Crao/templates/head.tmpl:77 @@ -685,7 +685,7 @@ msgid "%s: error while handling error:" msgstr "%s: Fehler während der Fehlerbehandlung von:" -#: ../lib/FileFinder.php:199 ../lib/loadsave.php:1154 +#: ../lib/FileFinder.php:199 ../lib/loadsave.php:1155 #, php-format msgid "%s: file not found" msgstr "»%s«: Datei nicht gefunden" @@ -765,8 +765,8 @@ # Any better translation? The locale/de/pgsrc/PhpWikiSystemverwalten # must also be renamed to match what is here. -#: ../lib/loadsave.php:96 ../lib/loadsave.php:483 ../lib/loadsave.php:1037 -#: ../lib/loadsave.php:1043 ../lib/loadsave.php:1051 ../lib/main.php:1244 +#: ../lib/loadsave.php:96 ../lib/loadsave.php:483 ../lib/loadsave.php:1038 +#: ../lib/loadsave.php:1044 ../lib/loadsave.php:1052 ../lib/main.php:1244 #: ../lib/main.php:1257 ../lib/PagePerm.php:190 ../lib/PagePerm.php:191 #: ../lib/plugin/WikiAdminRename.php:147 ../lib/plugin/WikiAdminSelect.php:221 #: ../themes/blog/templates/navbar.tmpl:11 @@ -778,7 +778,7 @@ #: ../themes/MonoBook/templates/navbar.tmpl:55 #: ../themes/Portland/templates/navbar.tmpl:24 #: ../themes/shamino_com/templates/actionbar.tmpl:17 -#: ../themes/Sidebar/templates/navbar.tmpl:68 +#: ../themes/Sidebar/templates/navbar.tmpl:63 #: ../themes/smaller/templates/navbar.tmpl:17 #: ../themes/wikilens/templates/head.tmpl:68 #: ../themes/wikilens/templates/head.tmpl:69 @@ -898,7 +898,7 @@ msgid "Empty pagename!" msgstr "Leerer Seitenname!" -#: ../lib/loadsave.php:915 ../lib/WikiTheme.php:703 +#: ../lib/loadsave.php:915 ../lib/WikiTheme.php:699 #, php-format msgid "“%s”: Bad page name" msgstr "»%s«: Ungültiger Seitenname" @@ -938,17 +938,17 @@ msgid "- saved to database as version %d" msgstr "- in der Datenbank gespeichert als Version %d." -#: ../lib/loadsave.php:1027 ../lib/loadsave.php:1296 +#: ../lib/loadsave.php:1028 ../lib/loadsave.php:1297 #, php-format msgid "MIME file %s" msgstr "MIME-Datei %s" -#: ../lib/loadsave.php:1028 ../lib/loadsave.php:1307 +#: ../lib/loadsave.php:1029 ../lib/loadsave.php:1308 #, php-format msgid "Serialized file %s" msgstr "Serialisierte Datei %s" -#: ../lib/loadsave.php:1029 ../lib/loadsave.php:1328 +#: ../lib/loadsave.php:1030 ../lib/loadsave.php:1329 #, php-format msgid "plain file %s" msgstr "Nur-Text-Datei %s" @@ -956,40 +956,40 @@ # This translation gives the general idea of the action to be performed, # but the text must be brief enough to fit inside a button: # "widersprechende Änderungen Zusammenfügen und die ergebende Seite Bearbeiten" -#: ../lib/loadsave.php:1036 ../lib/plugin/SyncWiki.php:276 +#: ../lib/loadsave.php:1037 ../lib/plugin/SyncWiki.php:276 msgid "Merge Edit" msgstr "Zusammenfügen Bearbeiten" -#: ../lib/loadsave.php:1042 +#: ../lib/loadsave.php:1043 msgid "Restore Anyway" msgstr "Ungeprüft überschreiben" -#: ../lib/loadsave.php:1050 +#: ../lib/loadsave.php:1051 msgid "Overwrite All" msgstr "" -#: ../lib/loadsave.php:1057 +#: ../lib/loadsave.php:1058 msgid " Sorry, cannot merge." msgstr " Konnte leider nicht automatisch einpflegen." -#: ../lib/loadsave.php:1080 +#: ../lib/loadsave.php:1081 msgid "Revert: missing required version argument" msgstr "Zurückspeichern: Parameter version muß angegeben werden" -#: ../lib/loadsave.php:1087 +#: ../lib/loadsave.php:1088 msgid "No revert: no page content" msgstr "Kein Zurückspeichern: leerer Seiteninalt" -#: ../lib/loadsave.php:1092 +#: ../lib/loadsave.php:1093 msgid "No revert: same version page" msgstr "Kein Zurückspeichern: selbe Version der Seite" -#: ../lib/loadsave.php:1097 +#: ../lib/loadsave.php:1098 msgid "Revert cancelled" msgstr "Zurückspeichern abgebrochen" -#: ../lib/loadsave.php:1106 ../lib/plugin/PasswordReset.php:109 -#: ../lib/plugin/PasswordReset.php:153 ../lib/plugin/UserPreferences.php:120 +#: ../lib/loadsave.php:1107 ../lib/plugin/PasswordReset.php:108 +#: ../lib/plugin/PasswordReset.php:154 ../lib/plugin/UserPreferences.php:120 #: ../lib/plugin/WatchPage.php:90 ../lib/plugin/WikiAdminChmod.php:148 #: ../lib/plugin/WikiAdminChown.php:177 ../lib/plugin/WikiAdminMarkup.php:168 #: ../lib/plugin/WikiAdminPurge.php:151 ../lib/plugin/WikiAdminRemove.php:204 @@ -1000,8 +1000,8 @@ msgid "Yes" msgstr "Ja" -#: ../lib/loadsave.php:1108 ../lib/plugin/PasswordReset.php:112 -#: ../lib/plugin/PasswordReset.php:156 ../lib/plugin/TranslateText.php:117 +#: ../lib/loadsave.php:1109 ../lib/plugin/PasswordReset.php:111 +#: ../lib/plugin/PasswordReset.php:157 ../lib/plugin/TranslateText.php:117 #: ../lib/plugin/UserPreferences.php:122 ../lib/plugin/WatchPage.php:92 #: ../lib/plugin/WatchPage.php:97 ../lib/plugin/WikiAdminChmod.php:160 #: ../lib/plugin/WikiAdminChown.php:190 ../lib/plugin/WikiAdminMarkup.php:181 @@ -1018,63 +1018,63 @@ msgid "Cancel" msgstr "Abbrechen" -#: ../lib/loadsave.php:1122 +#: ../lib/loadsave.php:1123 #, php-format msgid "revert to version %d" msgstr "Speichere Version %d zurück." -#: ../lib/loadsave.php:1129 +#: ../lib/loadsave.php:1130 #, php-format msgid "Revert: %s" msgstr "Zurückspeichern: %s" -#: ../lib/loadsave.php:1130 +#: ../lib/loadsave.php:1131 #, php-format msgid "- version %d saved to database as version %d" msgstr "- version %d in der Datenbank gespeichert als Version %d." -#: ../lib/loadsave.php:1149 ../lib/WikiGroup.php:882 +#: ../lib/loadsave.php:1150 ../lib/WikiGroup.php:882 #, php-format msgid "%s: not defined" msgstr "%s: nicht definiert" -#: ../lib/loadsave.php:1159 +#: ../lib/loadsave.php:1160 msgid "Default InterWiki map file not loaded." msgstr "Standard-Datei der InterWikiListe nicht geladen." -#: ../lib/loadsave.php:1166 ../lib/PageType.php:329 +#: ../lib/loadsave.php:1167 ../lib/PageType.php:329 #, php-format msgid "Loading InterWikiMap from external file %s." msgstr "Die InterWikiListe wird von der externen Datei %s geladen." -#: ../lib/loadsave.php:1345 ../lib/loadsave.php:1359 +#: ../lib/loadsave.php:1346 ../lib/loadsave.php:1360 msgid "Skipping" msgstr "Übersprungen" -#: ../lib/loadsave.php:1460 +#: ../lib/loadsave.php:1461 #, php-format msgid "Empty or not existing source. Unable to load: %s" msgstr "" -#: ../lib/loadsave.php:1464 +#: ../lib/loadsave.php:1465 #, php-format msgid "Bad file type: %s" msgstr "Ungültiger Dateityp: %s" -#: ../lib/loadsave.php:1478 +#: ../lib/loadsave.php:1479 #, php-format msgid "Loading “%s”" msgstr "»%s« wird geladen" -#: ../lib/loadsave.php:1510 +#: ../lib/loadsave.php:1511 msgid "Loading up virgin wiki" msgstr "Lade neue Seiten in das frische Wiki" -#: ../lib/loadsave.php:1565 +#: ../lib/loadsave.php:1566 msgid "No uploaded file to upload?" msgstr "Keine Datei zum Hochladen?" -#: ../lib/loadsave.php:1568 +#: ../lib/loadsave.php:1569 #, php-format msgid "Uploading %s" msgstr "%s wird hochgeladen" @@ -1129,7 +1129,7 @@ msgstr "Seite gelöscht %s von Benutzer %s" #: ../lib/MailNotify.php:391 ../lib/plugin/WikiAdminUtils.php:120 -#: ../lib/WikiUserNew.php:1804 +#: ../lib/WikiUserNew.php:1801 msgid "E-mail address confirmation" msgstr "E-Mail Bestätigung" @@ -1148,7 +1148,7 @@ "will expire at %s." msgstr "" -#: ../lib/main.php:111 ../lib/WikiDB.php:1065 +#: ../lib/main.php:111 ../lib/WikiDB.php:1067 msgid "Optimizing database" msgstr "Datenbank wird optimiert" @@ -1417,8 +1417,8 @@ msgid "FullTextSearch" msgstr "VolltextSuche" -#: ../lib/main.php:1185 ../lib/plugin/RecentChanges.php:898 -#: ../lib/plugin/TitleSearch.php:45 ../lib/WikiTheme.php:1524 +#: ../lib/main.php:1185 ../lib/plugin/RecentChanges.php:897 +#: ../lib/plugin/TitleSearch.php:45 ../lib/WikiTheme.php:1520 #: ../themes/Crao/templates/navbar.tmpl:2 #: ../themes/Crao/templates/navbar.tmpl:6 #: ../themes/Crao/templates/navbar.tmpl:49 @@ -1788,8 +1788,8 @@ msgid "Comments" msgstr "Kommentare" -#: ../lib/plugin/AllPages.php:35 ../themes/MonoBook/templates/navbar.tmpl:75 -#: ../themes/Sidebar/templates/navbar.tmpl:66 +#: ../lib/plugin/AllPages.php:35 ../themes/MonoBook/templates/navbar.tmpl:70 +#: ../themes/Sidebar/templates/navbar.tmpl:61 msgid "AllPages" msgstr "AlleSeiten" @@ -2234,7 +2234,7 @@ msgstr "Bearbeite %s" #: ../lib/plugin/Calendar.php:40 ../lib/plugin/Calendar.php:45 -#: ../lib/WikiTheme.php:1561 ../lib/WikiUser.php:501 +#: ../lib/WikiTheme.php:1557 ../lib/WikiUser.php:501 #: ../themes/blog/templates/sidebar.tmpl:15 #: ../themes/Crao/templates/head.tmpl:80 #: ../themes/Crao/templates/navbar.tmpl:26 @@ -2296,7 +2296,7 @@ msgstr "NeueSeite" #: ../lib/plugin/CreatePage.php:48 -msgid "Create a Wiki page by the provided name." +msgid "Create a wiki page by the provided name." msgstr "Erzeuge neue Wiki-Seite mit dem angegebenem Namen." #: ../lib/plugin/CreatePage.php:70 @@ -2382,7 +2382,7 @@ msgid "DeadEndPages" msgstr "VerwaisteSeiten" -#: ../lib/plugin/Diff.php:38 ../lib/WikiTheme.php:1058 +#: ../lib/plugin/Diff.php:38 ../lib/WikiTheme.php:1054 #: ../themes/blog/themeinfo.php:71 msgid "Diff" msgstr "Diff" @@ -2428,7 +2428,7 @@ #: ../lib/plugin/DynamicIncludePage.php:81 #: ../lib/plugin/DynamicIncludePage.php:82 #: ../lib/plugin/NewPagesPerUser.php:119 ../lib/plugin/NewPagesPerUser.php:120 -#: ../lib/plugin/RecentChanges.php:1487 ../lib/plugin/RecentChanges.php:1488 +#: ../lib/plugin/RecentChanges.php:1486 ../lib/plugin/RecentChanges.php:1487 #: ../themes/Sidebar/themeinfo.php:59 ../themes/Sidebar/themeinfo.php:60 msgid "Click to hide/show" msgstr "Hier klicken um zu verstecken" @@ -2836,7 +2836,7 @@ msgid "Wiki Name" msgstr "Name des Wikis" -#: ../lib/plugin/InterWikiSearch.php:96 ../lib/plugin/RecentChanges.php:895 +#: ../lib/plugin/InterWikiSearch.php:96 ../lib/plugin/RecentChanges.php:894 #: ../lib/plugin/SemanticSearchAdvanced.php:113 #: ../themes/Crao/templates/navbar.tmpl:40 #: ../themes/Crao/templates/navbar.tmpl:42 @@ -2932,7 +2932,7 @@ msgid "Links" msgstr "Links" -#: ../lib/plugin/LinkDatabase.php:180 +#: ../lib/plugin/LinkDatabase.php:184 #, php-format msgid "Unsupported format argument %s" msgstr "Nicht unterstützter format Parameter %s" @@ -3257,7 +3257,7 @@ "markup before rewrapping with emacs and checking into Subversion." msgstr "" -#: ../lib/plugin/PageDump.php:228 ../lib/plugin/PasswordReset.php:138 +#: ../lib/plugin/PageDump.php:228 ../lib/plugin/PasswordReset.php:137 #: ../lib/plugin/SemanticSearchAdvanced.php:149 #: ../lib/plugin/SemanticSearch.php:292 msgid "Warning:" @@ -3410,7 +3410,7 @@ msgstr "" #: ../lib/plugin/PasswordReset.php:67 ../lib/plugin/PasswordReset.php:90 -#: ../lib/plugin/PasswordReset.php:170 +#: ../lib/plugin/PasswordReset.php:171 msgid "Error" msgstr "" @@ -3430,41 +3430,41 @@ msgstr "" "Fehler beim Versenden der E-Mail mit dem neuen Passwort für Benutzer %s." -#: ../lib/plugin/PasswordReset.php:99 +#: ../lib/plugin/PasswordReset.php:98 msgid "Reset password of user: " msgstr "Setze Passwort für Benutzer zurück: " -#: ../lib/plugin/PasswordReset.php:109 ../lib/plugin/PasswordReset.php:153 +#: ../lib/plugin/PasswordReset.php:108 ../lib/plugin/PasswordReset.php:154 msgid "Send e-mail" msgstr "Versende E-Mail" -#: ../lib/plugin/PasswordReset.php:139 +#: ../lib/plugin/PasswordReset.php:138 msgid "You need to specify the userid!" msgstr "Sie müssen den Benutzernamen angeben!" -#: ../lib/plugin/PasswordReset.php:161 +#: ../lib/plugin/PasswordReset.php:162 msgid "Already logged in" msgstr "Bereits eingeloggt" -#: ../lib/plugin/PasswordReset.php:162 +#: ../lib/plugin/PasswordReset.php:163 msgid "Changing passwords is done at " msgstr "" -#: ../lib/plugin/PasswordReset.php:171 +#: ../lib/plugin/PasswordReset.php:172 #, php-format msgid "No e-mail stored for user %s." msgstr "" -#: ../lib/plugin/PasswordReset.php:173 +#: ../lib/plugin/PasswordReset.php:174 msgid "You need to ask an Administrator to reset this password. See below: " msgstr "" -#: ../lib/plugin/PasswordReset.php:185 +#: ../lib/plugin/PasswordReset.php:186 #, php-format msgid "Do you really want to reset the password of user %s?" msgstr "" -#: ../lib/plugin/PasswordReset.php:186 +#: ../lib/plugin/PasswordReset.php:187 msgid "An e-mail will be sent." msgstr "" @@ -3953,72 +3953,72 @@ msgid "Click to add this feed to your sidebar" msgstr "" -#: ../lib/plugin/RecentChanges.php:896 +#: ../lib/plugin/RecentChanges.php:895 msgid "Title Search" msgstr "TitelSuche" -#: ../lib/plugin/RecentChanges.php:1283 +#: ../lib/plugin/RecentChanges.php:1282 msgid "List all recent changes in this wiki." msgstr "Alle Änderungen in diesem Wiki auflisten." -#: ../lib/plugin/RecentChanges.php:1495 +#: ../lib/plugin/RecentChanges.php:1494 msgid "Show changes for:" msgstr "Zeige Änderungen innerhalb von:" -#: ../lib/plugin/RecentChanges.php:1542 +#: ../lib/plugin/RecentChanges.php:1541 msgid "1 day" msgstr "1 Tag" -#: ../lib/plugin/RecentChanges.php:1544 +#: ../lib/plugin/RecentChanges.php:1543 msgid "All time" msgstr "" -#: ../lib/plugin/RecentChanges.php:1546 +#: ../lib/plugin/RecentChanges.php:1545 #, php-format msgid "%s days" msgstr "%s Tagen" -#: ../lib/plugin/RecentChanges.php:1559 +#: ../lib/plugin/RecentChanges.php:1558 msgid "All users" msgstr "Alle Benutzer" -#: ../lib/plugin/RecentChanges.php:1562 +#: ../lib/plugin/RecentChanges.php:1561 msgid "My modifications only" msgstr "" -#: ../lib/plugin/RecentChanges.php:1580 -#: ../themes/MonoBook/templates/navbar.tmpl:75 +#: ../lib/plugin/RecentChanges.php:1579 +#: ../themes/MonoBook/templates/navbar.tmpl:70 msgid "All pages" msgstr "Alle Seiten" -#: ../lib/plugin/RecentChanges.php:1583 +#: ../lib/plugin/RecentChanges.php:1582 msgid "My pages only" msgstr "" -#: ../lib/plugin/RecentChanges.php:1601 +#: ../lib/plugin/RecentChanges.php:1600 msgid "Major modifications only" msgstr "" -#: ../lib/plugin/RecentChanges.php:1601 +#: ../lib/plugin/RecentChanges.php:1600 msgid "All modifications" msgstr "" -#: ../lib/plugin/RecentChanges.php:1613 +#: ../lib/plugin/RecentChanges.php:1612 msgid "Page once only" msgstr "" # (Im Wortsinne heißt das eigentlich: "jüngste = eben gemachte # Änderungen"; in terms of newspapers or journalism it's traditionally # "NeuesteNachrichten" or much more better "DasNeueste"). -#: ../lib/plugin/RecentChanges.php:1613 +#: ../lib/plugin/RecentChanges.php:1612 msgid "Full changes" msgstr "" -#: ../lib/plugin/RecentChanges.php:1625 +#: ../lib/plugin/RecentChanges.php:1624 msgid "Old and new pages" msgstr "" -#: ../lib/plugin/RecentChanges.php:1625 +#: ../lib/plugin/RecentChanges.php:1624 msgid "New pages only" msgstr "Nur neue Seiten" @@ -5123,7 +5123,7 @@ msgid "The page %s is already watched!" msgstr "Diese Seite %s is schon beobachtet" -#: ../lib/plugin/WatchPage.php:95 ../lib/WikiTheme.php:1056 +#: ../lib/plugin/WatchPage.php:95 ../lib/WikiTheme.php:1052 #: ../themes/blog/templates/actionbar.tmpl:15 ../themes/blog/themeinfo.php:69 #: ../themes/Crao/templates/actionbar.tmpl:4 #: ../themes/default/templates/actionbar.tmpl:12 @@ -5587,7 +5587,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:1064 +#: ../lib/WikiTheme.php:1060 msgid "Rename Page" msgstr "Seite Umbenennen" @@ -6286,7 +6286,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:1072 +#: ../lib/purgepage.php:24 ../lib/purgepage.php:57 ../lib/WikiTheme.php:1068 msgid "Purge Page" msgstr "Seiten endgültig löschen" @@ -6314,7 +6314,7 @@ msgid "Remove cancelled" msgstr "Löschen abgebrochen" -#: ../lib/removepage.php:24 ../lib/removepage.php:57 ../lib/WikiTheme.php:1070 +#: ../lib/removepage.php:24 ../lib/removepage.php:57 ../lib/WikiTheme.php:1066 msgid "Remove Page" msgstr "Seite Löschen" @@ -6766,18 +6766,18 @@ msgid "WikiDB::renamePage() not yet implemented for this backend" msgstr "WikiDB::renamePage() für dieses Backend noch nicht implementiert" -#: ../lib/WikiDB.php:987 +#: ../lib/WikiDB.php:989 #, php-format msgid "%s: Date of new revision is %s" msgstr "%s: Datum dieser aktuellen Neubearbeitung ist %s" -#: ../lib/WikiDB.php:1755 ../lib/WikiDB.php:1759 +#: ../lib/WikiDB.php:1757 ../lib/WikiDB.php:1761 #: ../themes/default/templates/homepage.tmpl:6 #, php-format msgid "Describe %s here." msgstr "Beschreiben Sie %s hier." -#: ../lib/WikiDB.php:1794 +#: ../lib/WikiDB.php:1796 #, 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!" @@ -6966,22 +6966,22 @@ msgid "Owner: %s" msgstr "Besitzer: %s" -#: ../lib/WikiTheme.php:644 +#: ../lib/WikiTheme.php:640 #, php-format msgid "Empty link to: %s" msgstr "Leerer Link zu: %s" -#: ../lib/WikiTheme.php:659 ../themes/MacOSX/themeinfo.php:80 +#: ../lib/WikiTheme.php:655 ../themes/MacOSX/themeinfo.php:80 #, php-format msgid "Create: %s" msgstr "Erzeugen: %s" -#: ../lib/WikiTheme.php:679 +#: ../lib/WikiTheme.php:675 #, php-format msgid "Google:%s" msgstr "" -#: ../lib/WikiTheme.php:1060 ../themes/blog/themeinfo.php:73 +#: ../lib/WikiTheme.php:1056 ../themes/blog/themeinfo.php:73 #: ../themes/Crao/templates/signin.tmpl:12 #: ../themes/Crao/templates/signin.tmpl:28 #: ../themes/default/templates/signin.tmpl:14 @@ -6995,7 +6995,7 @@ msgid "Sign Out" msgstr "Abmelden" -#: ../lib/WikiTheme.php:1062 ../lib/WikiUserNew.php:528 +#: ../lib/WikiTheme.php:1058 ../lib/WikiUserNew.php:528 #: ../lib/WikiUser.php:243 ../themes/blog/themeinfo.php:75 #: ../themes/Crao/templates/signin.tmpl:51 #: ../themes/default/templates/login.tmpl:68 @@ -7006,20 +7006,20 @@ msgid "Sign In" msgstr "Anmelden" -#: ../lib/WikiTheme.php:1066 ../themes/MacOSX/themeinfo.php:138 +#: ../lib/WikiTheme.php:1062 ../themes/MacOSX/themeinfo.php:138 msgid "Lock Page" msgstr "Seite Sperren" -#: ../lib/WikiTheme.php:1068 ../themes/MacOSX/themeinfo.php:139 +#: ../lib/WikiTheme.php:1064 ../themes/MacOSX/themeinfo.php:139 msgid "Unlock Page" msgstr "Seite Freigeben" -#: ../lib/WikiTheme.php:1249 +#: ../lib/WikiTheme.php:1245 msgid "" "Some action(page) wanted to add more headers, but they were already printed." msgstr "" -#: ../lib/WikiTheme.php:1350 ../themes/Hawaiian/themeinfo.php:35 +#: ../lib/WikiTheme.php:1346 ../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 @@ -7027,13 +7027,13 @@ msgid "Printer" msgstr "Drucker" -#: ../lib/WikiTheme.php:1351 ../themes/MacOSX/themeinfo.php:108 +#: ../lib/WikiTheme.php:1347 ../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:1352 ../themes/Hawaiian/themeinfo.php:36 +#: ../lib/WikiTheme.php:1348 ../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 @@ -7041,50 +7041,50 @@ msgid "Modern" msgstr "Modern" -#: ../lib/WikiTheme.php:1851 +#: ../lib/WikiTheme.php:1847 #, php-format msgid "Plugin %s: undefined" msgstr "Zusatzprogramm %s: undefiniert" -#: ../lib/WikiTheme.php:1878 +#: ../lib/WikiTheme.php:1874 msgid "Related Links" msgstr "Verwandte Links" -#: ../lib/WikiTheme.php:1901 +#: ../lib/WikiTheme.php:1897 msgid "External Links" msgstr "Externe Links" -#: ../lib/WikiUser/AdoDb.php:49 ../lib/WikiUser/AdoDb.php:210 +#: ../lib/WikiUser/AdoDb.php:49 ../lib/WikiUser/AdoDb.php:208 #: ../lib/WikiUser/Db.php:60 ../lib/WikiUser/File.php:78 #: ../lib/WikiUser/IMAP.php:35 ../lib/WikiUser/LDAP.php:147 #: ../lib/WikiUserNew.php:646 ../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/PdoDb.php:123 ../lib/WikiUser/PearDb.php:45 +#: ../lib/WikiUser/PearDb.php:137 ../lib/WikiUser.php:209 #: ../lib/WikiUser.php:292 ../lib/WikiUser/POP3.php:35 msgid "Invalid username." msgstr "Ungültiger Benutzername." -#: ../lib/WikiUser/AdoDb.php:168 ../lib/WikiUser/PdoDb.php:153 -#: ../lib/WikiUser/PearDb.php:158 +#: ../lib/WikiUser/AdoDb.php:166 ../lib/WikiUser/PdoDb.php:151 +#: ../lib/WikiUser/PearDb.php:156 #, php-format msgid "%s is missing" msgstr "%s Argument fehlt" -#: ../lib/WikiUser/AdoDb.php:225 ../lib/WikiUser/AdoDb.php:283 -#: ../lib/WikiUser/PdoDb.php:208 ../lib/WikiUser/PdoDb.php:272 -#: ../lib/WikiUser/PearDb.php:202 ../lib/WikiUser/PearDb.php:248 +#: ../lib/WikiUser/AdoDb.php:223 ../lib/WikiUser/AdoDb.php:281 +#: ../lib/WikiUser/PdoDb.php:206 ../lib/WikiUser/PdoDb.php:269 +#: ../lib/WikiUser/PearDb.php:200 ../lib/WikiUser/PearDb.php:246 #, php-format msgid "Either %s is missing or DATABASE_TYPE != “%s”" msgstr "" #: ../lib/WikiUser/Facebook.php:41 ../lib/WikiUser/Facebook.php:83 -#: ../lib/WikiUser/OpenID.php:214 ../lib/WikiUser/OpenID.php:240 +#: ../lib/WikiUser/OpenID.php:213 ../lib/WikiUser/OpenID.php:239 #, php-format msgid "The PECL %s extension cannot be loaded." msgstr "" #: ../lib/WikiUser/Facebook.php:42 ../lib/WikiUser/Facebook.php:84 -#: ../lib/WikiUser/OpenID.php:215 ../lib/WikiUser/OpenID.php:241 +#: ../lib/WikiUser/OpenID.php:214 ../lib/WikiUser/OpenID.php:240 #, php-format msgid " %s AUTH ignored." msgstr "%s AUTH ignoriert." @@ -7161,11 +7161,11 @@ msgid "Default preferences will be used." msgstr "Die Vorgabe Benutzereinstellungen werden verwendent." -#: ../lib/WikiUserNew.php:1280 +#: ../lib/WikiUserNew.php:1277 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:1307 +#: ../lib/WikiUserNew.php:1304 msgid "" "The length of the stored password is shorter than the system policy allows. " "Sorry, you cannot login.\n" @@ -7175,11 +7175,11 @@ "Sie können sich leider nicht anmelden.\n" " Sie müssen den System Administrator bitten, Ihr Passwort neu zu setzen." -#: ../lib/WikiUserNew.php:1321 +#: ../lib/WikiUserNew.php:1318 msgid "The crypt function is not available in this version of PHP." msgstr "" -#: ../lib/WikiUserNew.php:1322 +#: ../lib/WikiUserNew.php:1319 msgid "" "Please set ENCRYPTED_PASSWD to false in config/config.ini and probably " "change ADMIN_PASSWD." @@ -7187,12 +7187,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:1334 +#: ../lib/WikiUserNew.php:1331 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:1805 +#: ../lib/WikiUserNew.php:1802 #, php-format msgid "" "Welcome to %s!\n" @@ -7206,12 +7206,12 @@ "versenden.\n" "Siehe %s" -#: ../lib/WikiUserNew.php:1867 +#: ../lib/WikiUserNew.php:1864 #, php-format msgid "E-mail address “%s” is not properly formatted" msgstr "" -#: ../lib/WikiUserNew.php:1871 +#: ../lib/WikiUserNew.php:1868 #, php-format msgid "E-mail address “%s” is properly formatted" msgstr "" @@ -8706,7 +8706,7 @@ msgstr "Verlinkte Änderungen" #: ../themes/MonoBook/templates/navbar.tmpl:55 -#: ../themes/Sidebar/templates/navbar.tmpl:68 +#: ../themes/Sidebar/templates/navbar.tmpl:63 msgid "Administration" msgstr "" @@ -8715,15 +8715,13 @@ msgid "Upload images or media files" msgstr "" -#: ../themes/MonoBook/templates/navbar.tmpl:61 -#: ../themes/MonoBook/templates/navbar.tmpl:66 -#: ../themes/Sidebar/templates/navbar.tmpl:52 -#: ../themes/Sidebar/templates/navbar.tmpl:57 +#: ../themes/MonoBook/templates/navbar.tmpl:60 +#: ../themes/Sidebar/templates/navbar.tmpl:51 msgid "Printable version" msgstr "" -#: ../themes/MonoBook/templates/navbar.tmpl:71 -#: ../themes/Sidebar/templates/navbar.tmpl:62 +#: ../themes/MonoBook/templates/navbar.tmpl:66 +#: ../themes/Sidebar/templates/navbar.tmpl:57 msgid "Display as Pdf" msgstr "" Modified: trunk/locale/po/es.po =================================================================== --- trunk/locale/po/es.po 2012-12-29 20:51:48 UTC (rev 8708) +++ trunk/locale/po/es.po 2013-01-08 14:27:18 UTC (rev 8709) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-19 11:03+0100\n" +"POT-Creation-Date: 2013-01-08 15:25+0100\n" "PO-Revision-Date: 2000-02-01 00:50-0500\n" "Last-Translator: Pablo Roca <pr...@cl...>\n" "Language-Team: \n" @@ -188,10 +188,10 @@ msgid "LinkDatabase" msgstr "" -#: ../lib/display.php:172 ../lib/display.php:413 ../lib/loadsave.php:1572 +#: ../lib/display.php:172 ../lib/display.php:413 ../lib/loadsave.php:1573 #: ../lib/plugin/RecentChanges.php:64 ../lib/plugin/RecentChanges.php:229 #: ../lib/plugin/RecentChanges.php:236 ../lib/plugin/RecentChanges.php:439 -#: ../lib/plugin/RecentChanges.php:749 ../lib/plugin/RecentChanges.php:1278 +#: ../lib/plugin/RecentChanges.php:749 ../lib/plugin/RecentChanges.php:1277 #: ../lib/RSSWriter091.php:110 ../themes/blog/templates/actionbar.tmpl:10 #: ../themes/Crao/templates/head.tmpl:53 #: ../themes/Crao/templates/navbar.tmpl:11 @@ -367,7 +367,7 @@ "moderators at the definition in %s" msgstr "" -#: ../lib/editpage.php:575 ../lib/plugin/PasswordReset.php:162 +#: ../lib/editpage.php:575 ../lib/plugin/PasswordReset.php:163 #: ../lib/plugin/UserPreferences.php:40 ../lib/plugin/WatchPage.php:129 #: ../lib/plugin/WatchPage.php:151 ../themes/blog/templates/navbar.tmpl:14 #: ../themes/Crao/templates/head.tmpl:76 ../themes/Crao/templates/head.tmpl:77 @@ -679,7 +679,7 @@ msgid "%s: error while handling error:" msgstr "%s: error mientras que maneja error:" -#: ../lib/FileFinder.php:199 ../lib/loadsave.php:1154 +#: ../lib/FileFinder.php:199 ../lib/loadsave.php:1155 #, php-format msgid "%s: file not found" msgstr "%s: fichero no encontrado" @@ -756,8 +756,8 @@ msgid "Dump Pages as XHTML" msgstr "" -#: ../lib/loadsave.php:96 ../lib/loadsave.php:483 ../lib/loadsave.php:1037 -#: ../lib/loadsave.php:1043 ../lib/loadsave.php:1051 ../lib/main.php:1244 +#: ../lib/loadsave.php:96 ../lib/loadsave.php:483 ../lib/loadsave.php:1038 +#: ../lib/loadsave.php:1044 ../lib/loadsave.php:1052 ../lib/main.php:1244 #: ../lib/main.php:1257 ../lib/PagePerm.php:190 ../lib/PagePerm.php:191 #: ../lib/plugin/WikiAdminRename.php:147 ../lib/plugin/WikiAdminSelect.php:221 #: ../themes/blog/templates/navbar.tmpl:11 @@ -769,7 +769,7 @@ #: ../themes/MonoBook/templates/navbar.tmpl:55 #: ../themes/Portland/templates/navbar.tmpl:24 #: ../themes/shamino_com/templates/actionbar.tmpl:17 -#: ../themes/Sidebar/templates/navbar.tmpl:68 +#: ../themes/Sidebar/templates/navbar.tmpl:63 #: ../themes/smaller/templates/navbar.tmpl:17 #: ../themes/wikilens/templates/head.tmpl:68 #: ../themes/wikilens/templates/head.tmpl:69 @@ -884,7 +884,7 @@ msgid "Empty pagename!" msgstr "¡Escriba un nombre de página!" -#: ../lib/loadsave.php:915 ../lib/WikiTheme.php:703 +#: ../lib/loadsave.php:915 ../lib/WikiTheme.php:699 #, php-format msgid "“%s”: Bad page name" msgstr "“%s”: Mal nombre de la página" @@ -923,58 +923,58 @@ msgid "- saved to database as version %d" msgstr "- ahorrado a la base de datos como versión %d" -#: ../lib/loadsave.php:1027 ../lib/loadsave.php:1296 +#: ../lib/loadsave.php:1028 ../lib/loadsave.php:1297 #, php-format msgid "MIME file %s" msgstr "Archivo %s del MIME" -#: ../lib/loadsave.php:1028 ../lib/loadsave.php:1307 +#: ../lib/loadsave.php:1029 ../lib/loadsave.php:1308 #, php-format msgid "Serialized file %s" msgstr "Archivo serializado %s" -#: ../lib/loadsave.php:1029 ../lib/loadsave.php:1328 +#: ../lib/loadsave.php:1030 ../lib/loadsave.php:1329 #, php-format msgid "plain file %s" msgstr "archivo llano %s" -#: ../lib/loadsave.php:1036 ../lib/plugin/SyncWiki.php:276 +#: ../lib/loadsave.php:1037 ../lib/plugin/SyncWiki.php:276 msgid "Merge Edit" msgstr "Fusión Editar" -#: ../lib/loadsave.php:1042 +#: ../lib/loadsave.php:1043 msgid "Restore Anyway" msgstr "Restore de todos modos" -#: ../lib/loadsave.php:1050 +#: ../lib/loadsave.php:1051 msgid "Overwrite All" msgstr "Sobreescriba Todos" -#: ../lib/loadsave.php:1057 +#: ../lib/loadsave.php:1058 msgid " Sorry, cannot merge." msgstr " Apesadumbrado, no puede combinarse." -#: ../lib/loadsave.php:1080 +#: ../lib/loadsave.php:1081 #, fuzzy msgid "Revert: missing required version argument" msgstr "parámetro requerido de la versión que falta" -#: ../lib/loadsave.php:1087 +#: ../lib/loadsave.php:1088 #, fuzzy msgid "No revert: no page content" msgstr "ningún contenido de la página" -#: ../lib/loadsave.php:1092 +#: ../lib/loadsave.php:1093 #, fuzzy msgid "No revert: same version page" msgstr "la misma página de la versión" -#: ../lib/loadsave.php:1097 +#: ../lib/loadsave.php:1098 msgid "Revert cancelled" msgstr "" -#: ../lib/loadsave.php:1106 ../lib/plugin/PasswordReset.php:109 -#: ../lib/plugin/PasswordReset.php:153 ../lib/plugin/UserPreferences.php:120 +#: ../lib/loadsave.php:1107 ../lib/plugin/PasswordReset.php:108 +#: ../lib/plugin/PasswordReset.php:154 ../lib/plugin/UserPreferences.php:120 #: ../lib/plugin/WatchPage.php:90 ../lib/plugin/WikiAdminChmod.php:148 #: ../lib/plugin/WikiAdminChown.php:177 ../lib/plugin/WikiAdminMarkup.php:168 #: ../lib/plugin/WikiAdminPurge.php:151 ../lib/plugin/WikiAdminRemove.php:204 @@ -985,8 +985,8 @@ msgid "Yes" msgstr "Si" -#: ../lib/loadsave.php:1108 ../lib/plugin/PasswordReset.php:112 -#: ../lib/plugin/PasswordReset.php:156 ../lib/plugin/TranslateText.php:117 +#: ../lib/loadsave.php:1109 ../lib/plugin/PasswordReset.php:111 +#: ../lib/plugin/PasswordReset.php:157 ../lib/plugin/TranslateText.php:117 #: ../lib/plugin/UserPreferences.php:122 ../lib/plugin/WatchPage.php:92 #: ../lib/plugin/WatchPage.php:97 ../lib/plugin/WikiAdminChmod.php:160 #: ../lib/plugin/WikiAdminChown.php:190 ../lib/plugin/WikiAdminMarkup.php:181 @@ -1003,63 +1003,63 @@ msgid "Cancel" msgstr "Cancelar" -#: ../lib/loadsave.php:1122 +#: ../lib/loadsave.php:1123 #, php-format msgid "revert to version %d" msgstr "invierta a la versión %d" -#: ../lib/loadsave.php:1129 +#: ../lib/loadsave.php:1130 #, php-format msgid "Revert: %s" msgstr "Invierta: %s" -#: ../lib/loadsave.php:1130 +#: ../lib/loadsave.php:1131 #, php-format msgid "- version %d saved to database as version %d" msgstr "- versión %d ahorrada a la base de datos como versión %d" -#: ../lib/loadsave.php:1149 ../lib/WikiGroup.php:882 +#: ../lib/loadsave.php:1150 ../lib/WikiGroup.php:882 #, php-format msgid "%s: not defined" msgstr "%s: no definido" -#: ../lib/loadsave.php:1159 +#: ../lib/loadsave.php:1160 msgid "Default InterWiki map file not loaded." msgstr "Archivo del InterMapa de Wiki del defecto no cargado." -#: ../lib/loadsave.php:1166 ../lib/PageType.php:329 +#: ../lib/loadsave.php:1167 ../lib/PageType.php:329 #, php-format msgid "Loading InterWikiMap from external file %s." msgstr "Cargamento InterMapaDeWiki del archivo externo %s." -#: ../lib/loadsave.php:1345 ../lib/loadsave.php:1359 +#: ../lib/loadsave.php:1346 ../lib/loadsave.php:1360 msgid "Skipping" msgstr "El saltar" -#: ../lib/loadsave.php:1460 +#: ../lib/loadsave.php:1461 #, php-format msgid "Empty or not existing source. Unable to load: %s" msgstr "" -#: ../lib/loadsave.php:1464 +#: ../lib/loadsave.php:1465 #, php-format msgid "Bad file type: %s" msgstr "Mal tipo del archivo: %s" -#: ../lib/loadsave.php:1478 +#: ../lib/loadsave.php:1479 #, php-format msgid "Loading “%s”" msgstr "“%s” que carga" -#: ../lib/loadsave.php:1510 +#: ../lib/loadsave.php:1511 msgid "Loading up virgin wiki" msgstr "El cargar encima de wiki virginal" -#: ../lib/loadsave.php:1565 +#: ../lib/loadsave.php:1566 msgid "No uploaded file to upload?" msgstr "¿Ningún archivo uploaded a upload?" -#: ../lib/loadsave.php:1568 +#: ../lib/loadsave.php:1569 #, php-format msgid "Uploading %s" msgstr "%s uploading" @@ -1114,7 +1114,7 @@ msgstr "El usuarios %s eliminado página %s" #: ../lib/MailNotify.php:391 ../lib/plugin/WikiAdminUtils.php:120 -#: ../lib/WikiUserNew.php:1804 +#: ../lib/WikiUserNew.php:1801 msgid "E-mail address confirmation" msgstr "Verificación Del Email" @@ -1133,7 +1133,7 @@ "will expire at %s." msgstr "" -#: ../lib/main.php:111 ../lib/WikiDB.php:1065 +#: ../lib/main.php:111 ../lib/WikiDB.php:1067 msgid "Optimizing database" msgstr "Base de datos óptima" @@ -1399,8 +1399,8 @@ msgid "FullTextSearch" msgstr "BúsquedaDelTexto" -#: ../lib/main.php:1185 ../lib/plugin/RecentChanges.php:898 -#: ../lib/plugin/TitleSearch.php:45 ../lib/WikiTheme.php:1524 +#: ../lib/main.php:1185 ../lib/plugin/RecentChanges.php:897 +#: ../lib/plugin/TitleSearch.php:45 ../lib/WikiTheme.php:1520 #: ../themes/Crao/templates/navbar.tmpl:2 #: ../themes/Crao/templates/navbar.tmpl:6 #: ../themes/Crao/templates/navbar.tmpl:49 @@ -1771,8 +1771,8 @@ msgid "Comments" msgstr "" -#: ../lib/plugin/AllPages.php:35 ../themes/MonoBook/templates/navbar.tmpl:75 -#: ../themes/Sidebar/templates/navbar.tmpl:66 +#: ../lib/plugin/AllPages.php:35 ../themes/MonoBook/templates/navbar.tmpl:70 +#: ../themes/Sidebar/templates/navbar.tmpl:61 msgid "AllPages" msgstr "TodasLasPáginas" @@ -2206,7 +2206,7 @@ msgstr "Editar %s" #: ../lib/plugin/Calendar.php:40 ../lib/plugin/Calendar.php:45 -#: ../lib/WikiTheme.php:1561 ../lib/WikiUser.php:501 +#: ../lib/WikiTheme.php:1557 ../lib/WikiUser.php:501 #: ../themes/blog/templates/sidebar.tmpl:15 #: ../themes/Crao/templates/head.tmpl:80 #: ../themes/Crao/templates/navbar.tmpl:26 @@ -2268,7 +2268,7 @@ msgstr "CreeLaPágina" #: ../lib/plugin/CreatePage.php:48 -msgid "Create a Wiki page by the provided name." +msgid "Create a wiki page by the provided name." msgstr "" #: ../lib/plugin/CreatePage.php:70 @@ -2354,7 +2354,7 @@ msgid "DeadEndPages" msgstr "" -#: ../lib/plugin/Diff.php:38 ../lib/WikiTheme.php:1058 +#: ../lib/plugin/Diff.php:38 ../lib/WikiTheme.php:1054 #: ../themes/blog/themeinfo.php:71 msgid "Diff" msgstr "Diferencia" @@ -2400,7 +2400,7 @@ #: ../lib/plugin/DynamicIncludePage.php:81 #: ../lib/plugin/DynamicIncludePage.php:82 #: ../lib/plugin/NewPagesPerUser.php:119 ../lib/plugin/NewPagesPerUser.php:120 -#: ../lib/plugin/RecentChanges.php:1487 ../lib/plugin/RecentChanges.php:1488 +#: ../lib/plugin/RecentChanges.php:1486 ../lib/plugin/RecentChanges.php:1487 #: ../themes/Sidebar/themeinfo.php:59 ../themes/Sidebar/themeinfo.php:60 msgid "Click to hide/show" msgstr "" @@ -2801,7 +2801,7 @@ msgid "Wiki Name" msgstr "Nombre de la Wiki" -#: ../lib/plugin/InterWikiSearch.php:96 ../lib/plugin/RecentChanges.php:895 +#: ../lib/plugin/InterWikiSearch.php:96 ../lib/plugin/RecentChanges.php:894 #: ../lib/plugin/SemanticSearchAdvanced.php:113 #: ../themes/Crao/templates/navbar.tmpl:40 #: ../themes/Crao/templates/navbar.tmpl:42 @@ -2891,7 +2891,7 @@ msgid "Links" msgstr "" -#: ../lib/plugin/LinkDatabase.php:180 +#: ../lib/plugin/LinkDatabase.php:184 #, php-format msgid "Unsupported format argument %s" msgstr "" @@ -3188,7 +3188,7 @@ "markup before rewrapping with emacs and checking into Subversion." msgstr "" -#: ../lib/plugin/PageDump.php:228 ../lib/plugin/PasswordReset.php:138 +#: ../lib/plugin/PageDump.php:228 ../lib/plugin/PasswordReset.php:137 #: ../lib/plugin/SemanticSearchAdvanced.php:149 #: ../lib/plugin/SemanticSearch.php:292 msgid "Warning:" @@ -3340,7 +3340,7 @@ msgstr "" #: ../lib/plugin/PasswordReset.php:67 ../lib/plugin/PasswordReset.php:90 -#: ../lib/plugin/PasswordReset.php:170 +#: ../lib/plugin/PasswordReset.php:171 msgid "Error" msgstr "" @@ -3359,41 +3359,41 @@ msgid "Error sending e-mail with password for user %s." msgstr "" -#: ../lib/plugin/PasswordReset.php:99 +#: ../lib/plugin/PasswordReset.php:98 msgid "Reset password of user: " msgstr "Restablecimiento de la contraseña de usuario: " -#: ../lib/plugin/PasswordReset.php:109 ../lib/plugin/PasswordReset.php:153 +#: ../lib/plugin/PasswordReset.php:108 ../lib/plugin/PasswordReset.php:154 msgid "Send e-mail" msgstr "" -#: ../lib/plugin/PasswordReset.php:139 +#: ../lib/plugin/PasswordReset.php:138 msgid "You need to specify the userid!" msgstr "" -#: ../lib/plugin/PasswordReset.php:161 +#: ../lib/plugin/PasswordReset.php:162 msgid "Already logged in" msgstr "" -#: ../lib/plugin/PasswordReset.php:162 +#: ../lib/plugin/PasswordReset.php:163 msgid "Changing passwords is done at " msgstr "" -#: ../lib/plugin/PasswordReset.php:171 +#: ../lib/plugin/PasswordReset.php:172 #, php-format msgid "No e-mail stored for user %s." msgstr "" -#: ../lib/plugin/PasswordReset.php:173 +#: ../lib/plugin/PasswordReset.php:174 msgid "You need to ask an Administrator to reset this password. See below: " msgstr "" -#: ../lib/plugin/PasswordReset.php:185 +#: ../lib/plugin/PasswordReset.php:186 #, php-format msgid "Do you really want to reset the password of user %s?" msgstr "" -#: ../lib/plugin/PasswordReset.php:186 +#: ../lib/plugin/PasswordReset.php:187 msgid "An e-mail will be sent." msgstr "" @@ -3873,69 +3873,69 @@ msgid "Click to add this feed to your sidebar" msgstr "" -#: ../lib/plugin/RecentChanges.php:896 +#: ../lib/plugin/RecentChanges.php:895 msgid "Title Search" msgstr "Una búsqueda de títulos" -#: ../lib/plugin/RecentChanges.php:1283 +#: ../lib/plugin/RecentChanges.php:1282 msgid "List all recent changes in this wiki." msgstr "" -#: ../lib/plugin/RecentChanges.php:1495 +#: ../lib/plugin/RecentChanges.php:1494 msgid "Show changes for:" msgstr "Demuestre los cambios para:" -#: ../lib/plugin/RecentChanges.php:1542 +#: ../lib/plugin/RecentChanges.php:1541 msgid "1 day" msgstr "1 día" -#: ../lib/plugin/RecentChanges.php:1544 +#: ../lib/plugin/RecentChanges.php:1543 msgid "All time" msgstr "" -#: ../lib/plugin/RecentChanges.php:1546 +#: ../lib/plugin/RecentChanges.php:1545 #, php-format msgid "%s days" msgstr "%s dias" -#: ../lib/plugin/RecentChanges.php:1559 +#: ../lib/plugin/RecentChanges.php:1558 msgid "All users" msgstr "TodasLasUsuarios" -#: ../lib/plugin/RecentChanges.php:1562 +#: ../lib/plugin/RecentChanges.php:1561 msgid "My modifications only" msgstr "" -#: ../lib/plugin/RecentChanges.php:1580 -#: ../themes/MonoBook/templates/navbar.tmpl:75 +#: ../lib/plugin/RecentChanges.php:1579 +#: ../themes/MonoBook/templates/navbar.tmpl:70 msgid "All pages" msgstr "Todas las Páginas" -#: ../lib/plugin/RecentChanges.php:1583 +#: ../lib/plugin/RecentChanges.php:1582 msgid "My pages only" msgstr "" -#: ../lib/plugin/RecentChanges.php:1601 +#: ../lib/plugin/RecentChanges.php:1600 msgid "Major modifications only" msgstr "" -#: ../lib/plugin/RecentChanges.php:1601 +#: ../lib/plugin/RecentChanges.php:1600 msgid "All modifications" msgstr "" -#: ../lib/plugin/RecentChanges.php:1613 +#: ../lib/plugin/RecentChanges.php:1612 msgid "Page once only" msgstr "" -#: ../lib/plugin/RecentChanges.php:1613 +#: ../lib/plugin/RecentChanges.php:1612 msgid "Full changes" msgstr "" -#: ../lib/plugin/RecentChanges.php:1625 +#: ../lib/plugin/RecentChanges.php:1624 msgid "Old and new pages" msgstr "" -#: ../lib/plugin/RecentChanges.php:1625 +#: ../lib/plugin/RecentChanges.php:1624 msgid "New pages only" msgstr "Página nueva sólo" @@ -5011,7 +5011,7 @@ msgid "The page %s is already watched!" msgstr "" -#: ../lib/plugin/WatchPage.php:95 ../lib/WikiTheme.php:1056 +#: ../lib/plugin/WatchPage.php:95 ../lib/WikiTheme.php:1052 #: ../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 +5462,7 @@ msgstr "" #: ../lib/plugin/WikiAdminRename.php:222 ../lib/plugin/WikiAdminRename.php:248 -#: ../lib/WikiTheme.php:1064 +#: ../lib/WikiTheme.php:1060 msgid "Rename Page" msgstr "" @@ -6135,7 +6135,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:1072 +#: ../lib/purgepage.php:24 ../lib/purgepage.php:57 ../lib/WikiTheme.php:1068 msgid "Purge Page" msgstr "" @@ -6161,7 +6161,7 @@ msgid "Remove cancelled" msgstr "Borrar Página" -#: ../lib/removepage.php:24 ../lib/removepage.php:57 ../lib/WikiTheme.php:1070 +#: ../lib/removepage.php:24 ../lib/removepage.php:57 ../lib/WikiTheme.php:1066 msgid "Remove Page" msgstr "Borrar Página" @@ -6609,18 +6609,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:987 +#: ../lib/WikiDB.php:989 #, php-format msgid "%s: Date of new revision is %s" msgstr "%s: La fecha de la nueva revisión es %s" -#: ../lib/WikiDB.php:1755 ../lib/WikiDB.php:1759 +#: ../lib/WikiDB.php:1757 ../lib/WikiDB.php:1761 #: ../themes/default/templates/homepage.tmpl:6 #, php-format msgid "Describe %s here." msgstr "Describe %s aquí." -#: ../lib/WikiDB.php:1794 +#: ../lib/WikiDB.php:1796 #, 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!" @@ -6812,22 +6812,22 @@ msgid "Owner: %s" msgstr "Dueño: %s" -#: ../lib/WikiTheme.php:644 +#: ../lib/WikiTheme.php:640 #, php-format msgid "Empty link to: %s" msgstr "Acoplamiento vacío a: %s" -#: ../lib/WikiTheme.php:659 ../themes/MacOSX/themeinfo.php:80 +#: ../lib/WikiTheme.php:655 ../themes/MacOSX/themeinfo.php:80 #, php-format msgid "Create: %s" msgstr "Cree: %s" -#: ../lib/WikiTheme.php:679 +#: ../lib/WikiTheme.php:675 #, php-format msgid "Google:%s" msgstr "" -#: ../lib/WikiTheme.php:1060 ../themes/blog/themeinfo.php:73 +#: ../lib/WikiTheme.php:1056 ../themes/blog/themeinfo.php:73 #: ../themes/Crao/templates/signin.tmpl:12 #: ../themes/Crao/templates/signin.tmpl:28 #: ../themes/default/templates/signin.tmpl:14 @@ -6841,7 +6841,7 @@ msgid "Sign Out" msgstr "Registro Hacia fuera" -#: ../lib/WikiTheme.php:1062 ../lib/WikiUserNew.php:528 +#: ../lib/WikiTheme.php:1058 ../lib/WikiUserNew.php:528 #: ../lib/WikiUser.php:243 ../themes/blog/themeinfo.php:75 #: ../themes/Crao/templates/signin.tmpl:51 #: ../themes/default/templates/login.tmpl:68 @@ -6852,20 +6852,20 @@ msgid "Sign In" msgstr "Muestra Adentro" -#: ../lib/WikiTheme.php:1066 ../themes/MacOSX/themeinfo.php:138 +#: ../lib/WikiTheme.php:1062 ../themes/MacOSX/themeinfo.php:138 msgid "Lock Page" msgstr "Bloquear Página" -#: ../lib/WikiTheme.php:1068 ../themes/MacOSX/themeinfo.php:139 +#: ../lib/WikiTheme.php:1064 ../themes/MacOSX/themeinfo.php:139 msgid "Unlock Page" msgstr "Desbloquear Página" -#: ../lib/WikiTheme.php:1249 +#: ../lib/WikiTheme.php:1245 msgid "" "Some action(page) wanted to add more headers, but they were already printed." msgstr "" -#: ../lib/WikiTheme.php:1350 ../themes/Hawaiian/themeinfo.php:35 +#: ../lib/WikiTheme.php:1346 ../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 @@ -6873,13 +6873,13 @@ msgid "Printer" msgstr "Impresora" -#: ../lib/WikiTheme.php:1351 ../themes/MacOSX/themeinfo.php:108 +#: ../lib/WikiTheme.php:1347 ../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:1352 ../themes/Hawaiian/themeinfo.php:36 +#: ../lib/WikiTheme.php:1348 ../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 @@ -6887,50 +6887,50 @@ msgid "Modern" msgstr "Moderno" -#: ../lib/WikiTheme.php:1851 +#: ../lib/WikiTheme.php:1847 #, php-format msgid "Plugin %s: undefined" msgstr "Plugin %s: indefinido" -#: ../lib/WikiTheme.php:1878 +#: ../lib/WikiTheme.php:1874 msgid "Related Links" msgstr "Acoplamientos Relacionados" -#: ../lib/WikiTheme.php:1901 +#: ../lib/WikiTheme.php:1897 msgid "External Links" msgstr "Acoplamientos Externos" -#: ../lib/WikiUser/AdoDb.php:49 ../lib/WikiUser/AdoDb.php:210 +#: ../lib/WikiUser/AdoDb.php:49 ../lib/WikiUser/AdoDb.php:208 #: ../lib/WikiUser/Db.php:60 ../lib/WikiUser/File.php:78 #: ../lib/WikiUser/IMAP.php:35 ../lib/WikiUser/LDAP.php:147 #: ../lib/WikiUserNew.php:646 ../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/PdoDb.php:123 ../lib/WikiUser/PearDb.php:45 +#: ../lib/WikiUser/PearDb.php:137 ../lib/WikiUser.php:209 #: ../lib/WikiUser.php:292 ../lib/WikiUser/POP3.php:35 msgid "Invalid username." msgstr "Username inválido." -#: ../lib/WikiUser/AdoDb.php:168 ../lib/WikiUser/PdoDb.php:153 -#: ../lib/WikiUser/PearDb.php:158 +#: ../lib/WikiUser/AdoDb.php:166 ../lib/WikiUser/PdoDb.php:151 +#: ../lib/WikiUser/PearDb.php:156 #, php-format msgid "%s is missing" msgstr "%s falta" -#: ../lib/WikiUser/AdoDb.php:225 ../lib/WikiUser/AdoDb.php:283 -#: ../lib/WikiUser/PdoDb.php:208 ../lib/WikiUser/PdoDb.php:272 -#: ../lib/WikiUser/PearDb.php:202 ../lib/WikiUser/PearDb.php:248 +#: ../lib/WikiUser/AdoDb.php:223 ../lib/WikiUser/AdoDb.php:281 +#: ../lib/WikiUser/PdoDb.php:206 ../lib/WikiUser/PdoDb.php:269 +#: ../lib/WikiUser/PearDb.php:200 ../lib/WikiUser/PearDb.php:246 #, fuzzy, php-format msgid "Either %s is missing or DATABASE_TYPE != “%s”" msgstr "Cualquier %s es que falta o DATABASE_TYPE != “%s”" #: ../lib/WikiUser/Facebook.php:41 ../lib/WikiUser/Facebook.php:83 -#: ../lib/WikiUser/OpenID.php:214 ../lib/WikiUser/OpenID.php:240 +#: ../lib/WikiUser/OpenID.php:213 ../lib/WikiUser/OpenID.php:239 #, php-format msgid "The PECL %s extension cannot be loaded." msgstr "" #: ../lib/WikiUser/Facebook.php:42 ../lib/WikiUser/Facebook.php:84 -#: ../lib/WikiUser/OpenID.php:215 ../lib/WikiUser/OpenID.php:241 +#: ../lib/WikiUser/OpenID.php:214 ../lib/WikiUser/OpenID.php:240 #, php-format msgid " %s AUTH ignored." msgstr "" @@ -7007,13 +7007,13 @@ msgid "Default preferences will be used." msgstr "Las preferencias del defecto serán utilizadas." -#: ../lib/WikiUserNew.php:1280 +#: ../lib/WikiUserNew.php:1277 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:1307 +#: ../lib/WikiUserNew.php:1304 msgid "" "The length of the stored password is shorter than the system policy allows. " "Sorry, you cannot login.\n" @@ -7024,11 +7024,11 @@ " Usted tiene que pedir que el administrador de sistema reajuste su " "contraseña." -#: ../lib/WikiUserNew.php:1321 +#: ../lib/WikiUserNew.php:1318 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:1322 +#: ../lib/WikiUserNew.php:1319 msgid "" "Please set ENCRYPTED_PASSWD to false in config/config.ini and probably " "change ADMIN_PASSWD." @@ -7036,11 +7036,11 @@ "En ENCRYPTED_PASSWD por favor fijado a falso config/config.ini y " "probablemente cambio ADMIN_PASSWD." -#: ../lib/WikiUserNew.php:1334 +#: ../lib/WikiUserNew.php:1331 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:1805 +#: ../lib/WikiUserNew.php:1802 #, php-format msgid "" "Welcome to %s!\n" @@ -7053,12 +7053,12 @@ "para enviar notificaciones del cambio de la página.\n" "Vea %s" -#: ../lib/WikiUserNew.php:1867 +#: ../lib/WikiUserNew.php:1864 #, 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:1871 +#: ../lib/WikiUserNew.php:1868 #, php-format msgid "E-mail address “%s” is properly formatted" msgstr "La dirección “%s” del email se ajusta a formato correctamente" @@ -8499,7 +8499,7 @@ msgstr "Cambios Relacionados" #: ../themes/MonoBook/templates/navbar.tmpl:55 -#: ../themes/Sidebar/templates/navbar.tmpl:68 +#: ../themes/Sidebar/templates/navbar.tmpl:63 msgid "Administration" msgstr "Administración" @@ -8508,15 +8508,13 @@ msgid "Upload images or media files" msgstr "" -#: ../themes/MonoBook/templates/navbar.tmpl:61 -#: ../themes/MonoBook/templates/navbar.tmpl:66 -#: ../themes/Sidebar/templates/navbar.tmpl:52 -#: ../themes/Sidebar/templates/navbar.tmpl:57 +#: ../themes/MonoBook/templates/navbar.tmpl:60 +#: ../themes/Sidebar/templates/navbar.tmpl:51 msgid "Printable version" msgstr "" -#: ../themes/MonoBook/templates/navbar.tmpl:71 -#: ../themes/Sidebar/templates/navbar.tmpl:62 +#: ../themes/MonoBook/templates/navbar.tmpl:66 +#: ../themes/Sidebar/templates/navbar.tmpl:57 msgid "Display as Pdf" msgstr "" Modified: trunk/locale/po/fr.po =================================================================== --- trunk/locale/po/fr.po 2012-12-29 20:51:48 UTC (rev 8708) +++ trunk/locale/po/fr.po 2013-01-08 14:27:18 UTC (rev 8709) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-19 11:03+0100\n" +"POT-Creation-Date: 2013-01-08 15:25+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." @@ -184,10 +184,10 @@ msgid "LinkDatabase" msgstr "LiensDatabase" -#: ../lib/display.php:172 ../lib/display.php:413 ../lib/loadsave.php:1572 +#: ../lib/display.php:172 ../lib/display.php:413 ../lib/loadsave.php:1573 #: ../lib/plugin/RecentChanges.php:64 ../lib/plugin/RecentChanges.php:229 #: ../lib/plugin/RecentChanges.php:236 ../lib/plugin/RecentChanges.php:439 -#: ../lib/plugin/RecentChanges.php:749 ../lib/plugin/RecentChanges.php:1278 +#: ../lib/plugin/RecentChanges.php:749 ../lib/plugin/RecentChanges.php:1277 #: ../lib/RSSWriter091.php:110 ../themes/blog/templates/actionbar.tmpl:10 #: ../themes/Crao/templates/head.tmpl:53 #: ../themes/Crao/templates/navbar.tmpl:11 @@ -365,7 +365,7 @@ "moderators at the definition in %s" msgstr "" -#: ../lib/editpage.php:575 ../lib/plugin/PasswordReset.php:162 +#: ../lib/editpage.php:575 ../lib/plugin/PasswordReset.php:163 #: ../lib/plugin/UserPreferences.php:40 ../lib/plugin/WatchPage.php:129 #: ../lib/plugin/WatchPage.php:151 ../themes/blog/templates/navbar.tmpl:14 #: ../themes/Crao/templates/head.tmpl:76 ../themes/Crao/templates/head.tmpl:77 @@ -678,7 +678,7 @@ msgid "%s: error while handling error:" msgstr "%s : erreur pendant la gestion de l'erreur :" -#: ../lib/FileFinder.php:199 ../lib/loadsave.php:1154 +#: ../lib/FileFinder.php:199 ../lib/loadsave.php:1155 #, php-format msgid "%s: file not found" msgstr "%s : fichier non trouvé" @@ -755,8 +755,8 @@ msgid "Dump Pages as XHTML" msgstr "Exporter les pages en XHTML" -#: ../lib/loadsave.php:96 ../lib/loadsave.php:483 ../lib/loadsave.php:1037 -#: ../lib/loadsave.php:1043 ../lib/loadsave.php:1051 ../lib/main.php:1244 +#: ../lib/loadsave.php:96 ../lib/loadsave.php:483 ../lib/loadsave.php:1038 +#: ../lib/loadsave.php:1044 ../lib/loadsave.php:1052 ../lib/main.php:1244 #: ../lib/main.php:1257 ../lib/PagePerm.php:190 ../lib/PagePerm.php:191 #: ../lib/plugin/WikiAdminRename.php:147 ../lib/plugin/WikiAdminSelect.php:221 #: ../themes/blog/templates/navbar.tmpl:11 @@ -768,7 +768,7 @@ #: ../themes/MonoBook/templates/navbar.tmpl:55 #: ../themes/Portland/templates/navbar.tmpl:24 #: ../themes/shamino_com/templates/actionbar.tmpl:17 -#: ../themes/Sidebar/templates/navbar.tmpl:68 +#: ../themes/Sidebar/templates/navbar.tmpl:63 #: ../themes/smaller/templates/navbar.tmpl:17 #: ../themes/wikilens/templates/head.tmpl:68 #: ../themes/wikilens/templates/head.tmpl:69 @@ -884,7 +884,7 @@ msgid "Empty pagename!" msgstr "Nom de page vide !" -#: ../lib/loadsave.php:915 ../lib/WikiTheme.php:703 +#: ../lib/loadsave.php:915 ../lib/WikiTheme.php:699 #, php-format msgid "“%s”: Bad page name" msgstr "« %s » : nom de page non valide" @@ -922,55 +922,55 @@ msgid "- saved to database as version %d" msgstr "- enregistrée dans la base de données sous la version %d" -#: ../lib/loadsave.php:1027 ../lib/loadsave.php:1296 +#: ../lib/loadsave.php:1028 ../lib/loadsave.php:1297 #, php-format msgid "MIME file %s" msgstr "fichier MIME %s" -#: ../lib/loadsave.php:1028 ../lib/loadsave.php:1307 +#: ../lib/loadsave.php:1029 ../lib/loadsave.php:1308 #, php-format msgid "Serialized file %s" msgstr "Fichier sérialisé %s" -#: ../lib/loadsave.php:1029 ../lib/loadsave.php:1328 +#: ../lib/loadsave.php:1030 ../lib/loadsave.php:1329 #, php-format msgid "plain file %s" msgstr "fichier brut %s" -#: ../lib/loadsave.php:1036 ../lib/plugin/SyncWiki.php:276 +#: ../lib/loadsave.php:1037 ../lib/plugin/SyncWiki.php:276 msgid "Merge Edit" msgstr "Fusionner les modifications" -#: ../lib/loadsave.php:1042 +#: ../lib/loadsave.php:1043 msgid "Restore Anyway" msgstr "Restaurer quand même" -#: ../lib/loadsave.php:1050 +#: ../lib/loadsave.php:1051 msgid "Overwrite All" msgstr "Tout écraser" -#: ../lib/loadsave.php:1057 +#: ../lib/loadsave.php:1058 msgid " Sorry, cannot merge." msgstr " Désolé, impossible de fusionner." -#: ../lib/loadsave.php:1080 +#: ../lib/loadsave.php:1081 msgid "Revert: missing required version argument" msgstr "Révocation : argument de version obligatoire manquant" -#: ../lib/loadsave.php:1087 +#: ../lib/loadsave.php:1088 msgid "No revert: no page content" msgstr "Pas de révocation : pas de contenu dans la p... [truncated message content] |
From: <var...@us...> - 2013-01-11 10:21:01
|
Revision: 8711 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8711&view=rev Author: vargenau Date: 2013-01-11 10:20:47 +0000 (Fri, 11 Jan 2013) Log Message: ----------- seperated --> separated Modified Paths: -------------- trunk/config/config-dist.ini trunk/configurator.php trunk/lib/InlineParser.php trunk/lib/PageList.php trunk/lib/WikiDB.php trunk/lib/loadsave.php trunk/lib/plugin/FullTextSearch.php trunk/lib/plugin/PhotoAlbum.php trunk/lib/plugin/WikiAdminSelect.php trunk/lib/plugin/WikiFormRich.php trunk/locale/de/LC_MESSAGES/phpwiki.mo trunk/locale/de/LC_MESSAGES/phpwiki.php trunk/locale/de/pgsrc/ModerierteSeite 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/pgsrc/Help%2FFileInfoPlugin trunk/pgsrc/Help%2FFullTextSearchPlugin trunk/pgsrc/Help%2FLdapSearchPlugin trunk/pgsrc/Help%2FPageList trunk/pgsrc/Help%2FWikiFormRichPlugin trunk/pgsrc/Help%2FWikiPlugin trunk/themes/default/moacdropdown/js/acdropdown.js trunk/themes/default/moacdropdown/xmlrpc.txt trunk/themes/default/templates/userprefs.tmpl trunk/themes/fusionforge/templates/userprefs.tmpl Modified: trunk/config/config-dist.ini =================================================================== --- trunk/config/config-dist.ini 2013-01-10 10:32:24 UTC (rev 8710) +++ trunk/config/config-dist.ini 2013-01-11 10:20:47 UTC (rev 8711) @@ -961,7 +961,7 @@ ; DEFAULT_WIKI_PGSRC defines where the English pages reside. ;DEFAULT_WIKI_PGSRC = pgsrc -; These are ':'-seperated pages which will get loaded untranslated from DEFAULT_WIKI_PGSRC. +; These are ':'-separated pages which will get loaded untranslated from DEFAULT_WIKI_PGSRC. ;DEFAULT_WIKI_PAGES = "ReleaseNotes" ;========================================================================= Modified: trunk/configurator.php =================================================================== --- trunk/configurator.php 2013-01-10 10:32:24 UTC (rev 8710) +++ trunk/configurator.php 2013-01-11 10:20:47 UTC (rev 8711) @@ -1393,7 +1393,7 @@ $properties["Generic Pages"] = new array_variable('DEFAULT_WIKI_PAGES', array('ReleaseNotes', 'TestPage'), " -These are ':'-seperated pages which will get loaded untranslated from DEFAULT_WIKI_PGSRC. +These are ':'-separated pages which will get loaded untranslated from DEFAULT_WIKI_PGSRC. "); /////////////////// Modified: trunk/lib/InlineParser.php =================================================================== --- trunk/lib/InlineParser.php 2013-01-10 10:32:24 UTC (rev 8710) +++ trunk/lib/InlineParser.php 2013-01-11 10:20:47 UTC (rev 8711) @@ -617,7 +617,7 @@ class Markup_semanticlink extends SimpleMarkup { - // No units seperated by space allowed here + // No units separated by space allowed here // For :: (relations) only words, no comma, // but for := (attributes) comma and dots are allowed. Units with groupsep. // Ending dots or comma are not part of the link. Modified: trunk/lib/PageList.php =================================================================== --- trunk/lib/PageList.php 2013-01-10 10:32:24 UTC (rev 8710) +++ trunk/lib/PageList.php 2013-01-11 10:20:47 UTC (rev 8711) @@ -725,7 +725,7 @@ return array( // Currently supported options: /* what columns, what pages */ 'info' => 'pagename', - 'exclude' => '', // also wildcards, comma-seperated lists + 'exclude' => '', // also wildcards, comma-separated lists // and <!plugin-list !> arrays /* select pages by meta-data: */ 'author' => false, // current user by [] @@ -751,7 +751,7 @@ 'cols' => 1, // side-by-side display of list (1-3) 'azhead' => 0, // 1: group by initials // 2: provide shortcut links to initials also - 'comma' => 0, // condensed comma-seperated list, + 'comma' => 0, // condensed comma-separated list, // 1 if without links, 2 if with 'commasep' => false, // Default: ', ' 'listtype' => '', // ul (default), ol, dl, comma Modified: trunk/lib/WikiDB.php =================================================================== --- trunk/lib/WikiDB.php 2013-01-10 10:32:24 UTC (rev 8710) +++ trunk/lib/WikiDB.php 2013-01-11 10:20:47 UTC (rev 8711) @@ -281,7 +281,7 @@ * If false the result is faster in natural order. * @param string or false $limit Optional. Encoded as "$offset,$count". * $offset defaults to 0. - * @param string $exclude: Optional comma-seperated list of pagenames. + * @param string $exclude: Optional comma-separated list of pagenames. * * @return WikiDB_PageIterator A WikiDB_PageIterator which contains all pages * in the WikiDB which have non-default contents. @@ -301,7 +301,7 @@ * @access public * * @param boolean $include_empty If true include also empty pages - * @param string $exclude: comma-seperated list of pagenames. + * @param string $exclude: comma-separated list of pagenames. * TBD: array of pagenames * @return integer * @@ -336,7 +336,7 @@ * If false the result is faster in natural order. * @param string or false $limit Optional. Encoded as "$offset,$count". * $offset defaults to 0. - * @param string $exclude: Optional comma-seperated list of pagenames. + * @param string $exclude: Optional comma-separated list of pagenames. * @return WikiDB_PageIterator A WikiDB_PageIterator containing the matching pages. * @see TextSearchQuery */ @@ -367,7 +367,7 @@ * If false the result is faster in natural order. * @param string or false $limit Optional. Encoded as "$offset,$count". * $offset defaults to 0. - * @param string $exclude: Optional comma-seperated list of pagenames. + * @param string $exclude: Optional comma-separated list of pagenames. * @return WikiDB_PageIterator A WikiDB_PageIterator containing the matching pages. * @see TextSearchQuery */ Modified: trunk/lib/loadsave.php =================================================================== --- trunk/lib/loadsave.php 2013-01-10 10:32:24 UTC (rev 8710) +++ trunk/lib/loadsave.php 2013-01-11 10:20:47 UTC (rev 8711) @@ -443,9 +443,9 @@ * should be enough. * * @param string directory (optional) path to dump to. Default: HTML_DUMP_DIR - * @param string pages (optional) Comma-seperated of glob-style pagenames to dump. + * @param string pages (optional) Comma-separated of glob-style pagenames to dump. * Also array of pagenames allowed. - * @param string exclude (optional) Comma-seperated of glob-style pagenames to exclude + * @param string exclude (optional) Comma-separated of glob-style pagenames to exclude */ function DumpHtmlToDir(&$request) { Modified: trunk/lib/plugin/FullTextSearch.php =================================================================== --- trunk/lib/plugin/FullTextSearch.php 2013-01-10 10:32:24 UTC (rev 8710) +++ trunk/lib/plugin/FullTextSearch.php 2013-01-11 10:20:47 UTC (rev 8711) @@ -63,7 +63,7 @@ 'regex' => 'auto', 'sortby' => '-hi_content', 'noheader' => false, - 'exclude' => false, // comma-seperated list of glob + 'exclude' => false, // comma-separated list of glob 'quiet' => true)); // be less verbose } Modified: trunk/lib/plugin/PhotoAlbum.php =================================================================== --- trunk/lib/plugin/PhotoAlbum.php 2013-01-10 10:32:24 UTC (rev 8710) +++ trunk/lib/plugin/PhotoAlbum.php 2013-01-11 10:20:47 UTC (rev 8711) @@ -49,7 +49,7 @@ * photo-02.jpg * christmas.gif; Merry Christmas! * - * Inside textfile, filenames and optional descriptions are seperated by + * Inside textfile, filenames and optional descriptions are separated by * semi-colon on each line. Listed files must be in same directory as textfile * itself, so don't use relative paths inside textfile. * Modified: trunk/lib/plugin/WikiAdminSelect.php =================================================================== --- trunk/lib/plugin/WikiAdminSelect.php 2013-01-10 10:32:24 UTC (rev 8710) +++ trunk/lib/plugin/WikiAdminSelect.php 2013-01-11 10:20:47 UTC (rev 8711) @@ -80,7 +80,7 @@ /** * Preselect a list of pagenames by the supporting the following args: - * 's': comma-seperated list of pagename wildcards + * 's': comma-separated list of pagename wildcards * 'author', 'owner', 'creator': from WikiDB_Page * 'only: forgot what the difference to 's' was. * Sets $this->_list, which is picked up by collectPages() and is a default for p[] Modified: trunk/lib/plugin/WikiFormRich.php =================================================================== --- trunk/lib/plugin/WikiFormRich.php 2013-01-10 10:32:24 UTC (rev 8710) +++ trunk/lib/plugin/WikiFormRich.php 2013-01-11 10:20:47 UTC (rev 8711) @@ -39,7 +39,7 @@ * If no method is given, value will be used to fill in the valid values. * method="xmlrpc:server:name" or "url:http://server/wiki/method" or "array:jsvariable" * or "plugin:pluginname" - * args are optional arguments, space seperated, for the method. + * args are optional arguments, space separated, for the method. * A combobox is a pulldown with autocomplete=1. * * @Author: Reini Urban 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 2013-01-10 10:32:24 UTC (rev 8710) +++ trunk/locale/de/LC_MESSAGES/phpwiki.php 2013-01-11 10:20:47 UTC (rev 8711) @@ -381,7 +381,7 @@ $locale["Empty link to: %s"] = "Leerer Link zu: %s"; $locale["Empty pagename!"] = "Leerer Seitenname!"; $locale["Enable configurable polls."] = "Erlaubt konfigurierbare Umfragen."; -$locale["Enter pages seperated by space or comma. Wildcards (fileglobbing) allowed."] = "Liste aller Seiten durch Leerzeichen oder Komma getrennt. Reguläre Ausdrücke (fileglobbing) erlaubt."; +$locale["Enter pages separated by space or comma. Wildcards (fileglobbing) allowed."] = "Liste aller Seiten durch Leerzeichen oder Komma getrennt. Reguläre Ausdrücke (fileglobbing) erlaubt."; $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"; Modified: trunk/locale/de/pgsrc/ModerierteSeite =================================================================== --- trunk/locale/de/pgsrc/ModerierteSeite 2013-01-10 10:32:24 UTC (rev 8710) +++ trunk/locale/de/pgsrc/ModerierteSeite 2013-01-11 10:20:47 UTC (rev 8711) @@ -1,4 +1,4 @@ -Date: Fri, 10 Sep 2010 13:48:42 +0000 +Date: Fri, 11 Jan 2013 11:17:06 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0) Content-Type: application/x-phpwiki; pagename=ModerierteSeite; @@ -41,7 +41,7 @@ == Plugin Arguments -* moderators: comma seperated list of registered usernames or groups. +* moderators: comma separated list of registered usernames or groups. Each user should have his email defined in his prefs. Default: "Administrators" or <<SystemInfo ADMIN_USER >> * requirelevel: one of 0, 1, 2 or 10 on which moderation is used. Default: false (use requireaccess instead) 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 2013-01-10 10:32:24 UTC (rev 8710) +++ trunk/locale/fr/LC_MESSAGES/phpwiki.php 2013-01-11 10:20:47 UTC (rev 8711) @@ -400,7 +400,7 @@ $locale["Empty pagename!"] = "Nom de page vide !"; $locale["Enable DoubleClick Edit"] = "Autoriser la modification par double clic"; $locale["Enable configurable polls."] = "Permettre de faire des sondages configurables."; -$locale["Enter pages seperated by space or comma. Wildcards (fileglobbing) allowed."] = "Entrer les pages séparées par des virgules. Les étoiles (jokers) sont autorisées."; +$locale["Enter pages separated by space or comma. Wildcards (fileglobbing) allowed."] = "Entrer les pages séparées par des virgules. Les étoiles (jokers) sont autorisées."; $locale["Enter your UserId to sign in"] = "Entrez votre identifiant utilisateur pour vous connecter"; $locale["Entry on %s by %s."] = "Commentaire le %s par %s."; $locale["Enumeration"] = "Énumération"; @@ -1122,7 +1122,7 @@ $locale["Unable to open directory “%s” for reading"] = "Impossible d'ouvrir le répertoire « %s » en lecture"; $locale["Unable to read src=“%s”"] = "Impossible de lire src=%s"; $locale["Undefined method %s for special group %s"] = "Méthode non définie %s pour le groupe %s"; -$locale["Undo"] = "Annuler l'action"; +$locale["Undo"] = "Annuler"; $locale["Undo Search & Replace"] = "Annuler « Rechercher & Remplacer »"; $locale["Undo disabled"] = "Annuler dernière action désactivé."; $locale["Unexpected EOF in zip file"] = "Fin de fichier (EOF) inattendue dans le fichier Zip"; 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 2013-01-10 10:32:24 UTC (rev 8710) +++ trunk/locale/po/de.po 2013-01-11 10:20:47 UTC (rev 8711) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-08 15:25+0100\n" +"POT-Creation-Date: 2013-01-11 11:18+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." @@ -8258,7 +8258,7 @@ #: ../themes/default/templates/userprefs.tmpl:178 #: ../themes/fusionforge/templates/userprefs.tmpl:200 msgid "" -"Enter pages seperated by space or comma. Wildcards (fileglobbing) allowed." +"Enter pages separated by space or comma. Wildcards (fileglobbing) allowed." msgstr "" "Liste aller Seiten durch Leerzeichen oder Komma getrennt. Reguläre Ausdrücke " "(fileglobbing) erlaubt." Modified: trunk/locale/po/es.po =================================================================== --- trunk/locale/po/es.po 2013-01-10 10:32:24 UTC (rev 8710) +++ trunk/locale/po/es.po 2013-01-11 10:20:47 UTC (rev 8711) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-08 15:25+0100\n" +"POT-Creation-Date: 2013-01-11 11:18+0100\n" "PO-Revision-Date: 2000-02-01 00:50-0500\n" "Last-Translator: Pablo Roca <pr...@cl...>\n" "Language-Team: \n" @@ -8076,7 +8076,7 @@ #: ../themes/default/templates/userprefs.tmpl:178 #: ../themes/fusionforge/templates/userprefs.tmpl:200 msgid "" -"Enter pages seperated by space or comma. Wildcards (fileglobbing) allowed." +"Enter pages separated by space or comma. Wildcards (fileglobbing) allowed." msgstr "" #: ../themes/default/templates/userprefs.tmpl:188 Modified: trunk/locale/po/fr.po =================================================================== --- trunk/locale/po/fr.po 2013-01-10 10:32:24 UTC (rev 8710) +++ trunk/locale/po/fr.po 2013-01-11 10:20:47 UTC (rev 8711) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-08 15:25+0100\n" +"POT-Creation-Date: 2013-01-11 11:18+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." @@ -8161,7 +8161,7 @@ #: ../themes/default/templates/userprefs.tmpl:178 #: ../themes/fusionforge/templates/userprefs.tmpl:200 msgid "" -"Enter pages seperated by space or comma. Wildcards (fileglobbing) allowed." +"Enter pages separated by space or comma. Wildcards (fileglobbing) allowed." msgstr "" "Entrer les pages séparées par des virgules. Les étoiles (jokers) sont " "autorisées." Modified: trunk/locale/po/it.po =================================================================== --- trunk/locale/po/it.po 2013-01-10 10:32:24 UTC (rev 8710) +++ trunk/locale/po/it.po 2013-01-11 10:20:47 UTC (rev 8711) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-08 15:25+0100\n" +"POT-Creation-Date: 2013-01-11 11:18+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" @@ -8021,7 +8021,7 @@ #: ../themes/default/templates/userprefs.tmpl:178 #: ../themes/fusionforge/templates/userprefs.tmpl:200 msgid "" -"Enter pages seperated by space or comma. Wildcards (fileglobbing) allowed." +"Enter pages separated by space or comma. Wildcards (fileglobbing) allowed." msgstr "" #: ../themes/default/templates/userprefs.tmpl:188 Modified: trunk/locale/po/ja.po =================================================================== --- trunk/locale/po/ja.po 2013-01-10 10:32:24 UTC (rev 8710) +++ trunk/locale/po/ja.po 2013-01-11 10:20:47 UTC (rev 8711) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-08 15:25+0100\n" +"POT-Creation-Date: 2013-01-11 11:18+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" @@ -8192,7 +8192,7 @@ #: ../themes/default/templates/userprefs.tmpl:178 #: ../themes/fusionforge/templates/userprefs.tmpl:200 msgid "" -"Enter pages seperated by space or comma. Wildcards (fileglobbing) allowed." +"Enter pages separated by space or comma. Wildcards (fileglobbing) allowed." msgstr "" #: ../themes/default/templates/userprefs.tmpl:188 Modified: trunk/locale/po/nl.po =================================================================== --- trunk/locale/po/nl.po 2013-01-10 10:32:24 UTC (rev 8710) +++ trunk/locale/po/nl.po 2013-01-11 10:20:47 UTC (rev 8711) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-08 15:25+0100\n" +"POT-Creation-Date: 2013-01-11 11:18+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" @@ -8005,7 +8005,7 @@ #: ../themes/default/templates/userprefs.tmpl:178 #: ../themes/fusionforge/templates/userprefs.tmpl:200 msgid "" -"Enter pages seperated by space or comma. Wildcards (fileglobbing) allowed." +"Enter pages separated by space or comma. Wildcards (fileglobbing) allowed." msgstr "" #: ../themes/default/templates/userprefs.tmpl:188 Modified: trunk/locale/po/phpwiki.pot =================================================================== --- trunk/locale/po/phpwiki.pot 2013-01-10 10:32:24 UTC (rev 8710) +++ trunk/locale/po/phpwiki.pot 2013-01-11 10:20:47 UTC (rev 8711) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki-1.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-08 15:25+0100\n" +"POT-Creation-Date: 2013-01-11 11:18+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" @@ -7993,7 +7993,7 @@ #: ../themes/default/templates/userprefs.tmpl:178 #: ../themes/fusionforge/templates/userprefs.tmpl:200 msgid "" -"Enter pages seperated by space or comma. Wildcards (fileglobbing) allowed." +"Enter pages separated by space or comma. Wildcards (fileglobbing) allowed." msgstr "" #: ../themes/default/templates/userprefs.tmpl:188 Modified: trunk/locale/po/sv.po =================================================================== --- trunk/locale/po/sv.po 2013-01-10 10:32:24 UTC (rev 8710) +++ trunk/locale/po/sv.po 2013-01-11 10:20:47 UTC (rev 8711) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-08 15:25+0100\n" +"POT-Creation-Date: 2013-01-11 11:18+0100\n" "PO-Revision-Date: 2001-01-27 01:58+0200\n" "Last-Translator: Jon Åslund <jo...@he...>\n" "Language-Team: \n" @@ -7996,7 +7996,7 @@ #: ../themes/default/templates/userprefs.tmpl:178 #: ../themes/fusionforge/templates/userprefs.tmpl:200 msgid "" -"Enter pages seperated by space or comma. Wildcards (fileglobbing) allowed." +"Enter pages separated by space or comma. Wildcards (fileglobbing) allowed." msgstr "" #: ../themes/default/templates/userprefs.tmpl:188 Modified: trunk/locale/po/zh.po =================================================================== --- trunk/locale/po/zh.po 2013-01-10 10:32:24 UTC (rev 8710) +++ trunk/locale/po/zh.po 2013-01-11 10:20:47 UTC (rev 8711) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-08 15:25+0100\n" +"POT-Creation-Date: 2013-01-11 11:18+0100\n" "PO-Revision-Date: 2004-04-21 10:08+0800\n" "Last-Translator: DruryL <dr...@us...>\n" "Language-Team: DruryL <dr...@us...>\n" @@ -8360,7 +8360,7 @@ #: ../themes/default/templates/userprefs.tmpl:178 #: ../themes/fusionforge/templates/userprefs.tmpl:200 msgid "" -"Enter pages seperated by space or comma. Wildcards (fileglobbing) allowed." +"Enter pages separated by space or comma. Wildcards (fileglobbing) allowed." msgstr "輸入頁面並以空白或逗號分隔.允許使用萬用字元 (fileglobbing)." #: ../themes/default/templates/userprefs.tmpl:188 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 2013-01-10 10:32:24 UTC (rev 8710) +++ trunk/locale/zh/LC_MESSAGES/phpwiki.php 2013-01-11 10:20:47 UTC (rev 8711) @@ -209,7 +209,7 @@ $locale["Empty Preferences or format of UserPreferences cookie not recognised."] = "空的偏好設定或 UserPreferences cookie 格式無法辨認."; $locale["Empty link to: %s"] = "沒有連結到: %s"; $locale["Empty pagename!"] = "空白的頁面名稱!"; -$locale["Enter pages seperated by space or comma. Wildcards (fileglobbing) allowed."] = "輸入頁面並以空白或逗號分隔.允許使用萬用字元 (fileglobbing)."; +$locale["Enter pages separated by space or comma. Wildcards (fileglobbing) allowed."] = "輸入頁面並以空白或逗號分隔.允許使用萬用字元 (fileglobbing)."; $locale["Enter your UserId to sign in"] = "輸入你的帳號進行簽入"; $locale["Error: Empty search string."] = "錯誤: 空白的搜尋字串."; $locale["Error: The user HomePage must be a valid WikiWord. Sorry, UserPreferences cannot be saved."] = "錯誤: 使用者的首頁必須是一個合法的 WikiWord. 抱歉, UserPreferences 無法儲存."; Modified: trunk/pgsrc/Help%2FFileInfoPlugin =================================================================== --- trunk/pgsrc/Help%2FFileInfoPlugin 2013-01-10 10:32:24 UTC (rev 8710) +++ trunk/pgsrc/Help%2FFileInfoPlugin 2013-01-11 10:20:47 UTC (rev 8711) @@ -1,4 +1,4 @@ -Date: Fri, 16 Dec 2011 12:51:22 +0000 +Date: Fri, 11 Jan 2013 11:16:51 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0) Content-Type: application/x-phpwiki; pagename=Help%2FFileInfoPlugin; @@ -34,7 +34,7 @@ | //None// (required argument) |- | **display** -| Comma-seperated string of version, size, phonysize, date, mtime, owner, name, path, dirname, link, mime-typ, magic. +| Comma-separated string of version, size, phonysize, date, mtime, owner, name, path, dirname, link, mime-typ, magic. | //None// (required argument) |- | **format** Modified: trunk/pgsrc/Help%2FFullTextSearchPlugin =================================================================== --- trunk/pgsrc/Help%2FFullTextSearchPlugin 2013-01-10 10:32:24 UTC (rev 8710) +++ trunk/pgsrc/Help%2FFullTextSearchPlugin 2013-01-11 10:20:47 UTC (rev 8711) @@ -1,4 +1,4 @@ -Date: Fri, 7 Dec 2012 14:58:45 +0000 +Date: Fri, 11 Jan 2013 11:16:51 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0) Content-Type: application/x-phpwiki; pagename=Help%2FFullTextSearchPlugin; @@ -49,7 +49,7 @@ | false |- | **exclude** -| Comma-seperated list of glob to exclude +| Comma-separated list of glob to exclude | false |- | **quiet** Modified: trunk/pgsrc/Help%2FLdapSearchPlugin =================================================================== --- trunk/pgsrc/Help%2FLdapSearchPlugin 2013-01-10 10:32:24 UTC (rev 8710) +++ trunk/pgsrc/Help%2FLdapSearchPlugin 2013-01-11 10:20:47 UTC (rev 8711) @@ -1,4 +1,4 @@ -Date: Fri, 7 Dec 2012 18:31:23 +0000 +Date: Fri, 11 Jan 2013 11:16:51 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0) Content-Type: application/x-phpwiki; pagename=Help%2FLdapSearchPlugin; @@ -53,11 +53,11 @@ | "(cn=*)" |- | **attributes** -| space seperated fields to return as table columns: "cn sn" +| space separated fields to return as table columns: "cn sn" | empty |- | **options** -| ldap_set_option(). Column seperated name=value pairs. Esp. needed for Windows Active directory: "LDAP_OPT_PROTOCOL_VERSION=3:LDAP_OPT_REFERRALS=0" +| ldap_set_option(). Column separated name=value pairs. Esp. needed for Windows Active directory: "LDAP_OPT_PROTOCOL_VERSION=3:LDAP_OPT_REFERRALS=0" | LDAP_SET_OPTION if host == LDAP_AUTH_HOST |- | **user** Modified: trunk/pgsrc/Help%2FPageList =================================================================== --- trunk/pgsrc/Help%2FPageList 2013-01-10 10:32:24 UTC (rev 8710) +++ trunk/pgsrc/Help%2FPageList 2013-01-11 10:20:47 UTC (rev 8711) @@ -1,4 +1,4 @@ -Date: Thu, 9 Dec 2010 14:51:45 +0000 +Date: Fri, 11 Jan 2013 11:16:51 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0) Content-Type: application/x-phpwiki; pagename=Help%2FPageList; @@ -32,7 +32,7 @@ | pagename |- | **exclude** -| which pages to exclude. Wildcards, comma-seperated lists and <!plugin-list !> arrays allowed. +| which pages to exclude. Wildcards, comma-separated lists and <!plugin-list !> arrays allowed. | //none// |- | **author** @@ -68,7 +68,7 @@ | 0 |- | **comma** -| condensed comma-seperated list, 1 if without links, 2 if with +| condensed comma-separated list, 1 if without links, 2 if with | 0 |- | **commasep** Modified: trunk/pgsrc/Help%2FWikiFormRichPlugin =================================================================== --- trunk/pgsrc/Help%2FWikiFormRichPlugin 2013-01-10 10:32:24 UTC (rev 8710) +++ trunk/pgsrc/Help%2FWikiFormRichPlugin 2013-01-11 10:20:47 UTC (rev 8711) @@ -1,4 +1,4 @@ -Date: Fri, 7 Dec 2012 14:58:45 +0000 +Date: Fri, 11 Jan 2013 11:16:51 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0) Content-Type: application/x-phpwiki; pagename=Help%2FWikiFormRichPlugin; @@ -35,7 +35,7 @@ }}} * The plugin must return a pagelist. -* args are optional arguments, space seperated, for the method. +* args are optional arguments, space separated, for the method. * A combobox is a pulldown with autocomplete=1. * Values which are constants are evaluated. * The cancel button must be supported by the action (just some wikiadmin actions so far) Modified: trunk/pgsrc/Help%2FWikiPlugin =================================================================== --- trunk/pgsrc/Help%2FWikiPlugin 2013-01-10 10:32:24 UTC (rev 8710) +++ trunk/pgsrc/Help%2FWikiPlugin 2013-01-11 10:20:47 UTC (rev 8711) @@ -1,4 +1,4 @@ -Date: Fri, 7 Dec 2012 18:54:26 +0000 +Date: Fri, 11 Jan 2013 11:16:51 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0) Content-Type: application/x-phpwiki; pagename=Help%2FWikiPlugin; @@ -90,7 +90,7 @@ For details see the [[Help:PageList|PageList]] library documentation. -*exclude* and *pages* accept a list of pages. Either as comma-seperated list, +*exclude* and *pages* accept a list of pages. Either as comma-separated list, supporting glob-style wildcards, or via the ##<!plugin-list pluginname ~[args~] !>## invocation syntax, where pluginname might be any plugin returning a [[Help:PageList|PageList]]. See PhpWiki:PluginList. Modified: trunk/themes/default/moacdropdown/js/acdropdown.js =================================================================== --- trunk/themes/default/moacdropdown/js/acdropdown.js 2013-01-10 10:32:24 UTC (rev 8710) +++ trunk/themes/default/moacdropdown/js/acdropdown.js 2013-01-11 10:20:47 UTC (rev 8711) @@ -664,7 +664,7 @@ { // encoding: "xmlrpc:wiki.titleSearch [S] 4" // or "xmlrpc:http://localhost/wiki/?wiki.titleSearch [S] 4" - // encode the methodname as optional query_arg and the args space seperated + // encode the methodname as optional query_arg and the args space separated var sURL = this.sListURL var xmlrpc_url = data_path + '/RPC2.php' var aMethodArgs = sURL.split( ' ' ) Modified: trunk/themes/default/moacdropdown/xmlrpc.txt =================================================================== --- trunk/themes/default/moacdropdown/xmlrpc.txt 2013-01-10 10:32:24 UTC (rev 8710) +++ trunk/themes/default/moacdropdown/xmlrpc.txt 2013-01-11 10:20:47 UTC (rev 8711) @@ -6,7 +6,7 @@ long form (remote server): "xmlrpc:http://localhost/wiki/?wiki.titleSearch [S] 4" -encode the methodname as optional query_arg and the args space seperated +encode the methodname as optional query_arg and the args space separated args can only be strings Modified: trunk/themes/default/templates/userprefs.tmpl =================================================================== --- trunk/themes/default/templates/userprefs.tmpl 2013-01-10 10:32:24 UTC (rev 8710) +++ trunk/themes/default/templates/userprefs.tmpl 2013-01-11 10:20:47 UTC (rev 8711) @@ -175,7 +175,7 @@ <tr> <?php if ($isForm) { ?> <td><textarea name="pref[notifyPages]" cols="40" rows="6"><?php echo $pref->get('notifyPages')?></textarea></td> - <td><p class="hint"><?php echo _("Enter pages seperated by space or comma. Wildcards (fileglobbing) allowed.")?></p></td> + <td><p class="hint"><?php echo _("Enter pages separated by space or comma. Wildcards (fileglobbing) allowed.")?></p></td> <?php } else { ?> <td><?php echo $pref->get('notifyPages')?></td> <?php } ?> Modified: trunk/themes/fusionforge/templates/userprefs.tmpl =================================================================== --- trunk/themes/fusionforge/templates/userprefs.tmpl 2013-01-10 10:32:24 UTC (rev 8710) +++ trunk/themes/fusionforge/templates/userprefs.tmpl 2013-01-11 10:20:47 UTC (rev 8711) @@ -197,7 +197,7 @@ <tr> <?php if ($isForm) { ?> <td><textarea name="pref[notifyPages]" cols="40" rows="6"><?php echo $pref->get('notifyPages')?></textarea></td> - <td><p class="hint"><?php echo _("Enter pages seperated by space or comma. Wildcards (fileglobbing) allowed.")?></p></td> + <td><p class="hint"><?php echo _("Enter pages separated by space or comma. Wildcards (fileglobbing) allowed.")?></p></td> <?php } else { ?> <td colspan="2"><?php echo $pref->get('notifyPages')?></td> <?php } ?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2013-01-14 19:12:40
|
Revision: 8713 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8713&view=rev Author: vargenau Date: 2013-01-14 19:12:26 +0000 (Mon, 14 Jan 2013) Log Message: ----------- seperate --> separate Modified Paths: -------------- trunk/TODO trunk/admin/wiki2public.php trunk/config/config-dist.ini trunk/configurator.php trunk/doc/README.phpwiki-auth trunk/lib/EditToolbar.php trunk/lib/InlineParser.php trunk/lib/PagePerm.php trunk/lib/WikiDB/backend/dbaBase.php trunk/lib/WikiDB/backend/dumb/LinkSearchIter.php trunk/lib/WikiDB/backend.php trunk/lib/WikiPlugin.php trunk/lib/WikiTheme.php trunk/lib/WikiUser.php trunk/lib/WikiUserNew.php trunk/lib/XmlRpcServer.php trunk/lib/pear/Cache/Container/trifile.php trunk/lib/plugin/FrameInclude.php trunk/lib/plugin/RecentChanges.php trunk/lib/plugin/SemanticSearchAdvanced.php trunk/lib/plugin/SystemInfo.php trunk/lib/plugin/WikiAdminUtils.php trunk/lib/plugin/WikiBlog.php trunk/lib/upgrade.php trunk/locale/de/LC_MESSAGES/phpwiki.php trunk/locale/de/pgsrc/PhpWikiSystemverwalten trunk/locale/fr/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/PhpWikiDebug trunk/pgsrc/ReleaseNotes trunk/schemas/mssql-initialize.sql trunk/schemas/mysql-initialize.sql trunk/schemas/sqlsrv-initialize.sql trunk/tests/makemakebuild.pl trunk/tests/unit/test.php trunk/themes/default/templates/editpage.tmpl Modified: trunk/TODO =================================================================== --- trunk/TODO 2013-01-11 10:27:11 UTC (rev 8712) +++ trunk/TODO 2013-01-14 19:12:26 UTC (rev 8713) @@ -32,7 +32,7 @@ <BackLink include_self=false /> 4 And/or fix PLUGIN_MARKUP_MAP aliases which break the InlineParser. * Fix postgresql stored procedures. -* Move serialized data from page_data / version_data to seperate SQL columns. +* Move serialized data from page_data / version_data to separate SQL columns. * WikiDB hooks. (?) * Content expansion hooks in transformer. (SearchHighlight) * Convert RecentChanges to PageList as source for format options. Modified: trunk/admin/wiki2public.php =================================================================== --- trunk/admin/wiki2public.php 2013-01-11 10:27:11 UTC (rev 8712) +++ trunk/admin/wiki2public.php 2013-01-14 19:12:26 UTC (rev 8713) @@ -1,4 +1,4 @@ <?php -// cronjob script to copy pages marked as "public" to a seperate public wiki area. +// cronjob script to copy pages marked as "public" to a separate public wiki area. // If ENABLE_PAGE_PUBLIC = true // can only run via localhost for security reasons Modified: trunk/config/config-dist.ini =================================================================== --- trunk/config/config-dist.ini 2013-01-11 10:27:11 UTC (rev 8712) +++ trunk/config/config-dist.ini 2013-01-14 19:12:26 UTC (rev 8713) @@ -50,7 +50,7 @@ ; Experimental! ;ENABLE_WYSIWYG = true -; Which backend? Might need to be seperately installed. See lib/WysiwygEdit/ +; Which backend? Might need to be separately installed. See lib/WysiwygEdit/ ; Recommended is only Wikiwyg. ; ; Wikiwyg http://openjsan.org/doc/i/in/ingy/Wikiwyg/ @@ -65,7 +65,7 @@ ; Not recommended, but presented here to test several WYSIWYG backends. ;WYSIWYG_DEFAULT_PAGETYPE_HTML = false -; Upload into seperate userdirs. If enabled (default since 1.3.13) the generated Upload: link +; Upload into separate userdirs. If enabled (default since 1.3.13) the generated Upload: link ; will include the username plus "/". This will make all uploaded links longer, but we ; avoid nameclashes and you see who uploaded what file. ;UPLOAD_USERDIR = false @@ -176,7 +176,7 @@ ;ENABLE_RECENTCHANGESBOX = true ; You can enable an admin checkbox to set a "public" page attribute, to -; be used by external tools to generate a seperate public wiki. +; be used by external tools to generate a separate public wiki. ; Default: false ;ENABLE_PAGE_PUBLIC = true @@ -524,7 +524,7 @@ ; author is an author revision. ; ; The expiry parameters for each of those three classes of revisions -; can be adjusted seperately. For each class there are five +; can be adjusted separately. For each class there are five ; parameters (usually, only two or three of the five are actually ; set) which control how long those revisions are kept in the ; database. @@ -606,7 +606,7 @@ ; any/no password) using any userid which: ; 1) is not the ADMIN_USER, and ; 2) is a valid WikiWord (matches $WikiNameRegexp.) -; If true, users may be created by themselves. Otherwise we need seperate auth. +; If true, users may be created by themselves. Otherwise we need separate auth. ; If such a user will create a so called HomePage with his userid, he will ; be able to store his preferences and password there. ALLOW_BOGO_LOGIN = true Modified: trunk/configurator.php =================================================================== --- trunk/configurator.php 2013-01-11 10:27:11 UTC (rev 8712) +++ trunk/configurator.php 2013-01-14 19:12:26 UTC (rev 8713) @@ -806,7 +806,7 @@ author is and author revision. The expiry parameters for each of those three classes of revisions -can be adjusted seperately. For each class there are five +can be adjusted separately. For each class there are five parameters (usually, only two or three of the five are actually set) which control how long those revisions are kept in the database. @@ -1420,7 +1420,7 @@ $properties["Subpage Separator"] = new _define_optional('SUBPAGE_SEPARATOR', '"/"', " -One character which seperates pages from subpages. Defaults to '/', but '.' or ':' were also used.", +One character which separates pages from subpages. Defaults to '/', but '.' or ':' were also used.", "onchange=\"validate_ereg('Sorry, \'%s\' must be a single character. Currently only :, / or .', '^[/:.]$', 'SUBPAGE_SEPARATOR', this);\"" ); @@ -1495,7 +1495,7 @@ Part Six (optional): URL options -- you can probably skip this section. -For a pretty wiki (no index.php in the url) set a seperate DATA_PATH."); +For a pretty wiki (no index.php in the url) set a separate DATA_PATH."); $properties["Server Name"] = new _define_commented_optional('SERVER_NAME', $_SERVER['SERVER_NAME'], " @@ -1546,7 +1546,7 @@ new _define_commented_optional('VIRTUAL_PATH', '/SomeWiki', " VIRTUAL_PATH is the canonical URL path under which your your wiki appears. Normally this is the same as dirname(SCRIPT_NAME), however -using e.g. seperate starter scripts, apaches mod_actions (or mod_rewrite), +using e.g. separate starter scripts, apaches mod_actions (or mod_rewrite), you can make it something different. If you do this, you should set VIRTUAL_PATH here or in the starter scripts. Modified: trunk/doc/README.phpwiki-auth =================================================================== --- trunk/doc/README.phpwiki-auth 2013-01-11 10:27:11 UTC (rev 8712) +++ trunk/doc/README.phpwiki-auth 2013-01-14 19:12:26 UTC (rev 8713) @@ -22,7 +22,7 @@ was in index.php, but it was never enabled (which probably lead to some confusion). Since version 1.3.8 UserAuthentificationNew is enabled. -We have to seperate various storage methods for UserPreferences +We have to separate various storage methods for UserPreferences (cookie, PersonalPage and database), various retrieval methods for username-password pairs (AuthMethods) and various AuthPolicies. @@ -62,7 +62,7 @@ 2) is a valid WikiWord (matches $WikiNameRegexp.) If true, users may be created by themselves. Otherwise we need -seperate ALLOW_USER_PASSWORDS auth. If such a user will create a so +separate ALLOW_USER_PASSWORDS auth. If such a user will create a so called HomePage named after his WikiWord userid, he will be able to store his preferences and password there. If ALLOW_ANON_EDIT = true, one may still sign in to be able to store @@ -165,7 +165,7 @@ ! $DBAuthParams~[~] -Statements for seperate DB User Authentication. +Statements for separate DB User Authentication. This array defines the database prepare statements to select and update the password and preferences. This is typically used to Modified: trunk/lib/EditToolbar.php =================================================================== --- trunk/lib/EditToolbar.php 2013-01-11 10:27:11 UTC (rev 8712) +++ trunk/lib/EditToolbar.php 2013-01-14 19:12:26 UTC (rev 8713) @@ -264,7 +264,7 @@ } //TODO: Delegate this to run-time with showing an hidden input at the right, and do - // a seperate moacdropdown and xmlrpc:titleSearch. + // a separate moacdropdown and xmlrpc:titleSearch. // Button to generate categories, display in extra window as popup and insert $sr_html = HTML($sr_html, $this->categoriesPulldown()); Modified: trunk/lib/InlineParser.php =================================================================== --- trunk/lib/InlineParser.php 2013-01-11 10:27:11 UTC (rev 8712) +++ trunk/lib/InlineParser.php 2013-01-14 19:12:26 UTC (rev 8713) @@ -490,7 +490,7 @@ * [File:my_image.gif|what a pic] shows an inlined image linked to the page "what a pic" * * Note that for simplicity we will accept embedded object tags (non-images) - * here also, and seperate them later in LinkImage() + * here also, and separate them later in LinkImage() */ elseif (strstr($link, ':') and ($intermap = getInterwikiMap()) Modified: trunk/lib/PagePerm.php =================================================================== --- trunk/lib/PagePerm.php 2013-01-11 10:27:11 UTC (rev 8712) +++ trunk/lib/PagePerm.php 2013-01-14 19:12:26 UTC (rev 8713) @@ -437,7 +437,7 @@ or $member->isMember($creator)); } /* Or named groups or usernames. - Note: We don't seperate groups and users here. + Note: We don't separate groups and users here. Users overrides groups with the same name. */ return $user->UserName() === $group or Modified: trunk/lib/WikiDB/backend/dbaBase.php =================================================================== --- trunk/lib/WikiDB/backend/dbaBase.php 2013-01-11 10:27:11 UTC (rev 8712) +++ trunk/lib/WikiDB/backend/dbaBase.php 2013-01-14 19:12:26 UTC (rev 8713) @@ -31,7 +31,7 @@ * - Yes - RecentChanges support. Lists of most recent edits (major, minor, either). * 't' + mtime => 'a|i' + version+':'+pagename ('a': major, 'i': minor) * Cost: Currently we have to get_all_pages and sort it by mtime. - * With a seperate t table we have to update this table on every version change. + * With a separate t table we have to update this table on every version change. * - No - list of pagenames for get_all_pages (very cheap: iterate page table) * - Maybe - mostpopular list? 'h' + pagename => hits * Modified: trunk/lib/WikiDB/backend/dumb/LinkSearchIter.php =================================================================== --- trunk/lib/WikiDB/backend/dumb/LinkSearchIter.php 2013-01-11 10:27:11 UTC (rev 8712) +++ trunk/lib/WikiDB/backend/dumb/LinkSearchIter.php 2013-01-14 19:12:26 UTC (rev 8713) @@ -121,7 +121,7 @@ foreach ($attribs as $attribute => $value) { if ($this->relation and !$this->relation->match($attribute)) continue; // The logical operator and unit unification (not yet) is encoded into - // a seperate search object. + // a separate search object. if (!$this->search->match($value)) continue; $links[] = array('pagename' => $pagename, 'linkname' => $attribute, Modified: trunk/lib/WikiDB/backend.php =================================================================== --- trunk/lib/WikiDB/backend.php 2013-01-11 10:27:11 UTC (rev 8712) +++ trunk/lib/WikiDB/backend.php 2013-01-14 19:12:26 UTC (rev 8713) @@ -703,7 +703,7 @@ * Iterator returned by backend methods which (possibly) return * multiple records. * - * FIXME: This might be two seperate classes: page_iter and version_iter. + * FIXME: This might be two separate classes: page_iter and version_iter. * For the versions we have WikiDB_backend_dumb_AllRevisionsIter. */ class WikiDB_backend_iterator Modified: trunk/lib/WikiPlugin.php =================================================================== --- trunk/lib/WikiPlugin.php 2013-01-11 10:27:11 UTC (rev 8712) +++ trunk/lib/WikiPlugin.php 2013-01-14 19:12:26 UTC (rev 8713) @@ -168,7 +168,7 @@ $gt_p = "_\\( $opt_ws $qq_p $opt_ws \\)"; $argspec_p = "($arg_p) $opt_ws ($op_p) $opt_ws (?: $qq_p|$q_p|$gt_p|($word_p))"; - // handle plugin-list arguments seperately + // handle plugin-list arguments separately $plugin_p = '<!plugin-list\s+\w+.*?!>'; while (preg_match("/^($arg_p) $opt_ws ($op_p) $opt_ws ($plugin_p) $opt_ws/x", $argstr, $m)) { @ list(, $arg, $op, $plugin_val) = $m; Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2013-01-11 10:27:11 UTC (rev 8712) +++ trunk/lib/WikiTheme.php 2013-01-14 19:12:26 UTC (rev 8713) @@ -1234,8 +1234,8 @@ /** * Add a random header element to head - * TODO: first css, then js. Maybe seperate it into addJSHeaders/addCSSHeaders - * or use an optional type argument, and seperate it within _MoreHeaders[] + * TODO: first css, then js. Maybe separate it into addJSHeaders/addCSSHeaders + * or use an optional type argument, and separate it within _MoreHeaders[] */ //$GLOBALS['request']->_MoreHeaders = array(); function addMoreHeaders($element) @@ -1507,7 +1507,7 @@ } // Immediate title search results via XMLHTML(HttpRequest) - // by Bitflux GmbH, bitflux.ch. You need to install the livesearch.js seperately. + // by Bitflux GmbH, bitflux.ch. You need to install the livesearch.js separately. // Google's or acdropdown is better. function initLiveSearch() { Modified: trunk/lib/WikiUser.php =================================================================== --- trunk/lib/WikiUser.php 2013-01-11 10:27:11 UTC (rev 8712) +++ trunk/lib/WikiUser.php 2013-01-14 19:12:26 UTC (rev 8713) @@ -220,7 +220,7 @@ } function PrintLoginForm(&$request, $args, $fail_message = false, - $seperate_page = true) + $separate_page = true) { include_once 'lib/Template.php'; // Call update_locale in case the system's default language is not 'en'. @@ -236,7 +236,7 @@ $login = new Template('login', $request, compact('pagename', 'userid', 'require_level', 'fail_message', 'pass_required')); - if ($seperate_page) { + if ($separate_page) { $request->discardOutput(); $page = $request->getPage($pagename); $revision = $page->getCurrentRevision(); Modified: trunk/lib/WikiUserNew.php =================================================================== --- trunk/lib/WikiUserNew.php 2013-01-11 10:27:11 UTC (rev 8712) +++ trunk/lib/WikiUserNew.php 2013-01-14 19:12:26 UTC (rev 8713) @@ -502,7 +502,7 @@ //Fixme: for _HttpAuthPassUser function PrintLoginForm(&$request, $args, $fail_message = false, - $seperate_page = false) + $separate_page = false) { include_once 'lib/Template.php'; // Call update_locale in case the system's default language is not 'en'. @@ -521,8 +521,8 @@ compact('pagename', 'userid', 'require_level', 'fail_message', 'pass_required', 'nocache')); // check if the html template was already processed - $seperate_page = $seperate_page ? true : !alreadyTemplateProcessed('html'); - if ($seperate_page) { + $separate_page = $separate_page ? true : !alreadyTemplateProcessed('html'); + if ($separate_page) { $page = $request->getPage($pagename); $revision = $page->getCurrentRevision(); return GeneratePage($login, _("Sign In"), $revision); Modified: trunk/lib/XmlRpcServer.php =================================================================== --- trunk/lib/XmlRpcServer.php 2013-01-11 10:27:11 UTC (rev 8712) +++ trunk/lib/XmlRpcServer.php 2013-01-14 19:12:26 UTC (rev 8713) @@ -936,7 +936,7 @@ * Construct the server instance, and set up the dispatch map, * which maps the XML-RPC methods on to the wiki functions. * Provide the "wiki." prefix to each function. Besides - * the blog - pingback, ... - functions with a seperate namespace. + * the blog - pingback, ... - functions with a separate namespace. */ class XmlRpcServer extends xmlrpc_server { Modified: trunk/lib/pear/Cache/Container/trifile.php =================================================================== --- trunk/lib/pear/Cache/Container/trifile.php 2013-01-11 10:27:11 UTC (rev 8712) +++ trunk/lib/pear/Cache/Container/trifile.php 2013-01-14 19:12:26 UTC (rev 8713) @@ -25,7 +25,7 @@ * Tri-file cache. * * This cache container stores files with no special encoding to reduce overhead. - * Expiration & user data are stored in seperate files, prefixed with a '.' and + * Expiration & user data are stored in separate files, prefixed with a '.' and * suffixed with '.exp' & '.dat' respectively. * * See http://atomized.org/PEAR/Cache_trifile.html for more information. @@ -157,4 +157,4 @@ } } -?> \ No newline at end of file +?> Modified: trunk/lib/plugin/FrameInclude.php =================================================================== --- trunk/lib/plugin/FrameInclude.php 2013-01-11 10:27:11 UTC (rev 8712) +++ trunk/lib/plugin/FrameInclude.php 2013-01-14 19:12:26 UTC (rev 8713) @@ -21,7 +21,7 @@ */ /** - * FrameInclude: Display a url or page in a seperate frame inside our body. + * FrameInclude: Display a url or page in a separate frame inside our body. * * Usage: * <<FrameInclude src=http://www.internet-technology.de/fourwins_de.htm >> @@ -55,7 +55,7 @@ function getDescription() { - return _("Display a url in a seperate frame inside our body. Only one frame allowed."); + return _("Display a url in a separate frame inside our body. Only one frame allowed."); } function getDefaultArguments() Modified: trunk/lib/plugin/RecentChanges.php =================================================================== --- trunk/lib/plugin/RecentChanges.php 2013-01-11 10:27:11 UTC (rev 8712) +++ trunk/lib/plugin/RecentChanges.php 2013-01-14 19:12:26 UTC (rev 8713) @@ -355,7 +355,7 @@ $lmt = abs($limit); /** * Depending how this text is split up it can be tricky or - * impossible to translate with good grammar. So the seperate + * impossible to translate with good grammar. So the separate * strings for 1 day and %s days are necessary in this case * for translating to multiple languages, due to differing * overlapping ideal word cutting points. Modified: trunk/lib/plugin/SemanticSearchAdvanced.php =================================================================== --- trunk/lib/plugin/SemanticSearchAdvanced.php 2013-01-11 10:27:11 UTC (rev 8712) +++ trunk/lib/plugin/SemanticSearchAdvanced.php 2013-01-14 19:12:26 UTC (rev 8713) @@ -111,7 +111,7 @@ 'autocomplete_list' => 'array:semsearch_relations' ), $args['s']); $submit = Button('submit:semsearch[relations]', _("Search"), false, - array('title' => 'Move to help page. No seperate window')); + array('title' => 'Move to help page. No separate window')); $instructions = _("Search in all specified pages for the expression."); $form = HTML::form(array('action' => $action, 'method' => 'post', Modified: trunk/lib/plugin/SystemInfo.php =================================================================== --- trunk/lib/plugin/SystemInfo.php 2013-01-11 10:27:11 UTC (rev 8712) +++ trunk/lib/plugin/SystemInfo.php 2013-01-14 19:12:26 UTC (rev 8713) @@ -379,7 +379,7 @@ // Size of databases/files/cvs are possible plus the known size of the app. // Cache this costly operation. // Even if the whole plugin call is stored internally, we cache this - // seperately with a seperate key. + // separately with a separate key. function discspace() { global $DBParams; Modified: trunk/lib/plugin/WikiAdminUtils.php =================================================================== --- trunk/lib/plugin/WikiAdminUtils.php 2013-01-11 10:27:11 UTC (rev 8712) +++ trunk/lib/plugin/WikiAdminUtils.php 2013-01-14 19:12:26 UTC (rev 8713) @@ -104,7 +104,7 @@ $message = call_user_func(array(&$this, $method), $request, $args); - // display as seperate page or as alert? + // display as separate page or as alert? $alert = new Alert(fmt("WikiAdminUtils %s returned:", $args['action']), $message, array(_("Back") => $args['return_url'])); @@ -231,7 +231,7 @@ return $dbh->_backend->rebuild($args); } - //TODO: We need a seperate plugin for this. + //TODO: We need a separate plugin for this. // Too many options. function _do_access_restrictions(&$request, &$args) { Modified: trunk/lib/plugin/WikiBlog.php =================================================================== --- trunk/lib/plugin/WikiBlog.php 2013-01-11 10:27:11 UTC (rev 8712) +++ trunk/lib/plugin/WikiBlog.php 2013-01-14 19:12:26 UTC (rev 8713) @@ -39,7 +39,7 @@ * * HINTS/COMMENTS: * - * To have the blog show up on a seperate page: + * To have the blog show up on a separate page: * On TopPage, use * <<WikiBlog mode=add>> * Create TopPage/Blog with this page as actionpage: Modified: trunk/lib/upgrade.php =================================================================== --- trunk/lib/upgrade.php 2013-01-11 10:27:11 UTC (rev 8712) +++ trunk/lib/upgrade.php 2013-01-14 19:12:26 UTC (rev 8713) @@ -806,7 +806,7 @@ /** * if page.cached_html does not exists: - * put _cached_html from pagedata into a new seperate blob, + * put _cached_html from pagedata into a new separate blob, * not into the huge serialized string. * * It is only rarelely needed: for current page only, if-not-modified, @@ -849,7 +849,7 @@ } /** - * move _cached_html for all pages from pagedata into a new seperate blob. + * move _cached_html for all pages from pagedata into a new separate blob. * decoupled from action=upgrade, so that it can be used by a WikiAdminUtils button also. */ function _convert_cached_html() Modified: trunk/locale/de/LC_MESSAGES/phpwiki.php =================================================================== --- trunk/locale/de/LC_MESSAGES/phpwiki.php 2013-01-11 10:27:11 UTC (rev 8712) +++ trunk/locale/de/LC_MESSAGES/phpwiki.php 2013-01-14 19:12:26 UTC (rev 8713) @@ -339,7 +339,7 @@ $locale["Discussion"] = "Diskussion"; $locale["Display a list of randomly chosen pages or redirects to a random page."] = "Eine liste der zufälliger ausgewählter Seiten zeigen oder nach einer zufälliger ausgewählter Seite weiterleiten."; $locale["Display a set of photos listed in a text file with optional descriptions."] = "Zeigt die Liste der Bilder in einer Textdatei an, mit optionalen Beschreibungen."; -$locale["Display a url in a seperate frame inside our body. Only one frame allowed."] = "Zeigt eine URL in einem eigenen (oder gesonderten) Frame innerhalb der Seite. Nur ein Frame ist erlaubt."; +$locale["Display a url in a separate frame inside our body. Only one frame allowed."] = "Zeigt eine URL in einem eigenen (oder gesonderten) Frame innerhalb der Seite. Nur ein Frame ist erlaubt."; $locale["Display arbitrary SQL result tables."] = "Zeige Tabelle von SQL Abfragen an."; $locale["Display differences between revisions."] = "Zeilenweiser Vergleich der Versionen."; $locale["Don't cache this page."] = "Cache diese Seite nicht."; Modified: trunk/locale/de/pgsrc/PhpWikiSystemverwalten =================================================================== --- trunk/locale/de/pgsrc/PhpWikiSystemverwalten 2013-01-11 10:27:11 UTC (rev 8712) +++ trunk/locale/de/pgsrc/PhpWikiSystemverwalten 2013-01-14 19:12:26 UTC (rev 8713) @@ -223,7 +223,7 @@ === Convert cached_html to new SQL column This is only needed on SQL or ADODB if you didn't do action=upgrade, but created the - new page.cached_html field seperately, and now you want to move this data from + new page.cached_html field separately, and now you want to move this data from page.pagedata over to page.cached_html. <<WikiAdminUtils Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.php =================================================================== --- trunk/locale/fr/LC_MESSAGES/phpwiki.php 2013-01-11 10:27:11 UTC (rev 8712) +++ trunk/locale/fr/LC_MESSAGES/phpwiki.php 2013-01-14 19:12:26 UTC (rev 8713) @@ -344,7 +344,7 @@ $locale["Discussion"] = "Discussion"; $locale["Display a list of randomly chosen pages or redirects to a random page."] = "Affiche une liste de pages prises au hasard sur ce wiki."; $locale["Display a set of photos listed in a text file with optional descriptions."] = "Affiche un groupe de photos listées dans un fichier texte avec des descriptions facultatives."; -$locale["Display a url in a seperate frame inside our body. Only one frame allowed."] = "Affiche une url dans une cadre interne à la page. Un seul cadre autorisé."; +$locale["Display a url in a separate frame inside our body. Only one frame allowed."] = "Affiche une url dans une cadre interne à la page. Un seul cadre autorisé."; $locale["Display arbitrary SQL result tables."] = "Affiche le résultat de requêtes SQL simples."; $locale["Display as Pdf"] = "Afficher en PDF"; $locale["Display differences between revisions."] = "Affiche les différences entre versions."; @@ -411,7 +411,7 @@ $locale["Error: The user HomePage must be a valid WikiWord. Sorry, UserPreferences cannot be saved."] = "La page d'accueil d'un utilisateur doit être un NomWiki valide. Les préférences ne peuvent pas être enregistrées."; $locale["Every"] = "Toutes"; $locale["Expiry parameters"] = "Expiration des paramètres"; -$locale["Export to a seperate public area?"] = "Exporter dans une zone publique distincte ?"; +$locale["Export to a separate public area?"] = "Exporter dans une zone publique distincte ?"; $locale["External"] = "Externe"; $locale["External Links"] = "Liens externes"; $locale["External link (remember http:// prefix)"] = "Lien externe (le préfixe http:// est obligatoire)"; Modified: trunk/locale/po/de.po =================================================================== --- trunk/locale/po/de.po 2013-01-11 10:27:11 UTC (rev 8712) +++ trunk/locale/po/de.po 2013-01-14 19:12:26 UTC (rev 8713) @@ -2546,7 +2546,7 @@ #: ../lib/plugin/FrameInclude.php:58 msgid "" -"Display a url in a seperate frame inside our body. Only one frame allowed." +"Display a url in a separate frame inside our body. Only one frame allowed." msgstr "" "Zeigt eine URL in einem eigenen (oder gesonderten) Frame innerhalb der " "Seite. Nur ein Frame ist erlaubt." @@ -7806,7 +7806,7 @@ msgstr "" #: ../themes/default/templates/editpage.tmpl:80 -msgid "Export to a seperate public area?" +msgid "Export to a separate public area?" msgstr "" #: ../themes/default/templates/editpage.tmpl:80 Modified: trunk/locale/po/es.po =================================================================== --- trunk/locale/po/es.po 2013-01-11 10:27:11 UTC (rev 8712) +++ trunk/locale/po/es.po 2013-01-14 19:12:26 UTC (rev 8713) @@ -2514,7 +2514,7 @@ #: ../lib/plugin/FrameInclude.php:58 msgid "" -"Display a url in a seperate frame inside our body. Only one frame allowed." +"Display a url in a separate frame inside our body. Only one frame allowed." msgstr "" #: ../lib/plugin/FrameInclude.php:85 ../lib/plugin/RandomPage.php:63 @@ -7643,7 +7643,7 @@ msgstr "" #: ../themes/default/templates/editpage.tmpl:80 -msgid "Export to a seperate public area?" +msgid "Export to a separate public area?" msgstr "" #: ../themes/default/templates/editpage.tmpl:80 Modified: trunk/locale/po/fr.po =================================================================== --- trunk/locale/po/fr.po 2013-01-11 10:27:11 UTC (rev 8712) +++ trunk/locale/po/fr.po 2013-01-14 19:12:26 UTC (rev 8713) @@ -2519,7 +2519,7 @@ #: ../lib/plugin/FrameInclude.php:58 msgid "" -"Display a url in a seperate frame inside our body. Only one frame allowed." +"Display a url in a separate frame inside our body. Only one frame allowed." msgstr "" "Affiche une url dans une cadre interne à la page. Un seul cadre autorisé." @@ -7715,7 +7715,7 @@ msgstr "Rendre la page non modifiable ?" #: ../themes/default/templates/editpage.tmpl:80 -msgid "Export to a seperate public area?" +msgid "Export to a separate public area?" msgstr "Exporter dans une zone publique distincte ?" #: ../themes/default/templates/editpage.tmpl:80 Modified: trunk/locale/po/it.po =================================================================== --- trunk/locale/po/it.po 2013-01-11 10:27:11 UTC (rev 8712) +++ trunk/locale/po/it.po 2013-01-14 19:12:26 UTC (rev 8713) @@ -2494,7 +2494,7 @@ #: ../lib/plugin/FrameInclude.php:58 msgid "" -"Display a url in a seperate frame inside our body. Only one frame allowed." +"Display a url in a separate frame inside our body. Only one frame allowed." msgstr "" #: ../lib/plugin/FrameInclude.php:85 ../lib/plugin/RandomPage.php:63 @@ -7588,7 +7588,7 @@ msgstr "" #: ../themes/default/templates/editpage.tmpl:80 -msgid "Export to a seperate public area?" +msgid "Export to a separate public area?" msgstr "" #: ../themes/default/templates/editpage.tmpl:80 Modified: trunk/locale/po/ja.po =================================================================== --- trunk/locale/po/ja.po 2013-01-11 10:27:11 UTC (rev 8712) +++ trunk/locale/po/ja.po 2013-01-14 19:12:26 UTC (rev 8713) @@ -2520,7 +2520,7 @@ #: ../lib/plugin/FrameInclude.php:58 msgid "" -"Display a url in a seperate frame inside our body. Only one frame allowed." +"Display a url in a separate frame inside our body. Only one frame allowed." msgstr "" #: ../lib/plugin/FrameInclude.php:85 ../lib/plugin/RandomPage.php:63 @@ -7748,7 +7748,7 @@ msgstr "" #: ../themes/default/templates/editpage.tmpl:80 -msgid "Export to a seperate public area?" +msgid "Export to a separate public area?" msgstr "" #: ../themes/default/templates/editpage.tmpl:80 Modified: trunk/locale/po/nl.po =================================================================== --- trunk/locale/po/nl.po 2013-01-11 10:27:11 UTC (rev 8712) +++ trunk/locale/po/nl.po 2013-01-14 19:12:26 UTC (rev 8713) @@ -2486,7 +2486,7 @@ #: ../lib/plugin/FrameInclude.php:58 msgid "" -"Display a url in a seperate frame inside our body. Only one frame allowed." +"Display a url in a separate frame inside our body. Only one frame allowed." msgstr "" #: ../lib/plugin/FrameInclude.php:85 ../lib/plugin/RandomPage.php:63 @@ -7572,7 +7572,7 @@ msgstr "" #: ../themes/default/templates/editpage.tmpl:80 -msgid "Export to a seperate public area?" +msgid "Export to a separate public area?" msgstr "" #: ../themes/default/templates/editpage.tmpl:80 Modified: trunk/locale/po/phpwiki.pot =================================================================== --- trunk/locale/po/phpwiki.pot 2013-01-11 10:27:11 UTC (rev 8712) +++ trunk/locale/po/phpwiki.pot 2013-01-14 19:12:26 UTC (rev 8713) @@ -2479,7 +2479,7 @@ #: ../lib/plugin/FrameInclude.php:58 msgid "" -"Display a url in a seperate frame inside our body. Only one frame allowed." +"Display a url in a separate frame inside our body. Only one frame allowed." msgstr "" #: ../lib/plugin/FrameInclude.php:85 ../lib/plugin/RandomPage.php:63 @@ -7560,7 +7560,7 @@ msgstr "" #: ../themes/default/templates/editpage.tmpl:80 -msgid "Export to a seperate public area?" +msgid "Export to a separate public area?" msgstr "" #: ../themes/default/templates/editpage.tmpl:80 Modified: trunk/locale/po/sv.po =================================================================== --- trunk/locale/po/sv.po 2013-01-11 10:27:11 UTC (rev 8712) +++ trunk/locale/po/sv.po 2013-01-14 19:12:26 UTC (rev 8713) @@ -2480,7 +2480,7 @@ #: ../lib/plugin/FrameInclude.php:58 msgid "" -"Display a url in a seperate frame inside our body. Only one frame allowed." +"Display a url in a separate frame inside our body. Only one frame allowed." msgstr "" #: ../lib/plugin/FrameInclude.php:85 ../lib/plugin/RandomPage.php:63 @@ -7563,7 +7563,7 @@ msgstr "" #: ../themes/default/templates/editpage.tmpl:80 -msgid "Export to a seperate public area?" +msgid "Export to a separate public area?" msgstr "" #: ../themes/default/templates/editpage.tmpl:80 Modified: trunk/locale/po/zh.po =================================================================== --- trunk/locale/po/zh.po 2013-01-11 10:27:11 UTC (rev 8712) +++ trunk/locale/po/zh.po 2013-01-14 19:12:26 UTC (rev 8713) @@ -2580,7 +2580,7 @@ #: ../lib/plugin/FrameInclude.php:58 msgid "" -"Display a url in a seperate frame inside our body. Only one frame allowed." +"Display a url in a separate frame inside our body. Only one frame allowed." msgstr "在內容的分離框架中顯示 url. 只能放一個框架." #: ../lib/plugin/FrameInclude.php:85 ../lib/plugin/RandomPage.php:63 @@ -7909,7 +7909,7 @@ msgstr "" #: ../themes/default/templates/editpage.tmpl:80 -msgid "Export to a seperate public area?" +msgid "Export to a separate public area?" msgstr "" #: ../themes/default/templates/editpage.tmpl:80 Modified: trunk/pgsrc/PhpWikiDebug =================================================================== --- trunk/pgsrc/PhpWikiDebug 2013-01-11 10:27:11 UTC (rev 8712) +++ trunk/pgsrc/PhpWikiDebug 2013-01-14 19:12:26 UTC (rev 8713) @@ -48,7 +48,7 @@ == Convert cached_html to new SQL column == This is only needed on SQL or ADODB if you didn't do action=upgrade, but created the -new page.cached_html field seperately, and now you want to move this data from +new page.cached_html field separately, and now you want to move this data from page.pagedata over to page.cached_html. <<WikiAdminUtils action=convert-cached-html label="Convert cached_html" >> Modified: trunk/pgsrc/ReleaseNotes =================================================================== --- trunk/pgsrc/ReleaseNotes 2013-01-11 10:27:11 UTC (rev 8712) +++ trunk/pgsrc/ReleaseNotes 2013-01-14 19:12:26 UTC (rev 8713) @@ -460,7 +460,7 @@ Some external libraries are not (Pear_DB odbc, adodb oracle) * fixed sql statements for pagedata where it is not needed, fixing the typical ~PageList memory exhaustion on simple page lists. - cached_html is handled complete seperate now. + cached_html is handled complete separate now. * fixed and improved WikiDB pageid caching. * fixed some ~WikiGroup errors for WIKIPAGE and DB * fixed JS_SEARCHREPLACE Modified: trunk/schemas/mssql-initialize.sql =================================================================== --- trunk/schemas/mssql-initialize.sql 2013-01-11 10:27:11 UTC (rev 8712) +++ trunk/schemas/mssql-initialize.sql 2013-01-14 19:12:26 UTC (rev 8713) @@ -67,7 +67,7 @@ -- ALTER TABLE pref ADD passwd CHAR(48) BINARY DEFAULT ''; -- ALTER TABLE pref ADD groupname CHAR(48) BINARY DEFAULT 'users'; --- deprecated since 1.3.12. only useful for seperate databases. +-- deprecated since 1.3.12. only useful for separate databases. -- better use the extra pref table where such users can be created easily -- without password. -- CREATE TABLE user ( Modified: trunk/schemas/mysql-initialize.sql =================================================================== --- trunk/schemas/mysql-initialize.sql 2013-01-11 10:27:11 UTC (rev 8712) +++ trunk/schemas/mysql-initialize.sql 2013-01-14 19:12:26 UTC (rev 8713) @@ -82,7 +82,7 @@ -- ALTER TABLE pref ADD passwd CHAR(48) BINARY DEFAULT ''; -- ALTER TABLE pref ADD groupname CHAR(48) BINARY DEFAULT 'users'; --- deprecated since 1.3.12. only useful for seperate databases. +-- deprecated since 1.3.12. only useful for separate databases. -- better use the extra pref table where such users can be created easily -- without password. Modified: trunk/schemas/sqlsrv-initialize.sql =================================================================== --- trunk/schemas/sqlsrv-initialize.sql 2013-01-11 10:27:11 UTC (rev 8712) +++ trunk/schemas/sqlsrv-initialize.sql 2013-01-14 19:12:26 UTC (rev 8713) @@ -1,6 +1,6 @@ -- UNTESTED! --- the CREATE FUNCTION section must be run as a seperate query. cut/paste run before executing the remainder +-- the CREATE FUNCTION section must be run as a separate query. cut/paste run before executing the remainder -- of the contents of this file CREATE FUNCTION hasContent (@ContentField varchar(max)) @@ -13,7 +13,7 @@ RETURN 0 END --- end seperate section +-- end separate section CREATE TABLE page ( @@ -85,7 +85,7 @@ -- ALTER TABLE pref ADD passwd CHAR(48) BINARY DEFAULT ''; -- ALTER TABLE pref ADD groupname CHAR(48) BINARY DEFAULT 'users'; --- deprecated since 1.3.12. only useful for seperate databases. +-- deprecated since 1.3.12. only useful for separate databases. -- better use the extra pref table where such users can be created easily -- without password. -- CREATE TABLE user ( Modified: trunk/tests/makemakebuild.pl =================================================================== --- trunk/tests/makemakebuild.pl 2013-01-11 10:27:11 UTC (rev 8712) +++ trunk/tests/makemakebuild.pl 2013-01-14 19:12:26 UTC (rev 8713) @@ -16,7 +16,7 @@ # fix the url below for your server # run makemakebuild.pl, this creates Makefile (gnu make) and build.xml (ant) # run make, this compiles the classes and runs ant. -# if your classpath is wrong run ant seperately to test. +# if your classpath is wrong run ant separately to test. # run ant for each test. both ant and make can run independently. #my $my_wikiurl = 'http://reini/phpwiki/'; # this will replace steve's url below if defined Modified: trunk/tests/unit/test.php =================================================================== --- trunk/tests/unit/test.php 2013-01-11 10:27:11 UTC (rev 8712) +++ trunk/tests/unit/test.php 2013-01-14 19:12:26 UTC (rev 8713) @@ -98,7 +98,7 @@ //'PDO_oci', 'PDO_odbc' //TODO: convert cvs test -// For "cvs" see the seperate tests/unit_test_backend_cvs.php (cvs is experimental) +// For "cvs" see the separate tests/unit_test_backend_cvs.php (cvs is experimental) //TODO: read some database values from config.ini, just use the "test_" prefix // "flatfile" testing occurs in "tests/unit/.testbox/flatfile" // "dba" needs the DATABASE_DBA_HANDLER, also in the .textbox directory Modified: trunk/themes/default/templates/editpage.tmpl =================================================================== --- trunk/themes/default/templates/editpage.tmpl 2013-01-11 10:27:11 UTC (rev 8712) +++ trunk/themes/default/templates/editpage.tmpl 2013-01-14 19:12:26 UTC (rev 8713) @@ -77,7 +77,7 @@ <?php if ($user->isAdmin()) { ?> <?php echo $LOCKED_CB ?> <label for="edit-locked" title="<?php echo _("Make the page read-only?")?>"><?php echo _("Locked")?></label> <?php if (ENABLE_PAGE_PUBLIC) { ?> - <?php echo $PUBLIC_CB ?> <label for="edit-public" title="<?php echo _("Export to a seperate public area?")?>"><?php echo _("Public")?></label> + <?php echo $PUBLIC_CB ?> <label for="edit-public" title="<?php echo _("Export to a separate public area?")?>"><?php echo _("Public")?></label> <?php }} ?> </td> <td colspan="2" align="right"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2013-02-06 09:49:06
|
Revision: 8723 http://sourceforge.net/p/phpwiki/code/8723 Author: vargenau Date: 2013-02-06 09:49:04 +0000 (Wed, 06 Feb 2013) Log Message: ----------- Move comments to pgsrc; highlight.bg no longer exists in PHP 5.4; translate error message Modified Paths: -------------- trunk/lib/plugin/PhpHighlight.php trunk/pgsrc/Help%2FPhpHighlightPlugin Modified: trunk/lib/plugin/PhpHighlight.php =================================================================== --- trunk/lib/plugin/PhpHighlight.php 2013-02-04 10:15:01 UTC (rev 8722) +++ trunk/lib/plugin/PhpHighlight.php 2013-02-06 09:49:04 UTC (rev 8723) @@ -22,40 +22,13 @@ */ /** - * A plugin that runs the highlight_string() function in PHP on it's + * A plugin that runs the highlight_string() function in PHP on its * arguments to pretty-print PHP code. - * - * Usage: - * <<PhpHighlight default='#FF0000' comment='#0000CC' - * code that should be highlighted - * >> - * - * You do not have to add '<?php' and '?>' to the code - the plugin - * does this automatically if you do not set wrap to 0. - * - * If you do set wrap to 0, then you'll have to start and stop PHP - * mode in the source yourself, or you wont see any highlighting. But - * you cannot use '<?php' and '?>' in the source, because this - * interferes with PhpWiki, you'll have use '< ?php' and '? >' - * instead. - * - * Author: Martin Geisler <gim...@gi...>. - * - * Added ability to override colors defined in php.ini --Carsten Klapp - * - * Known Problems: - * <<PhpHighlight - * testing[somearray]; - * testing~[badworkaround~]; - * >> - * will swallow "[somearray]" */ class WikiPlugin_PhpHighlight extends WikiPlugin { - // Four required functions in a WikiPlugin. - function getName() { return _("PhpHighlight"); @@ -75,7 +48,7 @@ 'string' => ini_get("highlight.string"), //'#00CC00', 'comment' => ini_get("highlight.comment"), //'#FF9900', 'keyword' => ini_get("highlight.keyword"), //'#006600', - 'bg' => ini_get("highlight.bg"), //'#FFFFFF', + 'bg' => (version_compare(PHP_VERSION, '5.4', '<')) ? ini_get("highlight.bg") : '#FFFFFF', 'default' => ini_get("highlight.default"), //'#0000CC', 'html' => ini_get("highlight.html") //'#000000' ); @@ -88,7 +61,7 @@ $source =& $this->source; if (empty($source)) { return HTML::div(array('class' => "error"), - "Please provide source code to PhpHighlight plugin"); + _("Please provide source code to PhpHighlight plugin")); } $this->sanify_colors($string, $comment, $keyword, $bg, $default, $html); @@ -162,7 +135,9 @@ $this->oldstring = ini_set('highlight.string', $string); $this->oldcomment = ini_set('highlight.comment', $comment); $this->oldkeyword = ini_set('highlight.keyword', $keyword); - $this->oldbg = ini_set('highlight.bg', $bg); + if (version_compare(PHP_VERSION, '5.4', '<')) { + $this->oldbg = ini_set('highlight.bg', $bg); + } $this->olddefault = ini_set('highlight.default', $default); $this->oldhtml = ini_set('highlight.html', $html); } @@ -173,7 +148,9 @@ ini_set('highlight.string', $this->oldstring); ini_set('highlight.comment', $this->oldcomment); ini_set('highlight.keyword', $this->oldkeyword); - ini_set('highlight.bg', $this->oldbg); + if (version_compare(PHP_VERSION, '5.4', '<')) { + ini_set('highlight.bg', $this->oldbg); + } ini_set('highlight.default', $this->olddefault); ini_set('highlight.html', $this->oldhtml); } Modified: trunk/pgsrc/Help%2FPhpHighlightPlugin =================================================================== --- trunk/pgsrc/Help%2FPhpHighlightPlugin 2013-02-04 10:15:01 UTC (rev 8722) +++ trunk/pgsrc/Help%2FPhpHighlightPlugin 2013-02-06 09:49:04 UTC (rev 8723) @@ -1,4 +1,4 @@ -Date: Thu, 23 Nov 2012 19:30:39 +0000 +Date: Tue, 5 Feb 2013 15:49:31 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0) Content-Type: application/x-phpwiki; pagename=Help%2FPhpHighlightPlugin; @@ -99,9 +99,18 @@ } >> +== Known Problems == +{{{ +<<PhpHighlight + testing[somearray]; + testing~[badworkaround~]; +>> +}}} +will swallow "~[somearray~]" + == Authors == * [[mailto:gim...@gi...|Martin Geisler]] -* [[mailto:car...@us...|Carsten Klapp]] +* [[mailto:car...@us...|Carsten Klapp]] (added ability to override colors defined in ##php.ini##) == See Also == * [[Help:SyntaxHighlighterPlugin|SyntaxHighlighter]] plugin for highlighting other languages. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2013-03-20 20:53:19
|
Revision: 8734 http://sourceforge.net/p/phpwiki/code/8734 Author: vargenau Date: 2013-03-20 20:53:15 +0000 (Wed, 20 Mar 2013) Log Message: ----------- Remove unused variables Modified Paths: -------------- trunk/lib/WikiDB/backend/PDO_mysql.php trunk/lib/WikiDB/backend/PDO_oci8.php trunk/lib/plugin/BlogArchives.php trunk/lib/plugin/BlogJournal.php trunk/lib/plugin/Calendar.php trunk/lib/plugin/CalendarList.php trunk/lib/plugin/Diff.php trunk/lib/plugin/DynamicIncludePage.php trunk/lib/plugin/FullTextSearch.php trunk/lib/plugin/GraphViz.php trunk/lib/plugin/HtmlConverter.php trunk/lib/plugin/LinkSearch.php trunk/lib/plugin/PhpWeather.php trunk/lib/plugin/RandomPage.php trunk/lib/plugin/RecentChanges.php trunk/lib/plugin/SearchHighlight.php trunk/lib/plugin/SemanticSearch.php trunk/lib/plugin/SyncWiki.php trunk/lib/plugin/VisualWiki.php trunk/themes/MacOSX/themeinfo.php trunk/themes/Portland/themeinfo.php trunk/themes/Wordpress/themeinfo.php trunk/themes/alphatest.php trunk/themes/blog/themeinfo.php Modified: trunk/lib/WikiDB/backend/PDO_mysql.php =================================================================== --- trunk/lib/WikiDB/backend/PDO_mysql.php 2013-02-15 16:26:30 UTC (rev 8733) +++ trunk/lib/WikiDB/backend/PDO_mysql.php 2013-03-20 20:53:15 UTC (rev 8734) @@ -87,7 +87,6 @@ */ function optimize() { - $dbh = &$this->_dbh; $this->_timeout(); foreach ($this->_table_names as $table) { $this->query("OPTIMIZE TABLE $table"); Modified: trunk/lib/WikiDB/backend/PDO_oci8.php =================================================================== --- trunk/lib/WikiDB/backend/PDO_oci8.php 2013-02-15 16:26:30 UTC (rev 8733) +++ trunk/lib/WikiDB/backend/PDO_oci8.php 2013-03-20 20:53:15 UTC (rev 8734) @@ -65,7 +65,6 @@ function write_accesslog(&$entry) { - global $request; $dbh = &$this->_dbh; $log_tbl = $entry->_accesslog->logtable; $sth = $dbh->prepare("INSERT INTO $log_tbl" Modified: trunk/lib/plugin/BlogArchives.php =================================================================== --- trunk/lib/plugin/BlogArchives.php 2013-02-15 16:26:30 UTC (rev 8733) +++ trunk/lib/plugin/BlogArchives.php 2013-03-20 20:53:15 UTC (rev 8734) @@ -87,7 +87,6 @@ //if (!is_array('pagename'), explode(',', $info)) // unset($pagelist->_columns['pagename']); - $sp = HTML::Raw('· '); if (!empty($args['month'])) { $prefix = $parent . $this->_blogPrefix('wikiblog') . SUBPAGE_SEPARATOR . $args['month']; $pages = $dbi->titleSearch(new TextSearchQuery("^" . $prefix, true, 'posix')); Modified: trunk/lib/plugin/BlogJournal.php =================================================================== --- trunk/lib/plugin/BlogJournal.php 2013-02-15 16:26:30 UTC (rev 8733) +++ trunk/lib/plugin/BlogJournal.php 2013-03-20 20:53:15 UTC (rev 8734) @@ -79,7 +79,6 @@ } $parent = (empty($args['user']) ? '' : $args['user'] . SUBPAGE_SEPARATOR); - $sp = HTML::Raw('· '); $prefix = $base = $parent . $this->_blogPrefix('wikiblog'); if ($args['month']) $prefix .= (SUBPAGE_SEPARATOR . $args['month']); Modified: trunk/lib/plugin/Calendar.php =================================================================== --- trunk/lib/plugin/Calendar.php 2013-02-15 16:26:30 UTC (rev 8733) +++ trunk/lib/plugin/Calendar.php 2013-03-20 20:53:15 UTC (rev 8734) @@ -194,7 +194,6 @@ 1, // mday (1-31) $args['year']); - $colnum = $args['display_weeknum'] ? 8 : 7; $cal = HTML::table(array('cellspacing' => 0, 'cellpadding' => 2, 'class' => 'cal'), Modified: trunk/lib/plugin/CalendarList.php =================================================================== --- trunk/lib/plugin/CalendarList.php 2013-02-15 16:26:30 UTC (rev 8733) +++ trunk/lib/plugin/CalendarList.php 2013-03-20 20:53:15 UTC (rev 8734) @@ -126,10 +126,7 @@ $date_string = strftime($args['date_format'], $time); $page_for_date = $args['prefix'] . SUBPAGE_SEPARATOR . $date_string; - $t = localtime($time, 1); - $td = HTML::td(array('align' => 'center')); - if ($dbi->isWikiPage($page_for_date)) { // Extract the page contents for this date $p = $dbi->getPage($page_for_date); Modified: trunk/lib/plugin/Diff.php =================================================================== --- trunk/lib/plugin/Diff.php 2013-02-15 16:26:30 UTC (rev 8733) +++ trunk/lib/plugin/Diff.php 2013-03-20 20:53:15 UTC (rev 8734) @@ -57,7 +57,7 @@ function PageInfoRow($label, $rev, &$request) { - global $WikiTheme, $WikiNameRegexp; + global $WikiTheme; $row = HTML::tr(HTML::td(array('align' => 'right'), $label)); if ($rev) { Modified: trunk/lib/plugin/DynamicIncludePage.php =================================================================== --- trunk/lib/plugin/DynamicIncludePage.php 2013-02-15 16:26:30 UTC (rev 8733) +++ trunk/lib/plugin/DynamicIncludePage.php 2013-03-20 20:53:15 UTC (rev 8734) @@ -66,7 +66,6 @@ } else { $html = WikiPlugin_IncludePage::run($dbi, $argstr, $request, $basepage); } - $header = $html->_content[0]; $body = $html->_content[1]; $id = 'DynInc-' . MangleXmlIdentifier($page); $body->setAttr('id', $id . '-body'); Modified: trunk/lib/plugin/FullTextSearch.php =================================================================== --- trunk/lib/plugin/FullTextSearch.php 2013-02-15 16:26:30 UTC (rev 8733) +++ trunk/lib/plugin/FullTextSearch.php 2013-03-20 20:53:15 UTC (rev 8734) @@ -79,7 +79,6 @@ $query = new TextSearchQuery($s, $case_exact, $regex); $pages = $dbi->fullSearch($query, $sortby, $limit, $exclude); - $lines = array(); $hilight_re = $hilight ? $query->getHighlightRegexp() : false; $count = 0; @@ -166,7 +165,6 @@ function _getValue(&$page, $revision_handle) { - $html = false; $pagename = $page->getName(); $count = count($this->parentobj->_wpagelist[$pagename]); return LinkURL(WikiURL($page, array('action' => 'BackLinks'), false), Modified: trunk/lib/plugin/GraphViz.php =================================================================== --- trunk/lib/plugin/GraphViz.php 2013-02-15 16:26:30 UTC (rev 8733) +++ trunk/lib/plugin/GraphViz.php 2013-03-20 20:53:15 UTC (rev 8734) @@ -283,7 +283,6 @@ if (empty($source)) return $this->error(fmt("No dot graph given")); if (isWindows()) { - $ok = $tempfiles; $dotfile = $this->createDotFile($tempfiles . '.dot', $argarray); $args = "-T$gif $dotfile -o $outfile"; $cmdline = "$dotbin $args"; Modified: trunk/lib/plugin/HtmlConverter.php =================================================================== --- trunk/lib/plugin/HtmlConverter.php 2013-02-15 16:26:30 UTC (rev 8733) +++ trunk/lib/plugin/HtmlConverter.php 2013-03-20 20:53:15 UTC (rev 8734) @@ -140,7 +140,6 @@ $ascii = '[\x00-\x7F]'; $euc = '[\xA1-\xFE][\xA1-\xFE]'; - $character = "$ascii|$euc"; $this->_processA($file); $this->_processIMG($file); Modified: trunk/lib/plugin/LinkSearch.php =================================================================== --- trunk/lib/plugin/LinkSearch.php 2013-02-15 16:26:30 UTC (rev 8733) +++ trunk/lib/plugin/LinkSearch.php 2013-03-20 20:53:15 UTC (rev 8734) @@ -130,7 +130,6 @@ function run($dbi, $argstr, &$request, $basepage) { - global $WikiTheme; $args = $this->getArgs($argstr, $request); if (empty($args['page'])) Modified: trunk/lib/plugin/PhpWeather.php =================================================================== --- trunk/lib/plugin/PhpWeather.php 2013-02-15 16:26:30 UTC (rev 8733) +++ trunk/lib/plugin/PhpWeather.php 2013-03-20 20:53:15 UTC (rev 8734) @@ -71,7 +71,6 @@ function getDefaultArguments() { - global $LANG; return array('icao' => 'EKAH', 'cc' => 'DK', 'language' => 'en', Modified: trunk/lib/plugin/RandomPage.php =================================================================== --- trunk/lib/plugin/RandomPage.php 2013-02-15 16:26:30 UTC (rev 8733) +++ trunk/lib/plugin/RandomPage.php 2013-03-20 20:53:15 UTC (rev 8734) @@ -66,7 +66,6 @@ // fix deprecated arg if (is_integer($pages)) { $numpages = $pages; - $pages = false; // fix new pages handling in arg preprozessor. } elseif (is_array($pages)) { $numpages = (int)$pages[0]; Modified: trunk/lib/plugin/RecentChanges.php =================================================================== --- trunk/lib/plugin/RecentChanges.php 2013-02-15 16:26:30 UTC (rev 8733) +++ trunk/lib/plugin/RecentChanges.php 2013-03-20 20:53:15 UTC (rev 8734) @@ -111,7 +111,7 @@ function authorHasPage($author) { - global $WikiNameRegexp, $request; + global $request; $dbi = $request->getDbh(); return isWikiWord($author) && $dbi->isWikiPage($author); } @@ -438,7 +438,6 @@ extract($this->_args); $pagetitle = $show_minor ? _("RecentEdits") : _("RecentChanges"); - global $request; $sidebarurl = WikiURL($pagetitle, array('format' => 'sidebar'), 'absurl'); $addsidebarjsfunc = @@ -801,10 +800,7 @@ function format($changes) { include_once 'lib/InlineParser.php'; - $last_date = ''; $first = true; - $html = HTML::ul(); - $counter = 1; while ($rev = $changes->next()) { // enforce view permission if (mayAccessPage('view', $rev->_pagename)) { @@ -1039,12 +1035,7 @@ // "channel" is called "feed" in atom $rc_url = WikiURL($request->getArg('pagename'), false, 'absurl'); extract($this->_args); - $title = WIKI_NAME; $description = $this->title(); - if ($category) - $title = $category; - elseif ($pagematch) - $title = $pagematch; $feed_props = array('title' => $description, 'link' => array('rel' => "alternate", 'type' => "text/html", Modified: trunk/lib/plugin/SearchHighlight.php =================================================================== --- trunk/lib/plugin/SearchHighlight.php 2013-02-15 16:26:30 UTC (rev 8733) +++ trunk/lib/plugin/SearchHighlight.php 2013-03-20 20:53:15 UTC (rev 8734) @@ -77,7 +77,6 @@ } if ($hits) { $query = new TextSearchQuery($s, $case_exact, $regex); - $lines = array(); $hilight_re = $query->getHighlightRegexp(); $page = $request->getPage(); $html->pushContent($this->showhits($page, $hilight_re)); Modified: trunk/lib/plugin/SemanticSearch.php =================================================================== --- trunk/lib/plugin/SemanticSearch.php 2013-02-15 16:26:30 UTC (rev 8733) +++ trunk/lib/plugin/SemanticSearch.php 2013-03-20 20:53:15 UTC (rev 8734) @@ -88,7 +88,6 @@ function showForm(&$dbi, &$request, $args) { - global $WikiTheme; $action = $request->getPostURL(); $hiddenfield = HiddenInputs($request->getArgs(), '', array('action', 'page', 's', 'semsearch', @@ -275,8 +274,6 @@ function run($dbi, $argstr, &$request, $basepage) { - global $WikiTheme; - $this->_supported_operators = array(':=', '<', '<=', '>', '>=', '!=', '==', '=~'); $this->_text_operators = array(':=', '==', '=~', '!='); $args = $this->getArgs($argstr, $request); Modified: trunk/lib/plugin/SyncWiki.php =================================================================== --- trunk/lib/plugin/SyncWiki.php 2013-02-15 16:26:30 UTC (rev 8733) +++ trunk/lib/plugin/SyncWiki.php 2013-03-20 20:53:15 UTC (rev 8734) @@ -89,7 +89,6 @@ function _do_syncwiki(&$request, $args) { - global $charset; longer_timeout(240); if (!function_exists('wiki_xmlrpc_post')) { @@ -289,7 +288,6 @@ // TODO: store log or checkpoint for restauration? function _import($args, $our, $extdate = null) { - global $request; $reaction = 'import '; if ($args['noimport']) return ($reaction . _("skipped")); //$userid = $request->_user->_userid; @@ -343,7 +341,6 @@ // TODO: store log or checkpoint for restauration? function _upload($args, $path, $timeout) { - global $request; $reaction = 'upload '; if ($args['noupload']) return ($reaction . _("skipped")); Modified: trunk/lib/plugin/VisualWiki.php =================================================================== --- trunk/lib/plugin/VisualWiki.php 2013-02-15 16:26:30 UTC (rev 8733) +++ trunk/lib/plugin/VisualWiki.php 2013-03-20 20:53:15 UTC (rev 8734) @@ -463,7 +463,6 @@ $dot .= "node [fontname=$fontname,shape=$shape,fontsize=$fontsize];\n"; } $dot .= "\n"; - $i = 0; foreach ($names as $name) { $url = rawurlencode($name); Modified: trunk/themes/MacOSX/themeinfo.php =================================================================== --- trunk/themes/MacOSX/themeinfo.php 2013-02-15 16:26:30 UTC (rev 8733) +++ trunk/themes/MacOSX/themeinfo.php 2013-03-20 20:53:15 UTC (rev 8734) @@ -64,8 +64,6 @@ function linkUnknownWikiWord($wikiword, $linktext = '') { - global $request; - // Get rid of anchors on unknown wikiwords if (isa($wikiword, 'WikiPageName')) { $default_text = $wikiword->shortName; Modified: trunk/themes/Portland/themeinfo.php =================================================================== --- trunk/themes/Portland/themeinfo.php 2013-02-15 16:26:30 UTC (rev 8733) +++ trunk/themes/Portland/themeinfo.php 2013-03-20 20:53:15 UTC (rev 8734) @@ -17,7 +17,6 @@ function linkUnknownWikiWord($wikiword, $linktext = '') { - global $request; if (isa($wikiword, 'WikiPageName')) { $default_text = $wikiword->shortName; $wikiword = $wikiword->name; Modified: trunk/themes/Wordpress/themeinfo.php =================================================================== --- trunk/themes/Wordpress/themeinfo.php 2013-02-15 16:26:30 UTC (rev 8733) +++ trunk/themes/Wordpress/themeinfo.php 2013-03-20 20:53:15 UTC (rev 8734) @@ -19,7 +19,6 @@ function linkUnknownWikiWord($wikiword, $linktext = '') { - global $request; if (isa($wikiword, 'WikiPageName')) { $default_text = $wikiword->shortName; $wikiword = $wikiword->name; Modified: trunk/themes/alphatest.php =================================================================== --- trunk/themes/alphatest.php 2013-02-15 16:26:30 UTC (rev 8733) +++ trunk/themes/alphatest.php 2013-03-20 20:53:15 UTC (rev 8734) @@ -29,7 +29,6 @@ function find_pngs($dir) { - $file_list = ''; $stack[] = $dir; while ($stack) { $current_dir = array_pop($stack); Modified: trunk/themes/blog/themeinfo.php =================================================================== --- trunk/themes/blog/themeinfo.php 2013-02-15 16:26:30 UTC (rev 8733) +++ trunk/themes/blog/themeinfo.php 2013-03-20 20:53:15 UTC (rev 8734) @@ -97,7 +97,6 @@ /* TODO: use the blog summary as label instead of the pagename */ function linkExistingWikiWord($wikiword, $linktext = '', $version = false) { - global $request; if ($version !== false and !$this->HTML_DUMP_SUFFIX) $url = WikiURL($wikiword, array('version' => $version)); else This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2013-04-02 08:25:35
|
Revision: 8736 http://sourceforge.net/p/phpwiki/code/8736 Author: vargenau Date: 2013-04-02 08:25:32 +0000 (Tue, 02 Apr 2013) Log Message: ----------- Move info from code to help page Modified Paths: -------------- trunk/lib/plugin/WikiBlog.php trunk/pgsrc/Help%2FWikiBlogPlugin Modified: trunk/lib/plugin/WikiBlog.php =================================================================== --- trunk/lib/plugin/WikiBlog.php 2013-03-20 21:10:08 UTC (rev 8735) +++ trunk/lib/plugin/WikiBlog.php 2013-04-02 08:25:32 UTC (rev 8736) @@ -30,28 +30,6 @@ * This plugin shows 'blogs' (comments/news) associated with a * particular page and provides an input form for adding a new blog. * - * USAGE: - * Add <<WikiBlog >> at your PersonalPage and BlogArchive and - * BlogJournal will find the Blog entries automatically. - * - * Now it is also the base class for all attachable pagetypes: - * "wikiblog", "comment" and "wikiforum" - * - * HINTS/COMMENTS: - * - * To have the blog show up on a separate page: - * On TopPage, use - * <<WikiBlog mode=add>> - * Create TopPage/Blog with this page as actionpage: - * <<WikiBlog pagename=TopPage mode=show>> - * - * To have the main ADMIN_USER Blog appear under Blog and not under WikiBlog/Blog - * or UserName/Blog as for other users blogs, - * define BLOG_DEFAULT_EMPTY_PREFIX=true - * use the page Blog as basepage - * and user="" (as default for ADMIN or current user) and pagename="Blog" - * in the various blog plugins (BlogArchives, BlogJournal) - * * TODO: * * It also works as an action-page if you create a page called 'WikiBlog' @@ -94,16 +72,6 @@ } // Arguments: - // page - page which is blogged to (default current page) - // - // order - 'normal' - place in chronological order - // - 'reverse' - place in reverse chronological order - // - // mode - 'show' - only show old blogs - // 'add' - only show entry box for new blog - // 'show,add' - show old blogs then entry box - // 'add,show' - show entry box followed by old blogs - // // TODO: // // - arguments to allow selection of time range to display Modified: trunk/pgsrc/Help%2FWikiBlogPlugin =================================================================== --- trunk/pgsrc/Help%2FWikiBlogPlugin 2013-03-20 21:10:08 UTC (rev 8735) +++ trunk/pgsrc/Help%2FWikiBlogPlugin 2013-04-02 08:25:32 UTC (rev 8736) @@ -1,4 +1,4 @@ -Date: Fri, 13 Apr 2012 18:14:27 +0000 +Date: Tue, 2 Apr 2013 10:23:48 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0) Content-Type: application/x-phpwiki; pagename=Help%2FWikiBlogPlugin; @@ -9,10 +9,68 @@ This simple [[Help:WikiPlugin|plugin]] allows blog-style entries on a page. Try making a few entries, and then look at [[RecentChanges]] to get an idea of how things work. +This plugin shows 'blogs' (comments/news) associated with a +particular page and provides an input form for adding a new blog. + +== Arguments == + +{| class="bordered" +|- +! Argument +! Description +! Default value +|- +| **page** +| page which is blogged to +| Current page +|- +| **order** +| +* 'normal' - place in chronological order +* 'reverse' - place in reverse chronological order +| normal +|- +| **mode** +| +* 'show' - only show old blogs +* 'add' - only show entry box for new blog +* 'show,add' - show old blogs then entry box +* 'add,show' - show entry box followed by old blogs +| show,add +|} + +== Usage == + +Add {{{<<WikiBlog>>}}} at your ~PersonalPage and BlogArchives and +BlogJournal will find the Blog entries automatically. + +Now it is also the base class for all attachable pagetypes: +"wikiblog", "comment" and "wikiforum" + +== Hints/comments == + +To have the blog show up on a separate page: + +On ~TopPage, use {{{<<WikiBlog mode=add>>}}} +Create ~TopPage/Blog with this page as actionpage: +{{{<<WikiBlog pagename=TopPage mode=show>>}}} + +To have the main ADMIN_USER Blog appear under Blog and not under WikiBlog/Blog +or ~UserName/Blog as for other users blogs, +define BLOG_DEFAULT_EMPTY_PREFIX=true +use the page Blog as basepage +and user="" (as default for ADMIN or current user) and pagename="Blog" +in the various blog plugins (BlogArchives, BlogJournal) + == Example == <<WikiBlog>> +== Author == +* Michael Van Dam, major refactor by [[Help:Jeff Dairiki|Jeff Dairiki]] (as ~AddComment) +* Changed as baseclass to ~AddComment and ~WikiForum and ~EditToolbar integration by [[Help:Reini Urban|Reini Urban]]. + + == See Also == * [[Help:BlogJournalPlugin]] * [[Help:BlogArchivesPlugin]] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2013-04-02 10:15:04
|
Revision: 8738 http://sourceforge.net/p/phpwiki/code/8738 Author: vargenau Date: 2013-04-02 10:14:58 +0000 (Tue, 02 Apr 2013) Log Message: ----------- utf-8 --> UTF-8 Modified Paths: -------------- trunk/configurator.php trunk/doc/README.foaf trunk/doc/README.security trunk/locale/Makefile trunk/locale/README trunk/locale/de/pgsrc/%C3%84hnlicheSeiten trunk/locale/de/pgsrc/AlleBenutzer trunk/locale/de/pgsrc/AlleSeiten trunk/locale/de/pgsrc/AlleSeitenEditiertVonMir trunk/locale/de/pgsrc/AlleSeitenErzeugtVonMir trunk/locale/de/pgsrc/AlleSeitenImBesitzVonMir trunk/locale/de/pgsrc/BackLinks trunk/locale/de/pgsrc/BenutzerEinstellungen trunk/locale/de/pgsrc/BeobachteSeite trunk/locale/de/pgsrc/DebugAuthInfo trunk/locale/de/pgsrc/DebugGruppenInfo trunk/locale/de/pgsrc/DebugInfo trunk/locale/de/pgsrc/EditiereText trunk/locale/de/pgsrc/Einstellungen trunk/locale/de/pgsrc/FuzzySuche trunk/locale/de/pgsrc/G%C3%A4steBuch trunk/locale/de/pgsrc/GaesteBuch trunk/locale/de/pgsrc/Geringf%C3%BCgige%C3%84nderungen trunk/locale/de/pgsrc/GleicheSeiten trunk/locale/de/pgsrc/Hilfe%2FAktionsSeite trunk/locale/de/pgsrc/Hilfe%2FAlteTextFormatierungsRegeln trunk/locale/de/pgsrc/Hilfe%2FAutorenProtokollPlugin trunk/locale/de/pgsrc/Hilfe%2FGraphVizPlugin trunk/locale/de/pgsrc/Hilfe%2FGuterStil trunk/locale/de/pgsrc/Hilfe%2FHalloWeltPlugin trunk/locale/de/pgsrc/Hilfe%2FHochLadenPlugin trunk/locale/de/pgsrc/Hilfe%2FInhaltsVerzeichnisPlugin trunk/locale/de/pgsrc/Hilfe%2FNeueSeitePlugin trunk/locale/de/pgsrc/Hilfe%2FNeuerKommentarPlugin trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin%2FDiashow trunk/locale/de/pgsrc/Hilfe%2FPhpWiki trunk/locale/de/pgsrc/Hilfe%2FTextBearbeiten trunk/locale/de/pgsrc/Hilfe%2FTextFormatierungsRegeln trunk/locale/de/pgsrc/Hilfe%2FVorlagePlugin trunk/locale/de/pgsrc/Hilfe%2FWabiSabi trunk/locale/de/pgsrc/Hilfe%2FWieManWikiBenutzt trunk/locale/de/pgsrc/Hilfe%2FWikiTechnik trunk/locale/de/pgsrc/Hilfe%2FWikiWikiWeb trunk/locale/de/pgsrc/HochLaden trunk/locale/de/pgsrc/InterWikiListe trunk/locale/de/pgsrc/KategorieKategorie trunk/locale/de/pgsrc/LinkSuche trunk/locale/de/pgsrc/ListeRelationen trunk/locale/de/pgsrc/ListeSeiten trunk/locale/de/pgsrc/MeistBesucht trunk/locale/de/pgsrc/ModerierteSeite trunk/locale/de/pgsrc/NeueSeite trunk/locale/de/pgsrc/Neueste%C3%84nderungen trunk/locale/de/pgsrc/NeuesteSeiten trunk/locale/de/pgsrc/PasswortZur%C3%BCcksetzen trunk/locale/de/pgsrc/PhpWikiDokumentation trunk/locale/de/pgsrc/PhpWikiSystemverwalten trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FAclSetzen trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FChmod trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FChown trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FL%C3%B6schen trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FSuchenErsetzen trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FUmbenennen trunk/locale/de/pgsrc/PhpWikiUmfrage trunk/locale/de/pgsrc/SandKasten trunk/locale/de/pgsrc/SandKiste trunk/locale/de/pgsrc/SeiteFinden trunk/locale/de/pgsrc/SeiteSpeichern trunk/locale/de/pgsrc/SeitenErzeugen trunk/locale/de/pgsrc/SeitenInfo trunk/locale/de/pgsrc/SeitenProtokoll trunk/locale/de/pgsrc/SemantischeRelationen trunk/locale/de/pgsrc/SemantischeSuche trunk/locale/de/pgsrc/StartSeite trunk/locale/de/pgsrc/StartSeiteAlias trunk/locale/de/pgsrc/TitelSuche trunk/locale/de/pgsrc/UpLoad trunk/locale/de/pgsrc/Verlinkte%C3%84nderungen trunk/locale/de/pgsrc/VerwaisteSeiten trunk/locale/de/pgsrc/VolltextSuche trunk/locale/de/pgsrc/Vorlage%2FBeispiel trunk/locale/de/pgsrc/WerIstOnline trunk/locale/de/pgsrc/WikiAdminAuswahl trunk/locale/de/pgsrc/WunschZettelSeiten trunk/locale/de/pgsrc/ZufallsSeite trunk/locale/es/pgsrc/Ayuda%2FAgregarPaginas trunk/locale/es/pgsrc/Ayuda%2FBuenEstilo trunk/locale/es/pgsrc/Ayuda%2FComoUsarWiki trunk/locale/es/pgsrc/Ayuda%2FEditarElTexto trunk/locale/es/pgsrc/Ayuda%2FKBrown trunk/locale/es/pgsrc/Ayuda%2FMasAcercadeLaMecanica trunk/locale/es/pgsrc/Ayuda%2FPhpWiki trunk/locale/es/pgsrc/Ayuda%2FReglasDeFormatoDeTexto trunk/locale/es/pgsrc/Ayuda%2FViejoReglasDeFormatoDeTexto trunk/locale/es/pgsrc/Ayuda%2FWabiSabi trunk/locale/es/pgsrc/Ayuda%2FWikiWikiWeb trunk/locale/es/pgsrc/BuscarP%C3%A1gina trunk/locale/es/pgsrc/CajaDeArena trunk/locale/es/pgsrc/CambiosRecientes trunk/locale/es/pgsrc/MasPopulares trunk/locale/es/pgsrc/P%C3%A1ginaPrincipal trunk/locale/es/pgsrc/TodasLasPaginas trunk/locale/es/pgsrc/VisitantesRecientes trunk/locale/fr/pgsrc/%C3%89diterLesMetaDonn%C3%A9es trunk/locale/fr/pgsrc/%C3%89ditionsR%C3%A9centes trunk/locale/fr/pgsrc/AdministrationDePhpWiki trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FChown trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FD%C3%A9finirAcl trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FDroits trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FRechercherRemplacer trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FRenommer trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FSupprimer trunk/locale/fr/pgsrc/Aide trunk/locale/fr/pgsrc/Aide%2F%C3%89diterLeContenu trunk/locale/fr/pgsrc/Aide%2FAjouterDesPages trunk/locale/fr/pgsrc/Aide%2FAnciennesR%C3%A8glesDeFormatage trunk/locale/fr/pgsrc/Aide%2FCommentUtiliserUnWiki trunk/locale/fr/pgsrc/Aide%2FD%C3%A9tailsTechniques trunk/locale/fr/pgsrc/Aide%2FIc%C3%B4nesDeLien trunk/locale/fr/pgsrc/Aide%2FInterWiki trunk/locale/fr/pgsrc/Aide%2FLienGoogle trunk/locale/fr/pgsrc/Aide%2FPhpWiki trunk/locale/fr/pgsrc/Aide%2FPlugin%C3%89diterMetaData trunk/locale/fr/pgsrc/Aide%2FPluginAjouterDesCommentaires trunk/locale/fr/pgsrc/Aide%2FPluginAlbumPhotos trunk/locale/fr/pgsrc/Aide%2FPluginBeauTableau trunk/locale/fr/pgsrc/Aide%2FPluginBonjourLeMonde trunk/locale/fr/pgsrc/Aide%2FPluginCalendrier trunk/locale/fr/pgsrc/Aide%2FPluginColorationPhp trunk/locale/fr/pgsrc/Aide%2FPluginCommenter trunk/locale/fr/pgsrc/Aide%2FPluginCr%C3%A9erUnePage trunk/locale/fr/pgsrc/Aide%2FPluginCr%C3%A9erUneTdm trunk/locale/fr/pgsrc/Aide%2FPluginHistoriqueAuteur trunk/locale/fr/pgsrc/Aide%2FPluginHtmlPur trunk/locale/fr/pgsrc/Aide%2FPluginInclureUnCadre trunk/locale/fr/pgsrc/Aide%2FPluginInclureUnePage trunk/locale/fr/pgsrc/Aide%2FPluginInfosSyst%C3%A8me trunk/locale/fr/pgsrc/Aide%2FPluginIns%C3%A9rer trunk/locale/fr/pgsrc/Aide%2FPluginListeDesSousPages trunk/locale/fr/pgsrc/Aide%2FPluginListeDuCalendrier trunk/locale/fr/pgsrc/Aide%2FPluginM%C3%A9t%C3%A9oPhp trunk/locale/fr/pgsrc/Aide%2FPluginRechercheExterne trunk/locale/fr/pgsrc/Aide%2FPluginRedirection trunk/locale/fr/pgsrc/Aide%2FPluginRessourcesRss trunk/locale/fr/pgsrc/Aide%2FPluginTableauAncienStyle trunk/locale/fr/pgsrc/Aide%2FPluginTeX2png trunk/locale/fr/pgsrc/Aide%2FPluginTestDeCache trunk/locale/fr/pgsrc/Aide%2FPluginWiki trunk/locale/fr/pgsrc/Aide%2FPluginWikiBlog trunk/locale/fr/pgsrc/Aide%2FR%C3%A8glesDeFormatageDesTextes trunk/locale/fr/pgsrc/Aide%2FSteve%20Wainstead trunk/locale/fr/pgsrc/Aide%2FStyleCorrect trunk/locale/fr/pgsrc/Aide%2FURLMagiquesPhpWiki trunk/locale/fr/pgsrc/Aide%2FWabiSabi trunk/locale/fr/pgsrc/Aide%2FWikiWikiWeb trunk/locale/fr/pgsrc/AliasAccueil trunk/locale/fr/pgsrc/Bac%C3%80Sable trunk/locale/fr/pgsrc/CarteInterWiki trunk/locale/fr/pgsrc/Cat%C3%A9gorieCat%C3%A9gorie trunk/locale/fr/pgsrc/Cat%C3%A9gorieGroupes trunk/locale/fr/pgsrc/Cat%C3%A9goriePageDAction trunk/locale/fr/pgsrc/Cat%C3%A9goriePagesAccueil trunk/locale/fr/pgsrc/Cat%C3%A9goriePluginWiki trunk/locale/fr/pgsrc/ChangementsLi%C3%A9s trunk/locale/fr/pgsrc/ChercherUnePage trunk/locale/fr/pgsrc/ClassezLa trunk/locale/fr/pgsrc/CommentairesR%C3%A9cents trunk/locale/fr/pgsrc/Cr%C3%A9erUnePage trunk/locale/fr/pgsrc/D%C3%A9poserUnFichier trunk/locale/fr/pgsrc/Derni%C3%A8resModifs trunk/locale/fr/pgsrc/Derni%C3%A8resModifsCompl%C3%A8tes trunk/locale/fr/pgsrc/DerniersVisiteurs trunk/locale/fr/pgsrc/DocumentationDePhpWiki trunk/locale/fr/pgsrc/GestionDesPlugins trunk/locale/fr/pgsrc/HistoriqueDeLaPage trunk/locale/fr/pgsrc/InfosAuthentification trunk/locale/fr/pgsrc/InfosDeD%C3%A9bogage trunk/locale/fr/pgsrc/InfosSurLaPage trunk/locale/fr/pgsrc/LesPlusVisit%C3%A9es trunk/locale/fr/pgsrc/ListeDePages trunk/locale/fr/pgsrc/ModifsR%C3%A9centesPhpWiki trunk/locale/fr/pgsrc/NotesDeVersion trunk/locale/fr/pgsrc/PageAccueil trunk/locale/fr/pgsrc/PageAl%C3%A9atoire trunk/locale/fr/pgsrc/PagesFloues trunk/locale/fr/pgsrc/PagesOrphelines trunk/locale/fr/pgsrc/PagesRecherch%C3%A9es trunk/locale/fr/pgsrc/PagesSemblables trunk/locale/fr/pgsrc/PierrickMeignen trunk/locale/fr/pgsrc/Pr%C3%A9f%C3%A9rencesUtilisateurs trunk/locale/fr/pgsrc/QuiEstEnLigne trunk/locale/fr/pgsrc/R%C3%A9cup%C3%A9rationDeLaPage trunk/locale/fr/pgsrc/R%C3%A9troLiens trunk/locale/fr/pgsrc/RechercheEnTexteInt%C3%A9gral trunk/locale/fr/pgsrc/RechercheInterWiki trunk/locale/fr/pgsrc/RechercheParTitre trunk/locale/fr/pgsrc/SommaireDuProjet trunk/locale/fr/pgsrc/SondagePhpWiki trunk/locale/fr/pgsrc/TousLesUtilisateurs trunk/locale/fr/pgsrc/ToutesLesPages trunk/locale/fr/pgsrc/TraduireUnTexte trunk/locale/fr/pgsrc/VersionsR%C3%A9centes trunk/locale/fr/pgsrc/VisiteursR%C3%A9cents trunk/locale/it/pgsrc/Aiuto%2FAggiungerePagine trunk/locale/it/pgsrc/Aiuto%2FBuonStile trunk/locale/it/pgsrc/Aiuto%2FComeUsareWiki trunk/locale/it/pgsrc/Aiuto%2FMagicPhpWikiURLs trunk/locale/it/pgsrc/Aiuto%2FModificaIlTesto trunk/locale/it/pgsrc/Aiuto%2FPhpWiki trunk/locale/it/pgsrc/Aiuto%2FRegoleFormattazioneTesto trunk/locale/it/pgsrc/Aiuto%2FVarieSulFunzionamento trunk/locale/it/pgsrc/Aiuto%2FWabiSabi trunk/locale/it/pgsrc/Aiuto%2FWikiWikiWeb trunk/locale/it/pgsrc/AmministrazioneDiPhpWiki trunk/locale/it/pgsrc/AmministrazioneDiPhpWiki%2FRimuovi trunk/locale/it/pgsrc/CambiamentiRecenti trunk/locale/it/pgsrc/FuzzyPages trunk/locale/it/pgsrc/NoteDiRilascio trunk/locale/it/pgsrc/PaginaDiProva trunk/locale/it/pgsrc/PaginaPrincipale trunk/locale/it/pgsrc/PiuPopolari trunk/locale/it/pgsrc/RicercaDelTesto trunk/locale/it/pgsrc/RicercaSuTutto trunk/locale/it/pgsrc/ScatolaDiSabbia trunk/locale/it/pgsrc/SteveWainstead trunk/locale/it/pgsrc/TrovaPagina trunk/locale/it/pgsrc/TutteLePagine trunk/locale/it/pgsrc/VisitatoriRecenti trunk/locale/ja/pgsrc/%E3%83%9A%E3%83%BC%E3%82%B8%E6%A4%9C%E7%B4%A2 trunk/locale/ja/pgsrc/%E3%83%9B%E3%83%BC%E3%83%A0%E3%83%9A%E3%83%BC%E3%82%B8 trunk/locale/nl/pgsrc/Help%2FGebruikersVoorkeuren trunk/locale/nl/pgsrc/Help%2FGoedeStijl trunk/locale/nl/pgsrc/Help%2FHoeWikiTeGebruiken trunk/locale/nl/pgsrc/Help%2FJanNieuwenhuizen trunk/locale/nl/pgsrc/Help%2FMeerOverTechnieken trunk/locale/nl/pgsrc/Help%2FOudTekstFormatteringsRegels trunk/locale/nl/pgsrc/Help%2FPaginasToevoegen trunk/locale/nl/pgsrc/Help%2FPhpWiki trunk/locale/nl/pgsrc/Help%2FRecenteBezoekers trunk/locale/nl/pgsrc/Help%2FTekstFormatteringsRegels trunk/locale/nl/pgsrc/Help%2FToverPhpWikiURLs trunk/locale/nl/pgsrc/Help%2FVeranderTekst trunk/locale/nl/pgsrc/Help%2FWabiSabi trunk/locale/nl/pgsrc/Help%2FWikiWikiWeb trunk/locale/nl/pgsrc/MeestBezocht trunk/locale/nl/pgsrc/PhpWikiBeheer trunk/locale/nl/pgsrc/PhpWikiBeheer%2FVervangt trunk/locale/nl/pgsrc/PhpWikiBeheer%2FVerwijder trunk/locale/nl/pgsrc/RecenteVeranderingen trunk/locale/nl/pgsrc/ThuisPagina trunk/locale/nl/pgsrc/UitgaveNoten trunk/locale/nl/pgsrc/ZandBak trunk/locale/nl/pgsrc/ZoekPagina trunk/locale/sv/pgsrc/Framsida trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FG%C3%A4stboken trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FHurManAnv%C3%A4nderWiki trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FL%C3%A4ggaTillSidor trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FMerOmMekanismerna trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FPhpWiki trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FRedigeraText trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FTextformateringsregler trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FWikiWikiWeb trunk/locale/sv/pgsrc/MestPopul%C3%A4r trunk/locale/sv/pgsrc/PhpWikiAdministration trunk/locale/sv/pgsrc/S%C3%B6kEfterSida trunk/locale/sv/pgsrc/Sandl%C3%A5dan trunk/locale/zh/pgsrc/%E9%A6%96%E9%A0%81 Modified: trunk/configurator.php =================================================================== --- trunk/configurator.php 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/configurator.php 2013-04-02 10:14:58 UTC (rev 8738) @@ -165,7 +165,7 @@ "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"/> + <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"> <!-- Modified: trunk/doc/README.foaf =================================================================== --- trunk/doc/README.foaf 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/doc/README.foaf 2013-04-02 10:14:58 UTC (rev 8738) @@ -140,7 +140,7 @@ <meta name="Author" content="" /> <meta name="Keywords" content="" /> <meta name="Description" content="" /> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <style type="text/css"> table,th,td { border: 1px solid black; } </style> Modified: trunk/doc/README.security =================================================================== --- trunk/doc/README.security 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/doc/README.security 2013-04-02 10:14:58 UTC (rev 8738) @@ -162,7 +162,7 @@ created=1104916186; author_id=The%20PhpWiki%20programming%20team; markup=2; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: quoted-printable ~<?plugin ~AppendText ?> @@ -190,7 +190,7 @@ create:_ADMIN,_OWNER,Writers,-_SIGNED,-_BOGOUSER,-_AUTHENTICATED; list:_EVERY; remove:_ADMIN,_OWNER,-_SIGNED,-_BOGOUSER,-_AUTHENTICATED; change:_ADMIN,_OWNER,-_SIGNED,-_BOGOUSER,-_AUTHENTICATED; dump:_EVERY"; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: quoted-printable This page holds the default permissions for all pages Modified: trunk/locale/Makefile =================================================================== --- trunk/locale/Makefile 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/Makefile 2013-04-02 10:14:58 UTC (rev 8738) @@ -16,7 +16,7 @@ ${POT_FILE} : # dependencies are auto-generated by 'make depend' , see below cp -f $@ $@~ xgettext -L PHP --from-code=utf-8 -k_ -k__printf -k__sprintf -k__vsprintf -kfmt -o $@.extracted $^ - sed -e's,; charset=CHARSET,; charset=utf-8,' $@.extracted + sed -e's,; charset=CHARSET,; charset=UTF-8,' $@.extracted msgmerge -o $@.new $@~ $@.extracted && grep -v ^\#: $@.new > $@ rm -f $@.extracted Modified: trunk/locale/README =================================================================== --- trunk/locale/README 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/README 2013-04-02 10:14:58 UTC (rev 8738) @@ -205,7 +205,7 @@ pagename=G%C3%A4steBuch; flags=""; markup=2; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary - Make sure to rename files with accents in the page name converted Modified: trunk/locale/de/pgsrc/%C3%84hnlicheSeiten =================================================================== --- trunk/locale/de/pgsrc/%C3%84hnlicheSeiten 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/%C3%84hnlicheSeiten 2013-04-02 10:14:58 UTC (rev 8738) @@ -4,7 +4,7 @@ pagename=%C3%84hnlicheSeiten; flags=""; markup=2; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary ÄhnlicheSeiten haben einen identischen Wortteil im Namen. Siehe Modified: trunk/locale/de/pgsrc/AlleBenutzer =================================================================== --- trunk/locale/de/pgsrc/AlleBenutzer 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/AlleBenutzer 2013-04-02 10:14:58 UTC (rev 8738) @@ -4,7 +4,7 @@ pagename=AlleBenutzer; flags=PAGE_LOCKED; markup=2; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary Liste aller eingetragenen Benutzer, die ihre Modified: trunk/locale/de/pgsrc/AlleSeiten =================================================================== --- trunk/locale/de/pgsrc/AlleSeiten 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/AlleSeiten 2013-04-02 10:14:58 UTC (rev 8738) @@ -4,7 +4,7 @@ pagename=AlleSeiten; flags=PAGE_LOCKED; markup=2; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary Hier befindet sich alle Seiten dieses Wikis, auch VerwaisteSeiten Modified: trunk/locale/de/pgsrc/AlleSeitenEditiertVonMir =================================================================== --- trunk/locale/de/pgsrc/AlleSeitenEditiertVonMir 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/AlleSeitenEditiertVonMir 2013-04-02 10:14:58 UTC (rev 8738) @@ -4,7 +4,7 @@ pagename=AlleSeitenEditiertVonMir; flags=PAGE_LOCKED; markup=2; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary Die Liste aller Seiten, die von Ihnen zuletzt editiert wurden. (Wenn Sie sich authentifiziert haben) Modified: trunk/locale/de/pgsrc/AlleSeitenErzeugtVonMir =================================================================== --- trunk/locale/de/pgsrc/AlleSeitenErzeugtVonMir 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/AlleSeitenErzeugtVonMir 2013-04-02 10:14:58 UTC (rev 8738) @@ -4,7 +4,7 @@ pagename=AlleSeitenErzeugtVonMir; flags=PAGE_LOCKED; markup=2; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary Die Liste aller Seiten, die von Ihnen erzeugt wurden. (Wenn Sie sich authentifiziert haben) Modified: trunk/locale/de/pgsrc/AlleSeitenImBesitzVonMir =================================================================== --- trunk/locale/de/pgsrc/AlleSeitenImBesitzVonMir 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/AlleSeitenImBesitzVonMir 2013-04-02 10:14:58 UTC (rev 8738) @@ -4,7 +4,7 @@ pagename=AlleSeitenImBesitzVonMir; flags=PAGE_LOCKED; markup=2; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary Die Liste aller Seiten, die Ihnen gehören. (Wenn Sie sich authentifiziert haben) Modified: trunk/locale/de/pgsrc/BackLinks =================================================================== --- trunk/locale/de/pgsrc/BackLinks 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/BackLinks 2013-04-02 10:14:58 UTC (rev 8738) @@ -3,7 +3,7 @@ Content-Type: application/x-phpwiki; pagename=BackLinks; flags=PAGE_LOCKED; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary Der Titel der aktuellen Seite ist mit einem Suchbefehl nach allen Seiten verbunden, die einen Link auf die aktuelle Seite enthalten. Die BackLinks Funktion beantwortet also die Frage: »Wo wird der Name dieser Seite verwendet?«. Modified: trunk/locale/de/pgsrc/BenutzerEinstellungen =================================================================== --- trunk/locale/de/pgsrc/BenutzerEinstellungen 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/BenutzerEinstellungen 2013-04-02 10:14:58 UTC (rev 8738) @@ -4,7 +4,7 @@ pagename=BenutzerEinstellungen; flags=PAGE_LOCKED; markup=2; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary Sie können einige Einstellungen jetzt bestimmen. Die Werte werden in Modified: trunk/locale/de/pgsrc/BeobachteSeite =================================================================== --- trunk/locale/de/pgsrc/BeobachteSeite 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/BeobachteSeite 2013-04-02 10:14:58 UTC (rev 8738) @@ -4,7 +4,7 @@ pagename=BeobachteSeite; flags=""; markup=2; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary <<WatchPage >> Modified: trunk/locale/de/pgsrc/DebugAuthInfo =================================================================== --- trunk/locale/de/pgsrc/DebugAuthInfo 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/DebugAuthInfo 2013-04-02 10:14:58 UTC (rev 8738) @@ -5,7 +5,7 @@ flags=LOCKED; markup=2; acl="view:_AUTHENTICATED; edit:_AUTHENTICATED; create:_AUTHENTICATED,_BOGOUSER; list:_AUTHENTICATED; remove:_ADMIN,_OWNER; change:_ADMIN,_OWNER; dump:_EVERY"; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary <<_AuthInfo >> Modified: trunk/locale/de/pgsrc/DebugGruppenInfo =================================================================== --- trunk/locale/de/pgsrc/DebugGruppenInfo 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/DebugGruppenInfo 2013-04-02 10:14:58 UTC (rev 8738) @@ -5,7 +5,7 @@ flags=LOCKED; markup=2; acl="view:_AUTHENTICATED; edit:_AUTHENTICATED; create:_AUTHENTICATED,_BOGOUSER; list:_AUTHENTICATED; remove:_ADMIN,_OWNER; change:_ADMIN,_OWNER; dump:_EVERY"; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary <<_GroupInfo >> Modified: trunk/locale/de/pgsrc/DebugInfo =================================================================== --- trunk/locale/de/pgsrc/DebugInfo 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/DebugInfo 2013-04-02 10:14:58 UTC (rev 8738) @@ -3,7 +3,7 @@ Content-Type: application/x-phpwiki; pagename=DebugInfo; flags=PAGE_LOCKED; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary Detailansicht der Seite. Das ist wahrscheinlich sinnvoller zum Debuggen als alles andere. Modified: trunk/locale/de/pgsrc/EditiereText =================================================================== --- trunk/locale/de/pgsrc/EditiereText 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/EditiereText 2013-04-02 10:14:58 UTC (rev 8738) @@ -4,7 +4,7 @@ pagename=EditiereText; flags=""; markup=2; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary <<RedirectTo page=TextBearbeiten>> Modified: trunk/locale/de/pgsrc/Einstellungen =================================================================== --- trunk/locale/de/pgsrc/Einstellungen 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/Einstellungen 2013-04-02 10:14:58 UTC (rev 8738) @@ -5,7 +5,7 @@ flags=PAGE_LOCKED; markup=2; summary=RedirectTo%20Benutzer%20Einstellungen; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary <<RedirectTo page=BenutzerEinstellungen>> Modified: trunk/locale/de/pgsrc/FuzzySuche =================================================================== --- trunk/locale/de/pgsrc/FuzzySuche 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/FuzzySuche 2013-04-02 10:14:58 UTC (rev 8738) @@ -4,7 +4,7 @@ pagename=FuzzySuche; flags=PAGE_LOCKED; markup=2; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary <<FuzzyPages>> Modified: trunk/locale/de/pgsrc/G%C3%A4steBuch =================================================================== --- trunk/locale/de/pgsrc/G%C3%A4steBuch 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/G%C3%A4steBuch 2013-04-02 10:14:58 UTC (rev 8738) @@ -4,7 +4,7 @@ pagename=G%C3%A4steBuch; flags=""; markup=2; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary Tragen Sie sich einfach mit Namen und Datum auf dieser Seite ein! Modified: trunk/locale/de/pgsrc/GaesteBuch =================================================================== --- trunk/locale/de/pgsrc/GaesteBuch 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/GaesteBuch 2013-04-02 10:14:58 UTC (rev 8738) @@ -4,7 +4,7 @@ pagename=GaesteBuch; flags=PAGE_LOCKED; markup=2; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary <<RedirectTo page=GästeBuch>> Modified: trunk/locale/de/pgsrc/Geringf%C3%BCgige%C3%84nderungen =================================================================== --- trunk/locale/de/pgsrc/Geringf%C3%BCgige%C3%84nderungen 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/Geringf%C3%BCgige%C3%84nderungen 2013-04-02 10:14:58 UTC (rev 8738) @@ -3,7 +3,7 @@ Content-Type: application/x-phpwiki; pagename=Geringf%C3%BCgige%C3%84nderungen; flags=PAGE_LOCKED; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary Hier ist eine Liste der vor kurzem bearbeiteten Seiten in diesem Wiki. Alle geringfügigen Änderungen werden gezeigt, nicht nur die neuesten Änderungen. (Siehe NeuesteÄnderungen für die neuesten Hauptänderungen). Modified: trunk/locale/de/pgsrc/GleicheSeiten =================================================================== --- trunk/locale/de/pgsrc/GleicheSeiten 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/GleicheSeiten 2013-04-02 10:14:58 UTC (rev 8738) @@ -4,7 +4,7 @@ pagename=GleicheSeiten; flags=PAGE_LOCKED; markup=2; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary <<RedirectTo page=ÄhnlicheSeiten >> Modified: trunk/locale/de/pgsrc/Hilfe%2FAktionsSeite =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FAktionsSeite 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/Hilfe%2FAktionsSeite 2013-04-02 10:14:58 UTC (rev 8738) @@ -4,7 +4,7 @@ pagename=Hilfe%2FAktionsSeite; flags=""; markup=2; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary <<IncludePage page=Hilfe/WikiPlugin section="Aktions Seiten" >> Modified: trunk/locale/de/pgsrc/Hilfe%2FAlteTextFormatierungsRegeln =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FAlteTextFormatierungsRegeln 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/Hilfe%2FAlteTextFormatierungsRegeln 2013-04-02 10:14:58 UTC (rev 8738) @@ -3,7 +3,7 @@ Content-Type: application/x-phpwiki; pagename=Hilfe%2FAlteTextFormatierungsRegeln; flags=PAGE_LOCKED; - charset=utf-8; + charset=UTF-8; markup=2 Content-Transfer-Encoding: binary Modified: trunk/locale/de/pgsrc/Hilfe%2FAutorenProtokollPlugin =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FAutorenProtokollPlugin 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/Hilfe%2FAutorenProtokollPlugin 2013-04-02 10:14:58 UTC (rev 8738) @@ -4,7 +4,7 @@ pagename=Hilfe%2FAutorenProtokollPlugin; flags=""; markup=2; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary Liste aller Versionen eines Autors mit Diff-Links, oder eine SeitenProtokoll-ähnliche Liste einer oder aller (page=all) Seiten nur für einen Autor. Modified: trunk/locale/de/pgsrc/Hilfe%2FGraphVizPlugin =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FGraphVizPlugin 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/Hilfe%2FGraphVizPlugin 2013-04-02 10:14:58 UTC (rev 8738) @@ -4,7 +4,7 @@ pagename=Hilfe%2FGraphVizPlugin; flags=""; markup=2; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary ==== Beispiel Modified: trunk/locale/de/pgsrc/Hilfe%2FGuterStil =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FGuterStil 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/Hilfe%2FGuterStil 2013-04-02 10:14:58 UTC (rev 8738) @@ -3,7 +3,7 @@ Content-Type: application/x-phpwiki; pagename=Hilfe%2FGuterStil; flags=""; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary "Junge Schreiber glauben oft, dass Stil die Sauce für das Fleisch der Modified: trunk/locale/de/pgsrc/Hilfe%2FHalloWeltPlugin =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FHalloWeltPlugin 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/Hilfe%2FHalloWeltPlugin 2013-04-02 10:14:58 UTC (rev 8738) @@ -4,7 +4,7 @@ pagename=Hilfe%2FHalloWeltPlugin; flags=""; markup=2; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary Ein einfaches Beispiels-Plugin. Modified: trunk/locale/de/pgsrc/Hilfe%2FHochLadenPlugin =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FHochLadenPlugin 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/Hilfe%2FHochLadenPlugin 2013-04-02 10:14:58 UTC (rev 8738) @@ -4,7 +4,7 @@ pagename=Hilfe%2FHochLadenPlugin; flags=""; markup=2; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary Das HochLaden [[Hilfe:WikiPlugin|WikiPlugin]] zeigt eine Eingabebox und zwei Knöpfe. Modified: trunk/locale/de/pgsrc/Hilfe%2FInhaltsVerzeichnisPlugin =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FInhaltsVerzeichnisPlugin 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/Hilfe%2FInhaltsVerzeichnisPlugin 2013-04-02 10:14:58 UTC (rev 8738) @@ -4,7 +4,7 @@ pagename=Hilfe%2FInhaltsVerzeichnisPlugin; flags=""; markup=2; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary <<CreateToc jshide||=1 >> Modified: trunk/locale/de/pgsrc/Hilfe%2FNeueSeitePlugin =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FNeueSeitePlugin 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/Hilfe%2FNeueSeitePlugin 2013-04-02 10:14:58 UTC (rev 8738) @@ -4,7 +4,7 @@ pagename=Hilfe%2FNeueSeitePlugin; flags=PAGE_LOCKED; markup=2; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary WikiPlugin um leicht neue Seiten zu erzeugen, optional mit vorgegebenem Inhalt. Seit v1.3.8 Modified: trunk/locale/de/pgsrc/Hilfe%2FNeuerKommentarPlugin =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FNeuerKommentarPlugin 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/Hilfe%2FNeuerKommentarPlugin 2013-04-02 10:14:58 UTC (rev 8738) @@ -4,7 +4,7 @@ pagename=Hilfe%2FNeuerKommentarPlugin; flags=""; markup=2; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary <<CreateToc jshide||=1 >> Modified: trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin 2013-04-02 10:14:58 UTC (rev 8738) @@ -4,7 +4,7 @@ pagename=Hilfe%2FPhotoAlbumPlugin; flags=""; markup=2; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary == Zusammenfassung Modified: trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin%2FDiashow =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin%2FDiashow 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin%2FDiashow 2013-04-02 10:14:58 UTC (rev 8738) @@ -4,7 +4,7 @@ pagename=Hilfe%2FPhotoAlbumPlugin%2FDiashow; flags=""; markup=2; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary [ Zurück | PhotoAlbumPlugin ] Modified: trunk/locale/de/pgsrc/Hilfe%2FPhpWiki =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FPhpWiki 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/Hilfe%2FPhpWiki 2013-04-02 10:14:58 UTC (rev 8738) @@ -4,7 +4,7 @@ pagename=Hilfe%2FPhpWiki; flags=""; markup=2; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary Sie verwenden jetzt gerade PhpWiki. Faszinierend, oder? Modified: trunk/locale/de/pgsrc/Hilfe%2FTextBearbeiten =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FTextBearbeiten 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/Hilfe%2FTextBearbeiten 2013-04-02 10:14:58 UTC (rev 8738) @@ -4,7 +4,7 @@ pagename=Hilfe%2FTextBearbeiten; flags=""; markup=2; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary Alle Seiten (mit Ausnahme von Suchergebnissen) haben unten einen Link Modified: trunk/locale/de/pgsrc/Hilfe%2FTextFormatierungsRegeln =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FTextFormatierungsRegeln 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/Hilfe%2FTextFormatierungsRegeln 2013-04-02 10:14:58 UTC (rev 8738) @@ -4,7 +4,7 @@ pagename=Hilfe%2FTextFormatierungsRegeln; flags=PAGE_LOCKED; markup=2; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary ! Übersicht Modified: trunk/locale/de/pgsrc/Hilfe%2FVorlagePlugin =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FVorlagePlugin 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/Hilfe%2FVorlagePlugin 2013-04-02 10:14:58 UTC (rev 8738) @@ -4,7 +4,7 @@ pagename=Hilfe%2FVorlagePlugin; flags=""; markup=2; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary === Synopsis Modified: trunk/locale/de/pgsrc/Hilfe%2FWabiSabi =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FWabiSabi 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/Hilfe%2FWabiSabi 2013-04-02 10:14:58 UTC (rev 8738) @@ -3,7 +3,7 @@ Content-Type: application/x-phpwiki; pagename=Hilfe%2FWabiSabi; flags=""; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary Since wabi-sabi represents a comprehensive Japanese world view or aesthetic system, it is difficult to explain precisely in western terms. According to Leonard Koren, wabi-sabi is the most conspicuous and characteristic feature of what we think of as traditional Japanese beauty and it ''"occupies roughly the same position in the Japanese pantheon of aesthetic values as do the Greek ideals of beauty and perfection in the West."'' Modified: trunk/locale/de/pgsrc/Hilfe%2FWieManWikiBenutzt =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FWieManWikiBenutzt 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/Hilfe%2FWieManWikiBenutzt 2013-04-02 10:14:58 UTC (rev 8738) @@ -3,7 +3,7 @@ Content-Type: application/x-phpwiki; pagename=Hilfe%2FWieManWikiBenutzt; flags=""; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary ''»Wiki wiki«'' heißt »schnell« auf Hawai'anisch. Modified: trunk/locale/de/pgsrc/Hilfe%2FWikiTechnik =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FWikiTechnik 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/Hilfe%2FWikiTechnik 2013-04-02 10:14:58 UTC (rev 8738) @@ -4,7 +4,7 @@ pagename=Hilfe%2FWikiTechnik; flags=""; markup=2; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary PhpWiki ist in der serverseitigen Skriptsprache PHP Modified: trunk/locale/de/pgsrc/Hilfe%2FWikiWikiWeb =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FWikiWikiWeb 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/Hilfe%2FWikiWikiWeb 2013-04-02 10:14:58 UTC (rev 8738) @@ -3,7 +3,7 @@ Content-Type: application/x-phpwiki; pagename=Hilfe%2FWikiWikiWeb; flags=""; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary Ein WikiWikiWeb ist eine Website, bei der jeder am Inhalt mitarbeiten kann. Jeder, der das Wiki liest, kann auch Seiten bearbeiten und neue Seiten erstellen. Das bekannteste und meistverwendete Wiki ist das Portland Pattern Repository unter [[http://c2.com/cgi-bin/wiki?WikiWikiWeb]]. Modified: trunk/locale/de/pgsrc/HochLaden =================================================================== --- trunk/locale/de/pgsrc/HochLaden 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/HochLaden 2013-04-02 10:14:58 UTC (rev 8738) @@ -3,7 +3,7 @@ Content-Type: application/x-phpwiki; pagename=HochLaden; flags=""; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary <<UpLoad >> Modified: trunk/locale/de/pgsrc/InterWikiListe =================================================================== --- trunk/locale/de/pgsrc/InterWikiListe 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/InterWikiListe 2013-04-02 10:14:58 UTC (rev 8738) @@ -4,7 +4,7 @@ pagename=InterWikiListe; flags=PAGE_LOCKED; markup=2; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary Liste aller InterWiki Namen und URLs, die in diesem Wiki Modified: trunk/locale/de/pgsrc/KategorieKategorie =================================================================== --- trunk/locale/de/pgsrc/KategorieKategorie 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/KategorieKategorie 2013-04-02 10:14:58 UTC (rev 8738) @@ -4,7 +4,7 @@ pagename=KategorieKategorie; flags=""; markup=2; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary <<TitleSearch Modified: trunk/locale/de/pgsrc/LinkSuche =================================================================== --- trunk/locale/de/pgsrc/LinkSuche 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/LinkSuche 2013-04-02 10:14:58 UTC (rev 8738) @@ -4,7 +4,7 @@ pagename=LinkSuche; flags=PAGE_LOCKED; markup=2; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary <<LinkSearch >> Modified: trunk/locale/de/pgsrc/ListeRelationen =================================================================== --- trunk/locale/de/pgsrc/ListeRelationen 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/ListeRelationen 2013-04-02 10:14:58 UTC (rev 8738) @@ -4,7 +4,7 @@ pagename=ListeRelationen; flags=PAGE_LOCKED; markup=2; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary <<ListRelations >> Modified: trunk/locale/de/pgsrc/ListeSeiten =================================================================== --- trunk/locale/de/pgsrc/ListeSeiten 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/ListeSeiten 2013-04-02 10:14:58 UTC (rev 8738) @@ -4,7 +4,7 @@ pagename=ListeSeiten; flags=""; markup=2; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary Ein einfaches Beispiel für das ListPagesPlugin. Hauptsächlich für ein wikilens Thema benutzt, Modified: trunk/locale/de/pgsrc/MeistBesucht =================================================================== --- trunk/locale/de/pgsrc/MeistBesucht 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/MeistBesucht 2013-04-02 10:14:58 UTC (rev 8738) @@ -3,7 +3,7 @@ Content-Type: application/x-phpwiki; pagename=MeistBesucht; flags=PAGE_LOCKED; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary <<MostPopular limit||=20 >> Modified: trunk/locale/de/pgsrc/ModerierteSeite =================================================================== --- trunk/locale/de/pgsrc/ModerierteSeite 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/ModerierteSeite 2013-04-02 10:14:58 UTC (rev 8738) @@ -4,7 +4,7 @@ pagename=ModerierteSeite; flags="LOCKED"; markup=2; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary <<ModeratedPage >> Modified: trunk/locale/de/pgsrc/NeueSeite =================================================================== --- trunk/locale/de/pgsrc/NeueSeite 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/NeueSeite 2013-04-02 10:14:58 UTC (rev 8738) @@ -4,7 +4,7 @@ pagename=NeueSeite; flags=PAGE_LOCKED; markup=2; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary <<CreatePage >> Modified: trunk/locale/de/pgsrc/Neueste%C3%84nderungen =================================================================== --- trunk/locale/de/pgsrc/Neueste%C3%84nderungen 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/Neueste%C3%84nderungen 2013-04-02 10:14:58 UTC (rev 8738) @@ -4,7 +4,7 @@ pagename=Neueste%C3%84nderungen; flags=PAGE_LOCKED; markup=2; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary Eine Liste der kürzlich veränderter oder neuer Seiten wird hier Modified: trunk/locale/de/pgsrc/NeuesteSeiten =================================================================== --- trunk/locale/de/pgsrc/NeuesteSeiten 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/NeuesteSeiten 2013-04-02 10:14:58 UTC (rev 8738) @@ -4,7 +4,7 @@ pagename=NeuesteSeiten; flags=""; markup=2; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary Hier ist eine Liste von zuletzt erzeugten neuen Seiten in diesem Wiki. Modified: trunk/locale/de/pgsrc/PasswortZur%C3%BCcksetzen =================================================================== --- trunk/locale/de/pgsrc/PasswortZur%C3%BCcksetzen 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/PasswortZur%C3%BCcksetzen 2013-04-02 10:14:58 UTC (rev 8738) @@ -4,7 +4,7 @@ pagename=PasswortZur%C3%BCcksetzen; flags=""; markup=2; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary Jeder Administrator darf jedes Passwort jedes Benutzers zurücksetzen oder löschen. Der Benutzer darf sich dann Modified: trunk/locale/de/pgsrc/PhpWikiDokumentation =================================================================== --- trunk/locale/de/pgsrc/PhpWikiDokumentation 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/PhpWikiDokumentation 2013-04-02 10:14:58 UTC (rev 8738) @@ -3,7 +3,7 @@ Content-Type: application/x-phpwiki; pagename=PhpWikiDokumentation; flags=PAGE_LOCKED; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary ===Seiten in dieser Kategorie: Modified: trunk/locale/de/pgsrc/PhpWikiSystemverwalten =================================================================== --- trunk/locale/de/pgsrc/PhpWikiSystemverwalten 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/PhpWikiSystemverwalten 2013-04-02 10:14:58 UTC (rev 8738) @@ -4,7 +4,7 @@ pagename=PhpWikiSystemverwalten; flags=PAGE_LOCKED; markup=2; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary **//Beachte://** //Du mußt den Systemverwalter-Zugang zuerst mit einem Modified: trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FAclSetzen =================================================================== --- trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FAclSetzen 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FAclSetzen 2013-04-02 10:14:58 UTC (rev 8738) @@ -4,7 +4,7 @@ pagename=PhpWikiSystemverwalten%2FAclSetzen; flags=PAGE_LOCKED; markup=2; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary <<WikiAdminSetAcl >> Modified: trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FChmod =================================================================== --- trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FChmod 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FChmod 2013-04-02 10:14:58 UTC (rev 8738) @@ -4,7 +4,7 @@ pagename=PhpWikiSystemverwalten%2FChmod; flags=PAGE_LOCKED; markup=2; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary <<WikiAdminChmod >> Modified: trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FChown =================================================================== --- trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FChown 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FChown 2013-04-02 10:14:58 UTC (rev 8738) @@ -4,7 +4,7 @@ pagename=PhpWikiSystemverwalten%2FChown; flags=PAGE_LOCKED; markup=2; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary <<WikiAdminChown >> Modified: trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FL%C3%B6schen =================================================================== --- trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FL%C3%B6schen 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FL%C3%B6schen 2013-04-02 10:14:58 UTC (rev 8738) @@ -4,7 +4,7 @@ pagename=PhpWikiSystemverwalten%2FL%C3%B6schen; flags=PAGE_LOCKED; markup=2; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary <<WikiAdminRemove >> Modified: trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FSuchenErsetzen =================================================================== --- trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FSuchenErsetzen 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FSuchenErsetzen 2013-04-02 10:14:58 UTC (rev 8738) @@ -4,7 +4,7 @@ pagename=PhpWikiSystemverwalten%2FSuchenErsetzen; flags=PAGE_LOCKED; markup=2; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary <<WikiAdminSearchReplace >> Modified: trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FUmbenennen =================================================================== --- trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FUmbenennen 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FUmbenennen 2013-04-02 10:14:58 UTC (rev 8738) @@ -4,7 +4,7 @@ pagename=PhpWikiSystemverwalten%2FUmbenennen; flags=PAGE_LOCKED; markup=2; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary <<WikiAdminRename >> Modified: trunk/locale/de/pgsrc/PhpWikiUmfrage =================================================================== --- trunk/locale/de/pgsrc/PhpWikiUmfrage 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/PhpWikiUmfrage 2013-04-02 10:14:58 UTC (rev 8738) @@ -4,7 +4,7 @@ pagename=PhpWikiUmfrage; flags=PAGE_LOCKED; markup=2; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary <<NoCache >> Modified: trunk/locale/de/pgsrc/SandKasten =================================================================== --- trunk/locale/de/pgsrc/SandKasten 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/SandKasten 2013-04-02 10:14:58 UTC (rev 8738) @@ -4,7 +4,7 @@ pagename=SandKasten; flags=""; markup=2; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary Hier können Sie das Wiki ausprobieren. Modified: trunk/locale/de/pgsrc/SandKiste =================================================================== --- trunk/locale/de/pgsrc/SandKiste 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/SandKiste 2013-04-02 10:14:58 UTC (rev 8738) @@ -4,7 +4,7 @@ pagename=SandKiste; flags=""; markup=2; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary <<RedirectTo page=SandKasten >> Modified: trunk/locale/de/pgsrc/SeiteFinden =================================================================== --- trunk/locale/de/pgsrc/SeiteFinden 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/SeiteFinden 2013-04-02 10:14:58 UTC (rev 8738) @@ -4,7 +4,7 @@ pagename=SeiteFinden; flags=PAGE_LOCKED; markup=2; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary Als Startpunkt zum Herumstöbern im Wiki eignen sich am besten die Modified: trunk/locale/de/pgsrc/SeiteSpeichern =================================================================== --- trunk/locale/de/pgsrc/SeiteSpeichern 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/SeiteSpeichern 2013-04-02 10:14:58 UTC (rev 8738) @@ -4,7 +4,7 @@ pagename=SeiteSpeichern; flags=PAGE_LOCKED; markup=2; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary Betrachte eine Wiki Seite im MIME Format oder lade sie als Backup herunter als einzelne Seite. _Ein komplettes Backup aller Seiten kann in der PhpWikiVerwaltung erzeugt werden._ Modified: trunk/locale/de/pgsrc/SeitenErzeugen =================================================================== --- trunk/locale/de/pgsrc/SeitenErzeugen 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/SeitenErzeugen 2013-04-02 10:14:58 UTC (rev 8738) @@ -3,7 +3,7 @@ Content-Type: application/x-phpwiki; pagename=SeitenErzeugen; flags=""; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary Um dem Wiki eine neue Seite hinzuzufügen mußt du dir nur einen sinnvollen Titel einfallen lassen, alle Wörter im Titel großschreiben und sie AufDieseArtZusammenfuegen. Wiki erkennt dies automatisch als einen Hyperlink. **Umlaute kannst du in Titeln auch verwenden: [[den Namen in eckige Klammern so einschließen].** Modified: trunk/locale/de/pgsrc/SeitenInfo =================================================================== --- trunk/locale/de/pgsrc/SeitenInfo 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/SeitenInfo 2013-04-02 10:14:58 UTC (rev 8738) @@ -4,7 +4,7 @@ pagename=SeitenInfo; flags=PAGE_LOCKED; markup=2; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary <<PageInfo>> Modified: trunk/locale/de/pgsrc/SeitenProtokoll =================================================================== --- trunk/locale/de/pgsrc/SeitenProtokoll 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/SeitenProtokoll 2013-04-02 10:14:58 UTC (rev 8738) @@ -3,7 +3,7 @@ Content-Type: application/x-phpwiki; pagename=SeitenProtokoll; flags=PAGE_LOCKED; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary <<PageHistory>> Modified: trunk/locale/de/pgsrc/SemantischeRelationen =================================================================== --- trunk/locale/de/pgsrc/SemantischeRelationen 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/SemantischeRelationen 2013-04-02 10:14:58 UTC (rev 8738) @@ -4,7 +4,7 @@ pagename=SemantischeRelationen; flags=PAGE_LOCKED; markup=2; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary <<SemanticRelations >> Modified: trunk/locale/de/pgsrc/SemantischeSuche =================================================================== --- trunk/locale/de/pgsrc/SemantischeSuche 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/SemantischeSuche 2013-04-02 10:14:58 UTC (rev 8738) @@ -4,7 +4,7 @@ pagename=SemantischeSuche; flags=PAGE_LOCKED; markup=2; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary Suche nach semantischen Relationen und Attributen. Modified: trunk/locale/de/pgsrc/StartSeite =================================================================== --- trunk/locale/de/pgsrc/StartSeite 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/StartSeite 2013-04-02 10:14:58 UTC (rev 8738) @@ -3,7 +3,7 @@ Content-Type: application/x-phpwiki; pagename=StartSeite; flags=""; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary * Was ist ein WikiWikiWeb? Eine kurze Beschreibung dieser Anwendung. Modified: trunk/locale/de/pgsrc/StartSeiteAlias =================================================================== --- trunk/locale/de/pgsrc/StartSeiteAlias 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/StartSeiteAlias 2013-04-02 10:14:58 UTC (rev 8738) @@ -4,7 +4,7 @@ pagename=StartSeiteAlias; flags=""; markup=2; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary <<RedirectTo page=StartSeite >> Modified: trunk/locale/de/pgsrc/TitelSuche =================================================================== --- trunk/locale/de/pgsrc/TitelSuche 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/TitelSuche 2013-04-02 10:14:58 UTC (rev 8738) @@ -4,7 +4,7 @@ pagename=TitelSuche; flags=PAGE_LOCKED; markup=2; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary <<TitleSearch >> Modified: trunk/locale/de/pgsrc/UpLoad =================================================================== --- trunk/locale/de/pgsrc/UpLoad 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/UpLoad 2013-04-02 10:14:58 UTC (rev 8738) @@ -4,7 +4,7 @@ pagename=UpLoad; flags=""; markup=2; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary **Uploade eine Datei, die dann mit dem "Upload~:" Prefix zugänglich sein sein wird.** Modified: trunk/locale/de/pgsrc/Verlinkte%C3%84nderungen =================================================================== --- trunk/locale/de/pgsrc/Verlinkte%C3%84nderungen 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/Verlinkte%C3%84nderungen 2013-04-02 10:14:58 UTC (rev 8738) @@ -3,7 +3,7 @@ Content-Type: application/x-phpwiki; pagename=Verlinkte%C3%84nderungen; flags=PAGE_LOCKED; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary <<RelatedChanges show_minor||=1 days||=7 daylist=1,3,7,30,90,0 >> Modified: trunk/locale/de/pgsrc/VerwaisteSeiten =================================================================== --- trunk/locale/de/pgsrc/VerwaisteSeiten 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/VerwaisteSeiten 2013-04-02 10:14:58 UTC (rev 8738) @@ -4,7 +4,7 @@ pagename=VerwaisteSeiten; flags=PAGE_LOCKED; markup=2; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary Verwaiste Seiten (OrphanedPages) sind solche, die nicht verlinkt, Modified: trunk/locale/de/pgsrc/VolltextSuche =================================================================== --- trunk/locale/de/pgsrc/VolltextSuche 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/VolltextSuche 2013-04-02 10:14:58 UTC (rev 8738) @@ -3,7 +3,7 @@ Content-Type: application/x-phpwiki; pagename=VolltextSuche; flags=PAGE_LOCKED; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary <<FullTextSearch >> Modified: trunk/locale/de/pgsrc/Vorlage%2FBeispiel =================================================================== --- trunk/locale/de/pgsrc/Vorlage%2FBeispiel 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/Vorlage%2FBeispiel 2013-04-02 10:14:58 UTC (rev 8738) @@ -4,7 +4,7 @@ pagename=Vorlage%2FBeispiel; flags=""; markup=2; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary <noinclude> Modified: trunk/locale/de/pgsrc/WerIstOnline =================================================================== --- trunk/locale/de/pgsrc/WerIstOnline 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/WerIstOnline 2013-04-02 10:14:58 UTC (rev 8738) @@ -5,7 +5,7 @@ flags=""; version=2; markup=2; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary <<WhoIsOnline allow_detail=1 >> Modified: trunk/locale/de/pgsrc/WikiAdminAuswahl =================================================================== --- trunk/locale/de/pgsrc/WikiAdminAuswahl 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/WikiAdminAuswahl 2013-04-02 10:14:58 UTC (rev 8738) @@ -4,7 +4,7 @@ pagename=WikiAdminAuswahl; flags=PAGE_LOCKED; markup=2; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary <<WikiAdminSelect >> Modified: trunk/locale/de/pgsrc/WunschZettelSeiten =================================================================== --- trunk/locale/de/pgsrc/WunschZettelSeiten 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/WunschZettelSeiten 2013-04-02 10:14:58 UTC (rev 8738) @@ -4,7 +4,7 @@ pagename=WunschZettelSeiten; flags=""; markup=2; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary Das ist eine Liste von Seiten, die in diesem Wiki zitiert werden, aber Modified: trunk/locale/de/pgsrc/ZufallsSeite =================================================================== --- trunk/locale/de/pgsrc/ZufallsSeite 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/de/pgsrc/ZufallsSeite 2013-04-02 10:14:58 UTC (rev 8738) @@ -4,7 +4,7 @@ pagename=ZufallsSeite; flags=PAGE_LOCKED; markup=2; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary Die Anzahl der zufälligen ausgesuchten Seiten ist eine Zahl von 1 Modified: trunk/locale/es/pgsrc/Ayuda%2FAgregarPaginas =================================================================== --- trunk/locale/es/pgsrc/Ayuda%2FAgregarPaginas 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/es/pgsrc/Ayuda%2FAgregarPaginas 2013-04-02 10:14:58 UTC (rev 8738) @@ -3,7 +3,7 @@ Content-Type: application/x-phpwiki; pagename=Ayuda%2FAgregarPaginas; flags=""; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary Para añadir una nueva página a Wiki, todo lo que tiene que hacer es empezar con un titulo significativo, capitalizar todas las palabras como EsteEsUnTituloCapitalizado. Wiki lo reconoce automáticamente como un hipervínculo. Modified: trunk/locale/es/pgsrc/Ayuda%2FBuenEstilo =================================================================== --- trunk/locale/es/pgsrc/Ayuda%2FBuenEstilo 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/es/pgsrc/Ayuda%2FBuenEstilo 2013-04-02 10:14:58 UTC (rev 8738) @@ -3,7 +3,7 @@ Content-Type: application/x-phpwiki; pagename=Ayuda%2FBuenEstilo; flags=""; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary "Young writers often suppose that style is a garnish for the meat of Modified: trunk/locale/es/pgsrc/Ayuda%2FComoUsarWiki =================================================================== --- trunk/locale/es/pgsrc/Ayuda%2FComoUsarWiki 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/es/pgsrc/Ayuda%2FComoUsarWiki 2013-04-02 10:14:58 UTC (rev 8738) @@ -3,7 +3,7 @@ Content-Type: application/x-phpwiki; pagename=Ayuda%2FComoUsarWiki; flags=""; - charset=utf-8; + charset=UTF-8; markup=2 Content-Transfer-Encoding: binary Modified: trunk/locale/es/pgsrc/Ayuda%2FEditarElTexto =================================================================== --- trunk/locale/es/pgsrc/Ayuda%2FEditarElTexto 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/es/pgsrc/Ayuda%2FEditarElTexto 2013-04-02 10:14:58 UTC (rev 8738) @@ -3,7 +3,7 @@ Content-Type: application/x-phpwiki; pagename=Ayuda%2FEditarElTexto; flags=""; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary Todas las páginas (excepto los resultados de búsquedas) tienen una enlace hacia EditarElTexto en la parte inferior. Al hacer click sobre este enlace se puede editar el texto que se está leyendo. Modified: trunk/locale/es/pgsrc/Ayuda%2FKBrown =================================================================== --- trunk/locale/es/pgsrc/Ayuda%2FKBrown 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/es/pgsrc/Ayuda%2FKBrown 2013-04-02 10:14:58 UTC (rev 8738) @@ -3,7 +3,7 @@ Content-Type: application/x-phpwiki; pagename=Ayuda%2FKBrown; flags=""; - charset=utf-8; + charset=UTF-8; markup=1 Content-Transfer-Encoding: binary Modified: trunk/locale/es/pgsrc/Ayuda%2FMasAcercadeLaMecanica =================================================================== --- trunk/locale/es/pgsrc/Ayuda%2FMasAcercadeLaMecanica 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/es/pgsrc/Ayuda%2FMasAcercadeLaMecanica 2013-04-02 10:14:58 UTC (rev 8738) @@ -3,7 +3,7 @@ Content-Type: application/x-phpwiki; pagename=Ayuda%2FMasAcercadeLaMecanica; flags=""; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary PhpWiki está escrito con el lenguaje de servidor PHP, disponible en http://www.php.net/. El PHP se asemeja a C y Perl en su sintaxis, y funciona muy parecido a ASP, EmbPerl o JSP. Modified: trunk/locale/es/pgsrc/Ayuda%2FPhpWiki =================================================================== --- trunk/locale/es/pgsrc/Ayuda%2FPhpWiki 2013-04-02 09:05:00 UTC (rev 8737) +++ trunk/locale/es/pgsrc/Ayuda%2FPhpWiki 2013-04-02 10:14:58 UTC (rev 8738) @@ -3,7 +3,7 @@ Content-Type: application/x-phpwiki; pagename=Ayuda%2FPhpWiki; flags=PAGE_LOCKED; - charset=utf-8 + charset=UTF-8 Content-Transfer-Encoding: binary Esta usando PhpWiki e... [truncated message content] |
From: <var...@us...> - 2020-12-26 12:48:07
|
Revision: 10205 http://sourceforge.net/p/phpwiki/code/10205 Author: vargenau Date: 2020-12-26 12:48:06 +0000 (Sat, 26 Dec 2020) Log Message: ----------- Update pgsrc/Help%2FWikisUsingPhpWiki, locale/fr/pgsrc/Aide%2FWikisUtilisantPhpWiki Modified Paths: -------------- trunk/locale/fr/pgsrc/Aide%2FWikisUtilisantPhpWiki trunk/pgsrc/Help%2FWikisUsingPhpWiki Modified: trunk/locale/fr/pgsrc/Aide%2FWikisUtilisantPhpWiki =================================================================== --- trunk/locale/fr/pgsrc/Aide%2FWikisUtilisantPhpWiki 2020-12-26 12:11:24 UTC (rev 10204) +++ trunk/locale/fr/pgsrc/Aide%2FWikisUtilisantPhpWiki 2020-12-26 12:48:06 UTC (rev 10205) @@ -1,4 +1,4 @@ -Date: Fri, 5 Apr 2019 11:26:06 +0000 +Date: Sat, 26 Dec 2020 13:33:20 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=Aide%2FWikisUtilisantPhpWiki @@ -32,11 +32,9 @@ | http://kcpralumni.org/wiki/ | 1.5.4 | Sidebar | http://matthieuachard.free.fr/wiki/ | 1.2.10 | http://meanwhile.sourceforge.net/wiki/ | 1.4.0RC1 | ~MonoBook -| http://mtjezreel.com/phpwiki/ | 1.3.14 | Crao | http://mtswiki.westwood-tech.com/mtswiki-index.php/HomePage | 1.4.0RC1 | default | http://mupad-combinat.sourceforge.net/Wiki/AboutWiki.html | | default | http://muthanna.com/looperng/tutorial/HelpPages.html | ?? (wikidump) -| http://neckbeard.us | 1.5.4 | Sidebar | http://netfrag.org/rrr/wiki/ | 1.5.5 | Sidebar | http://nukemclan.free.fr | 1.2.10 | http://ohg82er.de/wiki/ | 1.3.2-jeffs-hacks | ~DigiLog (spécifique) @@ -48,12 +46,10 @@ | http://squibbett.vacationhomesonnantucket.com/wiki/ | 1.2.11 | http://swimuu.org/cu2c2-board/ | http://the-bees-knees.info/phpwiki/ | 1.5.4 | default -| http://tuleap.net/wiki/index.php?pagename=HomePage&group_id=101 | | Tuleap | http://utenmelk.no/wiki2/ | 1.6.0 | Wordpress | http://wac-tk.drni.de | 1.3.11p1 | Crao | https://wiki.cyberleo.net | 1.4.0RC1 | MacOSX | http://wiki.elaboratedsolutions.com -| http://wikiwiki.winak.be | 1.5.5 | Sidebar | http://wiki.wlug.org.nz | 1.3.11p1 | WLUG05 (spécifique) | http://wikiworld.com/wiki/ | | ~MonoBook | http://www.allpsych.uni-giessen.de/wikidump/HomePage.html | ?? (wikidump) Modified: trunk/pgsrc/Help%2FWikisUsingPhpWiki =================================================================== --- trunk/pgsrc/Help%2FWikisUsingPhpWiki 2020-12-26 12:11:24 UTC (rev 10204) +++ trunk/pgsrc/Help%2FWikisUsingPhpWiki 2020-12-26 12:48:06 UTC (rev 10205) @@ -1,4 +1,4 @@ -Date: Tue, 2 Apr 2019 13:26:06 +0000 +Date: Sat, 26 Dec 2020 13:33:20 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=Help%2FWikisUsingPhpWiki @@ -32,11 +32,9 @@ | http://kcpralumni.org/wiki/ | 1.5.4 | Sidebar | http://matthieuachard.free.fr/wiki/ | 1.2.10 | http://meanwhile.sourceforge.net/wiki/ | 1.4.0RC1 | ~MonoBook -| http://mtjezreel.com/phpwiki/ | 1.3.14 | Crao | http://mtswiki.westwood-tech.com/mtswiki-index.php/HomePage | 1.4.0RC1 | default | http://mupad-combinat.sourceforge.net/Wiki/AboutWiki.html | | default | http://muthanna.com/looperng/tutorial/HelpPages.html | ?? (wikidump) -| http://neckbeard.us | 1.5.4 | Sidebar | http://netfrag.org/rrr/wiki/ | 1.5.5 | Sidebar | http://nukemclan.free.fr | 1.2.10 | http://ohg82er.de/wiki/ | 1.3.2-jeffs-hacks | ~DigiLog (custom) @@ -48,12 +46,10 @@ | http://squibbett.vacationhomesonnantucket.com/wiki/ | 1.2.11 | http://swimuu.org/cu2c2-board/ | http://the-bees-knees.info/phpwiki/ | 1.5.4 | default -| http://tuleap.net/wiki/index.php?pagename=HomePage&group_id=101 | | Tuleap | http://utenmelk.no/wiki2/ | 1.6.0 | Wordpress | http://wac-tk.drni.de | 1.3.11p1 | Crao | https://wiki.cyberleo.net | 1.4.0RC1 | MacOSX | http://wiki.elaboratedsolutions.com -| http://wikiwiki.winak.be | 1.5.5 | Sidebar | http://wiki.wlug.org.nz | 1.3.11p1 | WLUG05 (custom) | http://wikiworld.com/wiki/ | | ~MonoBook | http://www.allpsych.uni-giessen.de/wikidump/HomePage.html | ?? (wikidump) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2013-04-02 13:51:39
|
Revision: 8739 http://sourceforge.net/p/phpwiki/code/8739 Author: vargenau Date: 2013-04-02 13:51:35 +0000 (Tue, 02 Apr 2013) Log Message: ----------- Use HTML 5 DOCTYPE; force CHARSET=utf-8 Modified Paths: -------------- trunk/config/config-default.ini trunk/config/config-dist.ini trunk/configurator.php trunk/lib/IniConfig.php trunk/lib/MailNotify.php trunk/lib/RssWriter.php trunk/lib/Template.php trunk/lib/WikiDB/backend/ADODB_mysql.php trunk/lib/WikiDB/backend/PDO_mysql.php trunk/lib/WikiDB/backend/PearDB_mysql.php trunk/lib/WikiPlugin.php trunk/lib/WikiTheme.php trunk/lib/WikiUser/LDAP.php trunk/lib/WysiwygEdit/Wikiwyg.php trunk/lib/XmlElement.php trunk/lib/XmlParser.php trunk/lib/config.php trunk/lib/display.php trunk/lib/editpage.php trunk/lib/loadsave.php trunk/lib/plugin/EditMetaData.php trunk/lib/plugin/ExternalSearch.php trunk/lib/plugin/GooglePlugin.php trunk/lib/plugin/LinkDatabase.php trunk/lib/plugin/LinkSearch.php trunk/lib/plugin/PageDump.php trunk/lib/plugin/RecentChanges.php trunk/lib/plugin/RssFeed.php trunk/lib/plugin/SemanticSearch.php trunk/lib/plugin/SemanticSearchAdvanced.php trunk/lib/plugin/SpellCheck.php trunk/lib/plugin/SystemInfo.php trunk/lib/plugin/WikiForm.php trunk/lib/plugin/WikiFormRich.php trunk/lib/plugin/_WikiTranslation.php trunk/lib/stdlib.php trunk/lib/upgrade.php trunk/lib/ziplib.php trunk/pgsrc/Help%2FTextFormattingRules trunk/tests/unit/test.php trunk/themes/Crao/templates/editpage.tmpl trunk/themes/Crao/templates/head.tmpl trunk/themes/Crao/templates/htmldump.tmpl trunk/themes/Portland/templates/editpage.tmpl trunk/themes/Sidebar/templates/frame-left.tmpl trunk/themes/Wordpress/templates/editpage.tmpl trunk/themes/Wordpress/templates/signin.tmpl trunk/themes/default/templates/addcomment.tmpl trunk/themes/default/templates/dialog.tmpl trunk/themes/default/templates/editpage.tmpl trunk/themes/default/templates/forumadd.tmpl trunk/themes/default/templates/login.tmpl trunk/themes/default/templates/redirect.tmpl trunk/themes/default/templates/wikiforum.tmpl trunk/themes/fusionforge/templates/editpage.tmpl trunk/themes/wikilens/templates/head.tmpl Modified: trunk/config/config-default.ini =================================================================== --- trunk/config/config-default.ini 2013-04-02 10:14:58 UTC (rev 8738) +++ trunk/config/config-default.ini 2013-04-02 13:51:35 UTC (rev 8739) @@ -128,7 +128,6 @@ THEME = Sidebar ; DEFAULT_LANGUAGE = -CHARSET = utf-8 WIKI_PGSRC = pgsrc DEFAULT_WIKI_PGSRC = pgsrc ; untranslated pgsrc pages to always include Modified: trunk/config/config-dist.ini =================================================================== --- trunk/config/config-dist.ini 2013-04-02 10:14:58 UTC (rev 8738) +++ trunk/config/config-dist.ini 2013-04-02 13:51:35 UTC (rev 8739) @@ -904,33 +904,6 @@ ; random heavy images: ;THEME = Hawaiian -; Select a valid charset name to be inserted into the xml/html pages, -; and to reference links to the stylesheets (css). For more info see: -; http://www.iana.org/assignments/character-sets. Note that PhpWiki -; has been extensively tested only with the latin1 (iso-8859-1) -; and utf-8 character sets. -; -; If you change the default with existing pages, -; PhpWiki may not work properly and will require modifications in all existing pages. -; You'll have to dump the old pages with the old charset -; and import it into the new one after having changed the charset. -; Currently we support utf-8 for all languages, euc-jp for ja -; and iso-8859-1 for all langs except ja and zh. Changing languages (UserPreferences) -; from one charset to another will not work! -; -; Character sets similar to iso-8859-1 may work with little or no -; modification depending on your setup. The database must also -; support the same charset, and of course the same is true for the -; web browser. euc-jp and utf-8 works ok, but only is mbstring is used. -CHARSET = utf-8 - -; Most exotic charsets are not supported by htmlspecialchars, which prints a warning: -; "charset `bla' not supported, assuming iso-8859-1" -; Even on simple 8bit charsets, where just <>& need to be replaced. -; See php-src:/ext/standard/html.c -; We can ignore these warnings then. -;IGNORE_CHARSET_NOT_SUPPORTED_WARNING = true - ; Select your language/locale - Default language is "" for auto-detection. ; Available languages: ; English "en" (English - HomePage) @@ -945,7 +918,6 @@ ; ; If you set DEFAULT_LANGUAGE to the empty string, the users ; preferred language as determined by the browser setting will be used. -; 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 2013-04-02 10:14:58 UTC (rev 8738) +++ trunk/configurator.php 2013-04-02 13:51:35 UTC (rev 8739) @@ -1333,12 +1333,6 @@ THEME = blog (Kubrick) [experimental] </pre>"); -$properties["Character Set"] = - new _define_optional('CHARSET', 'utf-8'); - -$properties["Ignore Charset Not Supported Warning"] = - new _define_optional('IGNORE_CHARSET_NOT_SUPPORTED_WARNING'); - $properties["Language"] = new _define_selection_optional('DEFAULT_LANGUAGE', array('en' => "English", Modified: trunk/lib/IniConfig.php =================================================================== --- trunk/lib/IniConfig.php 2013-04-02 10:14:58 UTC (rev 8738) +++ trunk/lib/IniConfig.php 2013-04-02 13:51:35 UTC (rev 8739) @@ -47,7 +47,7 @@ * (namespace pollution). (FusionForge, phpnuke, postnuke, phpBB2, carolina, ...) * Use one global $phpwiki object instead which holds the cfg vars, constants * and all other globals. - * (global $FieldSeparator, $charset, $WikiNameRegexp, $KeywordLinkRegexp; + * (global $FieldSeparator, $WikiNameRegexp, $KeywordLinkRegexp; * global $DisabledActions, $DBParams, $LANG, $AllActionPages) * * - Resurrect the larger "config object" code (in config/) so it'll aid the @@ -129,7 +129,6 @@ if (!file_exists($file)) { // We need to DATA_PATH for configurator, or pass the posted values // somewhow to the script - $GLOBALS['charset'] = 'utf-8'; include_once(dirname(__FILE__) . "/install.php"); run_install("_part1"); if (!defined("_PHPWIKI_INSTALL_RUNNING")) @@ -147,7 +146,7 @@ 'COOKIE_EXPIRATION_DAYS', 'COOKIE_DOMAIN', 'PASSWORD_LENGTH_MINIMUM', 'USER_AUTH_POLICY', 'GROUP_METHOD', - 'EDITING_POLICY', 'THEME', 'CHARSET', + 'EDITING_POLICY', 'THEME', 'WIKI_PGSRC', 'DEFAULT_WIKI_PGSRC', 'ALLOWED_PROTOCOLS', 'INLINE_IMAGES', 'SUBPAGE_SEPARATOR', /*'KEYWORDS',*/ // extra logic: @@ -572,7 +571,6 @@ function _ignore_unknown_charset_warning(&$error) { - //htmlspecialchars(): charset `iso-8859-2' not supported, assuming iso-8859-1 if (preg_match('/^htmlspecialchars\(\): charset \`.+\' not supported, assuming iso-8859-1/', $error->errstr) ) { @@ -585,36 +583,14 @@ // moved from lib/config.php [1ms] function fixup_static_configs($file) { - global $FieldSeparator, $charset, $WikiNameRegexp, $AllActionPages; + global $FieldSeparator, $WikiNameRegexp, $AllActionPages; global $DBParams, $LANG, $ErrorManager; // init FileFinder to add proper include paths FindFile("lib/interwiki.map", true); - // "\x80"-"\x9f" (and "\x00" - "\x1f") are non-printing control - // chars in iso-8859-* - // $FieldSeparator = "\263"; // this is a superscript 3 in ISO-8859-1. // $FieldSeparator = "\xFF"; // this byte should never appear in utf-8 - // Get rid of constant. pref is dynamic and language specific - $charset = CHARSET; - // Disabled: Let the admin decide which charset. - //if (isset($LANG) and in_array($LANG,array('zh'))) - // $charset = 'utf-8'; - if (strtolower($charset) == 'utf-8') - $FieldSeparator = "\xFF"; - else - $FieldSeparator = "\x81"; + $FieldSeparator = "\xFF"; - // Some exotic charsets are not supported by htmlspecialchars, which just prints an E_WARNING. - // Even on simple 8bit charsets, where just <>& need to be replaced. For iso-8859-[2-4] e.g. - // See <php-src>/ext/standard/html.c - // For performance reasons we require a magic constant to ignore this warning. - if (defined('IGNORE_CHARSET_NOT_SUPPORTED_WARNING') - and IGNORE_CHARSET_NOT_SUPPORTED_WARNING - ) { - $ErrorManager->pushErrorHandler - (new WikiFunctionCb('_ignore_unknown_charset_warning')); - } - // All pages containing plugins of the same name as the filename $ActionPages = explode(':', 'AllPages:AllUsers:AppendText:AuthorHistory:' @@ -995,8 +971,6 @@ } } // tell gettext not to use unicode. PHP >= 4.2.0. Thanks to Kai Krakow. - if (defined('CHARSET') and function_exists('bind_textdomain_codeset')) - @bind_textdomain_codeset("phpwiki", CHARSET); if ($LANG != 'en') textdomain("phpwiki"); if ($chback) { // change back Modified: trunk/lib/MailNotify.php =================================================================== --- trunk/lib/MailNotify.php 2013-04-02 10:14:58 UTC (rev 8738) +++ trunk/lib/MailNotify.php 2013-04-02 13:51:35 UTC (rev 8739) @@ -203,7 +203,7 @@ $headers = "From: $from\r\n" . "Bcc: " . join(',', $emails) . "\r\n" . "MIME-Version: 1.0\r\n" . - "Content-Type: text/plain; charset=" . CHARSET . "; format=flowed\r\n" . + "Content-Type: text/plain; charset=UTF-8; format=flowed\r\n" . "Content-Transfer-Encoding: 8bit"; $ok = mail(($to = array_shift($emails)), Modified: trunk/lib/RssWriter.php =================================================================== --- trunk/lib/RssWriter.php 2013-04-02 10:14:58 UTC (rev 8738) +++ trunk/lib/RssWriter.php 2013-04-02 13:51:35 UTC (rev 8739) @@ -3,10 +3,6 @@ * Code for creating RSS 1.0. */ -// Encoding for RSS output. -if (!defined('RSS_ENCODING')) - define('RSS_ENCODING', $GLOBALS['charset']); - /** * A class for writing RSS 1.0. * Modified: trunk/lib/Template.php =================================================================== --- trunk/lib/Template.php 2013-04-02 10:14:58 UTC (rev 8738) +++ trunk/lib/Template.php 2013-04-02 13:51:35 UTC (rev 8739) @@ -145,7 +145,7 @@ if (!isset($revision)) $revision = false; - global $WikiTheme, $charset; + global $WikiTheme; //$this->_dump_template(); $SEP = $WikiTheme->getButtonSeparator(); Modified: trunk/lib/WikiDB/backend/ADODB_mysql.php =================================================================== --- trunk/lib/WikiDB/backend/ADODB_mysql.php 2013-04-02 10:14:58 UTC (rev 8738) +++ trunk/lib/WikiDB/backend/ADODB_mysql.php 2013-04-02 13:51:35 UTC (rev 8739) @@ -50,16 +50,7 @@ // esp. needed for utf databases if ($this->_serverinfo['version'] > 401.0) { - global $charset; - $aliases = array('iso-8859-1' => 'latin1', - 'utf-8' => 'utf8'); - //http://dev.mysql.com/doc/mysql/en/charset-connection.html - if (isset($aliases[strtolower($charset)])) { - // mysql needs special unusual names and doesn't resolve aliases - mysql_query("SET NAMES '" . $aliases[$charset] . "'"); - } else { - mysql_query("SET NAMES '$charset'"); - } + mysql_query("SET NAMES 'UTF-8'"); } } Modified: trunk/lib/WikiDB/backend/PDO_mysql.php =================================================================== --- trunk/lib/WikiDB/backend/PDO_mysql.php 2013-04-02 10:14:58 UTC (rev 8738) +++ trunk/lib/WikiDB/backend/PDO_mysql.php 2013-04-02 13:51:35 UTC (rev 8739) @@ -44,16 +44,7 @@ } if ($this->_serverinfo['version'] > 401.0) { - global $charset; - $aliases = array('iso-8859-1' => 'latin1', - 'utf-8' => 'utf8'); - //http://dev.mysql.com/doc/mysql/en/charset-connection.html - if (isset($aliases[strtolower($charset)])) { - // mysql needs special unusual names and doesn't resolve aliases - mysql_query("SET NAMES '" . $aliases[$charset] . "'"); - } else { - mysql_query("SET NAMES '$charset'"); - } + mysql_query("SET NAMES 'UTF-8'"); } } Modified: trunk/lib/WikiDB/backend/PearDB_mysql.php =================================================================== --- trunk/lib/WikiDB/backend/PearDB_mysql.php 2013-04-02 10:14:58 UTC (rev 8738) +++ trunk/lib/WikiDB/backend/PearDB_mysql.php 2013-04-02 13:51:35 UTC (rev 8739) @@ -29,16 +29,7 @@ } // esp. needed for utf databases if ($this->_serverinfo['version'] > 401.0) { - global $charset; - $aliases = array('iso-8859-1' => 'latin1', - 'utf-8' => 'utf8'); - //http://dev.mysql.com/doc/mysql/en/charset-connection.html - if (isset($aliases[strtolower($charset)])) { - // mysql needs special unusual names and doesn't resolve aliases - mysql_query("SET NAMES '" . $aliases[strtolower($charset)] . "'"); - } else { - mysql_query("SET NAMES '$charset'"); - } + mysql_query("SET NAMES 'UTF-8'"); } } } Modified: trunk/lib/WikiPlugin.php =================================================================== --- trunk/lib/WikiPlugin.php 2013-04-02 10:14:58 UTC (rev 8738) +++ trunk/lib/WikiPlugin.php 2013-04-02 13:51:35 UTC (rev 8739) @@ -292,7 +292,7 @@ $form = HTML::form(array('action' => WikiURL($args['targetpage']), 'method' => $args['method'], 'class' => $args['class'], - 'accept-charset' => $GLOBALS['charset'])); + 'accept-charset' => 'UTF-8')); if (!USE_PATH_INFO) { $pagename = $request->get('pagename'); $form->pushContent(HTML::input(array('type' => 'hidden', Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2013-04-02 10:14:58 UTC (rev 8738) +++ trunk/lib/WikiTheme.php 2013-04-02 13:51:35 UTC (rev 8739) @@ -1137,7 +1137,6 @@ return HTML(); $link = HTML::link(array('rel' => $is_alt ? 'alternate stylesheet' : 'stylesheet', 'type' => 'text/css', - 'charset' => $GLOBALS['charset'], 'href' => $this->_findData($css_file))); if ($is_alt) $link->setAttr('title', $title); Modified: trunk/lib/WikiUser/LDAP.php =================================================================== --- trunk/lib/WikiUser/LDAP.php 2013-04-02 10:14:58 UTC (rev 8738) +++ trunk/lib/WikiUser/LDAP.php 2013-04-02 13:51:35 UTC (rev 8739) @@ -188,7 +188,6 @@ // On wrong password the ldap server will return: // "Unable to bind to server: Server is unwilling to perform" // The @ catches this error message. - // If CHARSET=utf-8 the form should have already converted it to utf-8. if ($r = @ldap_bind($ldap, $dn, $submitted_password)) { // ldap_bind will return TRUE if everything matches // Optionally get the mail from LDAP Modified: trunk/lib/WysiwygEdit/Wikiwyg.php =================================================================== --- trunk/lib/WysiwygEdit/Wikiwyg.php 2013-04-02 10:14:58 UTC (rev 8738) +++ trunk/lib/WysiwygEdit/Wikiwyg.php 2013-04-02 13:51:35 UTC (rev 8739) @@ -164,24 +164,12 @@ function replace_inside_html() { - global $charset; - $this->clean_links(); $this->clean_plugin_name(); $this->replace_known_plugins(); $this->replace_unknown_plugins(); // $this->replace_tags(); $this->clean_plugin(); - - if ($charset != 'utf-8') { - if ($charset == 'iso-8959-1') { - $this->_html = utf8_decode($this->_html); - } else { - // check for iconv support - loadPhpExtension("iconv"); - $this->_html = iconv("UTF-8", $charset, $this->_html); - } - } $this->html_content = $this->_html; } Modified: trunk/lib/XmlElement.php =================================================================== --- trunk/lib/XmlElement.php 2013-04-02 10:14:58 UTC (rev 8738) +++ trunk/lib/XmlElement.php 2013-04-02 13:51:35 UTC (rev 8739) @@ -195,7 +195,7 @@ function _quote($string) { if (!$string) return $string; - return htmlspecialchars($string, ENT_COMPAT, $GLOBALS['charset']); + return htmlspecialchars($string, ENT_COMPAT, 'UTF-8'); } } @@ -570,13 +570,7 @@ function XmlContent_quote($string) { if (!$string) return $string; - if (isset($GLOBALS['charset']) - and (!defined('IGNORE_CHARSET_NOT_SUPPORTED_WARNING') or !IGNORE_CHARSET_NOT_SUPPORTED_WARNING) - ) { - return htmlspecialchars($string, ENT_COMPAT, $GLOBALS['charset']); - } else { - return htmlspecialchars($string); - } + return htmlspecialchars($string, ENT_COMPAT, 'UTF-8'); } function PrintXML($val /* , ... */) Modified: trunk/lib/XmlParser.php =================================================================== --- trunk/lib/XmlParser.php 2013-04-02 10:14:58 UTC (rev 8738) +++ trunk/lib/XmlParser.php 2013-04-02 13:51:35 UTC (rev 8739) @@ -59,7 +59,7 @@ else $this->_parser = xml_parser_create(); - xml_parser_set_option($this->_parser, XML_OPTION_TARGET_ENCODING, $GLOBALS['charset']); + xml_parser_set_option($this->_parser, XML_OPTION_TARGET_ENCODING, 'UTF-8'); //This unfortunately does not work //xml_set_object($this->_parser, &$this); Modified: trunk/lib/config.php =================================================================== --- trunk/lib/config.php 2013-04-02 10:14:58 UTC (rev 8738) +++ trunk/lib/config.php 2013-04-02 13:51:35 UTC (rev 8739) @@ -216,7 +216,7 @@ if ($res = setlocale($category, $try)) return $res; // Try with charset appended... - $try = $try . '.' . $GLOBALS['charset']; + $try = $try . '.' . 'UTF-8'; if ($res = setlocale($category, $try)) return $res; foreach (array(".", '@', '_') as $sep) { @@ -287,7 +287,7 @@ // FIXME: Not all environments may support en_US? We should probably // have a list of locales to try. if (setlocale(LC_CTYPE, 0) == 'C') { - $x = setlocale(LC_CTYPE, 'en_US.' . $GLOBALS['charset']); + $x = setlocale(LC_CTYPE, 'en_US.UTF-8'); } else { $x = setlocale(LC_CTYPE, $setlocale); } Modified: trunk/lib/display.php =================================================================== --- trunk/lib/display.php 2013-04-02 10:14:58 UTC (rev 8738) +++ trunk/lib/display.php 2013-04-02 13:51:35 UTC (rev 8739) @@ -119,7 +119,7 @@ )); $html = GeneratePageAsXML($template, $pagename, $revision /*, array('VALID_LINKS' => $args['VALID_LINKS'])*/); - header("Content-Type: application/xhtml+xml; charset=" . $GLOBALS['charset']); + header("Content-Type: application/xhtml+xml; charset=UTF-8"); echo $html; } else { $pagelist = null; @@ -237,9 +237,8 @@ } $format = $request->getArg('format'); if ($format == 'xml') { // fast ajax: include page content asynchronously - global $charset; header("Content-Type: text/xml"); - echo "<", "?xml version=\"1.0\" encoding=\"$charset\"?", ">\n"; + echo "<", "?xml version=\"1.0\" encoding=\"UTF-8\"?", ">\n"; // DOCTYPE html needed to allow unencoded entities like without !CDATA[] echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">', "\n"; @@ -309,18 +308,6 @@ $request->appendValidators(array('pagerev' => $revision->getVersion(), '%mtime' => $revision->get('mtime'))); - /* - // FIXME: This is also in the template... - if ($request->getArg('action') != 'pdf' and !headers_sent()) { - // FIXME: enable MathML/SVG/... support - if (ENABLE_XHTML_XML - and (!isBrowserIE() - and strstr($request->get('HTTP_ACCEPT'),'application/xhtml+xml'))) - header("Content-Type: application/xhtml+xml; charset=" . $GLOBALS['charset']); - else - header("Content-Type: text/html; charset=" . $GLOBALS['charset']); - } - */ $toks['TITLE'] = $pagetitle; // <title> tag $toks['HEADER'] = $pageheader; // h1 with backlink Modified: trunk/lib/editpage.php =================================================================== --- trunk/lib/editpage.php 2013-04-02 10:14:58 UTC (rev 8738) +++ trunk/lib/editpage.php 2013-04-02 13:51:35 UTC (rev 8739) @@ -64,7 +64,7 @@ } } if (!headers_sent()) - header("Content-Type: text/html; charset=" . $GLOBALS['charset']); + header("Content-Type: text/html; charset=UTF-8"); } function editPage() Modified: trunk/lib/loadsave.php =================================================================== --- trunk/lib/loadsave.php 2013-04-02 10:14:58 UTC (rev 8738) +++ trunk/lib/loadsave.php 2013-04-02 13:51:35 UTC (rev 8739) @@ -1237,13 +1237,6 @@ break; } } - if (empty($pagehash['charset'])) - $pagehash['charset'] = 'utf-8'; - // compare to target charset - if (strtolower($pagehash['charset']) != strtolower($GLOBALS['charset'])) { - $pageinfo['content'] = charset_convert($params['charset'], $GLOBALS['charset'], $pageinfo['content']); - $pageinfo['pagename'] = charset_convert($params['charset'], $GLOBALS['charset'], $pageinfo['pagename']); - } return $pageinfo; } @@ -1282,9 +1275,6 @@ if (!$mtime) $mtime = time(); // Last resort. - // DONE: check source - target charset for content and pagename - // but only for pgsrc'ed content, not from the browser. - $default_pagename = rawurldecode($basename); if (($parts = ParseMimeifiedPages($text))) { if (count($parts) > 1) @@ -1311,13 +1301,6 @@ // plain old file $user = $request->getUser(); - $file_charset = 'utf-8'; - // compare to target charset - if ($file_charset != strtolower($GLOBALS['charset'])) { - $text = charset_convert($file_charset, $GLOBALS['charset'], $text); - $default_pagename = charset_convert($file_charset, $GLOBALS['charset'], $default_pagename); - } - // Assume plain text file. $pageinfo = array('pagename' => $default_pagename, 'pagedata' => array(), Modified: trunk/lib/plugin/EditMetaData.php =================================================================== --- trunk/lib/plugin/EditMetaData.php 2013-04-02 10:14:58 UTC (rev 8738) +++ trunk/lib/plugin/EditMetaData.php 2013-04-02 13:51:35 UTC (rev 8739) @@ -146,7 +146,7 @@ $button = Button('submit:metaedit', _("Submit"), false); $form = HTML::form(array('action' => $action, 'method' => 'post', - 'accept-charset' => $GLOBALS['charset']), + 'accept-charset' => 'UTF-8'), $hiddenfield, // edit existing fields $table, Modified: trunk/lib/plugin/ExternalSearch.php =================================================================== --- trunk/lib/plugin/ExternalSearch.php 2013-04-02 10:14:58 UTC (rev 8738) +++ trunk/lib/plugin/ExternalSearch.php 2013-04-02 13:51:35 UTC (rev 8739) @@ -108,7 +108,7 @@ $form = HTML::form(array('action' => $request->getPostURL(), 'method' => 'post', //'class' => 'class', //fixme - 'accept-charset' => $GLOBALS['charset']), + 'accept-charset' => 'UTF-8'), HiddenInputs(array('pagename' => $basepage))); $form->pushContent(HTML::input(array('type' => 'hidden', Modified: trunk/lib/plugin/GooglePlugin.php =================================================================== --- trunk/lib/plugin/GooglePlugin.php 2013-04-02 10:14:58 UTC (rev 8738) +++ trunk/lib/plugin/GooglePlugin.php 2013-04-02 13:51:35 UTC (rev 8739) @@ -111,7 +111,7 @@ $form = HTML::form(array('action' => $request->getPostURL(), 'method' => 'post', //'class' => 'class', //fixme - 'accept-charset' => $GLOBALS['charset']), + 'accept-charset' => 'UTF-8'), HiddenInputs(array('pagename' => $basepage, 'mode' => $mode))); $form->pushContent(HTML::input(array('type' => 'text', Modified: trunk/lib/plugin/LinkDatabase.php =================================================================== --- trunk/lib/plugin/LinkDatabase.php 2013-04-02 10:14:58 UTC (rev 8738) +++ trunk/lib/plugin/LinkDatabase.php 2013-04-02 13:51:35 UTC (rev 8739) @@ -142,14 +142,14 @@ } elseif ($args['format'] == 'xml') { // For hypergraph.jar. Best dump it to a local sitemap.xml periodically - global $WikiTheme, $charset; + global $WikiTheme; $currpage = $request->getArg('pagename'); $request->discardOutput(); $request->buffer_output(false); if (!headers_sent()) header("Content-Type: text/xml"); $request->checkValidators(); - echo "<?xml version=\"1.0\" encoding=\"$charset\"?>"; + echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"; // As applet it prefers only "GraphXML.dtd", but then we must copy it to the webroot. $dtd = $WikiTheme->_findData("GraphXML.dtd"); echo "<!DOCTYPE GraphXML SYSTEM \"$dtd\">\n"; Modified: trunk/lib/plugin/LinkSearch.php =================================================================== --- trunk/lib/plugin/LinkSearch.php 2013-04-02 10:14:58 UTC (rev 8738) +++ trunk/lib/plugin/LinkSearch.php 2013-04-02 13:51:35 UTC (rev 8739) @@ -116,7 +116,7 @@ $instructions = _("Search in pages for links with the matching name."); $form = HTML::form(array('action' => $action, 'method' => 'GET', - 'accept-charset' => $GLOBALS['charset']), + 'accept-charset' => 'UTF-8'), $dirsign_switch, $hiddenfield, $instructions, HTML::br(), Modified: trunk/lib/plugin/PageDump.php =================================================================== --- trunk/lib/plugin/PageDump.php 2013-04-02 10:14:58 UTC (rev 8738) +++ trunk/lib/plugin/PageDump.php 2013-04-02 13:51:35 UTC (rev 8739) @@ -123,16 +123,11 @@ $filename = FilenameForPage($page); Header("Content-disposition: attachment; filename=\"" . $filename . "\""); - // Read charset from generated page itself. - // Inconsequential at the moment, since loadsave.php - // always generates headers. - $charset = $p->get('charset'); - if (!$charset) $charset = $GLOBALS['charset']; // We generate 3 Content-Type headers! first in loadsave, // then here and the mimified string $mailified also has it! // This one is correct and overwrites the others. Header("Content-Type: application/octet-stream; name=\"" - . $filename . "\"; charset=\"" . $charset + . $filename . "\"; charset=\"" . 'UTF-8' . "\""); $request->checkValidators(); // let $request provide last modified & etag Modified: trunk/lib/plugin/RecentChanges.php =================================================================== --- trunk/lib/plugin/RecentChanges.php 2013-04-02 10:14:58 UTC (rev 8738) +++ trunk/lib/plugin/RecentChanges.php 2013-04-02 13:51:35 UTC (rev 8739) @@ -733,7 +733,7 @@ global $request; $request->discardOutput(); - printf("<?xml version=\"1.0\" encoding=\"%s\"?>\n", $GLOBALS['charset']); + printf("<?xml version=\"1.0\" encoding=\"%s\"?>\n", 'UTF-8'); printf('<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"'); printf(' "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">'); printf('<html xmlns="http://www.w3.org/1999/xhtml">'); @@ -860,7 +860,6 @@ global $request; $request->discardOutput(); $rss->finish(); - //header("Content-Type: application/rss+xml; charset=" . $GLOBALS['charset']); printf("\n<!-- Generated by PhpWiki-%s -->\n", PHPWIKI_VERSION); // Flush errors in comment, otherwise it's invalid XML. @@ -980,7 +979,6 @@ global $request; $request->discardOutput(); $rss->finish(); - //header("Content-Type: application/rss+xml; charset=" . $GLOBALS['charset']); printf("\n<!-- Generated by PhpWiki-%s -->\n", PHPWIKI_VERSION); // Flush errors in comment, otherwise it's invalid XML. global $ErrorManager; @@ -1060,7 +1058,6 @@ $request->discardOutput(); $rss->finish(); - //header("Content-Type: application/atom; charset=" . $GLOBALS['charset']); printf("\n<!-- Generated by PhpWiki-%s -->\n", PHPWIKI_VERSION); // Flush errors in comment, otherwise it's invalid XML. global $ErrorManager; Modified: trunk/lib/plugin/RssFeed.php =================================================================== --- trunk/lib/plugin/RssFeed.php 2013-04-02 10:14:58 UTC (rev 8738) +++ trunk/lib/plugin/RssFeed.php 2013-04-02 13:51:35 UTC (rev 8739) @@ -54,10 +54,7 @@ { extract($this->getArgs($argstr, $request)); - if (defined('CHARSET')) - $rss_parser = new RSSParser(CHARSET); - else - $rss_parser = new RSSParser(); + $rss_parser = new RSSParser(); if (!empty($url)) $rss_parser->parse_url($url, $debug); Modified: trunk/lib/plugin/SemanticSearch.php =================================================================== --- trunk/lib/plugin/SemanticSearch.php 2013-04-02 10:14:58 UTC (rev 8738) +++ trunk/lib/plugin/SemanticSearch.php 2013-04-02 13:51:35 UTC (rev 8739) @@ -142,7 +142,7 @@ $instructions = _("Search in pages for a relation with that value (a pagename)."); $form1 = HTML::form(array('action' => $action, 'method' => 'post', - 'accept-charset' => $GLOBALS['charset']), + 'accept-charset' => 'UTF-8'), $reldef, $hiddenfield, HiddenInputs(array('attribute' => '')), $instructions, HTML::br(), @@ -225,7 +225,7 @@ (HTML(" ", new Button(_("Advanced..."), _("SemanticSearchAdvanced")))); $form2 = HTML::form(array('action' => $action, 'method' => 'post', - 'accept-charset' => $GLOBALS['charset']), + 'accept-charset' => 'UTF-8'), $attdef, $hiddenfield, HiddenInputs(array('relation' => '')), $instructions, HTML::br(), Modified: trunk/lib/plugin/SemanticSearchAdvanced.php =================================================================== --- trunk/lib/plugin/SemanticSearchAdvanced.php 2013-04-02 10:14:58 UTC (rev 8738) +++ trunk/lib/plugin/SemanticSearchAdvanced.php 2013-04-02 13:51:35 UTC (rev 8739) @@ -114,7 +114,7 @@ $instructions = _("Search in all specified pages for the expression."); $form = HTML::form(array('action' => $action, 'method' => 'post', - 'accept-charset' => $GLOBALS['charset']), + 'accept-charset' => 'UTF-8'), $reldef, $hiddenfield, HiddenInputs(array('attribute' => '')), $instructions, HTML::br(), Modified: trunk/lib/plugin/SpellCheck.php =================================================================== --- trunk/lib/plugin/SpellCheck.php 2013-04-02 10:14:58 UTC (rev 8738) +++ trunk/lib/plugin/SpellCheck.php 2013-04-02 13:51:35 UTC (rev 8739) @@ -87,12 +87,11 @@ function pspell_check($text, $lang = false) { - global $charset; if ($lang) $lang = $GLOBALS['LANG']; $words = preg_split('/[\W]+?/', $text); $misspelled = $return = array(); - $pspell_config = pspell_config_create($lang, "", "", $charset, + $pspell_config = pspell_config_create($lang, "", "", 'UTF-8', PSPELL_NORMAL | PSPELL_RUN_TOGETHER); //pspell_config_runtogether($pspell_config, true); if (PSPELL_PWL) Modified: trunk/lib/plugin/SystemInfo.php =================================================================== --- trunk/lib/plugin/SystemInfo.php 2013-04-02 10:14:58 UTC (rev 8738) +++ trunk/lib/plugin/SystemInfo.php 2013-04-02 13:51:35 UTC (rev 8739) @@ -30,7 +30,7 @@ * * Provide access to phpwiki's lower level system information. * - * version, charset, pagestats, SERVER_NAME, database, discspace, + * version, pagestats, SERVER_NAME, database, discspace, * cachestats, userstats, linkstats, accessstats, hitstats, * revisionstats, interwikilinks, imageextensions, wikiwordregexp, * availableplugins, downloadurl or any other predefined CONSTANT Modified: trunk/lib/plugin/WikiForm.php =================================================================== --- trunk/lib/plugin/WikiForm.php 2013-04-02 10:14:58 UTC (rev 8738) +++ trunk/lib/plugin/WikiForm.php 2013-04-02 13:51:35 UTC (rev 8739) @@ -54,7 +54,7 @@ $form = HTML::form(array('action' => $request->getPostURL(), 'method' => 'post', 'class' => 'wikiadmin', - 'accept-charset' => $GLOBALS['charset']), + 'accept-charset' => 'UTF-8'), HiddenInputs(array('action' => $action, 'overwrite' => $overwrite, 'pagename' => $basepage))); Modified: trunk/lib/plugin/WikiFormRich.php =================================================================== --- trunk/lib/plugin/WikiFormRich.php 2013-04-02 10:14:58 UTC (rev 8738) +++ trunk/lib/plugin/WikiFormRich.php 2013-04-02 13:51:35 UTC (rev 8739) @@ -181,7 +181,7 @@ $form = HTML::form(array('action' => $request->getPostURL(), 'method' => strtolower($method), 'class' => 'wikiformrich', - 'accept-charset' => $GLOBALS['charset']), + 'accept-charset' => 'UTF-8'), HiddenInputs(array('action' => $action))); $nbsp = HTML::Raw(' '); $already_submit = 0; Modified: trunk/lib/plugin/_WikiTranslation.php =================================================================== --- trunk/lib/plugin/_WikiTranslation.php 2013-04-02 10:14:58 UTC (rev 8738) +++ trunk/lib/plugin/_WikiTranslation.php 2013-04-02 13:51:35 UTC (rev 8739) @@ -266,18 +266,6 @@ } else { $languages = array($languages); } - if (in_array('zh', $languages) or in_array('ja', $languages)) { - - // If the current charset != utf-8 the text will not be displayed correctly. - // But here we cannot change the header anymore. So we can decide to ignore them, - // or display them with all the errors. - //FIXME: do iconv the ob - if ($GLOBALS['charset'] != 'utf-8' and !defined('NEED_ICONV_TO')) { - define('NEED_ICONV_TO', 'utf-8'); - //either the extension or external - //$GLOBALS['charset'] = 'utf-8'; - } - } $to_lang = $languages[0]; if (!empty($string) and count($languages) == 1) { return $this->translate($string, $to_lang, $from_lang); Modified: trunk/lib/stdlib.php =================================================================== --- trunk/lib/stdlib.php 2013-04-02 10:14:58 UTC (rev 8738) +++ trunk/lib/stdlib.php 2013-04-02 13:51:35 UTC (rev 8739) @@ -2086,47 +2086,10 @@ */ function fixTitleEncoding($s) { - global $charset; - - $s = trim($s); - // print a warning? - if (empty($s)) return $s; - - $ishigh = preg_match('/[\x80-\xff]/', $s); - /* - $isutf = ($ishigh ? preg_match( '/^([\x00-\x7f]|[\xc0-\xdf][\x80-\xbf]|' . - '[\xe0-\xef][\x80-\xbf]{2}|[\xf0-\xf7][\x80-\xbf]{3})+$/', $s ) : true ); - */ - $isutf = ($ishigh ? isUtf8String($s) : true); - $locharset = strtolower($charset); - - if ($locharset != "utf-8" and $ishigh and $isutf) - $s = charset_convert('UTF-8', $locharset, $s); - if ($locharset == "utf-8" and $ishigh and !$isutf) - return utf8_encode($s); - - // Other languages can safely leave this function, or replace - // it with one to detect and convert another legacy encoding. return $s; } /** - * MySQL fulltext index doesn't grok utf-8, so we - * need to fold cases and convert to hex. - * src: languages/Language.php:stripForSearch() from mediawiki - */ -/* -function stripForSearch( $string ) { - global $wikiLowerChars; - // '/(?:[a-z]|\xc3[\x9f-\xbf]|\xc4[\x81\x83\x85\x87])/' => "a-z\xdf-\xf6\xf8-\xff" - return preg_replace( - "/([\\xc0-\\xff][\\x80-\\xbf]*)/e", - "'U8' . bin2hex( strtr( \"\$1\", \$wikiLowerChars ) )", - $string ); -} -*/ - -/** * Workaround for allow_url_fopen, to get the content of an external URI. * It returns the contents in one slurp. Parsers might want to check for allow_url_fopen * and use fopen, fread chunkwise. (see lib/XmlParser.php) Modified: trunk/lib/upgrade.php =================================================================== --- trunk/lib/upgrade.php 2013-04-02 10:14:58 UTC (rev 8738) +++ trunk/lib/upgrade.php 2013-04-02 13:51:35 UTC (rev 8739) @@ -608,9 +608,7 @@ ) { echo _("OK"), "<br />\n"; } else { - //SET CHARACTER SET latin1 - $charset = CHARSET; - if ($charset == 'iso-8859-1') $charset = 'latin1'; + $charset = 'UTF-8'; $this->dbi->genericSqlQuery("ALTER TABLE $page_tbl CHANGE pagename " . "pagename VARCHAR(100) " . "CHARACTER SET '$charset' COLLATE '$charset" . "_bin' NOT NULL"); @@ -772,7 +770,7 @@ // And on Windows: SELECT FROM mysql, possibly: UPDATE mysql. $form = HTML::form(array("method" => "post", "action" => $this->request->getPostURL(), - "accept-charset" => $GLOBALS['charset']), + "accept-charset" => 'UTF-8'), 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")), Modified: trunk/lib/ziplib.php =================================================================== --- trunk/lib/ziplib.php 2013-04-02 10:14:58 UTC (rev 8738) +++ trunk/lib/ziplib.php 2013-04-02 13:51:35 UTC (rev 8739) @@ -627,8 +627,6 @@ //TODO: convert to multiple lines? acl-view => groups,...; acl-edit => groups,... } - $params['charset'] = $GLOBALS['charset']; - // Non-US-ASCII is not allowed in Mime headers (at least not without // special handling) --- so we urlencode all parameter values. foreach ($params as $key => $val) @@ -880,18 +878,6 @@ else if ($encoding && $encoding != 'binary') ExitWiki(sprintf("Unknown %s", 'encoding type: $encoding')); - if (empty($params['charset'])) - $params['charset'] = 'utf-8'; - - // compare to target charset - if (strtolower($params['charset']) != strtolower($GLOBALS['charset'])) { - $data = charset_convert($params['charset'], $GLOBALS['charset'], $data); - //$page['pagename'] = charset_convert($params['charset'], $GLOBALS['charset'], $page['pagename']); - if (isset($versiondata['summary'])) - $versiondata['summary'] = charset_convert($params['charset'], $GLOBALS['charset'], $versiondata['summary']); - - } - $data .= GenerateFootnotesFromRefs($params); $page['content'] = preg_replace('/[ \t\r]*\n/', "\n", chop($data)); Modified: trunk/pgsrc/Help%2FTextFormattingRules =================================================================== --- trunk/pgsrc/Help%2FTextFormattingRules 2013-04-02 10:14:58 UTC (rev 8738) +++ trunk/pgsrc/Help%2FTextFormattingRules 2013-04-02 13:51:35 UTC (rev 8739) @@ -1,4 +1,4 @@ -Date: Wed, 19 Dec 2012 13:19:04 +0000 +Date: Tue, 2 Apr 2013 15:43:51 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0) Content-Type: application/x-phpwiki; pagename=Help%2FTextFormattingRules; @@ -147,14 +147,6 @@ All special non-whitespace HTML characters are displayed as-is. Exceptions below. -Special non-ASCII or non-latin characters are printed as-is only if supported -by the native wiki CHARSET. Add such characters on a non-supported CHARSET with the [[Help:RawHtmlPlugin]] if it is enabled by the Admin and e.g. the ##&#num;## syntax. - -E.g. These Japanese chars 'から 新規ページ' -on this <<SystemInfo CHARSET>> wiki. - -And with the plugin: <<RawHtml から 新規ページ>> - == Paragraphs == * Don't indent paragraphs Modified: trunk/tests/unit/test.php =================================================================== --- trunk/tests/unit/test.php 2013-04-02 10:14:58 UTC (rev 8738) +++ trunk/tests/unit/test.php 2013-04-02 13:51:35 UTC (rev 8739) @@ -358,7 +358,7 @@ $form->pushContent(HTML::td($option)); $table = HTML::form(array('action' => $_SERVER['PHP_SELF'], 'method' => 'GET', - 'accept-charset' => $GLOBALS['charset']), + 'accept-charset' => 'UTF-8'), $js, HTML::table(HTML::tr(array('valign'=>'top'), $form)), HTML::input(array('type' => 'submit')), Modified: trunk/themes/Crao/templates/editpage.tmpl =================================================================== --- trunk/themes/Crao/templates/editpage.tmpl 2013-04-02 10:14:58 UTC (rev 8738) +++ trunk/themes/Crao/templates/editpage.tmpl 2013-04-02 13:51:35 UTC (rev 8739) @@ -25,7 +25,7 @@ */ ?> <form method="post" id="editpage" name="editpage" action="<?php echo $request->getPostURL() ?>" - accept-charset="<?php echo CHARSET?>"> + accept-charset="UTF-8"> <?php if (!empty($_GET['start_debug'])) echo '<input type="hidden" name="start_debug" value="1" >'; ?> <?php /* To clear beyond a larger logo, such as in the Hawaiian theme */ ?> <br class="clear-floats" /> Modified: trunk/themes/Crao/templates/head.tmpl =================================================================== --- trunk/themes/Crao/templates/head.tmpl 2013-04-02 10:14:58 UTC (rev 8738) +++ trunk/themes/Crao/templates/head.tmpl 2013-04-02 13:51:35 UTC (rev 8739) @@ -1,5 +1,5 @@ <head> -<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET?>" /> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <?php $ROBOTS_CONTENT = isset($ROBOTS_META) ? $ROBOTS_META : "noindex,nofollow"; ?> <meta name="robots" content="<?php echo $ROBOTS_CONTENT ?>" /> <?php if (!empty($PAGE_DESCRIPTION)) { ?> Modified: trunk/themes/Crao/templates/htmldump.tmpl =================================================================== --- trunk/themes/Crao/templates/htmldump.tmpl 2013-04-02 10:14:58 UTC (rev 8738) +++ trunk/themes/Crao/templates/htmldump.tmpl 2013-04-02 13:51:35 UTC (rev 8739) @@ -3,13 +3,10 @@ * This template is used only for html file dumps, and is responsible * mainly for the outer level <html> stuff and the and <head>. */ -printf("<?xml version=\"1.0\" encoding=\"%s\"?>\n", CHARSET); ?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> +<!DOCTYPE> <head> -<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET?>" /> +<meta charset="UTF-8" /> <link rel="home" title="<?php echo HOME_PAGE?>" href="<?php echo WikiURL(HOME_PAGE)?>" /> <link rel="help" title="<?php echo _("HowToUseWiki")?>" href="<?php echo WikiURL(_("HowToUseWiki"))?>" /> <link rel="copyright" title="<?php echo COPYRIGHTPAGE_TITLE?>" href="<?php echo COPYRIGHTPAGE_URL?>" /> Modified: trunk/themes/Portland/templates/editpage.tmpl =================================================================== --- trunk/themes/Portland/templates/editpage.tmpl 2013-04-02 10:14:58 UTC (rev 8738) +++ trunk/themes/Portland/templates/editpage.tmpl 2013-04-02 13:51:35 UTC (rev 8739) @@ -9,7 +9,7 @@ <form method="post" name="editpage" action="<?php echo $request->getPostURL() ?>" - accept-charset="<?php echo CHARSET?>"> + accept-charset="UTF-8"> <table class="toolbar" width="100%" cellpadding="0" cellspacing="0" border="0"> <tr align="bottom"> Modified: trunk/themes/Sidebar/templates/frame-left.tmpl =================================================================== --- trunk/themes/Sidebar/templates/frame-left.tmpl 2013-04-02 10:14:58 UTC (rev 8738) +++ trunk/themes/Sidebar/templates/frame-left.tmpl 2013-04-02 13:51:35 UTC (rev 8739) @@ -2,11 +2,10 @@ /* * This template is responsible mainly for the outer level <html> stuff. */ -printf("<?xml version=\"1.0\" encoding=\"%s\"?>\n", CHARSET); ?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> +<!DOCTYPE> +<head> +<meta charset="UTF-8" /> <?php echo Template('head') ?> <body> <div class="toolbar"><?php echo Template('navbar') ?></div> Modified: trunk/themes/Wordpress/templates/editpage.tmpl =================================================================== --- trunk/themes/Wordpress/templates/editpage.tmpl 2013-04-02 10:14:58 UTC (rev 8738) +++ trunk/themes/Wordpress/templates/editpage.tmpl 2013-04-02 13:51:35 UTC (rev 8739) @@ -11,7 +11,7 @@ <div class="wikitext" id="editform"> <form method="post" name="editpage" id="editpage" action="<?php echo $request->getPostURL() ?>" - accept-charset="<?php echo CHARSET?>"> + accept-charset="UTF-8"> <?php if (!empty($_GET['start_debug'])) echo '<input type="hidden" name="start_debug" value="1" >'; ?> <table class="toolbar" width="100%" cellpadding="0" cellspacing="0" border="0"> Modified: trunk/themes/Wordpress/templates/signin.tmpl =================================================================== --- trunk/themes/Wordpress/templates/signin.tmpl 2013-04-02 10:14:58 UTC (rev 8738) +++ trunk/themes/Wordpress/templates/signin.tmpl 2013-04-02 13:51:35 UTC (rev 8739) @@ -8,7 +8,7 @@ ?> <?php if (empty($NOFORM)) { ?> <li> - <form method="post" action="<?php echo $request->getPostURL()?>" accept-charset="<?php echo CHARSET?>" name="<?php echo $FORMNAME?>"> + <form method="post" action="<?php echo $request->getPostURL()?>" accept-charset="UTF-8" name="<?php echo $FORMNAME?>"> <?php echo HiddenInputs($request->getArgs(), false, array('auth')) ?> <?php } ?> <?php Modified: trunk/themes/default/templates/addcomment.tmpl =================================================================== --- trunk/themes/default/templates/addcomment.tmpl 2013-04-02 10:14:58 UTC (rev 8738) +++ trunk/themes/default/templates/addcomment.tmpl 2013-04-02 13:51:35 UTC (rev 8739) @@ -4,7 +4,7 @@ <div class="wikicomment wikicomment-form"> <?php if (!$WikiTheme->DUMP_MODE) { ?> <form action="<?php echo $request->getPostURL()?>" method="post" class="wikiaction" - accept-charset="<?php echo CHARSET?>"> + accept-charset="UTF-8"> <input type="hidden" name="comment[pagename]" value="<?php echo $PAGENAME?>" /> <?php echo HiddenInputs($request->getArgs()) ?> <table class="wikicomment-form"> Modified: trunk/themes/default/templates/dialog.tmpl =================================================================== --- trunk/themes/default/templates/dialog.tmpl 2013-04-02 10:14:58 UTC (rev 8738) +++ trunk/themes/default/templates/dialog.tmpl 2013-04-02 13:51:35 UTC (rev 8739) @@ -2,13 +2,10 @@ /* * A "popup" dialog. (Though it does not pop up yet.) */ -printf("<?xml version=\"1.0\" encoding=\"%s\"?>\n", CHARSET); ?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> +<!DOCTYPE html> <head> -<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET?>" /> +<meta charset="UTF-8" /> <meta name="robots" content="noindex, nofollow" /> <meta name="generator" content="phpWiki" /> <meta name="PHPWIKI_VERSION" content="<?php echo PHPWIKI_VERSION?>" /> Modified: trunk/themes/default/templates/editpage.tmpl =================================================================== --- trunk/themes/default/templates/editpage.tmpl 2013-04-02 10:14:58 UTC (rev 8738) +++ trunk/themes/default/templates/editpage.tmpl 2013-04-02 13:51:35 UTC (rev 8739) @@ -27,7 +27,7 @@ */ ?> <form method="post" id="editpage" name="editpage" action="<?php echo $request->getPostURL() ?>" - accept-charset="<?php echo CHARSET?>"> + accept-charset="UTF-8"> <?php if (!empty($_GET['start_debug'])) echo '<input type="hidden" name="start_debug" value="1" >'; ?> <?php /* To clear beyond a larger logo, such as in the Hawaiian theme */ ?> <br class="clear-floats" /> Modified: trunk/themes/default/templates/forumadd.tmpl =================================================================== --- trunk/themes/default/templates/forumadd.tmpl 2013-04-02 10:14:58 UTC (rev 8738) +++ trunk/themes/default/templates/forumadd.tmpl 2013-04-02 13:51:35 UTC (rev 8739) @@ -3,7 +3,7 @@ ?> <div class="wikiforum wikiforum-reply"> <form action="<?php echo $request->getPostURL()?>" method="post" class="wikiaction" - accept-charset="<?php echo CHARSET?>"> + accept-charset="UTF-8"> <input type="hidden" name="forum[pagename]" value="<?php echo $PAGENAME?>" /> <?php echo HiddenInputs($request->getArgs()) ?> <table class="wikiforum-reply"> Modified: trunk/themes/default/templates/login.tmpl =================================================================== --- trunk/themes/default/templates/login.tmpl 2013-04-02 10:14:58 UTC (rev 8738) +++ trunk/themes/default/templates/login.tmpl 2013-04-02 13:51:35 UTC (rev 8739) @@ -60,7 +60,7 @@ if (empty($pass_required)) ?> <p><?php echo _("New users may use an empty password.") ?></p> <?php } ?> -<form method="post" action="<?php echo $request->getPostURL() ?>" accept-charset="<?php echo CHARSET?>" name="login"> +<form method="post" action="<?php echo $request->getPostURL() ?>" accept-charset="UTF-8" name="login"> <table> <tr> <td> Modified: trunk/themes/default/templates/redirect.tmpl =================================================================== --- trunk/themes/default/templates/redirect.tmpl 2013-04-02 10:14:58 UTC (rev 8738) +++ trunk/themes/default/templates/redirect.tmpl 2013-04-02 13:51:35 UTC (rev 8739) @@ -7,7 +7,7 @@ "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=<?php echo CHARSET?>" /> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <meta name="robots" content="noindex, nofollow" /> <meta name="generator" content="PhpWiki" /> <meta name="PHPWIKI_VERSION" content="<?php echo PHPWIKI_VERSION?>" /> Modified: trunk/themes/default/templates/wikiforum.tmpl =================================================================== --- trunk/themes/default/templates/wikiforum.tmpl 2013-04-02 10:14:58 UTC (rev 8738) +++ trunk/themes/default/templates/wikiforum.tmpl 2013-04-02 13:51:35 UTC (rev 8739) @@ -12,7 +12,7 @@ ?> <div class="wikiforum wikiforum-form"> <form action="<?php echo $request->getPostURL()?>" method="post" class="wikiaction" - accept-charset="<?php echo CHARSET?>"> + accept-charset="UTF-8"> <input type="hidden" name="forum[title]" value="<?php echo $FORUM_PARENT ?>" /> <?php echo HiddenInputs($request->getArgs()) ?> <table class="wikiforum wikiforum-list"> Modified: trunk/themes/fusionforge/templates/editpage.tmpl =================================================================== --- trunk/themes/fusionforge/templates/editpage.tmpl 2013-04-02 10:14:58 UTC (rev 8738) +++ trunk/themes/fusionforge/templates/editpage.tmpl 2013-04-02 13:51:35 UTC (rev 8739) @@ -60,7 +60,7 @@ <form method="post" id="editpage" name="editpage" action="<?php echo $request->getPostURL() ?>" - accept-charset="<?php echo CHARSET?>"> + accept-charset="UTF-8"> <?php if (!empty($_GET['start_debug'])) echo '<input type="hidden" name="start_debug" value="1" >'; ?> <?php /* To clear beyond a larger logo, such as in the Hawaiian theme */ ?> <br class="clear-floats" /> Modified: trunk/themes/wikilens/templates/head.tmpl =================================================================== --- trunk/themes/wikilens/templates/head.tmpl 2013-04-02 10:14:58 UTC (rev 8738) +++ trunk/themes/wikilens/templates/head.tmpl 2013-04-02 13:51:35 UTC (rev 8739) @@ -1,5 +1,5 @@ <head> -<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET?>" /> +<meta charset="UTF-8" /> <?php $ROBOTS_CONTENT = isset($ROBOTS_META) ? $ROBOTS_META : "noindex,nofollow"; ?> <meta name="robots" content="<?php echo $ROBOTS_CONTENT ?>" /> <?php if (!empty($PAGE_DESCRIPTION)) { ?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2013-04-02 15:49:56
|
Revision: 8741 http://sourceforge.net/p/phpwiki/code/8741 Author: vargenau Date: 2013-04-02 15:49:52 +0000 (Tue, 02 Apr 2013) Log Message: ----------- Use HTML 5 DOCTYPE Modified Paths: -------------- trunk/configurator.php trunk/lib/ErrorManager.php trunk/lib/plugin/RecentChanges.php trunk/passencrypt.php trunk/themes/Crao/templates/htmldump.tmpl trunk/themes/Sidebar/templates/frame-left.tmpl trunk/themes/default/templates/htmldump.tmpl Modified: trunk/configurator.php =================================================================== --- trunk/configurator.php 2013-04-02 15:34:45 UTC (rev 8740) +++ trunk/configurator.php 2013-04-02 15:49:52 UTC (rev 8741) @@ -159,13 +159,11 @@ IniConfig($fs_def_file); } -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"> -<html xmlns="http://www.w3.org/1999/xhtml"> +<!DOCTYPE html> +<html> <head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> + <meta charset="UTF-8" /> <title>Configuration tool for PhpWiki <?php echo $config_file ?></title> <style type="text/css" media="screen"> <!-- Modified: trunk/lib/ErrorManager.php =================================================================== --- trunk/lib/ErrorManager.php 2013-04-02 15:34:45 UTC (rev 8740) +++ trunk/lib/ErrorManager.php 2013-04-02 15:49:52 UTC (rev 8741) @@ -269,12 +269,10 @@ // Handle it ourself. if ($error->isFatal()) { $this->_noCacheHeaders(); - echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"; - echo "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n"; - echo "\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n"; + echo "<!DOCTYPE html>\n"; echo "<html>\n"; echo "<head>\n"; - echo "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n"; + echo "<meta charset=\"UTF-8\" />\n"; echo "<title>Fatal Error</title>\n"; echo "<link rel=\"stylesheet\" type=\"text/css\" href=\"themes/default/phpwiki.css\" />\n"; echo "</head>\n"; Modified: trunk/lib/plugin/RecentChanges.php =================================================================== --- trunk/lib/plugin/RecentChanges.php 2013-04-02 15:34:45 UTC (rev 8740) +++ trunk/lib/plugin/RecentChanges.php 2013-04-02 15:49:52 UTC (rev 8741) @@ -733,12 +733,8 @@ global $request; $request->discardOutput(); - printf("<?xml version=\"1.0\" encoding=\"%s\"?>\n", 'UTF-8'); - printf('<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"'); - printf(' "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">'); - printf('<html xmlns="http://www.w3.org/1999/xhtml">'); - - printf("<head>\n"); + print("<!DOCTYPE html>\n"); + print("<head>\n"); extract($this->_args); if (!empty($category)) $title = $category; Modified: trunk/passencrypt.php =================================================================== --- trunk/passencrypt.php 2013-04-02 15:34:45 UTC (rev 8740) +++ trunk/passencrypt.php 2013-04-02 15:49:52 UTC (rev 8741) @@ -1,9 +1,7 @@ -<?php echo "<?xml version=\"1.0\" encoding=\"iso-8859-1\"?>\n"; ?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> +<!DOCTYPE html> +<html> <head> - <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/> + <meta charset="UTF-8" /> <title>Password Encryption Tool</title> <!-- Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam Modified: trunk/themes/Crao/templates/htmldump.tmpl =================================================================== --- trunk/themes/Crao/templates/htmldump.tmpl 2013-04-02 15:34:45 UTC (rev 8740) +++ trunk/themes/Crao/templates/htmldump.tmpl 2013-04-02 15:49:52 UTC (rev 8741) @@ -4,7 +4,7 @@ * mainly for the outer level <html> stuff and the and <head>. */ ?> -<!DOCTYPE> +<!DOCTYPE html> <head> <meta charset="UTF-8" /> <link rel="home" title="<?php echo HOME_PAGE?>" href="<?php echo WikiURL(HOME_PAGE)?>" /> Modified: trunk/themes/Sidebar/templates/frame-left.tmpl =================================================================== --- trunk/themes/Sidebar/templates/frame-left.tmpl 2013-04-02 15:34:45 UTC (rev 8740) +++ trunk/themes/Sidebar/templates/frame-left.tmpl 2013-04-02 15:49:52 UTC (rev 8741) @@ -3,7 +3,7 @@ * This template is responsible mainly for the outer level <html> stuff. */ ?> -<!DOCTYPE> +<!DOCTYPE html> <head> <meta charset="UTF-8" /> <?php echo Template('head') ?> Modified: trunk/themes/default/templates/htmldump.tmpl =================================================================== --- trunk/themes/default/templates/htmldump.tmpl 2013-04-02 15:34:45 UTC (rev 8740) +++ trunk/themes/default/templates/htmldump.tmpl 2013-04-02 15:49:52 UTC (rev 8741) @@ -4,11 +4,10 @@ * mainly for the outer level <html> stuff and the and <head>. */ ?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> +<!DOCTYPE html> +<html> <head> -<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> +<meta charset="UTF-8" /> <link rel="home" title="<?php echo HOME_PAGE?>" href="<?php echo WikiURL(HOME_PAGE)?>" /> <link rel="help" title="<?php echo _("HowToUseWiki")?>" href="<?php echo WikiURL(_("HowToUseWiki"))?>" /> <link rel="copyright" title="<?php echo COPYRIGHTPAGE_TITLE?>" href="<?php echo COPYRIGHTPAGE_URL?>" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2013-04-16 15:18:16
|
Revision: 8756 http://sourceforge.net/p/phpwiki/code/8756 Author: vargenau Date: 2013-04-16 15:18:12 +0000 (Tue, 16 Apr 2013) Log Message: ----------- access-restrictions are not implemented Modified Paths: -------------- trunk/TODO trunk/lib/plugin/WikiAdminUtils.php trunk/locale/de/pgsrc/PhpWikiSystemverwalten trunk/locale/fr/pgsrc/AdministrationDePhpWiki trunk/locale/it/pgsrc/AmministrazioneDiPhpWiki trunk/pgsrc/Help%2FWikiAdminUtilsPlugin trunk/pgsrc/PhpWikiAdministration Modified: trunk/TODO =================================================================== --- trunk/TODO 2013-04-16 14:57:15 UTC (rev 8755) +++ trunk/TODO 2013-04-16 15:18:12 UTC (rev 8756) @@ -88,7 +88,6 @@ * plugin\SearchHighlight * logfile stuff: * plugin\RecentReferrers -* WikiAccessRestrictions * SpamAssassinIntegration already done lately: Modified: trunk/lib/plugin/WikiAdminUtils.php =================================================================== --- trunk/lib/plugin/WikiAdminUtils.php 2013-04-16 14:57:15 UTC (rev 8755) +++ trunk/lib/plugin/WikiAdminUtils.php 2013-04-16 15:18:12 UTC (rev 8756) @@ -26,7 +26,6 @@ purge-cache purge-bad-pagenames purge-empty-pages -access-restrictions email-verification convert-cached-html db-check @@ -116,7 +115,6 @@ $labels = array('purge-cache' => _("Purge Markup Cache"), 'purge-bad-pagenames' => _("Purge all Pages With Invalid Names"), 'purge-empty-pages' => _("Purge all empty, unreferenced Pages"), - 'access-restrictions' => _("Access Restrictions"), 'email-verification' => _("E-mail address confirmation"), 'convert-cached-html' => _("Convert cached_html"), 'db-check' => _("DB Check"), @@ -231,13 +229,6 @@ return $dbh->_backend->rebuild($args); } - //TODO: We need a separate plugin for this. - // Too many options. - private function _do_access_restrictions(&$request, &$args) - { - return _("Sorry. Access Restrictions not yet implemented"); - } - // pagelist with enable/disable button private function _do_email_verification(&$request, &$args) { Modified: trunk/locale/de/pgsrc/PhpWikiSystemverwalten =================================================================== --- trunk/locale/de/pgsrc/PhpWikiSystemverwalten 2013-04-16 14:57:15 UTC (rev 8755) +++ trunk/locale/de/pgsrc/PhpWikiSystemverwalten 2013-04-16 15:18:12 UTC (rev 8756) @@ -1,4 +1,4 @@ -Date: Mon, 4 Feb 2013 10:43:14 +0000 +Date: Tue, 16 Apr 2013 17:14:25 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0) Content-Type: application/x-phpwiki; pagename=PhpWikiSystemverwalten; @@ -12,7 +12,7 @@ nicht funktionieren.// <<CreateToc jshide||=1 with_toclink||=1 >> ----- + == Seiten Explorer == Entweder wähle zuerst die Seiten und führe dann die Aktion aus: @@ -43,16 +43,6 @@ label="E-Mail Verifizierung" >> -Zugangsbeschränkungen (disabled): - - To prevent from robots eating all possible ressources in a short time, blocking from certain IP's or not-well-behaving user agents can be defined below. See PhpWiki:HowToBlockRobots and MeatBall:SurgeProtector. _Note: Not yet enabled._ - - <<WikiAdminUtils - action=access-restrictions - label="Zugangsbeschränkungen" - >> - ----------- == Aufräumen == Räume die Wiki SandKiste auf. Hiermit kann man die Seite mit der @@ -60,7 +50,6 @@ [ SandKiste löschen | phpwiki:?action=loadfile&overwrite=1&source=locale/de/pgsrc/SandKiste ]. ----------- == Speichern und Archivieren == ==== Backup der PhpWiki Datenbank als ZIP Dateien @@ -90,8 +79,6 @@ Verzeichnis geschrieben. Beachte, dass evtl. deine Benutzerrechte dazu ausreichen müssen. ------------ - == Wiederherstellen == Wenn du ein PhpWiki Backup besitzt, kannst du dieses hier wieder @@ -127,8 +114,6 @@ ;:[ Upgrade | phpwiki:HomePage?action=upgrade ] ------------ - == Daten-Format == Momentan werden alle Seiten dateiweise als MIME (RFC:2045) E-Mail's @@ -159,8 +144,6 @@ Verzeichnis oder Einzeldateien als MIME E-Mail, Serialisiert oder einfache Textdatei.) ----- - == Seiten als XHTML Dateien speichern == <<WikiForm action=dumphtml>> @@ -171,8 +154,6 @@ Das XHTML-Verzeichnis kann auch heruntergeladen werden als eine **[XHTML ZIP Datei | phpwiki:?action=ziphtml]**. ----- - == PhpWiki Internals == These are here mostly for debugging purposes (at least, that's the Modified: trunk/locale/fr/pgsrc/AdministrationDePhpWiki =================================================================== --- trunk/locale/fr/pgsrc/AdministrationDePhpWiki 2013-04-16 14:57:15 UTC (rev 8755) +++ trunk/locale/fr/pgsrc/AdministrationDePhpWiki 2013-04-16 15:18:12 UTC (rev 8756) @@ -1,4 +1,4 @@ -Date: Mon, 8 Apr 2013 15:13:02 +0000 +Date: Tue, 16 Apr 2013 17:14:34 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0) Content-Type: application/x-phpwiki; pagename=AdministrationDePhpWiki; @@ -14,7 +14,6 @@ <<CreateToc jshide||=1 with_toclink||=1>> ----- == Explorateur de pages D'abord choississez une ou plusieurs pages et ensuite définissez une action : @@ -36,14 +35,6 @@ label="Vérification de l'email" >> -Pour prévenir des robots occupant toutes les ressources en un court temps, bloquant depuis certaines adresses IP ou ayant un mauvais comportement, les agents utilisateurs peuvent être définis ci-dessous. Voir PhpWiki:HowToBlockRobots et MeatBall:SurgeProtector. _Note : Pas encore activé._ - - <<WikiAdminUtils - action=access-restrictions - label="Restrictions d'accès" - >> - ----------- == Nettoyage Le [BacÀSable] Wiki est très simple à nettoyer. Vous pouvez ici le restaurer @@ -51,7 +42,6 @@ [ Râtisser le BacÀSable | phpwiki:?action=loadfile&source=pgsrc/SandBox ] ----------- == Sauvegarde des pages === Récupération des fichiers @@ -72,7 +62,6 @@ La version la plus récente de chaque page sera écrite dans le répertoire, à raison d'une page par fichier. Votre serveur doit avoir le droit d'écrire dans le répertoire ! ------------ == Restauration Si vous avez sauvegardé un ensemble de pages de PhpWiki, vous pouvez les recharger ici. Notez que les pages dans votre base de données seront écrasées ; ainsi, si vous avez récupéré votre [PageAccueil], lorsque vous le rechargerez depuis ce formulaire, il écrasera celui qui est actuellement dans votre base de données. Si vous désirez être sélectif, effacez juste du répertoire (ou du fichier zip) les pages que vous ne voulez pas charger. @@ -97,7 +86,6 @@ ;:[ Mise à jour | phpwiki:HomePage?action=upgrade ] ------------ == Format des fichiers Actuellement, les pages sont stockées, une par fichier, sous forme de messages électronique (RFC:822) MIME (RFC:2045). Le content-type utilisé est ''application/x-phpwiki'', et les métadonnées de chaque page sont codées dans les paramètres du content-type. Si le fichier contient plusieurs versions d'une page, il aura comme type ''multipart/mixed'', et contiendra plusieurs sous-parties, chacune de type ''application/x-phpwiki''. Le corps du message contient le texte de la page. @@ -114,8 +102,6 @@ Les fonctions de téléchargement et de chargement reconnaîtront automatiquement chacun de ces trois types de fichiers, et les géreront convenablement. ----- - == Sauvegarde des pages au format xhtml <<WikiForm action=dumphtml>> @@ -124,8 +110,6 @@ La collection de fichiers XHTML peut aussi être téléchargée comme une **[XHTML ZIP Snapshot | phpwiki:?action=ziphtml]**. ----- - == Le coeur de phpwiki Tout ceci surtout pour des débogages (au moins c'est ce que j'espère). Modified: trunk/locale/it/pgsrc/AmministrazioneDiPhpWiki =================================================================== --- trunk/locale/it/pgsrc/AmministrazioneDiPhpWiki 2013-04-16 14:57:15 UTC (rev 8755) +++ trunk/locale/it/pgsrc/AmministrazioneDiPhpWiki 2013-04-16 15:18:12 UTC (rev 8756) @@ -1,4 +1,4 @@ -Date: Fri, 4 Feb 2011 16:36:44 +0000 +Date: Tue, 16 Apr 2013 17:14:15 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0) Content-Type: application/x-phpwiki; pagename=AmministrazioneDiPhpWiki; @@ -34,14 +34,6 @@ label="Email Verification" >> -To prevent from robots eating all possible ressources in a short time, blocking from certain IP's or not-well-behaving user agents can be defined below. See PhpWiki:HowToBlockRobots and MeatBall:SurgeProtector. _Note: Not yet enabled._ - - <<WikiAdminUtils - action=access-restrictions - label="Access Restrictions" - >> - ----- == Cleanup A Wiki SandBox is very easy to clean. Here you can restore it to @@ -49,8 +41,6 @@ [Rake the SandBox|phpwiki:?action=loadfile&source=pgsrc/SandBox]. ----------- - == Making Snapshots or Backups === ZIP files of database @@ -79,7 +69,6 @@ directory, one page per file. Your server must have write permissions to the directory! ------------ == Restoring If you have dumped a set of pages from PhpWiki, you can reload them @@ -114,7 +103,6 @@ ;:[ Upgrade | phpwiki:HomePage?action=upgrade ] ------------ == Format of the files @@ -143,7 +131,6 @@ The upload and load functions will automatically recognize each of these three types of files, and handle them accordingly. ----- == Dump pages as XHTML @@ -157,7 +144,6 @@ The XHTML file collection can also be downloaded as an **[XHTML ZIP Snapshot | phpwiki:?action=ziphtml]**. ----- == Phpwiki Internals @@ -195,5 +181,4 @@ label="Exorcise WikiDB" >> ----- PhpWikiDocumentation Modified: trunk/pgsrc/Help%2FWikiAdminUtilsPlugin =================================================================== --- trunk/pgsrc/Help%2FWikiAdminUtilsPlugin 2013-04-16 14:57:15 UTC (rev 8755) +++ trunk/pgsrc/Help%2FWikiAdminUtilsPlugin 2013-04-16 15:18:12 UTC (rev 8756) @@ -1,4 +1,4 @@ -Date: Fri, 7 Dec 2012 15:16:29 +0000 +Date: Tue, 16 Apr 2013 17:13:59 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0) Content-Type: application/x-phpwiki; pagename=Help%2FWikiAdminUtilsPlugin; @@ -14,7 +14,6 @@ <<WikiAdminUtils action="purge-cache" >> <<WikiAdminUtils action="purge-bad-pagenames" >> <<WikiAdminUtils action="purge-empty-pages" >> -<<WikiAdminUtils action="access-restrictions" >> <<WikiAdminUtils action="email-verification" >> <<WikiAdminUtils action="convert-cached-html" >> <<WikiAdminUtils action="db-check" >> @@ -30,7 +29,7 @@ ! Default value |- | **action** -| Valid action are: "purge-cache", "purge-bad-pagenames", "purge-empty-pages", "access-restrictions", "email-verification", "convert-cached-html", "db-check" and "db-rebuild" +| Valid action are: "purge-cache", "purge-bad-pagenames", "purge-empty-pages", "email-verification", "convert-cached-html", "db-check" and "db-rebuild" | //None// |- | **label** Modified: trunk/pgsrc/PhpWikiAdministration =================================================================== --- trunk/pgsrc/PhpWikiAdministration 2013-04-16 14:57:15 UTC (rev 8755) +++ trunk/pgsrc/PhpWikiAdministration 2013-04-16 15:18:12 UTC (rev 8756) @@ -1,4 +1,4 @@ -Date: Fri, 6 Apr 2012 16:15:14 +0000 +Date: Tue, 16 Apr 2013 17:13:59 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0) Content-Type: application/x-phpwiki; pagename=PhpWikiAdministration; @@ -44,14 +44,6 @@ <<WikiAdminUtils action=email-verification label="Email Verification">> -=== Access Restrictions (disabled) === - -To prevent from robots eating all possible ressources in a short time, blocking from certain IPs -or not-well-behaving user agents can be defined below. See [[PhpWiki:HowToBlockRobots]] and -[[MeatBall:SurgeProtector]]. //Note: Not yet enabled.// - -<<WikiAdminUtils action=access-restrictions label="Access Restrictions">> - == Cleanup == A Wiki SandBox is very easy to clean. Here you can restore it to This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2013-04-16 16:02:53
|
Revision: 8761 http://sourceforge.net/p/phpwiki/code/8761 Author: vargenau Date: 2013-04-16 16:02:49 +0000 (Tue, 16 Apr 2013) Log Message: ----------- Add highlight.js Modified Paths: -------------- trunk/themes/fusionforge/templates/bottom.tmpl Added Paths: ----------- trunk/highlight.js/ trunk/highlight.js/LICENSE trunk/highlight.js/README.md trunk/highlight.js/README.ru.md trunk/highlight.js/classref.txt trunk/highlight.js/highlight.pack.js trunk/highlight.js/styles/ trunk/highlight.js/styles/arta.css trunk/highlight.js/styles/ascetic.css trunk/highlight.js/styles/brown_paper.css trunk/highlight.js/styles/brown_papersq.png trunk/highlight.js/styles/dark.css trunk/highlight.js/styles/default.css trunk/highlight.js/styles/far.css trunk/highlight.js/styles/github.css trunk/highlight.js/styles/googlecode.css trunk/highlight.js/styles/idea.css trunk/highlight.js/styles/ir_black.css trunk/highlight.js/styles/magula.css trunk/highlight.js/styles/monokai.css trunk/highlight.js/styles/pojoaque.css trunk/highlight.js/styles/pojoaque.jpg trunk/highlight.js/styles/rainbow.css trunk/highlight.js/styles/school_book.css trunk/highlight.js/styles/school_book.png trunk/highlight.js/styles/solarized_dark.css trunk/highlight.js/styles/solarized_light.css trunk/highlight.js/styles/sunburst.css trunk/highlight.js/styles/tomorrow-night-blue.css trunk/highlight.js/styles/tomorrow-night-bright.css trunk/highlight.js/styles/tomorrow-night-eighties.css trunk/highlight.js/styles/tomorrow-night.css trunk/highlight.js/styles/tomorrow.css trunk/highlight.js/styles/vs.css trunk/highlight.js/styles/xcode.css trunk/highlight.js/styles/zenburn.css Added: trunk/highlight.js/LICENSE =================================================================== --- trunk/highlight.js/LICENSE (rev 0) +++ trunk/highlight.js/LICENSE 2013-04-16 16:02:49 UTC (rev 8761) @@ -0,0 +1,24 @@ +Copyright (c) 2006, Ivan Sagalaev +All rights reserved. +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + * Neither the name of highlight.js nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY +EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY +DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Added: trunk/highlight.js/README.md =================================================================== --- trunk/highlight.js/README.md (rev 0) +++ trunk/highlight.js/README.md 2013-04-16 16:02:49 UTC (rev 8761) @@ -0,0 +1,143 @@ +# Highlight.js + +Highlight.js highlights syntax in code examples on blogs, forums and, +in fact, on any web page. It's very easy to use because it works +automatically: finds blocks of code, detects a language, highlights it. + +Autodetection can be fine tuned when it fails by itself (see "Heuristics"). + + +## Basic usage + +Link the library and a stylesheet from your page and hook highlighting to +the page load event: + +```html +<link rel="stylesheet" href="styles/default.css"> +<script src="highlight.pack.js"></script> +<script>hljs.initHighlightingOnLoad();</script> +``` + +This will highlight all code on the page marked up as `<pre><code> .. </code></pre>`. +If you use different markup or need to apply highlighting dynamically, read +"Custom initialization" below. + +- You can download your own customized version of "highlight.pack.js" or + use the hosted one as described on the download page: + <http://softwaremaniacs.org/soft/highlight/en/download/> + +- Style themes are available in the download package or as hosted files. + To create a custom style for your site see the class reference in the file + [classref.txt][cr] from the downloaded package. + +[cr]: http://github.com/isagalaev/highlight.js/blob/master/classref.txt + + +## node.js + +Highlight.js can be used under node.js. The package with all supported languages is +installable from NPM: + + npm install highlight.js + +Alternatively, you can build it from the source with only languages you need: + + python tools/build.py -tnode lang1 lang2 .. + +Using the library: + +```javascript +var hljs = require('highlight.js'); + +// If you know the language +hljs.highlight(lang, code).value; + +// Automatic language detection +hljs.highlightAuto(code).value; +``` + +## Tab replacement + +You can replace TAB ('\x09') characters used for indentation in your code +with some fixed number of spaces or with a `<span>` to give them special +styling: + +```html +<script type="text/javascript"> + hljs.tabReplace = ' '; // 4 spaces + // ... or + hljs.tabReplace = '<span class="indent">\t</span>'; + + hljs.initHighlightingOnLoad(); +</script> +``` + +## Custom initialization + +If you use different markup for code blocks you can initialize them manually +with `highlightBlock(code, tabReplace, useBR)` function. It takes a DOM element +containing the code to highlight and optionally a string with which to replace +TAB characters. + +Initialization using, for example, jQuery might look like this: + +```javascript +$(document).ready(function() { + $('pre code').each(function(i, e) {hljs.highlightBlock(e)}); +}); +``` + +You can use `highlightBlock` to highlight blocks dynamically inserted into +the page. Just make sure you don't do it twice for already highlighted +blocks. + +If your code container relies on `<br>` tags instead of line breaks (i.e. if +it's not `<pre>`) pass `true` into the third parameter of `highlightBlock` +to make highlight.js use `<br>` in the output: + +```javascript +$('div.code').each(function(i, e) {hljs.highlightBlock(e, null, true)}); +``` + + +## Heuristics + +Autodetection of a code's language is done using a simple heuristic: +the program tries to highlight a fragment with all available languages and +counts all syntactic structures that it finds along the way. The language +with greatest count wins. + +This means that in short fragments the probability of an error is high +(and it really happens sometimes). In this cases you can set the fragment's +language explicitly by assigning a class to the `<code>` element: + +```html +<pre><code class="html">...</code></pre> +``` + +You can use class names recommended in HTML5: "language-html", +"language-php". Classes also can be assigned to the `<pre>` element. + +To disable highlighting of a fragment altogether use "no-highlight" class: + +```html +<pre><code class="no-highlight">...</code></pre> +``` + + +## Export + +File export.html contains a little program that allows you to paste in a code +snippet and then copy and paste the resulting HTML code generated by the +highlighter. This is useful in situations when you can't use the script itself +on a site. + + +## Meta + +- Version: 7.3 +- URL: http://softwaremaniacs.org/soft/highlight/en/ +- Author: Ivan Sagalaev (<ma...@so...>) + +For the license terms see LICENSE files. +For the list of contributors see AUTHORS.en.txt file. Added: trunk/highlight.js/README.ru.md =================================================================== --- trunk/highlight.js/README.ru.md (rev 0) +++ trunk/highlight.js/README.ru.md 2013-04-16 16:02:49 UTC (rev 8761) @@ -0,0 +1,149 @@ +# Highlight.js + +Highlight.js нужен для подсветки синтаксиса в примерах кода в блогах, +форумах и вообще на любых веб-страницах. Пользоваться им очень просто, +потому что работает он автоматически: сам находит блоки кода, сам +определяет язык, сам подсвечивает. + +Автоопределением языка можно управлять, когда оно не справляется само (см. +дальше "Эвристика"). + + +## Простое использование + +Подключите библиотеку и стиль на страницу и повесть вызов подсветки на +загрузку страницы: + +```html +<link rel="stylesheet" href="styles/default.css"> +<script src="highlight.pack.js"></script> +<script>hljs.initHighlightingOnLoad();</script> +``` + +Весь код на странице, обрамлённый в теги `<pre><code> .. </code></pre>` +будет автоматически подсвечен. Если вы используете другие теги или хотите +подсвечивать блоки кода динамически, читайте "Инициализацию вручную" ниже. + +- Вы можете скачать собственную версию "highlight.pack.js" или сослаться + на захостенный файл, как описано на странице загрузки: + <http://softwaremaniacs.org/soft/highlight/download/> + +- Стилевые темы можно найти в загруженном архиве или также использовать + захостенные. Чтобы сделать собственный стиль для своего сайта, вам + будет полезен справочник классов в файле [classref.txt][cr], который тоже + есть в архиве. + +[cr]: http://github.com/isagalaev/highlight.js/blob/master/classref.txt + + +## node.js + +Highlight.js можно использовать в node.js. Библиотеку со всеми возможными языками можно +установить с NPM: + + npm install highlight.js + +Также её можно собрать из исходников с только теми языками, которые нужны: + + python tools/build.py -tnode lang1 lang2 .. + +Использование библиотеки: + +```javascript +var hljs = require('highlight.js'); + +// Если вы знаете язык +hljs.highlight(lang, code).value; + +// Автоопределение языка +hljs.highlightAuto(code).value; +``` + + +## Замена TABов + +Также вы можете заменить символы TAB ('\x09'), используемые для отступов, на +фиксированное количество пробелов или на отдельный `<span>`, чтобы задать ему +какой-нибудь специальный стиль: + +```html +<script type="text/javascript"> + hljs.tabReplace = ' '; // 4 spaces + // ... or + hljs.tabReplace = '<span class="indent">\t</span>'; + + hljs.initHighlightingOnLoad(); +</script> +``` + + +## Инициализация вручную + +Если вы используете другие теги для блоков кода, вы можете инициализировать их +явно с помощью функции `highlightBlock(code, tabReplace, useBR)`. Она принимает +DOM-элемент с текстом расцвечиваемого кода и опционально - строчку для замены +символов TAB. + +Например с использованием jQuery код инициализации может выглядеть так: + +```javascript +$(document).ready(function() { + $('pre code').each(function(i, e) {hljs.highlightBlock(e)}); +}); +``` + +`highlightBlock` можно также использовать, чтобы подсветить блоки кода, +добавленные на страницу динамически. Только убедитесь, что вы не делаете этого +повторно для уже раскрашенных блоков. + +Если ваш блок кода использует `<br>` вместо переводов строки (т.е. если это не +`<pre>`), передайте `true` третьим параметром в `highlightBlock`: + +```javascript +$('div.code').each(function(i, e) {hljs.highlightBlock(e, null, true)}); +``` + + +## Эвристика + +Определение языка, на котором написан фрагмент, делается с помощью +довольно простой эвристики: программа пытается расцветить фрагмент всеми +языками подряд, и для каждого языка считает количество подошедших +синтаксически конструкций и ключевых слов. Для какого языка нашлось больше, +тот и выбирается. + +Это означает, что в коротких фрагментах высока вероятность ошибки, что +периодически и случается. Чтобы указать язык фрагмента явно, надо написать +его название в виде класса к элементу `<code>`: + +```html +<pre><code class="html">...</code></pre> +``` + +Можно использовать рекомендованные в HTML5 названия классов: +"language-html", "language-php". Также можно назначать классы на элемент +`<pre>`. + +Чтобы запретить расцветку фрагмента вообще, используется класс "no-highlight": + +```html +<pre><code class="no-highlight">...</code></pre> +``` + + +## Экспорт + +В файле export.html находится небольшая программка, которая показывает и дает +скопировать непосредственно HTML-код подсветки для любого заданного фрагмента кода. +Это может понадобится например на сайте, на котором нельзя подключить сам скрипт +highlight.js. + + +## Координаты + +- Версия: 7.3 +- URL: http://softwaremaniacs.org/soft/highlight/ +- Автор: Иван Сагалаев (<ma...@so...>) + +Лицензионное соглашение читайте в файле LICENSE. +Список соавторов читайте в файле AUTHORS.ru.txt Added: trunk/highlight.js/classref.txt =================================================================== --- trunk/highlight.js/classref.txt (rev 0) +++ trunk/highlight.js/classref.txt 2013-04-16 16:02:49 UTC (rev 8761) @@ -0,0 +1,568 @@ +This is a full list of available classes corresponding to languages' +syntactic structures. The parentheses after language name contain identifiers +used as class names in `<code>` element. + +Python ("python"): + + keyword keyword + built_in built-in objects (None, False, True and Ellipsis) + number number + string string (of any type) + comment comment + decorator @-decorator for functions + function function header "def some_name(...):" + class class header "class SomeName(...):" + title name of a function or a class inside a header + params everything inside parentheses in a function's or class' header + +Python profiler results ("profile"): + + number number + string string + builtin builtin function entry + filename filename in an entry + summary profiling summary + header header of table of results + keyword column header + function function name in an entry (including parentheses) + title actual name of a function in an entry (excluding parentheses) + prompt interpreter prompt (>>> or ...) + +Ruby ("ruby"): + + keyword keyword + string string + subst in-string substitution (#{...}) + comment comment + yardoctag YARD tag + function function header "def some_name(...):" + class class header "class SomeName(...):" + title name of a function or a class inside a header + parent name of a parent class + symbol symbol + +Perl ("perl"): + + keyword keyword + comment comment + number number + string string + regexp regular expression + sub subroutine header (from "sub" till "{") + variable variable starting with "$", "%", "@" + operator operator + pod plain old doc + +PHP ("php"): + + keyword keyword + number number + string string (of any type) + comment comment + phpdoc phpdoc params in comments + variable variable starting with "$" + preprocessor preprocessor marks: "<?php" and "?>" + +Scala ("scala"): + + keyword keyword + number number + string string + comment comment + annotation annotation + javadoc javadoc comment + javadoctag @-tag in javadoc + class class header + title class name inside a header + params everything in parentheses inside a class header + inheritance keywords "extends" and "with" inside class header + +Go language ("go"): + comment comment + string string constant + number number + keyword language keywords + constant true false nil iota + typename built-in plain types (int, string etc.) + built_in built-in functions + +HTML, XML ("xml"): + + tag any tag from "<" till ">" + attribute tag's attribute with or without value + value attribute's value + comment comment + pi processing instruction (<? ... ?>) + doctype <!DOCTYPE ... > declaration + cdata CDATA section + +CSS ("css"): + + tag tag in selectors + id #some_name in selectors + class .some_name in selectors + at_rule @-rule till first "{" or ";" + attr_selector attribute selector (square brackets in a[href^=http://]) + pseudo pseudo classes and elemens (:after, ::after etc.) + comment comment + rules everything from "{" till "}" + attribute property name inside a rule + value property value inside a rule, from ":" till ";" or + till the end of rule block + number number within a value + string string within a value + hexcolor hex color (#FFFFFF) within a value + function CSS function within a value + important "!important" symbol + +Markdown ("markdown"): + + header header + bullet list bullet + emphasis emphasis + strong strong emphasis + blockquote blockquote + code code + horizontal_rule horizontal rule + link_label link label + link_url link url + +Django ("django"): + + keyword HTML tag in HTML, default tags and default filters in templates + tag any tag from "<" till ">" + comment comment + doctype <!DOCTYPE ... > declaration + attribute tag's attribute with or withou value + value attribute's value + template_tag template tag {% .. %} + variable template variable {{ .. }} + template_comment template comment, both {# .. #} and {% comment %} + filter filter from "|" till the next filter or the end of tag + argument filter argument + +JSON ("json"): + + number number + literal "true", "false" and "null" + string string value + attribute name of an object property + value value of an object property + +JavaScript ("javascript"): + + keyword keyword + comment comment + number number + literal special literal: "true", "false" and "null" + string string + regexp regular expression + function header of a function + title name of a function inside a header + params parentheses and everything inside them in a function's header + +CoffeeScript ("coffeescript"): + + keyword keyword + comment comment + number number + literal special literal: "true", "false" and "null" + string string + regexp regular expression + function header of a function + class header of a class + title name of a function variable inside a header + params parentheses and everything inside them in a function's header + property @-property within class and functions + +ActionScript ("actionscript"): + + comment comment + string string + number number + keyword keywords + literal literal + reserved reserved keyword + title name of declaration (package, class or function) + preprocessor preprocessor directive (import, include) + type type of returned value (for functions) + package package (named or not) + class class/interface + function function + param params of function + rest_arg rest argument of function + +VBScript ("vbscript"): + + keyword keyword + number number + string string + comment comment + built_in built-in function + +HTTP ("http"): + + request first line of a request + status first line of a response + attribute header name + string header value or query string in a request line + number status code + +Lua ("lua"): + + keyword keyword + number number + string string + comment comment + built_in built-in operator + function header of a function + title name of a function inside a header + params everything inside parentheses in a function's header + long_brackets multiline string in [=[ .. ]=] + +Delphi ("delphi"): + + keyword keyword + comment comment (of any type) + number number + string string + function header of a function, procedure, constructor and destructor + title name of a function, procedure, constructor or destructor + inside a header + params everything inside parentheses in a function's header + class class' body from "= class" till "end;" + +Java ("java"): + + keyword keyword + number number + string string + comment commment + annotaion annotation + javadoc javadoc comment + class class header from "class" till "{" + title class name inside a header + params everything in parentheses inside a class header + inheritance keywords "extends" and "implements" inside class header + +C++ ("cpp"): + + keyword keyword + number number + string string and character + comment comment + preprocessor preprocessor directive + stl_container instantiation of STL containers ("vector<...>") + +Objective C ("objectivec"): + keyword keyword + built_in Cocoa/Cocoa Touch constants and classes + number number + string string + comment comment + preprocessor preprocessor directive + class interface/implementation, protocol and forward class declaration + variable properties and struct accesors + +Vala ("vala"): + + keyword keyword + number number + string string + comment comment + class class definitions + title in class definition + constant ALL_UPPER_CASE + +C# ("cs"): + + keyword keyword + number number + string string + comment commment + xmlDocTag xmldoc tag ("///", "<!--", "-->", "<..>") + +D language ("d"): + + comment comment + string string constant + number number + keyword language keywords (including @attributes) + constant true false null + built_in built-in plain types (int, string etc.) + +RenderMan RSL ("rsl"): + + keyword keyword + number number + string string (including @"..") + comment comment + preprocessor preprocessor directive + shader sahder keywords + shading shading keywords + built_in built-in function + +RenderMan RIB ("rib"): + + keyword keyword + number number + string string + comment comment + commands command + +Maya Embedded Language ("mel"): + + keyword keyword + number number + string string + comment comment + variable variable + +SQL ("sql"): + + keyword keyword (mostly SQL'92 and SQL'99) + number number + string string (of any type: "..", '..', `..`) + comment comment + aggregate aggregate function + +Smalltalk ("smalltalk"): + + keyword keyword + number number + string string + comment commment + symbol symbol + array array + class name of a class + char char + localvars block of local variables + +Lisp ("lisp"): + + keyword keyword + number number + string string + comment commment + variable variable + literal b, t and nil + list non-quoted list + title first symbol in a non-quoted list + body remainder of the non-quoted list + quoted quoted list, both "(quote .. )" and "'(..)" + +Clojure ("clojure"): + + comment comments and hints + string string + number number + collection collections + attribute :keyword + title function name (built-in or user defined) + built_in built-in function name + +Ini ("ini"): + + title title of a section + value value of a setting of any type + string string + number number + keyword boolean value keyword + +Apache ("apache"): + + keyword keyword + number number + comment commment + literal On and Off + sqbracket variables in rewrites "%{..}" + cbracket options in rewrites "[..]" + tag begin and end of a configuration section + +Nginx ("nginx"): + + title directive title + string string + number number + comment comment + built_in built-in constant + variable $-variable + regexp regexp + +Diff ("diff"): + + header file header + chunk chunk header within a file + addition added lines + deletion deleted lines + change changed lines + +DOS ("dos"): + + keyword keyword + flow batch control keyword + stream DOS special files ("con", "prn", ...) + winutils some commands (see dos.js specifically) + envvar environment variables + +Bash ("bash"): + + keyword keyword + string string + number number + comment comment + literal special literal: "true" и "false" + variable variable + shebang script interpreter header + +CMake ("cmake") + + keyword keyword + number number + string string + comment commment + envvar $-variable + +Axapta ("axapta"): + + keyword keyword + number number + string string + comment commment + class class header from "class" till "{" + title class name inside a header + params everything in parentheses inside a class header + inheritance keywords "extends" and "implements" inside class header + preprocessor preprocessor directive + +1C ("1c"): + + keyword keyword + number number + date date + string string + comment commment + function header of function or procudure + title function name inside a header + params everything in parentheses inside a function header + preprocessor preprocessor directive + +AVR assembler ("avrasm"): + + keyword keyword + built_in pre-defined register + number number + string string + comment commment + label label + preprocessor preprocessor directive + localvars substitution in .macro + +VHDL ("vhdl") + + keyword keyword + number number + string string + comment commment + literal signal logical value + typename typename + attribute signal attribute + +Parser3 ("parser3"): + + keyword keyword + number number + comment commment + variable variable starting with "$" + preprocessor preprocessor directive + title user-defined name starting with "@" + +TeX ("tex"): + + comment comment + number number + command command + parameter parameter + formula formula + special special symbol + +Haskell ("haskell"): + + keyword keyword + number number + string string + comment comment + class type classes and other data types + title function name + type type class name + typedef definition of types (type, newtype, data) + +Erlang ("erlang"): + + comment comment + string string + number number + keyword keyword + record_name record access (#record_name) + title name of declaration function + variable variable (starts with capital letter or with _) + pp.keywords module's attribute (-attribute) + function_name atom or atom:atom in case of function call + +Rust ("rust"): + + comment comment + string string + number number + keyword keyword + title name of declaration + preprocessor preprocessor directive + +Matlab ("matlab"): + + comment comment + string string + number number + keyword keyword + title function name + function function + param params of function + matrix matrix in [ .. ] + cell cell in { .. } + +R ("r"): + + comment comment + string string constant + number number + keyword language keywords (function, if) plus "structural" + functions (attach, require, setClass) + literal special literal: TRUE, FALSE, NULL, NA, etc. + +OpenGL Shading Language ("glsl"): + + comment comment + number number + preprocessor preprocessor directive + keyword keyword + built_in GLSL built-in functions and variables + literal true false + +AppleScript ("applescript"): + + keyword keyword + command core AppleScript command + constant AppleScript built in constant + type AppleScript variable type (integer, etc.) + property Applescript built in property (length, etc.) + number number + string string + comment comment + title name of a handler + +Brainfuck ("brainfuck"): + + title Brainfuck while loop command + literal Brainfuck inc and dec commands + comment comment + string Brainfuck input and output commands Added: trunk/highlight.js/highlight.pack.js =================================================================== --- trunk/highlight.js/highlight.pack.js (rev 0) +++ trunk/highlight.js/highlight.pack.js 2013-04-16 16:02:49 UTC (rev 8761) @@ -0,0 +1 @@ +var hljs=new function(){function l(o){return o.replace(/&/gm,"&").replace(/</gm,"<").replace(/>/gm,">")}function b(p){for(var o=p.firstChild;o;o=o.nextSibling){if(o.nodeName=="CODE"){return o}if(!(o.nodeType==3&&o.nodeValue.match(/\s+/))){break}}}function h(p,o){return Array.prototype.map.call(p.childNodes,function(q){if(q.nodeType==3){return o?q.nodeValue.replace(/\n/g,""):q.nodeValue}if(q.nodeName=="BR"){return"\n"}return h(q,o)}).join("")}function a(q){var p=(q.className+" "+q.parentNode.className).split(/\s+/);p=p.map(function(r){return r.replace(/^language-/,"")});for(var o=0;o<p.length;o++){if(e[p[o]]||p[o]=="no-highlight"){return p[o]}}}function c(q){var o=[];(function p(r,s){for(var t=r.firstChild;t;t=t.nextSibling){if(t.nodeType==3){s+=t.nodeValue.length}else{if(t.nodeName=="BR"){s+=1}else{if(t.nodeType==1){o.push({event:"start",offset:s,node:t});s=p(t,s);o.push({event:"stop",offset:s,node:t})}}}}return s})(q,0);return o}function j(x,v,w){var p=0;var y="";var r=[];function t(){if(x.length&&v.length){if(x[0].offset!=v[0].offset){return(x[0].offset<v[0].offset)?x:v}else{return v[0].event=="start"?x:v}}else{return x.length?x:v}}function s(A){function z(B){return" "+B.nodeName+'="'+l(B.value)+'"'}return"<"+A.nodeName+Array.prototype.map.call(A.attributes,z).join("")+">"}while(x.length||v.length){var u=t().splice(0,1)[0];y+=l(w.substr(p,u.offset-p));p=u.offset;if(u.event=="start"){y+=s(u.node);r.push(u.node)}else{if(u.event=="stop"){var o,q=r.length;do{q--;o=r[q];y+=("</"+o.nodeName.toLowerCase()+">")}while(o!=u.node);r.splice(q,1);while(q<r.length){y+=s(r[q]);q++}}}}return y+l(w.substr(p))}function f(q){function o(s,r){return RegExp(s,"m"+(q.cI?"i":"")+(r?"g":""))}function p(y,w){if(y.compiled){return}y.compiled=true;var s=[];if(y.k){var r={};function z(A,t){t.split(" ").forEach(function(B){var C=B.split("|");r[C[0]]=[A,C[1]?Number(C[1]):1];s.push(C[0])})}y.lR=o(y.l||hljs.IR,true);if(typeof y.k=="string"){z("keyword",y.k)}else{for(var x in y.k){if(!y.k.hasOwnProperty(x)){continue}z(x,y.k[x])}}y.k=r}if(w){if(y.bWK){y.b="\\b("+s.join("|")+")\\s"}y.bR=o(y.b?y.b:"\\B|\\b");if(!y.e&&!y.eW){y.e="\\B|\\b"}if(y.e){y.eR=o(y.e)}y.tE=y.e||"";if(y.eW&&w.tE){y.tE+=(y.e?"|":"")+w.tE}}if(y.i){y.iR=o(y.i)}if(y.r===undefined){y.r=1}if(!y.c){y.c=[]}for(var v=0;v<y.c.length;v++){if(y.c[v]=="self"){y.c[v]=y}p(y.c[v],y)}if(y.starts){p(y.starts,w)}var u=[];for(var v=0;v<y.c.length;v++){u.push(y.c[v].b)}if(y.tE){u.push(y.tE)}if(y.i){u.push(y.i)}y.t=u.length?o(u.join("|"),true):{exec:function(t){return null}}}p(q)}function d(D,E){function o(r,M){for(var L=0;L<M.c.length;L++){var K=M.c[L].bR.exec(r);if(K&&K.index==0){return M.c[L]}}}function s(K,r){if(K.e&&K.eR.test(r)){return K}if(K.eW){return s(K.parent,r)}}function t(r,K){return K.i&&K.iR.test(r)}function y(L,r){var K=F.cI?r[0].toLowerCase():r[0];return L.k.hasOwnProperty(K)&&L.k[K]}function G(){var K=l(w);if(!A.k){return K}var r="";var N=0;A.lR.lastIndex=0;var L=A.lR.exec(K);while(L){r+=K.substr(N,L.index-N);var M=y(A,L);if(M){v+=M[1];r+='<span class="'+M[0]+'">'+L[0]+"</span>"}else{r+=L[0]}N=A.lR.lastIndex;L=A.lR.exec(K)}return r+K.substr(N)}function z(){if(A.sL&&!e[A.sL]){return l(w)}var r=A.sL?d(A.sL,w):g(w);if(A.r>0){v+=r.keyword_count;B+=r.r}return'<span class="'+r.language+'">'+r.value+"</span>"}function J(){return A.sL!==undefined?z():G()}function I(L,r){var K=L.cN?'<span class="'+L.cN+'">':"";if(L.rB){x+=K;w=""}else{if(L.eB){x+=l(r)+K;w=""}else{x+=K;w=r}}A=Object.create(L,{parent:{value:A}});B+=L.r}function C(K,r){w+=K;if(r===undefined){x+=J();return 0}var L=o(r,A);if(L){x+=J();I(L,r);return L.rB?0:r.length}var M=s(A,r);if(M){if(!(M.rE||M.eE)){w+=r}x+=J();do{if(A.cN){x+="</span>"}A=A.parent}while(A!=M.parent);if(M.eE){x+=l(r)}w="";if(M.starts){I(M.starts,"")}return M.rE?0:r.length}if(t(r,A)){throw"Illegal"}w+=r;return r.length||1}var F=e[D];f(F);var A=F;var w="";var B=0;var v=0;var x="";try{var u,q,p=0;while(true){A.t.lastIndex=p;u=A.t.exec(E);if(!u){break}q=C(E.substr(p,u.index-p),u[0]);p=u.index+q}C(E.substr(p));return{r:B,keyword_count:v,value:x,language:D}}catch(H){if(H=="Illegal"){return{r:0,keyword_count:0,value:l(E)}}else{throw H}}}function g(s){var o={keyword_count:0,r:0,value:l(s)};var q=o;for(var p in e){if(!e.hasOwnProperty(p)){continue}var r=d(p,s);r.language=p;if(r.keyword_count+r.r>q.keyword_count+q.r){q=r}if(r.keyword_count+r.r>o.keyword_count+o.r){q=o;o=r}}if(q.language){o.second_best=q}return o}function i(q,p,o){if(p){q=q.replace(/^((<[^>]+>|\t)+)/gm,function(r,v,u,t){return v.replace(/\t/g,p)})}if(o){q=q.replace(/\n/g,"<br>")}return q}function m(r,u,p){var v=h(r,p);var t=a(r);if(t=="no-highlight"){return}var w=t?d(t,v):g(v);t=w.language;var o=c(r);if(o.length){var q=document.createElement("pre");q.innerHTML=w.value;w.value=j(o,c(q),v)}w.value=i(w.value,u,p);var s=r.className;if(!s.match("(\\s|^)(language-)?"+t+"(\\s|$)")){s=s?(s+" "+t):t}r.innerHTML=w.value;r.className=s;r.result={language:t,kw:w.keyword_count,re:w.r};if(w.second_best){r.second_best={language:w.second_best.language,kw:w.second_best.keyword_count,re:w.second_best.r}}}function n(){if(n.called){return}n.called=true;Array.prototype.map.call(document.getElementsByTagName("pre"),b).filter(Boolean).forEach(function(o){m(o,hljs.tabReplace)})}function k(){window.addEventListener("DOMContentLoaded",n,false);window.addEventListener("load",n,false)}var e={};this.LANGUAGES=e;this.highlight=d;this.highlightAuto=g;this.fixMarkup=i;this.highlightBlock=m;this.initHighlighting=n;this.initHighlightingOnLoad=k;this.IR="[a-zA-Z][a-zA-Z0-9_]*";this.UIR="[a-zA-Z_][a-zA-Z0-9_]*";this.NR="\\b\\d+(\\.\\d+)?";this.CNR="(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)";this.BNR="\\b(0b[01]+)";this.RSR="!|!=|!==|%|%=|&|&&|&=|\\*|\\*=|\\+|\\+=|,|\\.|-|-=|/|/=|:|;|<|<<|<<=|<=|=|==|===|>|>=|>>|>>=|>>>|>>>=|\\?|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~";this.BE={b:"\\\\[\\s\\S]",r:0};this.ASM={cN:"string",b:"'",e:"'",i:"\\n",c:[this.BE],r:0};this.QSM={cN:"string",b:'"',e:'"',i:"\\n",c:[this.BE],r:0};this.CLCM={cN:"comment",b:"//",e:"$"};this.CBLCLM={cN:"comment",b:"/\\*",e:"\\*/"};this.HCM={cN:"comment",b:"#",e:"$"};this.NM={cN:"number",b:this.NR,r:0};this.CNM={cN:"number",b:this.CNR,r:0};this.BNM={cN:"number",b:this.BNR,r:0};this.inherit=function(q,r){var o={};for(var p in q){o[p]=q[p]}if(r){for(var p in r){o[p]=r[p]}}return o}}();hljs.LANGUAGES.bash=function(a){var g="true false";var e="if then else elif fi for break continue while in do done echo exit return set declare";var c={cN:"variable",b:"\\$[a-zA-Z0-9_#]+"};var b={cN:"variable",b:"\\${([^}]|\\\\})+}"};var h={cN:"string",b:'"',e:'"',i:"\\n",c:[a.BE,c,b],r:0};var d={cN:"string",b:"'",e:"'",c:[{b:"''"}],r:0};var f={cN:"test_condition",b:"",e:"",c:[h,d,c,b],k:{literal:g},r:0};return{k:{keyword:e,literal:g},c:[{cN:"shebang",b:"(#!\\/bin\\/bash)|(#!\\/bin\\/sh)",r:10},c,b,a.HCM,h,d,a.inherit(f,{b:"\\[ ",e:" \\]",r:0}),a.inherit(f,{b:"\\[\\[ ",e:" \\]\\]"})]}}(hljs);hljs.LANGUAGES.cs=function(a){return{k:"abstract as base bool break byte case catch char checked class const continue decimal default delegate do double else enum event explicit extern false finally fixed float for foreach goto if implicit in int interface internal is lock long namespace new null object operator out override params private protected public readonly ref return sbyte sealed short sizeof stackalloc static string struct switch this throw true try typeof uint ulong unchecked unsafe ushort using virtual volatile void while ascending descending from get group into join let orderby partial select set value var where yield",c:[{cN:"comment",b:"///",e:"$",rB:true,c:[{cN:"xmlDocTag",b:"///|<!--|-->"},{cN:"xmlDocTag",b:"</?",e:">"}]},a.CLCM,a.CBLCLM,{cN:"preprocessor",b:"#",e:"$",k:"if else elif endif define undef warning error line region endregion pragma checksum"},{cN:"string",b:'@"',e:'"',c:[{b:'""'}]},a.ASM,a.QSM,a.CNM]}}(hljs);hljs.LANGUAGES.ruby=function(e){var a="[a-zA-Z_][a-zA-Z0-9_]*(\\!|\\?)?";var j="[a-zA-Z_]\\w*[!?=]?|[-+~]\\@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?";var g={keyword:"and false then defined module in return redo if BEGIN retry end for true self when next until do begin unless END rescue nil else break undef not super class case require yield alias while ensure elsif or include"};var c={cN:"yardoctag",b:"@[A-Za-z]+"};var k=[{cN:"comment",b:"#",e:"$",c:[c]},{cN:"comment",b:"^\\=begin",e:"^\\=end",c:[c],r:10},{cN:"comment",b:"^__END__",e:"\\n$"}];var d={cN:"subst",b:"#\\{",e:"}",l:a,k:g};var i=[e.BE,d];var b=[{cN:"string",b:"'",e:"'",c:i,r:0},{cN:"string",b:'"',e:'"',c:i,r:0},{cN:"string",b:"%[qw]?\\(",e:"\\)",c:i},{cN:"string",b:"%[qw]?\\[",e:"\\]",c:i},{cN:"string",b:"%[qw]?{",e:"}",c:i},{cN:"string",b:"%[qw]?<",e:">",c:i,r:10},{cN:"string",b:"%[qw]?/",e:"/",c:i,r:10},{cN:"string",b:"%[qw]?%",e:"%",c:i,r:10},{cN:"string",b:"%[qw]?-",e:"-",c:i,r:10},{cN:"string",b:"%[qw]?\\|",e:"\\|",c:i,r:10}];var h={cN:"function",bWK:true,e:" |$|;",k:"def",c:[{cN:"title",b:j,l:a,k:g},{cN:"params",b:"\\(",e:"\\)",l:a,k:g}].concat(k)};var f=k.concat(b.concat([{cN:"class",bWK:true,e:"$|;",k:"class module",c:[{cN:"title",b:"[A-Za-z_]\\w*(::\\w+)*(\\?|\\!)?",r:0},{cN:"inheritance",b:"<\\s*",c:[{cN:"parent",b:"("+e.IR+"::)?"+e.IR}]}].concat(k)},h,{cN:"constant",b:"(::)?(\\b[A-Z]\\w*(::)?)+",r:0},{cN:"symbol",b:":",c:b.concat([{b:j}]),r:0},{cN:"symbol",b:a+":",r:0},{cN:"number",b:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",r:0},{cN:"number",b:"\\?\\w"},{cN:"variable",b:"(\\$\\W)|((\\$|\\@\\@?)(\\w+))"},{b:"("+e.RSR+")\\s*",c:k.concat([{cN:"regexp",b:"/",e:"/[a-z]*",i:"\\n",c:[e.BE,d]}]),r:0}]));d.c=f;h.c[1].c=f;return{l:a,k:g,c:f}}(hljs);hljs.LANGUAGES.diff=function(a){return{c:[{cN:"chunk",b:"^\\@\\@ +\\-\\d+,\\d+ +\\+\\d+,\\d+ +\\@\\@$",r:10},{cN:"chunk",b:"^\\*\\*\\* +\\d+,\\d+ +\\*\\*\\*\\*$",r:10},{cN:"chunk",b:"^\\-\\-\\- +\\d+,\\d+ +\\-\\-\\-\\-$",r:10},{cN:"header",b:"Index: ",e:"$"},{cN:"header",b:"=====",e:"=====$"},{cN:"header",b:"^\\-\\-\\-",e:"$"},{cN:"header",b:"^\\*{3} ",e:"$"},{cN:"header",b:"^\\+\\+\\+",e:"$"},{cN:"header",b:"\\*{5}",e:"\\*{5}$"},{cN:"addition",b:"^\\+",e:"$"},{cN:"deletion",b:"^\\-",e:"$"},{cN:"change",b:"^\\!",e:"$"}]}}(hljs);hljs.LANGUAGES.javascript=function(a){return{k:{keyword:"in if for while finally var new function do return void else break catch instanceof with throw case default try this switch continue typeof delete let yield const",literal:"true false null undefined NaN Infinity"},c:[a.ASM,a.QSM,a.CLCM,a.CBLCLM,a.CNM,{b:"("+a.RSR+"|\\b(case|return|throw)\\b)\\s*",k:"return throw case",c:[a.CLCM,a.CBLCLM,{cN:"regexp",b:"/",e:"/[gim]*",i:"\\n",c:[{b:"\\\\/"}]},{b:"<",e:">;",sL:"xml"}],r:0},{cN:"function",bWK:true,e:"{",k:"function",c:[{cN:"title",b:"[A-Za-z$_][0-9A-Za-z$_]*"},{cN:"params",b:"\\(",e:"\\)",c:[a.CLCM,a.CBLCLM],i:"[\"'\\(]"}],i:"\\[|%"}]}}(hljs);hljs.LANGUAGES.css=function(a){var b={cN:"function",b:a.IR+"\\(",e:"\\)",c:[a.NM,a.ASM,a.QSM]};return{cI:true,i:"[=/|']",c:[a.CBLCLM,{cN:"id",b:"\\#[A-Za-z0-9_-]+"},{cN:"class",b:"\\.[A-Za-z0-9_-]+",r:0},{cN:"attr_selector",b:"\\[",e:"\\]",i:"$"},{cN:"pseudo",b:":(:)?[a-zA-Z0-9\\_\\-\\+\\(\\)\\\"\\']+"},{cN:"at_rule",b:"@(font-face|page)",l:"[a-z-]+",k:"font-face page"},{cN:"at_rule",b:"@",e:"[{;]",eE:true,k:"import page media charset",c:[b,a.ASM,a.QSM,a.NM]},{cN:"tag",b:a.IR,r:0},{cN:"rules",b:"{",e:"}",i:"[^\\s]",r:0,c:[a.CBLCLM,{cN:"rule",b:"[^\\s]",rB:true,e:";",eW:true,c:[{cN:"attribute",b:"[A-Z\\_\\.\\-]+",e:":",eE:true,i:"[^\\s]",starts:{cN:"value",eW:true,eE:true,c:[b,a.NM,a.QSM,a.ASM,a.CBLCLM,{cN:"hexcolor",b:"\\#[0-9A-F]+"},{cN:"important",b:"!important"}]}}]}]}]}}(hljs);hljs.LANGUAGES.xml=function(a){var c="[A-Za-z0-9\\._:-]+";var b={eW:true,c:[{cN:"attribute",b:c,r:0},{b:'="',rB:true,e:'"',c:[{cN:"value",b:'"',eW:true}]},{b:"='",rB:true,e:"'",c:[{cN:"value",b:"'",eW:true}]},{b:"=",c:[{cN:"value",b:"[^\\s/>]+"}]}]};return{cI:true,c:[{cN:"pi",b:"<\\?",e:"\\?>",r:10},{cN:"doctype",b:"<!DOCTYPE",e:">",r:10,c:[{b:"\\[",e:"\\]"}]},{cN:"comment",b:"<!--",e:"-->",r:10},{cN:"cdata",b:"<\\!\\[CDATA\\[",e:"\\]\\]>",r:10},{cN:"tag",b:"<style(?=\\s|>|$)",e:">",k:{title:"style"},c:[b],starts:{e:"</style>",rE:true,sL:"css"}},{cN:"tag",b:"<script(?=\\s|>|$)",e:">",k:{title:"script"},c:[b],starts:{e:"<\/script>",rE:true,sL:"javascript"}},{b:"<%",e:"%>",sL:"vbscript"},{cN:"tag",b:"</?",e:"/?>",c:[{cN:"title",b:"[^ />]+"},b]}]}}(hljs);hljs.LANGUAGES.http=function(a){return{i:"\\S",c:[{cN:"status",b:"^HTTP/[0-9\\.]+",e:"$",c:[{cN:"number",b:"\\b\\d{3}\\b"}]},{cN:"request",b:"^[A-Z]+ (.*?) HTTP/[0-9\\.]+$",rB:true,e:"$",c:[{cN:"string",b:" ",e:" ",eB:true,eE:true}]},{cN:"attribute",b:"^\\w",e:": ",eE:true,i:"\\n|\\s|=",starts:{cN:"string",e:"$"}},{b:"\\n\\n",starts:{sL:"",eW:true}}]}}(hljs);hljs.LANGUAGES.java=function(a){return{k:"false synchronized int abstract float private char boolean static null if const for true while long throw strictfp finally protected import native final return void enum else break transient new catch instanceof byte super volatile case assert short package default double public try this switch continue throws",c:[{cN:"javadoc",b:"/\\*\\*",e:"\\*/",c:[{cN:"javadoctag",b:"@[A-Za-z]+"}],r:10},a.CLCM,a.CBLCLM,a.ASM,a.QSM,{cN:"class",bWK:true,e:"{",k:"class interface",i:":",c:[{bWK:true,k:"extends implements",r:10},{cN:"title",b:a.UIR}]},a.CNM,{cN:"annotation",b:"@[A-Za-z]+"}]}}(hljs);hljs.LANGUAGES.php=function(a){var e={cN:"variable",b:"\\$+[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*"};var b=[a.inherit(a.ASM,{i:null}),a.inherit(a.QSM,{i:null}),{cN:"string",b:'b"',e:'"',c:[a.BE]},{cN:"string",b:"b'",e:"'",c:[a.BE]}];var c=[a.BNM,a.CNM];var d={cN:"title",b:a.UIR};return{cI:true,k:"and include_once list abstract global private echo interface as static endswitch array null if endwhile or const for endforeach self var while isset public protected exit foreach throw elseif include __FILE__ empty require_once do xor return implements parent clone use __CLASS__ __LINE__ else break print eval new catch __METHOD__ case exception php_user_filter default die require __FUNCTION__ enddeclare final try this switch continue endfor endif declare unset true false namespace trait goto instanceof insteadof __DIR__ __NAMESPACE__ __halt_compiler",c:[a.CLCM,a.HCM,{cN:"comment",b:"/\\*",e:"\\*/",c:[{cN:"phpdoc",b:"\\s@[A-Za-z]+"}]},{cN:"comment",eB:true,b:"__halt_compiler.+?;",eW:true},{cN:"string",b:"<<<['\"]?\\w+['\"]?$",e:"^\\w+;",c:[a.BE]},{cN:"preprocessor",b:"<\\?php",r:10},{cN:"preprocessor",b:"\\?>"},e,{cN:"function",bWK:true,e:"{",k:"function",i:"\\$|\\[|%",c:[d,{cN:"params",b:"\\(",e:"\\)",c:["self",e,a.CBLCLM].concat(b).concat(c)}]},{cN:"class",bWK:true,e:"{",k:"class",i:"[:\\(\\$]",c:[{bWK:true,eW:true,k:"extends",c:[d]},d]},{b:"=>"}].concat(b).concat(c)}}(hljs);hljs.LANGUAGES.python=function(a){var f={cN:"prompt",b:"^(>>>|\\.\\.\\.) "};var c=[{cN:"string",b:"(u|b)?r?'''",e:"'''",c:[f],r:10},{cN:"string",b:'(u|b)?r?"""',e:'"""',c:[f],r:10},{cN:"string",b:"(u|r|ur)'",e:"'",c:[a.BE],r:10},{cN:"string",b:'(u|r|ur)"',e:'"',c:[a.BE],r:10},{cN:"string",b:"(b|br)'",e:"'",c:[a.BE]},{cN:"string",b:'(b|br)"',e:'"',c:[a.BE]}].concat([a.ASM,a.QSM]);var e={cN:"title",b:a.UIR};var d={cN:"params",b:"\\(",e:"\\)",c:["self",a.CNM,f].concat(c)};var b={bWK:true,e:":",i:"[${=;\\n]",c:[e,d],r:10};return{k:{keyword:"and elif is global as in if from raise for except finally print import pass return exec else break not with class assert yield try while continue del or def lambda nonlocal|10",built_in:"None True False Ellipsis NotImplemented"},i:"(</|->|\\?)",c:c.concat([f,a.HCM,a.inherit(b,{cN:"function",k:"def"}),a.inherit(b,{cN:"class",k:"class"}),a.CNM,{cN:"decorator",b:"@",e:"$"},{b:"\\b(print|exec)\\("}])}}(hljs);hljs.LANGUAGES.sql=function(a){return{cI:true,c:[{cN:"operator",b:"(begin|start|commit|rollback|savepoint|lock|alter|create|drop|rename|call|delete|do|handler|insert|load|replace|select|truncate|update|set|show|pragma|grant)\\b(?!:)",e:";",eW:true,k:{keyword:"all partial global month current_timestamp using go revoke smallint indicator end-exec disconnect zone with character assertion to add current_user usage input local alter match collate real then rollback get read timestamp session_user not integer bit unique day minute desc insert execute like ilike|2 level decimal drop continue isolation found where constraints domain right national some module transaction relative second connect escape close system_user for deferred section cast current sqlstate allocate intersect deallocate numeric public preserve full goto initially asc no key output collation group by union session both last language constraint column of space foreign deferrable prior connection unknown action commit view or first into float year primary cascaded except restrict set references names table outer open select size are rows from prepare distinct leading create only next inner authorization schema corresponding option declare precision immediate else timezone_minute external varying translation true case exception join hour default double scroll value cursor descriptor values dec fetch procedure delete and false int is describe char as at in varchar null trailing any absolute current_time end grant privileges when cross check write current_date pad begin temporary exec time update catalog user sql date on identity timezone_hour natural whenever interval work order cascade diagnostics nchar having left call do handler load replace truncate start lock show pragma exists number",aggregate:"count sum min max avg"},c:[{cN:"string",b:"'",e:"'",c:[a.BE,{b:"''"}],r:0},{cN:"string",b:'"',e:'"',c:[a.BE,{b:'""'}],r:0},{cN:"string",b:"`",e:"`",c:[a.BE]},a.CNM]},a.CBLCLM,{cN:"comment",b:"--",e:"$"}]}}(hljs);hljs.LANGUAGES.ini=function(a){return{cI:true,i:"[^\\s]",c:[{cN:"comment",b:";",e:"$"},{cN:"title",b:"^\\[",e:"\\]"},{cN:"setting",b:"^[a-z0-9\\[\\]_-]+[ \\t]*=[ \\t]*",e:"$",c:[{cN:"value",eW:true,k:"on off true false yes no",c:[a.QSM,a.NM]}]}]}}(hljs);hljs.LANGUAGES.perl=function(e){var a="getpwent getservent quotemeta msgrcv scalar kill dbmclose undef lc ma syswrite tr send umask sysopen shmwrite vec qx utime local oct semctl localtime readpipe do return format read sprintf dbmopen pop getpgrp not getpwnam rewinddir qqfileno qw endprotoent wait sethostent bless s|0 opendir continue each sleep endgrent shutdown dump chomp connect getsockname die socketpair close flock exists index shmgetsub for endpwent redo lstat msgctl setpgrp abs exit select print ref gethostbyaddr unshift fcntl syscall goto getnetbyaddr join gmtime symlink semget splice x|0 getpeername recv log setsockopt cos last reverse gethostbyname getgrnam study formline endhostent times chop length gethostent getnetent pack getprotoent getservbyname rand mkdir pos chmod y|0 substr endnetent printf next open msgsnd readdir use unlink getsockopt getpriority rindex wantarray hex system getservbyport endservent int chr untie rmdir prototype tell listen fork shmread ucfirst setprotoent else sysseek link getgrgid shmctl waitpid unpack getnetbyname reset chdir grep split require caller lcfirst until warn while values shift telldir getpwuid my getprotobynumber delete and sort uc defined srand accept package seekdir getprotobyname semop our rename seek if q|0 chroot sysread setpwent no crypt getc chown sqrt write setnetent setpriority foreach tie sin msgget map stat getlogin unless elsif truncate exec keys glob tied closedirioctl socket readlink eval xor readline binmode setservent eof ord bind alarm pipe atan2 getgrent exp time push setgrent gt lt or ne m|0 break given say state when";var d={cN:"subst",b:"[$@]\\{",e:"\\}",k:a,r:10};var b={cN:"variable",b:"\\$\\d"};var i={cN:"variable",b:"[\\$\\%\\@\\*](\\^\\w\\b|#\\w+(\\:\\:\\w+)*|[^\\s\\w{]|{\\w+}|\\w+(\\:\\:\\w*)*)"};var f=[e.BE,d,b,i];var h={b:"->",c:[{b:e.IR},{b:"{",e:"}"}]};var g={cN:"comment",b:"^(__END__|__DATA__)",e:"\\n$",r:5};var c=[b,i,e.HCM,g,{cN:"comment",b:"^\\=\\w",e:"\\=cut",eW:true},h,{cN:"string",b:"q[qwxr]?\\s*\\(",e:"\\)",c:f,r:5},{cN:"string",b:"q[qwxr]?\\s*\\[",e:"\\]",c:f,r:5},{cN:"string",b:"q[qwxr]?\\s*\\{",e:"\\}",c:f,r:5},{cN:"string",b:"q[qwxr]?\\s*\\|",e:"\\|",c:f,r:5},{cN:"string",b:"q[qwxr]?\\s*\\<",e:"\\>",c:f,r:5},{cN:"string",b:"qw\\s+q",e:"q",c:f,r:5},{cN:"string",b:"'",e:"'",c:[e.BE],r:0},{cN:"string",b:'"',e:'"',c:f,r:0},{cN:"string",b:"`",e:"`",c:[e.BE]},{cN:"string",b:"{\\w+}",r:0},{cN:"string",b:"-?\\w+\\s*\\=\\>",r:0},{cN:"number",b:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",r:0},{b:"("+e.RSR+"|\\b(split|return|print|reverse|grep)\\b)\\s*",k:"split return print reverse grep",r:0,c:[e.HCM,g,{cN:"regexp",b:"(s|tr|y)/(\\\\.|[^/])*/(\\\\.|[^/])*/[a-z]*",r:10},{cN:"regexp",b:"(m|qr)?/",e:"/[a-z]*",c:[e.BE],r:0}]},{cN:"sub",bWK:true,e:"(\\s*\\(.*?\\))?[;{]",k:"sub",r:5},{cN:"operator",b:"-\\w\\b",r:0}];d.c=c;h.c[1].c=c;return{k:a,c:c}}(hljs);hljs.LANGUAGES.json=function(a){var e={literal:"true false null"};var d=[a.QSM,a.CNM];var c={cN:"value",e:",",eW:true,eE:true,c:d,k:e};var b={b:"{",e:"}",c:[{cN:"attribute",b:'\\s*"',e:'"\\s*:\\s*',eB:true,eE:true,c:[a.BE],i:"\\n",starts:c}],i:"\\S"};var f={b:"\\[",e:"\\]",c:[a.inherit(c,{cN:null})],i:"\\S"};d.splice(d.length,0,b,f);return{c:d,k:e,i:"\\S"}}(hljs);hljs.LANGUAGES.cpp=function(a){var b={keyword:"false int float while private char catch export virtual operator sizeof dynamic_cast|10 typedef const_cast|10 const struct for static_cast|10 union namespace unsigned long throw volatile static protected bool template mutable if public friend do return goto auto void enum else break new extern using true class asm case typeid short reinterpret_cast|10 default double register explicit signed typename try this switch continue wchar_t inline delete alignof char16_t char32_t constexpr decltype noexcept nullptr static_assert thread_local restrict _Bool complex",built_in:"std string cin cout cerr clog stringstream istringstream ostringstream auto_ptr deque list queue stack vector map set bitset multiset multimap unordered_set unordered_map unordered_multiset unordered_multimap array shared_ptr"};return{k:b,i:"</",c:[a.CLCM,a.CBLCLM,a.QSM,{cN:"string",b:"'\\\\?.",e:"'",i:"."},{cN:"number",b:"\\b(\\d+(\\.\\d*)?|\\.\\d+)(u|U|l|L|ul|UL|f|F)"},a.CNM,{cN:"preprocessor",b:"#",e:"$"},{cN:"stl_container",b:"\\b(deque|list|queue|stack|vector|map|set|bitset|multiset|multimap|unordered_map|unordered_set|unordered_multiset|unordered_multimap|array)\\s*<",e:">",k:b,r:10,c:["self"]}]}}(hljs); \ No newline at end of file Added: trunk/highlight.js/styles/arta.css =================================================================== --- trunk/highlight.js/styles/arta.css (rev 0) +++ trunk/highlight.js/styles/arta.css 2013-04-16 16:02:49 UTC (rev 8761) @@ -0,0 +1,158 @@ +/* +Date: 17.V.2011 +Author: pumbur <pu...@pu...> +*/ + +pre code +{ + display: block; padding: 0.5em; + background: #222; +} + +pre .profile .header *, +pre .ini .title, +pre .nginx .title +{ + color: #fff; +} + +pre .comment, +pre .javadoc, +pre .preprocessor, +pre .preprocessor .title, +pre .shebang, +pre .profile .summary, +pre .diff, +pre .pi, +pre .doctype, +pre .tag, +pre .template_comment, +pre .css .rules, +pre .tex .special +{ + color: #444; +} + +pre .string, +pre .symbol, +pre .diff .change, +pre .regexp, +pre .xml .attribute, +pre .smalltalk .char, +pre .xml .value, +pre .ini .value, +pre .clojure .attribute +{ + color: #ffcc33; +} + +pre .number, +pre .addition +{ + color: #00cc66; +} + +pre .built_in, +pre .literal, +pre .vhdl .typename, +pre .go .constant, +pre .go .typename, +pre .ini .keyword, +pre .lua .title, +pre .perl .variable, +pre .php .variable, +pre .mel .variable, +pre .django .variable, +pre .css .funtion, +pre .smalltalk .method, +pre .hexcolor, +pre .important, +pre .flow, +pre .inheritance, +pre .parser3 .variable +{ + color: #32AAEE; +} + +pre .keyword, +pre .tag .title, +pre .css .tag, +pre .css .class, +pre .css .id, +pre .css .pseudo, +pre .css .attr_selector, +pre .lisp .title, +pre .clojure .built_in, +pre .winutils, +pre .tex .command, +pre .request, +pre .status +{ + color: #6644aa; +} + +pre .title, +pre .ruby .constant, +pre .vala .constant, +pre .parent, +pre .deletion, +pre .template_tag, +pre .css .keyword, +pre .objectivec .class .id, +pre .smalltalk .class, +pre .lisp .keyword, +pre .apache .tag, +pre .nginx .variable, +pre .envvar, +pre .bash .variable, +pre .go .built_in, +pre .vbscript .built_in, +pre .lua .built_in, +pre .rsl .built_in, +pre .tail, +pre .avrasm .label, +pre .tex .formula, +pre .tex .formula * +{ + color: #bb1166; +} + +pre .yardoctag, +pre .phpdoc, +pre .profile .header, +pre .ini .title, +pre .apache .tag, +pre .parser3 .title +{ + font-weight: bold; +} + +pre .coffeescript .javascript, +pre .javascript .xml, +pre .tex .formula, +pre .xml .javascript, +pre .xml .vbscript, +pre .xml .css, +pre .xml .cdata +{ + opacity: 0.6; +} + +pre code, +pre .javascript, +pre .css, +pre .xml, +pre .subst, +pre .diff .chunk, +pre .css .value, +pre .css .attribute, +pre .lisp .string, +pre .lisp .number, +pre .tail .params, +pre .container, +pre .haskell *, +pre .erlang *, +pre .erlang_repl * +{ + color: #aaa; +} Added: trunk/highlight.js/styles/ascetic.css =================================================================== --- trunk/highlight.js/styles/ascetic.css (rev 0) +++ trunk/highlight.js/styles/ascetic.css 2013-04-16 16:02:49 UTC (rev 8761) @@ -0,0 +1,50 @@ +/* + +Original style from softwaremaniacs.org (c) Ivan Sagalaev <Ma...@So...> + +*/ + +pre code { + display: block; padding: 0.5em; + background: white; color: black; +} + +pre .string, +pre .tag .value, +pre .filter .argument, +pre .addition, +pre .change, +pre .apache .tag, +pre .apache .cbracket, +pre .nginx .built_in, +pre .tex .formula { + color: #888; +} + +pre .comment, +pre .template_comment, +pre .shebang, +pre .doctype, +pre .pi, +pre .javadoc, +pre .deletion, +pre .apache .sqbracket { + color: #CCC; +} + +pre .keyword, +pre .tag .title, +pre .ini .title, +pre .lisp .title, +pre .clojure .title, +pre .http .title, +pre .nginx .title, +pre .css .tag, +pre .winutils, +pre .flow, +pre .apache .tag, +pre .tex .command, +pre .request, +pre .status { + font-weight: bold; +} Added: trunk/highlight.js/styles/brown_paper.css =================================================================== --- trunk/highlight.js/styles/brown_paper.css (rev 0) +++ trunk/highlight.js/styles/brown_paper.css 2013-04-16 16:02:49 UTC (rev 8761) @@ -0,0 +1,104 @@ +/* + +Brown Paper style from goldblog.com.ua (c) Zaripov Yura <yu...@uk...> + +*/ + +pre code { + display: block; padding: 0.5em; + background:#b7a68e url(./brown_papersq.png); +} + +pre .keyword, +pre .literal, +pre .change, +pre .winutils, +pre .flow, +pre .lisp .title, +pre .clojure .built_in, +pre .nginx .title, +pre .tex .special, +pre .request, +pre .status { + color:#005599; + font-weight:bold; +} + +pre code, +pre .subst, +pre .tag .keyword { + color: #363C69; +} + +pre .string, +pre .title, +pre .haskell .type, +pre .tag .value, +pre .css .rules .value, +pre .preprocessor, +pre .ruby .symbol, +pre .ruby .symbol .string, +pre .ruby .class .parent, +pre .built_in, +pre .sql .aggregate, +pre .django .template_tag, +pre .django .variable, +pre .smalltalk .class, +pre .javadoc, +pre .ruby .string, +pre .django .filter .argument, +pre .smalltalk .localvars, +pre .smalltalk .array, +pre .attr_selector, +pre .pseudo, +pre .addition, +pre .stream, +pre .envvar, +pre .apache .tag, +pre .apache .cbracket, +pre .tex .number { + color: #2C009F; +} + +pre .comment, +pre .java .annotation, +pre .python .decorator, +pre .template_comment, +pre .pi, +pre .doctype, +pre .deletion, +pre .shebang, +pre .apache .sqbracket, +pre .nginx .built_in, +pre .tex .formula { + color: #802022; +} + +pre .keyword, +pre .literal, +pre .css .id, +pre .phpdoc, +pre .title, +pre .haskell .type, +pre .vbscript .built_in, +pre .sql .aggregate, +pre .rsl .built_in, +pre .smalltalk .class, +pre .diff .header, +pre .chunk, +pre .winutils, +pre .bash .variable, +pre .apache .tag, +pre .tex .command { + font-weight: bold; +} + +pre .coffeescript .javascript, +pre .javascript .xml, +pre .tex .formula, +pre .xml .javascript, +pre .xml .vbscript, +pre .xml .css, +pre .xml .cdata { + opacity: 0.8; +} Added: trunk/highlight.js/styles/brown_papersq.png =================================================================== (Binary files differ) Index: trunk/highlight.js/styles/brown_papersq.png =================================================================== --- trunk/highlight.js/styles/brown_papersq.png 2013-04-16 15:53:47 UTC (rev 8760) +++ trunk/highlight.js/styles/brown_papersq.png 2013-04-16 16:02:49 UTC (rev 8761) Property changes on: trunk/highlight.js/styles/brown_papersq.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/highlight.js/styles/dark.css =================================================================== --- trunk/highlight.js/styles/dark.css (rev 0) +++ trunk/highlight.js/styles/dark.css 2013-04-16 16:02:49 UTC (rev 8761) @@ -0,0 +1,103 @@ +/* + +Dark style from softwaremaniacs.org (c) Iv... [truncated message content] |
From: <var...@us...> - 2013-04-26 13:53:52
|
Revision: 8775 http://sourceforge.net/p/phpwiki/code/8775 Author: vargenau Date: 2013-04-26 13:53:49 +0000 (Fri, 26 Apr 2013) Log Message: ----------- Add () for new WikiPluginLoader Modified Paths: -------------- trunk/SOAP.php trunk/lib/CachedMarkup.php trunk/lib/EditToolbar.php trunk/lib/Template.php trunk/lib/WikiDB.php trunk/lib/WikiPluginCached.php trunk/lib/XmlRpcServer.php trunk/lib/display.php trunk/lib/plugin/InterWikiSearch.php trunk/lib/plugin/PluginManager.php trunk/lib/plugin/RecentChangesCached.php trunk/lib/plugin/SystemInfo.php trunk/lib/plugin/WikiFormRich.php Modified: trunk/SOAP.php =================================================================== --- trunk/SOAP.php 2013-04-26 13:41:37 UTC (rev 8774) +++ trunk/SOAP.php 2013-04-26 13:53:49 UTC (rev 8775) @@ -275,7 +275,7 @@ $RetArray = array(); if (!empty($plugins)) { require_once 'lib/WikiPlugin.php'; - $w = new WikiPluginLoader; + $w = new WikiPluginLoader(); foreach ($plugins as $plugin) { $pluginName = str_replace(".php", "", $plugin); $p = $w->getPlugin($pluginName, false); // second arg? @@ -293,7 +293,7 @@ global $server; checkCredentials($server, $credentials, 'change', "Help/" . $pluginname . "Plugin"); require_once 'lib/WikiPlugin.php'; - $w = new WikiPluginLoader; + $w = new WikiPluginLoader(); $synopsis = ''; $p = $w->getPlugin($pluginName, false); // second arg? // trap php files which aren't WikiPlugin~s: wikiplugin + wikiplugin_cached only @@ -319,7 +319,7 @@ $basepage = ''; ; require_once 'lib/WikiPlugin.php'; - $w = new WikiPluginLoader; + $w = new WikiPluginLoader(); $p = $w->getPlugin($pluginName, false); // second arg? $pagelist = $p->run($dbi, $pluginargs, $request, $basepage); $pages = array(); Modified: trunk/lib/CachedMarkup.php =================================================================== --- trunk/lib/CachedMarkup.php 2013-04-26 13:41:37 UTC (rev 8774) +++ trunk/lib/CachedMarkup.php 2013-04-26 13:53:49 UTC (rev 8775) @@ -863,7 +863,7 @@ if (!$loader) { include_once 'lib/WikiPlugin.php'; - $loader = new WikiPluginLoader; + $loader = new WikiPluginLoader(); } return $loader; } Modified: trunk/lib/EditToolbar.php =================================================================== --- trunk/lib/EditToolbar.php 2013-04-26 13:41:37 UTC (rev 8774) +++ trunk/lib/EditToolbar.php 2013-04-26 13:53:49 UTC (rev 8775) @@ -346,7 +346,7 @@ if (!empty($plugins)) { $plugin_js = ''; require_once 'lib/WikiPlugin.php'; - $w = new WikiPluginLoader; + $w = new WikiPluginLoader(); foreach ($plugins as $plugin) { $pluginName = str_replace(".php", "", $plugin); if (in_array($pluginName, $AllAllowedPlugins)) { Modified: trunk/lib/Template.php =================================================================== --- trunk/lib/Template.php 2013-04-26 13:41:37 UTC (rev 8774) +++ trunk/lib/Template.php 2013-04-26 13:53:49 UTC (rev 8775) @@ -84,7 +84,7 @@ static $loader; if (empty($loader)) - $loader = new WikiPluginLoader; + $loader = new WikiPluginLoader(); $this->_print($loader->expandPI($pi, $this->_request, $this, $this->_basepage)); } Modified: trunk/lib/WikiDB.php =================================================================== --- trunk/lib/WikiDB.php 2013-04-26 13:41:37 UTC (rev 8774) +++ trunk/lib/WikiDB.php 2013-04-26 13:53:49 UTC (rev 8775) @@ -1089,7 +1089,7 @@ array('loadfile', 'upgrade')) ) { require_once 'lib/WikiPlugin.php'; - $w = new WikiPluginLoader; + $w = new WikiPluginLoader(); $p = $w->getPlugin("RecentChangesCached", false); $p->box_update(false, $GLOBALS['request'], $this->_pagename); } Modified: trunk/lib/WikiPluginCached.php =================================================================== --- trunk/lib/WikiPluginCached.php 2013-04-26 13:41:37 UTC (rev 8774) +++ trunk/lib/WikiPluginCached.php 2013-04-26 13:53:49 UTC (rev 8775) @@ -861,7 +861,7 @@ $pluginname = $plugincall['pluginname']; $argarray = $plugincall['arguments']; - $loader = new WikiPluginLoader; + $loader = new WikiPluginLoader(); $plugin = $loader->getPlugin($pluginname); // cache empty, but image maps have to be created _inline_ Modified: trunk/lib/XmlRpcServer.php =================================================================== --- trunk/lib/XmlRpcServer.php 2013-04-26 13:41:37 UTC (rev 8774) +++ trunk/lib/XmlRpcServer.php 2013-04-26 13:53:49 UTC (rev 8775) @@ -709,7 +709,7 @@ $RetArray = array(); if (!empty($plugins)) { require_once 'lib/WikiPlugin.php'; - $w = new WikiPluginLoader; + $w = new WikiPluginLoader(); foreach ($plugins as $plugin) { $pluginName = str_replace(".php", "", $plugin); $p = $w->getPlugin($pluginName, false); // second arg? @@ -741,7 +741,7 @@ $pluginName = short_string_decode($ParamPlugin->scalarval()); require_once 'lib/WikiPlugin.php'; - $w = new WikiPluginLoader; + $w = new WikiPluginLoader(); $synopsis = ''; $p = $w->getPlugin($pluginName, false); // second arg? // trap php files which aren't WikiPlugin~s: wikiplugin + wikiplugin_cached only @@ -784,7 +784,7 @@ $basepage = ''; //$pluginName; require_once 'lib/WikiPlugin.php'; - $w = new WikiPluginLoader; + $w = new WikiPluginLoader(); $p = $w->getPlugin($pluginName, false); // second arg? $pagelist = $p->run($dbi, $plugin_args, $request, $basepage); $list = array(); Modified: trunk/lib/display.php =================================================================== --- trunk/lib/display.php 2013-04-26 13:41:37 UTC (rev 8774) +++ trunk/lib/display.php 2013-04-26 13:53:49 UTC (rev 8775) @@ -129,7 +129,7 @@ // Need the pagelist from the first plugin foreach ($transformedContent->_content as $cached_element) { if (is_a($cached_element, "Cached_PluginInvocation")) { - $loader = new WikiPluginLoader; + $loader = new WikiPluginLoader(); $markup = null; // return the first found pagelist $pagelist = $loader->expandPI($cached_element->_pi, $request, Modified: trunk/lib/plugin/InterWikiSearch.php =================================================================== --- trunk/lib/plugin/InterWikiSearch.php 2013-04-26 13:41:37 UTC (rev 8774) +++ trunk/lib/plugin/InterWikiSearch.php 2013-04-26 13:53:49 UTC (rev 8775) @@ -106,7 +106,7 @@ ? WikiLink($moniker) : $moniker); - $w = new WikiPluginLoader; + $w = new WikiPluginLoader(); $p = $w->getPlugin('ExternalSearch'); $argstr = sprintf('url="%s"', addslashes($interurl)); $searchtd = HTML::td($p->run($dbi, $argstr, $request, $basepage)); Modified: trunk/lib/plugin/PluginManager.php =================================================================== --- trunk/lib/plugin/PluginManager.php 2013-04-26 13:41:37 UTC (rev 8774) +++ trunk/lib/plugin/PluginManager.php 2013-04-26 13:53:49 UTC (rev 8775) @@ -97,7 +97,7 @@ $tbody = HTML::tbody(); $row_no = 0; - $w = new WikiPluginLoader; + $w = new WikiPluginLoader(); foreach ($plugins as $pluginName) { $pluginName = str_replace(".php", "", $pluginName); Modified: trunk/lib/plugin/RecentChangesCached.php =================================================================== --- trunk/lib/plugin/RecentChangesCached.php 2013-04-26 13:41:37 UTC (rev 8774) +++ trunk/lib/plugin/RecentChangesCached.php 2013-04-26 13:53:49 UTC (rev 8775) @@ -67,7 +67,7 @@ $changes = $plugin->getChanges($dbi, $args); return $plugin->format($changes, $args); /* - $loader = new WikiPluginLoader; + $loader = new WikiPluginLoader(); return $loader->expandPI('<?plugin RecentChanges ' . WikiPluginCached::glueArgs($argarray) . ' ?>', $request, $this, $basepage); Modified: trunk/lib/plugin/SystemInfo.php =================================================================== --- trunk/lib/plugin/SystemInfo.php 2013-04-26 13:41:37 UTC (rev 8774) +++ trunk/lib/plugin/SystemInfo.php 2013-04-26 13:53:49 UTC (rev 8775) @@ -78,7 +78,7 @@ function getHtml($dbi, $argarray, $request, $basepage) { - $loader = new WikiPluginLoader; + $loader = new WikiPluginLoader(); return $loader->expandPI('<<SystemInfo ' . WikiPluginCached::glueArgs($argarray) // all . ' ?>', $request, $this, $basepage); Modified: trunk/lib/plugin/WikiFormRich.php =================================================================== --- trunk/lib/plugin/WikiFormRich.php 2013-04-26 13:41:37 UTC (rev 8774) +++ trunk/lib/plugin/WikiFormRich.php 2013-04-26 13:53:49 UTC (rev 8775) @@ -358,7 +358,7 @@ $pluginName = substr($input['method'], 7); $basepage = ''; require_once 'lib/WikiPlugin.php'; - $w = new WikiPluginLoader; + $w = new WikiPluginLoader(); $p = $w->getPlugin($pluginName, false); // second arg? if (!is_object($p)) trigger_error("invalid input['method'] " . $input['method'], E_USER_WARNING); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2013-05-28 17:13:03
|
Revision: 8785 http://sourceforge.net/p/phpwiki/code/8785 Author: vargenau Date: 2013-05-28 17:13:01 +0000 (Tue, 28 May 2013) Log Message: ----------- Update translations Modified Paths: -------------- trunk/lib/plugin/SemanticSearchAdvanced.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/it/LC_MESSAGES/phpwiki.php trunk/locale/ja/LC_MESSAGES/phpwiki.mo trunk/locale/nl/LC_MESSAGES/phpwiki.mo trunk/locale/nl/LC_MESSAGES/phpwiki.php trunk/locale/po/de.po trunk/locale/po/es.po trunk/locale/po/fr.po trunk/locale/po/it.po trunk/locale/po/ja.po trunk/locale/po/nl.po trunk/locale/po/phpwiki.pot trunk/locale/po/sv.po trunk/locale/po/zh.po trunk/locale/sv/LC_MESSAGES/phpwiki.mo trunk/locale/sv/LC_MESSAGES/phpwiki.php trunk/locale/zh/LC_MESSAGES/phpwiki.mo trunk/locale/zh/LC_MESSAGES/phpwiki.php Modified: trunk/lib/plugin/SemanticSearchAdvanced.php =================================================================== --- trunk/lib/plugin/SemanticSearchAdvanced.php 2013-05-28 16:45:33 UTC (rev 8784) +++ trunk/lib/plugin/SemanticSearchAdvanced.php 2013-05-28 17:13:01 UTC (rev 8785) @@ -119,7 +119,7 @@ $hiddenfield, HiddenInputs(array('attribute' => '')), $instructions, HTML::br(), HTML::table(array('border' => '0', 'width' => '100%'), - HTML::tr(HTML::td(_("Pagename(s): "), $pagefilter), + HTML::tr(HTML::td(_("Page Name")._(': '), $pagefilter), HTML::td(array('align' => 'right'), $help)), HTML::tr(HTML::td(array('colspan' => 2), 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 2013-05-28 16:45:33 UTC (rev 8784) +++ trunk/locale/de/LC_MESSAGES/phpwiki.php 2013-05-28 17:13:01 UTC (rev 8785) @@ -26,10 +26,10 @@ $locale["%d page(s) with more than %d hits (>%d%%)."] = "%d Seite(n) die mehr als %d aufgerufen haben (>%d%%)."; $locale["%d pages"] = "%d Seiten"; $locale["%d pages have been changed."] = "%d Seiten wurden geändert."; -$locale["%d pages have been changed:"] = "%d Seiten wurden geändert."; -$locale["%d pages have been permanently purged:"] = "%d Seiten wurden unwiderruflich gelöscht."; -$locale["%d pages have been removed:"] = "%d Seiten wurden geändert."; -$locale["%d pages have been renamed:"] = "%d Seiten wurden geändert."; +$locale["%d pages have been changed:"] = "%d Seiten wurden geändert:"; +$locale["%d pages have been permanently purged:"] = "%d Seiten wurden unwiderruflich gelöscht:"; +$locale["%d pages have been removed:"] = "%d Seiten wurden geändert:"; +$locale["%d pages have been renamed:"] = "%d Seiten wurden geändert:"; $locale["%d pages with less than %d hits (<%d%%)."] = "%d Seiten die weniger als %d aufgerufen haben (<%d%%)."; $locale["%s %s %s is disallowed on this wiki for %s user “%s” (level: %s)."] = "%s %s »%s« ist auf diesem Wiki für %s Benutzer »%s« (Level: %s) nicht zugelassen."; $locale["%s KiB (%s bytes)"] = "%s KiB (%s Bytes)"; @@ -68,7 +68,7 @@ $locale["%s: error while handling error:"] = "%s: Fehler während der Fehlerbehandlung von:"; $locale["%s: file not found"] = "»%s«: Datei nicht gefunden"; $locale["%s: no such class"] = "Unbekannte Klasse: »%s«"; -$locale["%s: no such revision %d."] = "%s(%d): keine solche Version"; +$locale["%s: no such revision %d."] = "%s(%d): keine solche Version."; $locale["%s: not a subclass of WikiPlugin."] = "%s scheint kein WikiPlugin zu sein."; $locale["%s: not defined"] = "%s: nicht definiert"; $locale["&version=-1 might help."] = "&version=-1 wird empfohlen."; @@ -108,7 +108,7 @@ $locale["ACL"] = "ACL"; $locale["ACL changed for page “%s”"] = "ACL für Seite »%s« geändert."; $locale["ACL changed for page “%s” from “%s” to “%s”."] = "ACL für Seite »%s« geändert von »%s« zu »%s«."; -$locale["ACL deleted for page “%s”"] = "ACL für Seite »%s« gelöscht."; +$locale["ACL deleted for page “%s”"] = "ACL für Seite »%s« gelöscht"; $locale["ACL not changed for page “%s”."] = "ACL für Seite »%s« nicht geändert."; $locale["ADDING"] = "HINZU"; $locale["ADMIN"] = "ADMIN"; @@ -217,7 +217,7 @@ $locale["Cannot create directory “%s”"] = "Das Verzeichnis »%s« kann nicht erzeugt werden"; $locale["Cannot create page with empty name!"] = "Kann Seite mit leerem Namen nicht erzeugen"; $locale["Cannot open AUTH_GROUP_FILE %s"] = "Kann AUTH_GROUP_FILE %s nicht öffnen"; -$locale["Cannot rename. New page name too long."] = "Kein Ausgewählte. Seite Name zu lang"; +$locale["Cannot rename. New page name too long."] = "Kein Ausgewählte. Seite Name zu lang."; $locale["Case exact?"] = "Groß-/Kleinschreibung beachten"; $locale["Case insensitive?"] = "Groß-/Kleinschreibung beachten?"; $locale["Category"] = "Kategorie"; @@ -229,12 +229,12 @@ $locale["Change Password"] = "Ändere Passwort"; $locale["Change Verification Status"] = "Ändere Bestätigungs-Status"; $locale["Change country"] = "Land ändern"; -$locale["Change markup to: "] = "Ändere Formatierung zu:"; +$locale["Change markup to: "] = "Ändere Formatierung zu: "; $locale["Change markup type"] = "Ändere Formatierungs-Typ"; $locale["Change markup type from %s to %s"] = "Ändere Formatierungs-Typ von %s zu %s"; $locale["Change owner of page “%s” to “%s”."] = "Besitzer der Seite »%s« auf »%s« geändert."; $locale["Change owner of selected pages."] = "Den Besitzer ausgewählte Seiten ändern."; -$locale["Change owner to: "] = "Besitzer ändern zu:"; +$locale["Change owner to: "] = "Besitzer ändern zu: "; $locale["Change page attributes"] = "Ändern von Eigenschaften"; $locale["Change the markup type of selected pages."] = "Ändere den Formatierungstyp aller ausgewählte Seiten."; $locale["Change your rating from "] = "Ändern Sie Ihre Bewertung ab "; @@ -250,7 +250,7 @@ $locale["Check for mysql session.sess_id sanity"] = "Prüfe auf mysql session.sess_id Korrektheit"; $locale["Check for new session.sess_ip column"] = "Prüfe auf neue Spalte session.sess_ip column"; $locale["Check for table %s"] = "Prüfe Tabelle %s"; -$locale["Check menu items to display."] = "Klicken um anzuzeigen"; +$locale["Check menu items to display."] = "Klicken um anzuzeigen."; $locale["Check to add this ACL"] = "Anklicken um diese ACL hinzuzufügen"; $locale["Check you are logged in."] = "Sie sollten jetzt angemeldet sein."; $locale["Chmod"] = "Chmod"; @@ -402,7 +402,7 @@ $locale["Failed to connect to LDAP host"] = "LDAP Server nicht gefunden"; $locale["Fatal PhpWiki Error"] = "Fataler PhpWiki-Fehler"; $locale["File successfully uploaded."] = "Datei erfolgreich hochgeladen."; -$locale["File “%s” not found."] = "Datei »%s« nicht gefunden"; +$locale["File “%s” not found."] = "Datei »%s« nicht gefunden."; $locale["FileInfo"] = "DateiInfo"; $locale["Files with extension %s are not allowed."] = "Dateien mit der Endung %s sind nicht erlaubt."; $locale["Find page"] = "Seite finden"; @@ -676,14 +676,14 @@ $locale["OldStyleTable"] = "TraditionellerTabellenStil"; $locale["Older page:"] = "Ältere Seite:"; $locale["One UserPreferences field successfully updated."] = "Eined BenutzerEinstellung erfolgreich auf neuesten Stand gebracht."; -$locale["One page has been changed:"] = "Eine Seite wird geändert."; -$locale["One page has been permanently purged:"] = "Eine Seite wird unwiderruflich gelöscht."; +$locale["One page has been changed:"] = "Eine Seite wird geändert:"; +$locale["One page has been permanently purged:"] = "Eine Seite wird unwiderruflich gelöscht:"; $locale["One page has been removed:"] = "Eine Seite wird gelöscht:"; -$locale["One page has been renamed:"] = "Eine Seite wird geändert."; +$locale["One page has been renamed:"] = "Eine Seite wird geändert:"; $locale["One page links to %s:"] = "Eine Seite ist mit %s verlinkt:"; $locale["One page would link to %s:"] = "Eine Seite würde mit %s verlinkt sein:"; $locale["Only files with extension HTML are allowed"] = "Nur Dateien mit der Endung HTML sind erlaubt"; -$locale["Only files with the extension %s are allowed."] = "Nur Dateien mit der Endung %s sind erlaubt"; +$locale["Only files with the extension %s are allowed."] = "Nur Dateien mit der Endung %s sind erlaubt."; $locale["Oops! Revision %s of %s seems to have been deleted!"] = "Hoppla! Es scheint, die Version %s von %s wurde gelöscht!"; $locale["Operation undone"] = "Aktion rückgängig gemacht"; $locale["Optimizing database"] = "Datenbank wird optimiert"; @@ -720,19 +720,19 @@ $locale["Page statistics"] = "Seiten Statistiken"; $locale["Page successfully updated."] = "Datei erfolgreich geändert."; $locale["Page “%s” already exists. Ignored."] = "Seite %s existiert bereits. Ignoriert."; -$locale["Page “%s” does not exist."] = "Seite »%s« existiert nicht"; +$locale["Page “%s” does not exist."] = "Seite »%s« existiert nicht."; $locale["PageChange Notification Error: Couldn't send %s to %s"] = "SeitenÄnderung Benachrichtigung Fehler: Konnte %s nicht an %s senden"; $locale["PageChange Notification of %s"] = "SeitenÄnderung Benachrichtigung von %s"; $locale["PageChange Notification of %s sent to %s"] = "SeitenÄnderung Benachrichtigung von %s an %s gesendet"; $locale["PageDump"] = "SeiteSpeichern"; $locale["PageGroup"] = "SeitenGruppe"; -$locale["PageGroup for %s."] = "SeitenGruppe für »%s«"; +$locale["PageGroup for %s."] = "SeitenGruppe für »%s«."; $locale["PageHistory"] = "SeitenProtokoll"; $locale["PageHistory for %s"] = "Verlaufsprotokoll für Seite %s"; $locale["PageInfo"] = "SeitenInfo"; $locale["PageName|optional label"] = "SeitenName|optionaler Name"; $locale["Pagedata size: %d KiB"] = "Größe der Seitendaten: %d KiB"; -$locale["Pages which have been deleted at least %s days are already checked."] = "Seiten, die in den letzten %s Tagen gelöscht wurden, sind bereits ausgewählt"; +$locale["Pages which have been deleted at least %s days are already checked."] = "Seiten, die in den letzten %s Tagen gelöscht wurden, sind bereits ausgewählt."; $locale["Password cannot be changed."] = "Passwort konnte nicht geändert werden."; $locale["Password updated."] = "Passwort geändert."; $locale["Password was not changed."] = "Passwort wurde nicht geändert."; @@ -776,7 +776,7 @@ $locale["Plugin %s disabled."] = "Zusatzprogramm %s deaktiviert."; $locale["Plugin %s failed."] = "Zusatzprogramm %s fehlgeschlagen."; $locale["Plugin %s: undefined"] = "Zusatzprogramm %s: undefiniert"; -$locale["Plugin “%s” does not exist."] = "Zusatzprogramm »%s« existiert nicht"; +$locale["Plugin “%s” does not exist."] = "Zusatzprogramm »%s« existiert nicht."; $locale["PluginManager"] = "ZusatzprogrammManager"; $locale["PopularNearby"] = "MeistBesuchtNahe"; $locale["Post new"] = "Neuer Eintrag"; @@ -901,7 +901,7 @@ $locale["Search the titles of all pages in this wiki."] = "Die Titeln aller Seiten dieses Wikis durchsuchen."; $locale["Search:"] = "Suche:"; $locale["SearchHighlight"] = "SucheHervorheben"; -$locale["SearchReplace"] = "Suchen & Ersetzen"; +$locale["SearchReplace"] = "Suchen und Ersetzen"; $locale["See %s"] = "Siehe %s"; $locale["See %s tips for editing."] = "Siehe %s Tips fürs Edieren."; $locale["See: %s"] = "Siehe: %s"; @@ -909,7 +909,7 @@ $locale["Select the files to purge"] = "Wählen Sie die Seiten zum Löschen:"; $locale["Select the files to remove"] = "Wähle Seiten zum Umbenennen aus:"; $locale["Select the pages to change the markup type"] = "Wählen Sie die Seiten zum Ändern:"; -$locale["Select the pages to change the owner"] = "Wählen Sie die Seiten zum Ändern:"; +$locale["Select the pages to change the owner"] = "Wählen Sie die Seiten zum Ändern"; $locale["Select the pages to change:"] = "Wählen Sie die Seiten zum Ändern:"; $locale["Select the pages to rename:"] = "Wähle Seiten zum Umbenennen aus:"; $locale["Select the pages to search and replace"] = "Seiten auswählen:"; @@ -985,7 +985,7 @@ $locale["Synopsis"] = "Übersicht"; $locale["SyntaxHighlighter"] = "SyntaxHervorhebung"; $locale["Table of Contents"] = "Inhaltsverzeichnis"; -$locale["TeX imagepath not writable."] = "Keine Schreibrechte für das TeX Bildpath"; +$locale["TeX imagepath not writable."] = "Keine Schreibrechte für das TeX Bildpath."; $locale["Template"] = "Vorlage"; $locale["Template Name"] = "Vorlagenname"; $locale["TermsOfUse"] = "BenutzungsBedingungen"; @@ -1119,7 +1119,7 @@ $locale["View Source"] = "QuellTextAnsicht"; $locale["View Source: %s"] = "Quelltext Ansicht: %s"; $locale["View a single page dump online."] = "Betrachte das interne Speicherformat einer einzelnen Seite."; -$locale["View the current version."] = "Die aktuelle Version ansehen"; +$locale["View the current version."] = "Die aktuelle Version ansehen."; $locale["View this page and all subpages"] = "Anzeige aller Seiten und Unterseiten"; $locale["Viewing redirecting page."] = "Zeige Redirekt-Seite."; $locale["Viewing the source of pages"] = "Die Quelltextansicht der Seiten in diesem Wiki"; 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 2013-05-28 16:45:33 UTC (rev 8784) +++ trunk/locale/fr/LC_MESSAGES/phpwiki.php 2013-05-28 17:13:01 UTC (rev 8785) @@ -253,7 +253,7 @@ $locale["Check to add this ACL"] = "Cocher pour ajouter cette ACL"; $locale["Check you are a member of the current project."] = "Vous êtes déjà membre de ce projet."; $locale["Check you are in the right project."] = "Vérifiez que vous êtes dans le bon projet."; -$locale["Check you are logged in."] = "Vous devez vous identifier"; +$locale["Check you are logged in."] = "Vous devez vous identifier."; $locale["Chmod"] = "Chmod"; $locale["Chmod to permission:"] = "Changer le mode de permission à :"; $locale["Click a button to get an example text"] = "Cliquer sur un bouton pour obtenir une exemple de texte"; @@ -521,7 +521,7 @@ $locale["Illegal character “%s” in page name."] = "Caractère « %s » interdit dans le nom de la page."; $locale["Illegal characters in external URL."] = "Caractère interdit dans une URL externe."; $locale["Illegal chars %s removed"] = "Caractères interdits %s supprimés"; -$locale["Illegal inclusion of page %s: no read access."] = "insertion récursive de la page %s ignoré"; +$locale["Illegal inclusion of page %s: no read access."] = "Insertion récursive de la page %s ignoré."; $locale["Illegal operator: %s"] = "Opérateur interdit : %s"; $locale["Image loaded from cache file: %s"] = "Image chargée depuis le fichier cache : %s"; $locale["Image saved to cache file: %s"] = "Image sauvée dans le fichier cache : %s"; @@ -558,7 +558,7 @@ $locale["Invalid chmod string"] = "Chaîne de caractère invalide pour le changement de mode"; $locale["Invalid color: %s"] = "Couleur non valide : %s"; $locale["Invalid image size"] = "Taille d'image invalide"; -$locale["Invalid password or userid."] = "Mot de passe ou utilisateur non valide :"; +$locale["Invalid password or userid."] = "Mot de passe ou utilisateur non valide."; $locale["Invalid password."] = "Mot de passe invalide."; $locale["Invalid username “%s” for LDAP Auth"] = "Utilisateur non valide « %s » dans l'annuaire LDAP"; $locale["Invalid username."] = "Identifiant d'utilisateur invalide."; @@ -774,7 +774,7 @@ $locale["Pagedata size: %d KiB"] = "Taille des données de la page : %d Kio"; $locale["Pages which have been deleted at least %s days are already checked."] = "Les pages qui ont été supprimées il y a au plus %s jours sont déjà cochées."; $locale["Password cannot be changed."] = "Impossible de changer le mot de passe."; -$locale["Password updated."] = "Mot de passe mis à jour"; +$locale["Password updated."] = "Mot de passe mis à jour."; $locale["Password was not changed."] = "Le mot de passe n'a pas été mis à jour."; $locale["Password:"] = "Mot de passe :"; $locale["Past versions of this page."] = "Versions précédentes de cette page."; @@ -818,7 +818,6 @@ $locale["PopularNearby"] = "PopulairesAlentour"; $locale["Post new"] = "Poster une annonce"; $locale["Posted: %s"] = "Posté le %s"; -$locale["Postponed %s for %s."] = "Pas de listes trouvées pour %1\$s"; $locale["Prediction: %.1f"] = "Prédiction : %.1f"; $locale["Prediction: %s"] = "Prédiction : %s"; $locale["Preferences"] = "Préférences"; @@ -829,6 +828,7 @@ $locale["Preview as developer format"] = "Prévisualisation au format développeurs"; $locale["Preview as normal format"] = "Prévisualisation au format de sauvegarde"; $locale["Preview only! Changes not saved."] = "Prévisualisation uniquement ! Modifications non enregistrées."; +$locale["Preview only! Changes not saved. Please continue editing. (You'll find your edit area at the bottom of the page.)"] = "Vous êtes en prévisualisation ! Veuillez continuer votre édition. (Vous trouverez votre zone d'édition en bas de page)."; $locale["Preview: Page dump of %s"] = "Prévisualisation : récupération de %s"; $locale["Previous"] = "Précédent"; $locale["Previous Author"] = "Auteur précédent"; @@ -851,7 +851,7 @@ $locale["Purge cancelled"] = "Purge de la page annulée"; $locale["Purge this page"] = "Purger cette page"; $locale["PurgeHtmlCache"] = "PurgerLeCache"; -$locale["Purged page “%s” successfully."] = "Page « %s » purgée avec succès"; +$locale["Purged page “%s” successfully."] = "Page « %s » purgée avec succès."; $locale["Purging pages"] = "Purger des pages"; $locale["Querying backend directly for “%s”"] = "Requête directe au backend pour « %s »"; $locale["Quick Search"] = "Recherche rapide"; @@ -903,7 +903,7 @@ $locale["Remove cancelled"] = "Suppression de la page annulée"; $locale["Remove selected pages"] = "Supprimer les pages sélectionnées"; $locale["Remove this page"] = "Supprimer cette page"; -$locale["Removed page “%s” successfully."] = "Page « %s » supprimée avec succès"; +$locale["Removed page “%s” successfully."] = "Page « %s » supprimée avec succès."; $locale["Removing pages"] = "Supprimer les pages"; $locale["Rename"] = "Renommer"; $locale["Rename Page"] = "Renommer la page"; @@ -1080,7 +1080,7 @@ $locale["This page is external."] = "Cette page est externe."; $locale["This plugin is currently under development and does not work!"] = "Ce plugin est en cours de développement et ne marche pas !"; $locale["This project is shared with third-party users"] = "The projet est partagé avec des utilisateurs extérieurs"; -$locale["This revision of the page does not exist."] = "Cette version de la page n'existe pas"; +$locale["This revision of the page does not exist."] = "Cette version de la page n'existe pas."; $locale["Time Zone"] = "Fuseau horaire"; $locale["Title"] = "Titre"; $locale["Title 1"] = "Titre 1"; @@ -1176,7 +1176,7 @@ $locale["View Source"] = "Voir la source"; $locale["View Source: %s"] = "Source de : %s"; $locale["View a single page dump online."] = "Voir une sauvegarde de page en ligne."; -$locale["View the current version."] = "Visualiser la version actuelle"; +$locale["View the current version."] = "Visualiser la version actuelle."; $locale["View this page and all subpages"] = "Voir cette page et ses sous-pages"; $locale["Viewing redirecting page."] = "Voir la page de redirection."; $locale["Viewing the source of pages"] = "Visualisation de la source des pages"; @@ -1193,6 +1193,7 @@ $locale["Warning:"] = "Attention :"; $locale["Warning: The search string cannot be empty!"] = "ATTENTION: vous devez entrez au moins une lettre pour la recherche!"; $locale["Warning: You are editing an old revision."] = "Attention : vous modifiez une version archivée."; +$locale["Warning: You are editing an old revision. Saving this page will overwrite the current version."] = "Attention : vous modifiez une ancienne version de cette page. Enregistrer cette page écrasera la version actuelle."; $locale["Watch"] = "Surveiller"; $locale["Watch Page"] = "Surveiller"; $locale["WatchPage"] = "Suivre"; 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 2013-05-28 16:45:33 UTC (rev 8784) +++ trunk/locale/it/LC_MESSAGES/phpwiki.php 2013-05-28 17:13:01 UTC (rev 8785) @@ -189,7 +189,7 @@ $locale["Remove this page"] = "Rimuovi la pagina"; $locale["Removed page “%s” successfully."] = "La pagina “%s” è stata rimossa correttamente."; $locale["Removing pages"] = "Rimuovi la pagina"; -$locale["Renamed page from “%s” to “%s”."] = "Cambia titolo %s a %s"; +$locale["Renamed page from “%s” to “%s”."] = "Cambia titolo %s a %s."; $locale["Reset Preferences"] = "Ripristina Preferenze"; $locale["Restore Anyway"] = "Restore Comunque"; $locale["Revert"] = "Ritorni"; Modified: trunk/locale/ja/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/nl/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/nl/LC_MESSAGES/phpwiki.php =================================================================== --- trunk/locale/nl/LC_MESSAGES/phpwiki.php 2013-05-28 16:45:33 UTC (rev 8784) +++ trunk/locale/nl/LC_MESSAGES/phpwiki.php 2013-05-28 17:13:01 UTC (rev 8785) @@ -1,6 +1,6 @@ <?php -$locale[" is identical."] = " zijn identiek"; +$locale[" is identical."] = " zijn identiek."; $locale[" to "] = " naar "; $locale["%4d %s\n"] = "%4d %s\n"; $locale["%s: %s"] = "%s: %s"; Modified: trunk/locale/po/de.po =================================================================== --- trunk/locale/po/de.po 2013-05-28 16:45:33 UTC (rev 8784) +++ trunk/locale/po/de.po 2013-05-28 17:13:01 UTC (rev 8785) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-28 18:44+0200\n" +"POT-Creation-Date: 2013-05-28 19:11+0200\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." @@ -70,7 +70,7 @@ #, php-format msgid "Page “%s” does not exist." -msgstr "Seite »%s« existiert nicht" +msgstr "Seite »%s« existiert nicht." #, php-format msgid "Diff: %s" @@ -1123,7 +1123,7 @@ msgstr "Umbenennen" msgid "SearchReplace" -msgstr "Suchen & Ersetzen" +msgstr "Suchen und Ersetzen" msgid "List this page and all subpages" msgstr "Auflistung aller Seiten und Unterseiten" @@ -1619,7 +1619,7 @@ #, php-format msgid "%s: no such revision %d." -msgstr "%s(%d): keine solche Version" +msgstr "%s(%d): keine solche Version." msgid "CreateToc disabled for old markup." msgstr "InhaltsVerzeichnis deaktiviert für altes Markup." @@ -1715,7 +1715,7 @@ #, php-format msgid "File “%s” not found." -msgstr "Datei »%s« nicht gefunden" +msgstr "Datei »%s« nicht gefunden." msgid "" "Output suppressed. FileInfoPlugin with local files require a locked page." @@ -2291,7 +2291,7 @@ #, php-format msgid "PageGroup for %s." -msgstr "SeitenGruppe für »%s«" +msgstr "SeitenGruppe für »%s«." msgid "Contents" msgstr "Inhalt" @@ -3332,7 +3332,7 @@ msgstr "" msgid "TeX imagepath not writable." -msgstr "Keine Schreibrechte für das TeX Bildpath" +msgstr "Keine Schreibrechte für das TeX Bildpath." msgid "Sorry, this version of PHP cannot create PNG image files." msgstr "" @@ -3489,7 +3489,7 @@ #, php-format msgid "Only files with the extension %s are allowed." -msgstr "Nur Dateien mit der Endung %s sind erlaubt" +msgstr "Nur Dateien mit der Endung %s sind erlaubt." msgid "" "Invalid filename. File names may only contain alphanumeric characters and " @@ -3784,11 +3784,11 @@ msgstr "Konnte den Besitzer der Seite »%s« nicht in »%s« ändern." msgid "One page has been changed:" -msgstr "Eine Seite wird geändert." +msgstr "Eine Seite wird geändert:" #, php-format msgid "%d pages have been changed:" -msgstr "%d Seiten wurden geändert." +msgstr "%d Seiten wurden geändert:" msgid "PhpWikiAdministration/Chown" msgstr "PhpWikiSystemverwalten/Chown" @@ -3801,21 +3801,21 @@ "Sind Sie sicher, dass Sie die ausgewählen Seiten wirklich ändern wollen?" msgid "Select the pages to change the owner" -msgstr "Wählen Sie die Seiten zum Ändern:" +msgstr "Wählen Sie die Seiten zum Ändern" msgid "Change owner to: " -msgstr "Besitzer ändern zu:" +msgstr "Besitzer ändern zu: " msgid "WikiDeleteAcl" msgstr "" #, fuzzy msgid "Delete page permissions." -msgstr "Vorgabe Zugriffsrecht" +msgstr "Vorgabe Zugriffsrecht." #, php-format msgid "ACL deleted for page “%s”" -msgstr "ACL für Seite »%s« gelöscht." +msgstr "ACL für Seite »%s« gelöscht" # Any better translation? The locale/de/pgsrc/PhpWikiSystemverwalten # must also be renamed to match what is here. @@ -3828,7 +3828,7 @@ #, fuzzy msgid "Select the pages where to delete access rights" -msgstr "Wählen Sie die Seiten zum Ändern:" +msgstr "Wählen Sie die Seiten zum Ändern" msgid "Selected Pages: " msgstr "Ausgewählte Seiten: " @@ -3870,7 +3870,7 @@ msgstr "Wählen Sie die Seiten zum Ändern:" msgid "Change markup to: " -msgstr "Ändere Formatierung zu:" +msgstr "Ändere Formatierung zu: " msgid "WikiAdminPurge" msgstr "" @@ -3887,11 +3887,11 @@ msgstr "Seite »%s« wurde nicht gelöscht. Zugriff verweigert." msgid "One page has been permanently purged:" -msgstr "Eine Seite wird unwiderruflich gelöscht." +msgstr "Eine Seite wird unwiderruflich gelöscht:" #, php-format msgid "%d pages have been permanently purged:" -msgstr "%d Seiten wurden unwiderruflich gelöscht." +msgstr "%d Seiten wurden unwiderruflich gelöscht:" msgid "No pages purged." msgstr "Keine Änderungen." @@ -3933,7 +3933,7 @@ #, php-format msgid "%d pages have been removed:" -msgstr "%d Seiten wurden geändert." +msgstr "%d Seiten wurden geändert:" msgid "No pages removed." msgstr "Keine Seiten gelöscht." @@ -3966,14 +3966,14 @@ #, php-format msgid "Pages which have been deleted at least %s days are already checked." msgstr "" -"Seiten, die in den letzten %s Tagen gelöscht wurden, sind bereits ausgewählt" +"Seiten, die in den letzten %s Tagen gelöscht wurden, sind bereits ausgewählt." msgid "WikiAdminRename" msgstr "WikiAdminUmbenennen" #, fuzzy msgid "Rename selected pages." -msgstr "Ausgewählte Seiten umbenennen" +msgstr "Ausgewählte Seiten umbenennen." msgid "Rename to" msgstr "Umbennen zu" @@ -3992,7 +3992,7 @@ msgstr "Wähle Seiten zum Umbenennen aus:" msgid "Cannot rename. New page name too long." -msgstr "Kein Ausgewählte. Seite Name zu lang" +msgstr "Kein Ausgewählte. Seite Name zu lang." #, php-format msgid "Page “%s” already exists. Ignored." @@ -4015,11 +4015,11 @@ msgstr "Konnte Seite »%s« nicht in »%s« umbenennen." msgid "One page has been renamed:" -msgstr "Eine Seite wird geändert." +msgstr "Eine Seite wird geändert:" #, php-format msgid "%d pages have been renamed:" -msgstr "%d Seiten wurden geändert." +msgstr "%d Seiten wurden geändert:" msgid "No pages renamed." msgstr "Keine Seiten umbenannt." @@ -5020,7 +5020,7 @@ #, php-format msgid "Plugin “%s” does not exist." -msgstr "Zusatzprogramm »%s« existiert nicht" +msgstr "Zusatzprogramm »%s« existiert nicht." #, php-format msgid "%s: no such class" @@ -5382,7 +5382,7 @@ msgstr "Sie sehen eine alte Version dieser Seite." msgid "View the current version." -msgstr "Die aktuelle Version ansehen" +msgstr "Die aktuelle Version ansehen." #, php-format msgid "Page Execution took %s seconds" @@ -6035,7 +6035,7 @@ msgstr "" msgid "Check menu items to display." -msgstr "Klicken um anzuzeigen" +msgstr "Klicken um anzuzeigen." msgid "Left Menu" msgstr "" Modified: trunk/locale/po/es.po =================================================================== --- trunk/locale/po/es.po 2013-05-28 16:45:33 UTC (rev 8784) +++ trunk/locale/po/es.po 2013-05-28 17:13:01 UTC (rev 8785) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-28 18:44+0200\n" +"POT-Creation-Date: 2013-05-28 19:11+0200\n" "PO-Revision-Date: 2000-02-01 00:50-0500\n" "Last-Translator: Pablo Roca <pr...@cl...>\n" "Language-Team: \n" Modified: trunk/locale/po/fr.po =================================================================== --- trunk/locale/po/fr.po 2013-05-28 16:45:33 UTC (rev 8784) +++ trunk/locale/po/fr.po 2013-05-28 17:13:01 UTC (rev 8785) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-28 18:44+0200\n" +"POT-Creation-Date: 2013-05-28 19:11+0200\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." @@ -1888,7 +1888,7 @@ #, php-format msgid "Illegal inclusion of page %s: no read access." -msgstr "insertion récursive de la page %s ignoré" +msgstr "Insertion récursive de la page %s ignoré." msgid "Error: rev must be a positive integer." msgstr "" @@ -3060,7 +3060,7 @@ #, php-format msgid "Postponed %s for %s." -msgstr "Pas de listes trouvées pour %1$s" +msgstr "" msgid "skipped" msgstr "ignoré" @@ -3397,7 +3397,7 @@ msgstr "" msgid "Check you are logged in." -msgstr "Vous devez vous identifier" +msgstr "Vous devez vous identifier." msgid "Check you are in the right project." msgstr "Vérifiez que vous êtes dans le bon projet." @@ -3480,7 +3480,7 @@ msgstr "Erreur de mot de passe. Veuillez recommencer." msgid "Password updated." -msgstr "Mot de passe mis à jour" +msgstr "Mot de passe mis à jour." msgid "Password was not changed." msgstr "Le mot de passe n'a pas été mis à jour." @@ -3803,7 +3803,7 @@ #, php-format msgid "Purged page “%s” successfully." -msgstr "Page « %s » purgée avec succès" +msgstr "Page « %s » purgée avec succès." #, php-format msgid "Didn't purge page “%s”. Access denied." @@ -3842,7 +3842,7 @@ #, php-format msgid "Removed page “%s” successfully." -msgstr "Page « %s » supprimée avec succès" +msgstr "Page « %s » supprimée avec succès." #, php-format msgid "Didn't remove page “%s”. Access denied." @@ -5063,7 +5063,7 @@ msgstr "Mot de passe invalide." msgid "Invalid password or userid." -msgstr "Mot de passe ou utilisateur non valide :" +msgstr "Mot de passe ou utilisateur non valide." msgid "Insufficient permissions." msgstr "Permissions insuffisantes." @@ -5272,7 +5272,7 @@ msgstr "Vous lisez une ancienne version de cette page." msgid "View the current version." -msgstr "Visualiser la version actuelle" +msgstr "Visualiser la version actuelle." #, php-format msgid "Page Execution took %s seconds" @@ -5847,20 +5847,21 @@ msgstr "Erreur :" msgid "This revision of the page does not exist." -msgstr "Cette version de la page n'existe pas" +msgstr "Cette version de la page n'existe pas." -#, fuzzy msgid "" "Preview only! Changes not saved. Please continue editing. (You'll find your " "edit area at the bottom of the page.)" msgstr "" -"Veuillez continuer votre édition. (Vous trouverez votre %s en bas de page)." +"Vous êtes en prévisualisation ! Veuillez continuer votre édition. (Vous " +"trouverez votre zone d'édition en bas de page)." -#, fuzzy msgid "" "Warning: You are editing an old revision. Saving this page will overwrite " "the current version." -msgstr "Enregistrer cette page écrasera la version actuelle." +msgstr "" +"Attention : vous modifiez une ancienne version de cette page. Enregistrer " +"cette page écrasera la version actuelle." msgid "Warning: leaving the page will lose all your modifications!" msgstr "" @@ -6075,108 +6076,3 @@ msgid "Edit this page" msgstr "Modifier cette page" - -#~ msgid "Pagename(s): " -#~ msgstr "Nom de la page : " - -#~ msgid "Sorry. Access Restrictions not yet implemented" -#~ msgstr "Désolé. Restriction d'accès pas encore disponible" - -#~ msgid "SteveWainstead" -#~ msgstr "SteveWainstead" - -#~ msgid "Plugins" -#~ msgstr "Greffons" - -#~ msgid "PageTrail Plugin" -#~ msgstr "Pour suivre les pages à la trace" - -#~ msgid " replace " -#~ msgstr " remplace " - -#~ msgid "I'm sorry, there is no such page as %s." -#~ msgstr "Désolé, %s ne correspond à aucune page." - -#~ msgid "from %s" -#~ msgstr "du %s" - -#~ msgid "%s is empty" -#~ msgstr "%s est vide" - -#~ msgid "Included from %s:" -#~ msgstr "Inséré de %s :" - -#~ msgid "argument “%s” not declared by plugin" -#~ msgstr "argument « %s » non déclaré par le plugin" - -#~ msgid "file %s not found" -#~ msgstr "fichier %s non trouvé" - -#~ msgid "Who Is Online" -#~ msgstr "Qui est en ligne" - -#~ msgid "View the current version" -#~ msgstr "Voir la version actuelle" - -#~ msgid "Dump pages as XHTML" -#~ msgstr "Exporter les pages en XHTML" - -#~ msgid "Change owner of selected pages" -#~ msgstr "Changer le propriétaire des pages sélectionnées" - -#~ msgid "CANCEL" -#~ msgstr "ANNULE" - -#~ msgid "Page “%s” does not exist" -#~ msgstr "La page « %s » n'existe pas" - -#~ msgid "Page %s not found." -#~ msgstr "Page %s non trouvée." - -#~ msgid "<none>" -#~ msgstr "<aucun>" - -#~ msgid " Skipped" -#~ msgstr "Ignoré" - -#~ 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" - -#~ msgid "SetAcl" -#~ msgstr "DéfinirAcl" - -#~ msgid "SetAclSimple" -#~ msgstr "DéfinirAclSimple" - -#~ msgid "SpecialPages" -#~ msgstr "Pages spéciales" - -#~ msgid "No pagename specified" -#~ msgstr "Pas de nom de page spécifié" - -#~ msgid "No mandatory “%s” argument provided." -#~ msgstr "L'argument obligatoire « %s » manque." - -#~ msgid "No page specified." -#~ msgstr "Aucune page indiquée" - -#~ msgid "Syntax language not specified." -#~ msgstr "Syntaxe du langage non spécifié." - -#~ msgid "Invalid pagename!" -#~ msgstr "Nom de page invalide !" - -#~ msgid "Illegal character '" -#~ msgstr "Caractère interdit '" - -#~ msgid "' in page name." -#~ msgstr "' dans le nom de la page." Modified: trunk/locale/po/it.po =================================================================== --- trunk/locale/po/it.po 2013-05-28 16:45:33 UTC (rev 8784) +++ trunk/locale/po/it.po 2013-05-28 17:13:01 UTC (rev 8785) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-28 18:44+0200\n" +"POT-Creation-Date: 2013-05-28 19:11+0200\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" @@ -3853,7 +3853,7 @@ #, php-format msgid "Renamed page from “%s” to “%s”." -msgstr "Cambia titolo %s a %s" +msgstr "Cambia titolo %s a %s." #, php-format msgid "Renaming created redirect page from “%s” to “%s”" Modified: trunk/locale/po/ja.po =================================================================== --- trunk/locale/po/ja.po 2013-05-28 16:45:33 UTC (rev 8784) +++ trunk/locale/po/ja.po 2013-05-28 17:13:01 UTC (rev 8785) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-28 18:44+0200\n" +"POT-Creation-Date: 2013-05-28 19:11+0200\n" "PO-Revision-Date: 2003-06-07 09:01+0900\n" "Last-Translator: Tadashi Jokagi <web...@el...>\n" "Language-Team: LANGUAGE <LL...@li...>\n" Modified: trunk/locale/po/nl.po =================================================================== --- trunk/locale/po/nl.po 2013-05-28 16:45:33 UTC (rev 8784) +++ trunk/locale/po/nl.po 2013-05-28 17:13:01 UTC (rev 8785) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-28 18:44+0200\n" +"POT-Creation-Date: 2013-05-28 19:11+0200\n" "PO-Revision-Date: 2000-09-30 02:23+0200\n" "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n" "Language-Team: Dutch <nl...@li...>\n" @@ -1593,7 +1593,7 @@ msgstr "" msgid " is identical." -msgstr " zijn identiek" +msgstr " zijn identiek." msgid "Version " msgstr "Versie " Modified: trunk/locale/po/phpwiki.pot =================================================================== --- trunk/locale/po/phpwiki.pot 2013-05-28 16:45:33 UTC (rev 8784) +++ trunk/locale/po/phpwiki.pot 2013-05-28 17:13:01 UTC (rev 8785) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki-1.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-28 18:44+0200\n" +"POT-Creation-Date: 2013-05-28 19:11+0200\n" "PO-Revision-Date: 2002-12-14 17:51-0500\n" "Last-Translator: Reini Urban <ru...@us...>\n" "Language-Team: LANGUAGE <LL...@li...>\n" Modified: trunk/locale/po/sv.po =================================================================== --- trunk/locale/po/sv.po 2013-05-28 16:45:33 UTC (rev 8784) +++ trunk/locale/po/sv.po 2013-05-28 17:13:01 UTC (rev 8785) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-28 18:44+0200\n" +"POT-Creation-Date: 2013-05-28 19:11+0200\n" "PO-Revision-Date: 2001-01-27 01:58+0200\n" "Last-Translator: Jon Åslund <jo...@he...>\n" "Language-Team: \n" @@ -1587,7 +1587,7 @@ msgstr "" msgid " is identical." -msgstr " är identiska" +msgstr " är identiska." msgid "Version " msgstr "" Modified: trunk/locale/po/zh.po =================================================================== --- trunk/locale/po/zh.po 2013-05-28 16:45:33 UTC (rev 8784) +++ trunk/locale/po/zh.po 2013-05-28 17:13:01 UTC (rev 8785) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-28 18:44+0200\n" +"POT-Creation-Date: 2013-05-28 19:11+0200\n" "PO-Revision-Date: 2004-04-21 10:08+0800\n" "Last-Translator: DruryL <dr...@us...>\n" "Language-Team: DruryL <dr...@us...>\n" @@ -131,7 +131,7 @@ msgstr "資料庫" msgid "RecentChanges" -msgstr "RecentChanges" +msgstr "" #, fuzzy, php-format msgid "Unsupported argument: %s=%s" @@ -146,7 +146,7 @@ msgstr "(已從 %s 重導向)" msgid "SandBox" -msgstr "SandBox" +msgstr "" msgid "Your version" msgstr "你的版本" @@ -249,7 +249,7 @@ msgstr "" msgid "UserPreferences" -msgstr "UserPreferences" +msgstr "" #, php-format msgid "" @@ -295,9 +295,8 @@ msgid "Save" msgstr "儲存" -#, fuzzy msgid "Changes" -msgstr "RecentChanges" +msgstr "" msgid "Upload" msgstr "上傳" @@ -445,9 +444,8 @@ msgid "Undo Search & Replace" msgstr "搜尋與取代" -#, fuzzy msgid "Insert Categories" -msgstr "CategoryPage" +msgstr "" msgid "Insert" msgstr "" @@ -456,13 +454,11 @@ msgid "Insert Plugin" msgstr "使用此 plugin" -#, fuzzy msgid "Insert PageLink" -msgstr "AddingPages" +msgstr "" -#, fuzzy msgid "Insert Image or Video" -msgstr "AddingPages" +msgstr "" #, fuzzy msgid "Insert Template" @@ -477,7 +473,7 @@ msgstr "%s: 找不到檔案." msgid "CategoryGroup" -msgstr "CategoryGroup" +msgstr "" msgid "An unnamed PhpWiki" msgstr "未被命名的 PhpWiki" @@ -523,15 +519,14 @@ msgstr "傾印頁面為 XHTML" msgid "PhpWikiAdministration" -msgstr "PhpWikiAdministration" +msgstr "" #, php-format msgid "Edited by: %s" msgstr "由 %s 編輯" -#, fuzzy msgid "LoadDump" -msgstr "PageDump" +msgstr "" #, php-format msgid "PageChange Notification of %s sent to %s" @@ -904,9 +899,8 @@ msgid "download a html zip dump from this wiki" msgstr "從此 wiki 下載 html zip dump" -#, fuzzy msgid "use" -msgstr "AllUsers" +msgstr "" msgid "Browsing pages" msgstr "瀏覽頁面" @@ -985,10 +979,10 @@ msgstr "致命的 PhpWiki 錯誤" msgid "PageDump" -msgstr "PageDump" +msgstr "" msgid "FullTextSearch" -msgstr "FullTextSearch" +msgstr "" msgid "TitleSearch" msgstr "標題搜索" @@ -1069,7 +1063,7 @@ msgstr "權限" msgid "ACL" -msgstr "ACL" +msgstr "" msgid "All" msgstr "" @@ -1234,7 +1228,7 @@ msgstr "意見" msgid "AllPages" -msgstr "AllPages" +msgstr "" msgid "List all pages in this wiki." msgstr "在此 wiki 列出所有頁面." @@ -1264,7 +1258,7 @@ msgstr "經過時間: %s s" msgid "AllUsers" -msgstr "AllUsers" +msgstr "" #, fuzzy msgid "List all once authenticated users." @@ -1307,9 +1301,8 @@ msgid "remote_hosts" msgstr "" -#, fuzzy msgid "users" -msgstr "AllUsers" +msgstr "" msgid "host_users" msgstr "" @@ -1353,9 +1346,8 @@ msgid "<empty>" msgstr "<空白>" -#, fuzzy msgid "AppendText" -msgstr "Appearance" +msgstr "" #, fuzzy msgid "Append text to any page in this wiki." @@ -1448,7 +1440,7 @@ msgstr "被 %s 修改的所有頁面的主要與次要變更歷程." msgid "DebugInfo" -msgstr "DebugInfo" +msgstr "" #, php-format msgid "Get debugging information for %s." @@ -1466,7 +1458,7 @@ msgstr "<未能顯示>" msgid "BackLinks" -msgstr "BackLinks" +msgstr "" #, php-format msgid "List all pages which link to %s." @@ -1562,7 +1554,7 @@ msgstr "寬" msgid "CategoryPage" -msgstr "CategoryPage" +msgstr "" msgid "Create a Wiki Category Page." msgstr "建立 Wiki Category 頁面" @@ -1586,7 +1578,7 @@ msgstr "" msgid "CreatePage" -msgstr "CreatePage" +msgstr "" msgid "Create a wiki page by the provided name." msgstr "以提供的名稱建立 Wiki 頁面." @@ -1652,9 +1644,8 @@ msgid "Display current time and date." msgstr "" -#, fuzzy msgid "DeadEndPages" -msgstr "WantedPages" +msgstr "" msgid "Diff" msgstr "差異" @@ -1736,9 +1727,8 @@ msgid "Display a Facebook Like button." msgstr "" -#, fuzzy msgid "FileInfo" -msgstr "Info" +msgstr "" msgid "Display file information like version, size, date... of uploaded files." msgstr "" @@ -1784,7 +1774,7 @@ msgstr "標題搜索" msgid "FrameInclude" -msgstr "FrameInclude" +msgstr "" msgid "" "Display a url in a separate frame inside our body. Only one frame allowed." @@ -1824,12 +1814,12 @@ msgid "Ignored stoplist words “%s”" msgstr "" -#, fuzzy, php-format +#, php-format msgid "(%d Links)" -msgstr "BackLinks" +msgstr "" msgid "FuzzyPages" -msgstr "FuzzyPages" +msgstr "" #, php-format msgid "Search for page titles similar to %s." @@ -1870,7 +1860,7 @@ msgstr "" msgid "GooglePlugin" -msgstr "GooglePlugin" +msgstr "" msgid "Make use of the Google API." msgstr "" @@ -1880,13 +1870,13 @@ msgstr "沒發現任何變更" msgid "GoTo" -msgstr "GoTo" +msgstr "" msgid "Go to or create page." msgstr "前往或建立頁面." msgid "Go" -msgstr "Go" +msgstr "" msgid "GraphViz" msgstr "" @@ -1909,16 +1899,15 @@ msgid "%s error: outputfile “%s” not created" msgstr "" -#, fuzzy msgid "DebugGroupInfo" -msgstr "DebugInfo" +msgstr "" #, php-format msgid "Show Group Information." msgstr "" msgid "HelloWorld" -msgstr "HelloWorld" +msgstr "" #, fuzzy msgid "Simple Sample Plugin." @@ -1977,7 +1966,7 @@ msgstr "" msgid "IncludeSiteMap" -msgstr "IncludeSiteMap" +msgstr "" #, fuzzy, php-format msgid "Include recursively all linked pages starting at %s." @@ -2003,11 +1992,10 @@ msgstr "搜尋" msgid "JabberPresence" -msgstr "JabberPresence" +msgstr "" -#, fuzzy msgid "Display Jabber presence." -msgstr "JabberPresence" +msgstr "" #, fuzzy msgid "LdapSearch" @@ -2028,7 +2016,7 @@ msgstr "" msgid "LikePages" -msgstr "LikePages" +msgstr "" #, php-format msgid "List page names which share an initial or final title word with “%s”." @@ -2055,9 +2043,8 @@ msgid "All pages with all links in this wiki (%d total):" msgstr "在此 wiki 中的頁面 (共 %d):" -#, fuzzy msgid "Links" -msgstr "BackLinks" +msgstr "" #, php-format msgid "Unsupported format argument %s" @@ -2086,17 +2073,15 @@ msgid "Search in pages for links with the matching name." msgstr "" -#, fuzzy msgid "Link" -msgstr "BackLinks" +msgstr "" #, php-format msgid "LinkSearch result for \"%s\" in pages \"%s\", direction %s" msgstr "" -#, fuzzy msgid "ListPages" -msgstr "LikePages" +msgstr "" msgid "List pages that are explicitly given as the pages argument." msgstr "" @@ -2116,7 +2101,7 @@ msgstr "變更頁面屬性" msgid "ListSubpages" -msgstr "ListSubpages" +msgstr "" msgid "Lists the names of all SubPages of the current page." msgstr "列出目前頁面的所有子頁面名稱." @@ -2194,7 +2179,7 @@ msgstr "%s 無法寫入." msgid "MostPopular" -msgstr "MostPopular" +msgstr "" msgid "List the most popular pages." msgstr "列出最受歡迎的頁面." @@ -2222,13 +2207,13 @@ msgstr "已認證的使用者" msgid "NoCache" -msgstr "NoCache" +msgstr "" msgid "Don't cache this page." msgstr "不要快取此頁面." msgid "OldStyleTable" -msgstr "OldStyleTable" +msgstr "" msgid "Layout tables using the old markup style." msgstr "使用舊標記風格佈局的表格." @@ -2238,7 +2223,7 @@ msgstr "線沒有以 '|' 為首." msgid "OrphanedPages" -msgstr "OrphanedPages" +msgstr "" msgid "List pages which are not linked to by any other page." msgstr "列出未被其他頁面連結到的頁面." @@ -2309,7 +2294,7 @@ msgstr "警告:" msgid "PageGroup" -msgstr "PageGroup" +msgstr "" #, fuzzy, php-format msgid "PageGroup for %s." @@ -2352,7 +2337,7 @@ msgstr "任找兩個空格打勾然後 %s." msgid "PageHistory" -msgstr "PageHistory" +msgstr "" #, php-format msgid "Version %d" @@ -2369,18 +2354,17 @@ msgstr "列出 PageHistory (頁面歷程) - %s" msgid "PageInfo" -msgstr "PageInfo" +msgstr "" #, php-format msgid "Show extra page Info and statistics for %s." msgstr "顯示額外的頁面資訊與統計 - %s." msgid "PageTrail" -msgstr "PageTrail" +msgstr "" -#, fuzzy msgid "Display PageTrail." -msgstr "PageTrail" +msgstr "" #, fuzzy msgid "PasswordReset" @@ -2445,7 +2429,7 @@ msgstr "" msgid "PhotoAlbum" -msgstr "PhotoAlbum" +msgstr "" #, fuzzy msgid "" @@ -2467,7 +2451,7 @@ msgstr "無法讀取 %s" msgid "PhpHighlight" -msgstr "PhpHighlight" +msgstr "" msgid "PHP syntax highlighting." msgstr "PHP 語法效果" @@ -2480,7 +2464,7 @@ msgstr "錯誤的顏色值: %s" msgid "PhpWeather" -msgstr "PhpWeather" +msgstr "" msgid "Provide weather reports from the Internet." msgstr "PhpWeather plugin 由網路取得資訊並提供天氣報告" @@ -2520,7 +2504,7 @@ msgstr "查看源碼" msgid "PluginManager" -msgstr "PluginManager" +msgstr "" #, fuzzy msgid "List of plugins on this wiki." @@ -2530,7 +2514,7 @@ msgstr "使用此 plugin" msgid "Plugin" -msgstr "Plugin" +msgstr "" msgid "Arguments" msgstr "引數" @@ -2569,11 +2553,10 @@ msgstr "列出最受歡迎的頁面." msgid "CategoryCategory" -msgstr "CategoryCategory" +msgstr "" -#, fuzzy msgid "Category" -msgstr "CategoryPage" +msgstr "" msgid "Topic" msgstr "" @@ -2607,14 +2590,14 @@ msgstr "" msgid "PreferencesInfo" -msgstr "PreferencesInfo" +msgstr "" #, php-format msgid "Get preferences information for current user %s." msgstr "為目前使用者 %s 取得偏好設定資訊." msgid "PrevNext" -msgstr "PrevNext" +msgstr "" #, fuzzy, php-format msgid "Easy navigation buttons for %s." @@ -2634,13 +2617,13 @@ msgstr "" msgid "RandomPage" -msgstr "RandomPage" +msgstr "" msgid "Display a list of randomly chosen pages or redirects to a random page." msgstr "顯示隨機選出的頁面列表或重導向到隨機選取的頁面." msgid "RateIt" -msgstr "RateIt" +msgstr "" msgid "Rating system. Store user ratings per page." msgstr "評比系統. 儲存每頁的使用者評比." @@ -2704,7 +2687,7 @@ msgstr "Raw HTML 已經被關閉." msgid "Raw HTML" -msgstr "Raw HTML" +msgstr "" #, php-format msgid "%s is only allowed in locked pages." @@ -2714,12 +2697,11 @@ msgid "UserContribs" msgstr "使用者統計" -#, fuzzy msgid "RecentNewPages" -msgstr "RecentChanges" +msgstr "" msgid "RecentEdits" -msgstr "RecentEdits" +msgstr "" #, fuzzy msgid "Deleted" @@ -2843,16 +2825,14 @@ msgid "%s days" msgstr "%s 天" -#, fuzzy msgid "All users" -msgstr "AllUsers" +msgstr "" msgid "My modifications only" msgstr "" -#, fuzzy msgid "All pages" -msgstr "AllPages" +msgstr "" msgid "My pages only" msgstr "" @@ -2868,9 +2848,8 @@ msgid "Page once only" msgstr "內容" -#, fuzzy msgid "Full changes" -msgstr "FullRecentChanges" +msgstr "" #, fuzzy msgid "Old and new pages" @@ -2895,9 +2874,8 @@ msgid "List all recent edits in this wiki." msgstr "在此 wiki 列出所有頁面." -#, fuzzy msgid "Recent Edits" -msgstr "RecentEdits" +msgstr "" msgid "RecentReferrers" msgstr "" @@ -2906,7 +2884,7 @@ msgstr "" msgid "RedirectTo" -msgstr "RedirectTo" +msgstr "" #, fuzzy msgid "Redirect to another URL or page." @@ -2945,9 +2923,8 @@ msgid "Related Changes" msgstr "最近變更" -#, fuzzy msgid "RelatedChanges" -msgstr "RecentChanges" +msgstr "" msgid "Retransform CachedMarkup" msgstr "" @@ -2961,13 +2938,13 @@ msgstr "為 page “%s” 設定 acl." msgid "RichTable" -msgstr "RichTable" +msgstr "" msgid "Layout tables using a very rich markup style." msgstr "使用豐富標記風格進行佈局的表格." msgid "RssFeed" -msgstr "RssFeed" +msgstr "" #, fuzzy msgid "Simple RSS Feed aggregator." @@ -2994,9 +2971,8 @@ msgid "Display the list of relations and attributes on this page." msgstr "變更頁面屬性" -#, fuzzy msgid "SemanticSearch" -msgstr "InterWikiSearch" +msgstr "" #, fuzzy, php-format msgid "Semantic relations for %s" @@ -3012,9 +2988,8 @@ msgid "Find out how to add relations and attributes to pages." msgstr "" -#, fuzzy msgid "SemanticSearchAdvanced" -msgstr "InterWikiSearch" +msgstr "" msgid "Parse and execute a full query expression." msgstr "" @@ -3099,7 +3074,7 @@ msgstr "" msgid "SiteMap" -msgstr "SiteMap" +msgstr "" msgid "Recursively get BackLinks or links." msgstr "遞迴地取得 BackLinks 或連結" @@ -3125,7 +3100,7 @@ msgstr "" msgid "SqlResult" -msgstr "SqlResult" +msgstr "" msgid "Display arbitrary SQL result tables." msgstr "顯示不受限制的 SQL 結果表格" @@ -3210,7 +3185,7 @@ msgstr "" msgid "SystemInfo" -msgstr "SystemInfo" +msgstr "" msgid "Provide access to PhpWiki's lower level system information." msgstr "提供存取 PhpWiki 下層系統資訊." @@ -3354,7 +3329,7 @@ msgstr "過期參數" msgid "Wikiname regexp" -msgstr "Wikiname regexp" +msgstr "" msgid "Allowed protocols" msgstr "允許的協定" @@ -3426,7 +3401,7 @@ msgstr "以 “%s” 進行標題搜尋的結果" msgid "Transclude" -msgstr "Transclude" +msgstr "" msgid "Include an external web page within the body of a wiki page." msgstr "含括外部網頁到 wiki 頁面的內容中." @@ -3447,7 +3422,7 @@ msgstr "Transcluded 從 %s" msgid "TranslateText" -msgstr "TranslateText" +msgstr "" msgid "Define a translation for a specified text." msgstr "為特定文字定義轉換." @@ -3467,7 +3442,7 @@ msgstr "你的轉換文字是空白或等於未轉換的文字. 請再試一次." msgid "ContributedTranslations" -msgstr "ContributedTranslations" +msgstr "" #, php-format msgid "Translate “%s” to “%s” in *%s*" @@ -3498,7 +3473,7 @@ msgstr "轉換" msgid "UnfoldSubpages" -msgstr "UnfoldSubpages" +msgstr "" msgid "Include the content of all SubPages of the current page." msgstr "含括目前頁面所有子頁面的內容." @@ -3650,7 +3625,7 @@ msgstr "" msgid "Rate" -msgstr "Rate" +msgstr "" msgid "Video" msgstr "" @@ -3677,13 +3652,13 @@ msgstr "圖例" msgid "WantedPages" -msgstr "WantedPages" +msgstr "" msgid "List referenced page names which do not exist yet." msgstr "列出還未存在的頁面名稱." msgid "PgsrcTranslation" -msgstr "PgsrcTranslation" +msgstr "" #, php-format msgid "Wanted Pages for %s (%d total):" @@ -3756,7 +3731,7 @@ msgstr "" msgid "WhoIsOnline" -msgstr "WhoIsOnline" +msgstr "" msgid "Show summary information of the current user sessions." msgstr "顯示目前使用者 session 的摘要資訊." @@ -3777,7 +3752,7 @@ msgstr "%d 分鐘" msgid "WikiAdminChmod" -msgstr "WikiAdminChmod" +msgstr "" msgid "Set individual page permissions." msgstr "設定個別頁面的權限." @@ -3804,7 +3779,7 @@ msgstr "你確定你想要永久變更選定的檔案?" msgid "Chmod" -msgstr "Chmod" +msgstr "" msgid "Select the pages to change:" msgstr "選擇頁面以進行更名:" @@ -3824,9 +3799,8 @@ msgid "(disable individual page permissions, enable inheritance)?" msgstr "(禁制個別網頁的權限,使用繼承)?" -#, fuzzy msgid "WikiAdminChown" -msgstr "WikiAdminChmod" +msgstr "" #, fuzzy msgid "Change owner of selected pages." @@ -3852,9 +3826,8 @@ msgid "%d pages have been changed:" msgstr "%s 頁面已經變更." -#, fuzzy msgid "PhpWikiAdministration/Chown" -msgstr "PhpWikiAdministration/Chmod" +msgstr "" msgid "Confirm ownership change" msgstr "" @@ -3883,9 +3856,8 @@ msgid "ACL deleted for page “%s”" msgstr "為 page “%s” 設定 acl." -#, fuzzy msgid "PhpWikiAdministration/AdminAclDelete" -msgstr "PhpWikiAdministration" +msgstr "" #, fuzzy msgid "Delete ACL" @@ -3899,9 +3871,8 @@ msgid "Selected Pages: " msgstr "選擇頁面" -#, fuzzy msgid "WikiAdminMarkup" -msgstr "WikiAdminRename" +msgstr "" #, fuzzy msgid "Change the markup type of selected pages." @@ -3919,9 +3890,8 @@ msgid "Couldn't change page “%s” to markup type “%s”." msgstr "無法為頁面 “%s” 變更權限為 “%s”." -#, fuzzy msgid "PhpWikiAdministration/Markup" -msgstr "PhpWikiAdministration" +msgstr "" msgid "Confirm markup change" msgstr "" @@ -3942,9 +3912,8 @@ msgid "Change markup to: " msgstr "改變密碼" -#, fuzzy msgid "WikiAdminPurge" -msgstr "WikiAdminRename" +msgstr "" #, fuzzy msgid "Permanently purge all selected pages." @@ -3970,9 +3939,8 @@ msgid "No pages purged." msgstr "沒有頁面被變更." -#, fuzzy msgid "PhpWikiAdministration/Purge" -msgstr "PhpWikiAdministration" +msgstr "" msgid "Confirm purge" msgstr "" @@ -3990,7 +3958,7 @@ msgstr "選擇頁面以進行更名:" msgid "WikiAdminRemove" -msgstr "WikiAdminRemove" +msgstr "" msgid "Permanently remove all selected pages." msgstr "永久移除選定的頁面." @@ -4016,7 +3984,7 @@ msgstr "沒有頁面被更名" msgid "PhpWikiAdministration/Remove" -msgstr "PhpWikiAdministration/Remove" +msgstr "" msgid "Remove" msgstr "移除" @@ -4044,7 +4012,7 @@ msgstr "(列出過去 %s 天內已被刪除且檢查過的頁面.)" msgid "WikiAdminRename" -msgstr "WikiAdminRename" +msgstr "" #, fuzzy msgid "Rename selected pages." @@ -4122,7 +4090,7 @@ msgstr "" msgid "WikiAdminSearchReplace" -msgstr "WikiAdminSearchReplace" +msgstr "" msgid "Search and replace text in selected wiki pages." msgstr "在選定的頁面中搜尋並更換文字." @@ -4163,7 +4131,7 @@ msgstr "" msgid "WikiAdminSelect" -msgstr "WikiAdminSelect" +msgstr "" msgid "" "Allows selection of multiple pages which get passed to other WikiAdmin " @@ -4181,7 +4149,7 @@ msgstr "已選擇的頁面 “%s” 傳遞到 “%s”." msgid "WikiAdminSetAcl" -msgstr "WikiAdminSetAcl" +msgstr "" #, fuzzy, php-format msgid "ACL not changed for page “%s”." @@ -4203,9 +4171,8 @@ msgid "Invalid ACL" msgstr "錯誤的 acl" -#, fuzzy msgid "PhpWikiAdministration/SetAcl" -msgstr "PhpWikiAdministration" +msgstr "" #, fuzzy msgid "" @@ -4238,9 +4205,8 @@ msgid "(Currently not working)" msgstr "現在不建議使用!" -#, fuzzy msgid "WikiAdminSetExternal" -msgstr "WikiAdminSetAcl" +msgstr "" #, fuzzy msgid "Mark selected pages as external." @@ -4250,9 +4216,8 @@ msgid "change page “%s” to external." msgstr "改變頁面 “%s” 權限為 “%s”." -#, fuzzy msgid "PhpWikiAdministration/SetExternal" -msgstr "PhpWikiAdministration" +msgstr "" #, fuzzy msgid "Set pages to external" @@ -4263,7 +4228,7 @@ msgstr "選擇頁面以進行搜尋:" msgid "WikiAdminUtils" -msgstr "WikiAdminUtils" +msgstr "" #, fuzzy msgid "Miscellaneous utility functions for the Administrator." @@ -4280,9 +4245,8 @@ msgid "WikiAdminUtils %s returned:" msgstr "WikiAdminUtils 說:" -#, fuzzy msgid "Back" -msgstr "BackLinks" +msgstr "" msgid "Purge Markup Cache" msgstr "清除標記快取" @@ -4342,7 +4306,7 @@ msgstr "檔案已經成功地上傳." msgid "E-mail" -msgstr "E-mail" +msgstr "" msgid "Verification Status" msgstr "確認狀態" @@ -4355,7 +4319,7 @@ msgstr "改變確認狀態" msgid "WikiBlog" -msgstr "WikiBlog" +msgstr "" #, fuzzy, php-format msgid "Show and add blogs for %s." @@ -4368,16 +4332,15 @@ msgid "%s on %s:" msgstr "%s 在 %s" -#, fuzzy msgid "WikicreoleTable" -msgstr "WikiPoll" +msgstr "" #, fuzzy msgid "Layout tables using the Wikicreole syntax." msgstr "使用舊標記風格佈局的表格." msgid "WikiForm" -msgstr "WikiForm" +msgstr "" msgid "Provide generic WikiForm input buttons." msgstr "" @@ -4396,7 +4359,7 @@ msgstr "" msgid "WikiPoll" -msgstr "WikiPoll" +msgstr "" #, fuzzy msgid "Enable configurable polls." @@ -4435,18 +4398,17 @@ msgid "AllPagesLastEditedByMe" msgstr "" -#, fuzzy msgid "AllPagesOwnedByMe" -msgstr "AllPages" +msgstr "" msgid "CategoryHomePages" -msgstr "CategoryHomePages" +msgstr "" msgid "FindPage" -msgstr "FindPage" +msgstr "" msgid "FullRecentChanges" -msgstr "FullRecentChanges" +msgstr "" msgid "Help/AddingPages" msgstr "" @@ -4548,34 +4510,34 @@ msgstr "" msgid "HomePageAlias" -msgstr "HomePageAlias" +msgstr "" msgid "InterWiki" -msgstr "InterWiki" +msgstr "" msgid "PhpWikiAdministration/Chmod" -msgstr "PhpWikiAdministration/Chmod" +msgstr "" msgid "PhpWikiAdministration/Rename" -msgstr "PhpWikiAdministration/Rename" +msgstr "" msgid "PhpWikiAdministration/Replace" -msgstr "PhpWikiAdministration/Replace" +msgstr "" msgid "PhpWikiDocumentation" -msgstr "PhpWikiDocumentation" +msgstr "" msgid "PhpWikiPoll" -msgstr "PhpWikiPoll" +msgstr "" msgid "RecentVisitors" -msgstr "RecentVisitors" +msgstr "" msgid "ReleaseNotes" -msgstr "ReleaseNotes" +msgstr "" msgid "UpLoad" -msgstr "UpLoad" +msgstr "" msgid "_WikiTranslation" msgstr "_WikiTranslation" @@ -5071,9 +5033,8 @@ msgid "Rating" msgstr "使用者統計" -#, fuzzy msgid "Go?" -msgstr "Go" +msgstr "" #, fuzzy msgid "MinMisery" @@ -5182,7 +5143,7 @@ msgstr "Top & bottom 工具列" msgid "Modern" -msgstr "Modern" +msgstr "" #, fuzzy, php-format msgid "Plugin %s: undefined" @@ -5441,7 +5402,7 @@ msgstr "" msgid "Info" -msgstr "Info" +msgstr "" msgid "View Source" msgstr "查看源碼" @@ -5491,13 +5452,11 @@ msgid "Admin" msgstr "管理者" -#, fuzzy msgid "Blog" -msgstr "WikiBlog" +msgstr "" -#, fuzzy msgid "Page Trail" -msgstr "PageTrail" +msgstr "" #, fuzzy msgid "This page has been locked and cannot be edited." @@ -5530,7 +5489,7 @@ msgstr "編輯舊的修訂" msgid "PurgeHtmlCache" -msgstr "PurgeHtmlCache" +msgstr "" msgid "" "Purge HTML cache for this page. Regenerate from WikiMarkup when next " @@ -5577,10 +5536,10 @@ msgstr "" msgid "HowToUseWiki" -msgstr "HowToUseWiki" +msgstr "" msgid "WikiWikiWeb" -msgstr "WikiWikiWeb" +msgstr "" msgid "Today" msgstr "今天" @@ -5710,7 +5669,7 @@ msgstr "Blog 頁面" msgid "InterWikiMap" -msgstr "InterWikiMap" +msgstr "" msgid "Subpage" msgstr "子頁面" @@ -5780,19 +5739,19 @@ "In total there are %d user sessions online :: Unique %d Registered and %d " "Guests" -#, fuzzy, php-format +#, php-format msgid "Most users ever online was %d at %s." -msgstr "Most users ever online was %d at %s" +msgstr "" msgid "Registered Users Online: " -msgstr "已註冊的使用者在線上:" +msgstr "已註冊的使用者在線上: " msgid "Admin is also online." msgstr "Admin 也在線上." -#, fuzzy, php-format +#, php-format msgid "This data is based on users active over the past %s." -msgstr "This data is based on users active over the past %s" +msgstr "" msgid "Sorry, no dynamic DB Session support." msgstr "抱歉,無動態 DB Session 支援." @@ -5922,7 +5881,7 @@ msgstr "" msgid "Appearance" -msgstr "Appearance" +msgstr "" msgid "Here you can override site-specific default values." msgstr "你可以在這裡覆寫掉站台預設的值." @@ -6001,9 +5960,8 @@ msgid "Update Preferences" msgstr "更新偏好設定" -#, fuzzy msgid "Reset Preferences" -msgstr "UserPreferences" +msgstr "" #, fuzzy, php-format msgid "Entry on %s by %s." @@ -6012,9 +5970,9 @@ msgid "New Topic" msgstr "" -#, fuzzy, php-format +#, php-format msgid "Posted: %s" -msgstr "User: %s" +msgstr "" #, fuzzy msgid "Page" @@ -6024,25 +5982,21 @@ msgid "Template/Talk" msgstr "佈景主題" -#, fuzzy msgid "Create Page" -msgstr "CreatePage" +msgstr "" -#, fuzzy msgid "History" -msgstr "PageHistory" +msgstr "" #, fuzzy msgid "Last Difference" msgstr "更新偏好設定" -#, fuzzy msgid "Page Info" -msgstr "PageInfo" +msgstr "" -#, fuzzy msgid "Back Links" -msgstr "BackLinks" +msgstr "" #, fuzzy msgid "Change Owner" @@ -6051,9 +6005,8 @@ msgid "Access Rights" msgstr "" -#, fuzzy msgid "Purge" -msgstr "PrevNext" +msgstr "" msgid "Error:" msgstr "" @@ -6085,35 +6038,30 @@ msgstr "選擇頁面以進行更名:" msgid "TextFormattingRules" -msgstr "TextFormattingRules" +msgstr "" -#, fuzzy msgid "Recent Changes" -msgstr "RecentChanges" +msgstr "" #, fuzzy... [truncated message content] |
From: <var...@us...> - 2013-06-12 16:04:34
|
Revision: 8795 http://sourceforge.net/p/phpwiki/code/8795 Author: vargenau Date: 2013-06-12 16:04:29 +0000 (Wed, 12 Jun 2013) Log Message: ----------- getName should not translate Modified Paths: -------------- trunk/lib/WikiPlugin.php trunk/lib/plugin/AddComment.php trunk/lib/plugin/AllPages.php trunk/lib/plugin/AllUsers.php trunk/lib/plugin/AnalyseAccessLogSql.php trunk/lib/plugin/AppendText.php trunk/lib/plugin/AsciiMath.php trunk/lib/plugin/AsciiSVG.php trunk/lib/plugin/AtomFeed.php trunk/lib/plugin/AuthorHistory.php trunk/lib/plugin/BackLinks.php trunk/lib/plugin/BlogArchives.php trunk/lib/plugin/BlogJournal.php trunk/lib/plugin/BoxRight.php trunk/lib/plugin/CacheTest.php trunk/lib/plugin/Calendar.php trunk/lib/plugin/CalendarList.php trunk/lib/plugin/CategoryPage.php trunk/lib/plugin/Chart.php trunk/lib/plugin/Comment.php trunk/lib/plugin/CreateBib.php trunk/lib/plugin/CreatePage.php trunk/lib/plugin/CreateToc.php trunk/lib/plugin/CurrentTime.php trunk/lib/plugin/DeadEndPages.php trunk/lib/plugin/Diff.php trunk/lib/plugin/DynamicIncludePage.php trunk/lib/plugin/EditMetaData.php trunk/lib/plugin/ExternalSearch.php trunk/lib/plugin/FileInfo.php trunk/lib/plugin/FoafViewer.php trunk/lib/plugin/FrameInclude.php trunk/lib/plugin/FullTextSearch.php trunk/lib/plugin/FuzzyPages.php trunk/lib/plugin/GoTo.php trunk/lib/plugin/GoogleMaps.php trunk/lib/plugin/GooglePlugin.php trunk/lib/plugin/GraphViz.php trunk/lib/plugin/HelloWorld.php trunk/lib/plugin/HtmlConverter.php trunk/lib/plugin/Imdb.php trunk/lib/plugin/IncludePage.php trunk/lib/plugin/IncludePages.php trunk/lib/plugin/IncludeSiteMap.php trunk/lib/plugin/IncludeTree.php trunk/lib/plugin/InterWikiSearch.php trunk/lib/plugin/JabberPresence.php trunk/lib/plugin/LdapSearch.php trunk/lib/plugin/LikePages.php trunk/lib/plugin/LinkDatabase.php trunk/lib/plugin/LinkSearch.php trunk/lib/plugin/ListPages.php trunk/lib/plugin/ListRelations.php trunk/lib/plugin/ListSubpages.php trunk/lib/plugin/MediawikiTable.php trunk/lib/plugin/ModeratedPage.php trunk/lib/plugin/MostPopular.php trunk/lib/plugin/NewPagesPerUser.php trunk/lib/plugin/NoCache.php trunk/lib/plugin/OldStyleTable.php trunk/lib/plugin/OrphanedPages.php trunk/lib/plugin/PageDump.php trunk/lib/plugin/PageGroup.php trunk/lib/plugin/PageHistory.php trunk/lib/plugin/PageInfo.php trunk/lib/plugin/PageTrail.php trunk/lib/plugin/PasswordReset.php trunk/lib/plugin/PhotoAlbum.php trunk/lib/plugin/PhpHighlight.php trunk/lib/plugin/PhpWeather.php trunk/lib/plugin/Ploticus.php trunk/lib/plugin/PluginManager.php trunk/lib/plugin/PopUp.php trunk/lib/plugin/PopularNearby.php trunk/lib/plugin/PopularTags.php trunk/lib/plugin/PreferenceApp.php trunk/lib/plugin/PrevNext.php trunk/lib/plugin/Processing.php trunk/lib/plugin/RandomPage.php trunk/lib/plugin/RateIt.php trunk/lib/plugin/RawHtml.php trunk/lib/plugin/RecentChanges.php trunk/lib/plugin/RecentChangesCached.php trunk/lib/plugin/RecentComments.php trunk/lib/plugin/RecentEdits.php trunk/lib/plugin/RecentReferrers.php trunk/lib/plugin/RedirectTo.php trunk/lib/plugin/RelatedChanges.php trunk/lib/plugin/RichTable.php trunk/lib/plugin/RssFeed.php trunk/lib/plugin/SearchHighlight.php trunk/lib/plugin/SemanticRelations.php trunk/lib/plugin/SemanticSearch.php trunk/lib/plugin/SemanticSearchAdvanced.php trunk/lib/plugin/SiteMap.php trunk/lib/plugin/SpellCheck.php trunk/lib/plugin/SqlResult.php trunk/lib/plugin/SyncWiki.php trunk/lib/plugin/SyntaxHighlighter.php trunk/lib/plugin/SystemInfo.php trunk/lib/plugin/TeX2png.php trunk/lib/plugin/Template.php trunk/lib/plugin/TexToPng.php trunk/lib/plugin/TitleSearch.php trunk/lib/plugin/Transclude.php trunk/lib/plugin/TranslateText.php trunk/lib/plugin/UnfoldSubpages.php trunk/lib/plugin/UpLoad.php trunk/lib/plugin/UriResolver.php trunk/lib/plugin/UserPreferences.php trunk/lib/plugin/UserRatings.php trunk/lib/plugin/Video.php trunk/lib/plugin/VisualWiki.php trunk/lib/plugin/WantedPages.php trunk/lib/plugin/WantedPagesOld.php trunk/lib/plugin/WatchPage.php trunk/lib/plugin/WhoIsOnline.php trunk/lib/plugin/WikiAdminChmod.php trunk/lib/plugin/WikiAdminChown.php trunk/lib/plugin/WikiAdminDeleteAcl.php trunk/lib/plugin/WikiAdminMarkup.php trunk/lib/plugin/WikiAdminPurge.php trunk/lib/plugin/WikiAdminRemove.php trunk/lib/plugin/WikiAdminRename.php trunk/lib/plugin/WikiAdminSearchReplace.php trunk/lib/plugin/WikiAdminSelect.php trunk/lib/plugin/WikiAdminSetAcl.php trunk/lib/plugin/WikiAdminSetAclSimple.php trunk/lib/plugin/WikiAdminSetExternal.php trunk/lib/plugin/WikiAdminUtils.php trunk/lib/plugin/WikiBlog.php trunk/lib/plugin/WikiForm.php trunk/lib/plugin/WikiFormRich.php trunk/lib/plugin/WikiForum.php trunk/lib/plugin/WikiPoll.php trunk/lib/plugin/WikicreoleTable.php trunk/lib/plugin/YouTube.php trunk/lib/plugin/_AuthInfo.php trunk/lib/plugin/_BackendInfo.php trunk/lib/plugin/_GroupInfo.php trunk/lib/plugin/_PreferencesInfo.php trunk/lib/plugin/_Retransform.php trunk/lib/plugin/_WikiTranslation.php trunk/lib/plugin/text2png.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/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/WikiPlugin.php =================================================================== --- trunk/lib/WikiPlugin.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/WikiPlugin.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -72,22 +72,33 @@ * getDefaultFormArguments to compute the default link/form * targets. * - * If you want to gettextify the name (probably a good idea), - * override this method in your plugin class, like: + * If you override this method in your plugin class, + * you MUST NOT translate the name. * <pre> - * function getName() { return _("MyPlugin"); } + * function getName() { return "MyPlugin"; } * </pre> * * @return string plugin name/target. */ function getName() { - return preg_replace('/^.*_/', '', get_class($this)); + return preg_replace('/^WikiPlugin_/', '', get_class($this)); } + /** + * Get description of plugin. + * + * This method should be overriden in your plugin class, like: + * <pre> + * function getDescription() { return _("MyPlugin does this..."); } + * </pre> + * + * @return string plugin description + */ + function getDescription() { - return $this->getName(); + return _('This plugin has no description.'); } function getArgs($argstr, $request = false, $defaults = array()) @@ -276,7 +287,7 @@ function getDefaultFormArguments() { return array('targetpage' => $this->getName(), - 'buttontext' => $this->getName(), + 'buttontext' => _($this->getName()), 'class' => 'wikiaction', 'method' => 'get', 'textinput' => 's', @@ -292,7 +303,6 @@ $this->getDefaultArguments()); $args = $this->getArgs($argstr, $request, $defaults); - $plugin = $this->getName(); $textinput = $args['textinput']; assert(!empty($textinput) && isset($args['textinput'])); Modified: trunk/lib/plugin/AddComment.php =================================================================== --- trunk/lib/plugin/AddComment.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/AddComment.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -35,11 +35,6 @@ class WikiPlugin_AddComment extends WikiPlugin_WikiBlog { - function getName() - { - return _("AddComment"); - } - function getDescription() { return sprintf(_("Show and add comments for %s."), '[pagename]'); Modified: trunk/lib/plugin/AllPages.php =================================================================== --- trunk/lib/plugin/AllPages.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/AllPages.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -30,11 +30,6 @@ class WikiPlugin_AllPages extends WikiPlugin { - function getName() - { - return _("AllPages"); - } - function getDescription() { return _("List all pages in this wiki."); Modified: trunk/lib/plugin/AllUsers.php =================================================================== --- trunk/lib/plugin/AllUsers.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/AllUsers.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -33,11 +33,6 @@ class WikiPlugin_AllUsers extends WikiPlugin { - function getName() - { - return _("AllUsers"); - } - function getDescription() { return _("List all once authenticated users."); Modified: trunk/lib/plugin/AnalyseAccessLogSql.php =================================================================== --- trunk/lib/plugin/AnalyseAccessLogSql.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/AnalyseAccessLogSql.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -258,11 +258,6 @@ ); } - function getName() - { - return _("AnalyseAccessLogSql"); - } - function getDescription() { return _("Show summary information from the access log table."); Modified: trunk/lib/plugin/AppendText.php =================================================================== --- trunk/lib/plugin/AppendText.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/AppendText.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -33,11 +33,6 @@ class WikiPlugin_AppendText extends WikiPlugin { - function getName() - { - return _("AppendText"); - } - function getDescription() { return _("Append text to any page in this wiki."); Modified: trunk/lib/plugin/AsciiMath.php =================================================================== --- trunk/lib/plugin/AsciiMath.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/AsciiMath.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -41,11 +41,6 @@ class WikiPlugin_AsciiMath extends WikiPlugin { - function getName() - { - return _("AsciiMath"); - } - function getDescription() { return _("Render ASCII Math as MathML."); Modified: trunk/lib/plugin/AsciiSVG.php =================================================================== --- trunk/lib/plugin/AsciiSVG.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/AsciiSVG.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -28,11 +28,6 @@ class WikiPlugin_AsciiSVG extends WikiPlugin { - function getName() - { - return _("AsciiSVG"); - } - function getDescription() { return _("Render inline ASCII SVG."); Modified: trunk/lib/plugin/AtomFeed.php =================================================================== --- trunk/lib/plugin/AtomFeed.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/AtomFeed.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -28,11 +28,6 @@ class WikiPlugin_AtomFeed extends WikiPlugin { - function getName() - { - return _('AtomFeed'); - } - function getDescription() { return _('Atom Aggregator Plugin.'); Modified: trunk/lib/plugin/AuthorHistory.php =================================================================== --- trunk/lib/plugin/AuthorHistory.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/AuthorHistory.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -59,11 +59,6 @@ class WikiPlugin_AuthorHistory extends WikiPlugin { - function getName() - { - return _("AuthorHistory"); - } - function getDescription() { return sprintf(_("List all page revisions edited by one user with diff links, or show a PageHistory-like list of a single page for only one user.")); Modified: trunk/lib/plugin/BackLinks.php =================================================================== --- trunk/lib/plugin/BackLinks.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/BackLinks.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -25,11 +25,6 @@ class WikiPlugin_BackLinks extends WikiPlugin { - function getName() - { - return _("BackLinks"); - } - function getDescription() { return sprintf(_("List all pages which link to %s."), '[pagename]'); Modified: trunk/lib/plugin/BlogArchives.php =================================================================== --- trunk/lib/plugin/BlogArchives.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/BlogArchives.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -35,11 +35,6 @@ class WikiPlugin_BlogArchives extends WikiPlugin_WikiBlog { - function getName() - { - return _("Archives"); - } - function getDescription() { return _("List blog months links for the current or ADMIN user."); Modified: trunk/lib/plugin/BlogJournal.php =================================================================== --- trunk/lib/plugin/BlogJournal.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/BlogJournal.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -34,11 +34,6 @@ class WikiPlugin_BlogJournal extends WikiPlugin_WikiBlog { - function getName() - { - return _("BlogJournal"); - } - function getDescription() { return _("Include latest blog entries for the current or ADMIN user."); Modified: trunk/lib/plugin/BoxRight.php =================================================================== --- trunk/lib/plugin/BoxRight.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/BoxRight.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -26,11 +26,6 @@ class WikiPlugin_BoxRight extends WikiPlugin { - function getName() - { - return "BoxRight"; - } - function getDescription() { return _("A simple plugin for <div class=boxright> with wikimarkup."); Modified: trunk/lib/plugin/CacheTest.php =================================================================== --- trunk/lib/plugin/CacheTest.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/CacheTest.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -61,14 +61,9 @@ return PLUGIN_CACHED_IMG_ONDEMAND; } - function getName() - { - return "CacheTest"; - } - function getDescription() { - return 'This is a simple example using WikiPluginCached.'; + return _('This is a simple example using WikiPluginCached.'); } function getDefaultArguments() Modified: trunk/lib/plugin/Calendar.php =================================================================== --- trunk/lib/plugin/Calendar.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/Calendar.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -35,11 +35,6 @@ class WikiPlugin_Calendar extends WikiPlugin { - function getName() - { - return _("Calendar"); - } - function getDescription() { return _("Calendar"); Modified: trunk/lib/plugin/CalendarList.php =================================================================== --- trunk/lib/plugin/CalendarList.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/CalendarList.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -49,11 +49,6 @@ class WikiPlugin_CalendarList extends WikiPlugin { - function getName() - { - return _("CalendarList"); - } - function getDescription() { return _("CalendarList"); Modified: trunk/lib/plugin/CategoryPage.php =================================================================== --- trunk/lib/plugin/CategoryPage.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/CategoryPage.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -40,11 +40,6 @@ class WikiPlugin_CategoryPage extends WikiPlugin { - function getName() - { - return _("CategoryPage"); - } - function getDescription() { return _("Create a Wiki Category Page."); Modified: trunk/lib/plugin/Chart.php =================================================================== --- trunk/lib/plugin/Chart.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/Chart.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -46,11 +46,6 @@ class WikiPlugin_Chart extends WikiPlugin { - function getName() - { - return _("Chart"); - } - function getDescription() { return _("Render SVG charts."); Modified: trunk/lib/plugin/Comment.php =================================================================== --- trunk/lib/plugin/Comment.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/Comment.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -38,11 +38,6 @@ class WikiPlugin_Comment extends WikiPlugin { - function getName() - { - return _("Comment"); - } - function getDescription() { return _("Embed hidden comments in WikiPages."); Modified: trunk/lib/plugin/CreateBib.php =================================================================== --- trunk/lib/plugin/CreateBib.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/CreateBib.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -33,11 +33,6 @@ class WikiPlugin_CreateBib extends WikiPlugin { - function getName() - { - return _("CreateBib"); - } - function getDescription() { return _("Automatically create a Bibtex file from linked pages."); Modified: trunk/lib/plugin/CreatePage.php =================================================================== --- trunk/lib/plugin/CreatePage.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/CreatePage.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -38,11 +38,6 @@ class WikiPlugin_CreatePage extends WikiPlugin_Template { - function getName() - { - return _("CreatePage"); - } - function getDescription() { return _("Create a wiki page by the provided name."); Modified: trunk/lib/plugin/CreateToc.php =================================================================== --- trunk/lib/plugin/CreateToc.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/CreateToc.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -41,11 +41,6 @@ class WikiPlugin_CreateToc extends WikiPlugin { - function getName() - { - return _("CreateToc"); - } - function getDescription() { return _("Create a Table of Contents and automatically link to headers."); Modified: trunk/lib/plugin/CurrentTime.php =================================================================== --- trunk/lib/plugin/CurrentTime.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/CurrentTime.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -53,15 +53,9 @@ class WikiPlugin_CurrentTime extends WikiPlugin { - function getName() - { - return _("CurrentTime"); - } - function getDescription() { return _("Display current time and date."); - } // Establish default values for each of this plugin's arguments. Modified: trunk/lib/plugin/DeadEndPages.php =================================================================== --- trunk/lib/plugin/DeadEndPages.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/DeadEndPages.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -27,10 +27,6 @@ class WikiPlugin_DeadEndPages extends WikiPlugin_OrphanedPages { - function getName() - { - return _("DeadEndPages"); - } } // Local Variables: Modified: trunk/lib/plugin/Diff.php =================================================================== --- trunk/lib/plugin/Diff.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/Diff.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -33,11 +33,6 @@ extends WikiPlugin { - function getName() - { - return _("Diff"); - } - function getDescription() { return _("Display differences between revisions."); Modified: trunk/lib/plugin/DynamicIncludePage.php =================================================================== --- trunk/lib/plugin/DynamicIncludePage.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/DynamicIncludePage.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -31,11 +31,6 @@ class WikiPlugin_DynamicIncludePage extends WikiPlugin_IncludePage { - function getName() - { - return _("DynamicIncludePage"); - } - function getDescription() { return _("Dynamically include the content from another wiki page."); Modified: trunk/lib/plugin/EditMetaData.php =================================================================== --- trunk/lib/plugin/EditMetaData.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/EditMetaData.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -44,11 +44,6 @@ class WikiPlugin_EditMetaData extends WikiPlugin__BackendInfo { - function getName() - { - return _("EditMetaData"); - } - function getDescription() { return sprintf(_("Edit metadata for %s."), '[pagename]'); Modified: trunk/lib/plugin/ExternalSearch.php =================================================================== --- trunk/lib/plugin/ExternalSearch.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/ExternalSearch.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -36,11 +36,6 @@ class WikiPlugin_ExternalSearch extends WikiPlugin { - function getName() - { - return _("ExternalSearch"); - } - function getDescription() { return _("Redirect to an external web site based on form input."); Modified: trunk/lib/plugin/FileInfo.php =================================================================== --- trunk/lib/plugin/FileInfo.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/FileInfo.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -36,11 +36,6 @@ class WikiPlugin_FileInfo extends WikiPlugin { - function getName() - { - return _("FileInfo"); - } - function getDescription() { return _("Display file information like version, size, date... of uploaded files."); Modified: trunk/lib/plugin/FoafViewer.php =================================================================== --- trunk/lib/plugin/FoafViewer.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/FoafViewer.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -66,11 +66,6 @@ return false; } - function getName() - { - return _("FoafViewer"); - } - function getDescription() { return _("Parse an RDF FOAF file and extract information to render as HTML."); Modified: trunk/lib/plugin/FrameInclude.php =================================================================== --- trunk/lib/plugin/FrameInclude.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/FrameInclude.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -48,11 +48,6 @@ class WikiPlugin_FrameInclude extends WikiPlugin { - function getName() - { - return _("FrameInclude"); - } - function getDescription() { return _("Display a url in a separate frame inside our body. Only one frame allowed."); Modified: trunk/lib/plugin/FullTextSearch.php =================================================================== --- trunk/lib/plugin/FullTextSearch.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/FullTextSearch.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -42,11 +42,6 @@ class WikiPlugin_FullTextSearch extends WikiPlugin { - function getName() - { - return _("FullTextSearch"); - } - function getDescription() { return _("Search the content of all pages in this wiki."); Modified: trunk/lib/plugin/FuzzyPages.php =================================================================== --- trunk/lib/plugin/FuzzyPages.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/FuzzyPages.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -35,11 +35,6 @@ class WikiPlugin_FuzzyPages extends WikiPlugin { - function getName() - { - return _("FuzzyPages"); - } - function getDescription() { return sprintf(_("Search for page titles similar to %s."), Modified: trunk/lib/plugin/GoTo.php =================================================================== --- trunk/lib/plugin/GoTo.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/GoTo.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -33,11 +33,6 @@ class WikiPlugin_GoTo extends WikiPlugin { - function getName() - { - return _("GoTo"); - } - function getDescription() { return _("Go to or create page."); Modified: trunk/lib/plugin/GoogleMaps.php =================================================================== --- trunk/lib/plugin/GoogleMaps.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/GoogleMaps.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -58,11 +58,6 @@ class WikiPlugin_GoogleMaps extends WikiPlugin { - function getName() - { - return _("GoogleMaps"); - } - function getDescription() { return _("Display a marker with further infos (when clicking) on given coordinates."); Modified: trunk/lib/plugin/GooglePlugin.php =================================================================== --- trunk/lib/plugin/GooglePlugin.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/GooglePlugin.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -39,11 +39,6 @@ class WikiPlugin_GooglePlugin extends WikiPlugin { - function getName() - { - return _("GooglePlugin"); - } - function getDescription() { return _("Make use of the Google API."); Modified: trunk/lib/plugin/GraphViz.php =================================================================== --- trunk/lib/plugin/GraphViz.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/GraphViz.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -105,11 +105,6 @@ return PLUGIN_CACHED_IMG_INLINE; // normal cached libgd image handles } - function getName() - { - return _("GraphViz"); - } - function getDescription() { return _("GraphViz image or imagemap creation of directed graphs."); Modified: trunk/lib/plugin/HelloWorld.php =================================================================== --- trunk/lib/plugin/HelloWorld.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/HelloWorld.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -40,17 +40,9 @@ class WikiPlugin_HelloWorld extends WikiPlugin { - // Four required functions in a WikiPlugin. - - function getName() - { - return _("HelloWorld"); - } - function getDescription() { return _("Simple Sample Plugin."); - } // Establish default values for each of this plugin's arguments. Modified: trunk/lib/plugin/HtmlConverter.php =================================================================== --- trunk/lib/plugin/HtmlConverter.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/HtmlConverter.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -32,12 +32,6 @@ class WikiPlugin_HtmlConverter extends WikiPlugin { - - function getName() - { - return "HtmlConverter"; - } - function getDescription() { return _("Convert HTML markup into wiki markup."); @@ -50,12 +44,6 @@ function run($dbi, $argstr, &$request, $basepage) { - - /* plugin not yet has arguments - save for later (copied from UpLoad) - $args = $this->getArgs($argstr, $request); - extract($args); - */ - $form = HTML::form(array('action' => $request->getPostURL(), 'enctype' => 'multipart/form-data', 'method' => 'post')); Modified: trunk/lib/plugin/Imdb.php =================================================================== --- trunk/lib/plugin/Imdb.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/Imdb.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -51,11 +51,6 @@ class WikiPlugin_Imdb extends WikiPlugin_SqlResult { - function getName() - { - return _("Imdb"); - } - function getDescription() { return _("Query a local imdb database."); Modified: trunk/lib/plugin/IncludePage.php =================================================================== --- trunk/lib/plugin/IncludePage.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/IncludePage.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -30,11 +30,6 @@ class WikiPlugin_IncludePage extends WikiPlugin { - function getName() - { - return _("IncludePage"); - } - function getDescription() { return _("Include text from another wiki page."); Modified: trunk/lib/plugin/IncludePages.php =================================================================== --- trunk/lib/plugin/IncludePages.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/IncludePages.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -31,11 +31,6 @@ class WikiPlugin_IncludePages extends WikiPlugin_IncludePage { - function getName() - { - return _("IncludePages"); - } - function getDescription() { return _("Include multiple pages."); Modified: trunk/lib/plugin/IncludeSiteMap.php =================================================================== --- trunk/lib/plugin/IncludeSiteMap.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/IncludeSiteMap.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -48,11 +48,6 @@ class WikiPlugin_IncludeSiteMap extends WikiPlugin_SiteMap { - function getName() - { - return _("IncludeSiteMap"); - } - function getDescription() { return sprintf(_("Include recursively all linked pages starting at %s."), Modified: trunk/lib/plugin/IncludeTree.php =================================================================== --- trunk/lib/plugin/IncludeTree.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/IncludeTree.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -35,11 +35,6 @@ class WikiPlugin_IncludeTree extends WikiPlugin_SiteMap { - function getName() - { - return _("IncludeTree"); - } - function getDescription() { return _("Display Dynamic Category Tree."); Modified: trunk/lib/plugin/InterWikiSearch.php =================================================================== --- trunk/lib/plugin/InterWikiSearch.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/InterWikiSearch.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -27,11 +27,6 @@ class WikiPlugin_InterWikiSearch extends WikiPlugin { - function getName() - { - return _("InterWikiSearch"); - } - function getDescription() { return _("Perform searches on InterWiki sites listed in InterWikiMap."); Modified: trunk/lib/plugin/JabberPresence.php =================================================================== --- trunk/lib/plugin/JabberPresence.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/JabberPresence.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -38,11 +38,6 @@ class WikiPlugin_JabberPresence extends WikiPlugin { - function getName() - { - return _("JabberPresence"); - } - function getDescription() { return _("Display Jabber presence."); Modified: trunk/lib/plugin/LdapSearch.php =================================================================== --- trunk/lib/plugin/LdapSearch.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/LdapSearch.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -49,11 +49,6 @@ class WikiPlugin_LdapSearch extends WikiPlugin { - function getName() - { - return _("LdapSearch"); - } - function getDescription() { return _("Search an LDAP directory."); Modified: trunk/lib/plugin/LikePages.php =================================================================== --- trunk/lib/plugin/LikePages.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/LikePages.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -26,11 +26,6 @@ class WikiPlugin_LikePages extends WikiPlugin { - function getName() - { - return _("LikePages"); - } - function getDescription() { return sprintf(_("List page names which share an initial or final title word with “%s”."), Modified: trunk/lib/plugin/LinkDatabase.php =================================================================== --- trunk/lib/plugin/LinkDatabase.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/LinkDatabase.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -38,11 +38,6 @@ class WikiPlugin_LinkDatabase extends WikiPluginCached { - function getName() - { - return _("LinkDatabase"); - } - function getPluginType() { return PLUGIN_CACHED_HTML; Modified: trunk/lib/plugin/LinkSearch.php =================================================================== --- trunk/lib/plugin/LinkSearch.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/LinkSearch.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -31,11 +31,6 @@ class WikiPlugin_LinkSearch extends WikiPlugin { - function getName() - { - return _("LinkSearch"); - } - function getDescription() { return _("Search page and link names."); Modified: trunk/lib/plugin/ListPages.php =================================================================== --- trunk/lib/plugin/ListPages.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/ListPages.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -34,11 +34,6 @@ class WikiPlugin_ListPages extends WikiPlugin { - function getName() - { - return _("ListPages"); - } - function getDescription() { return _("List pages that are explicitly given as the pages argument."); Modified: trunk/lib/plugin/ListRelations.php =================================================================== --- trunk/lib/plugin/ListRelations.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/ListRelations.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -30,11 +30,6 @@ class WikiPlugin_ListRelations extends WikiPlugin { - function getName() - { - return _("ListRelations"); - } - function getDescription() { return _("Display the list of all defined relations and optionnally attributes in this entire wiki."); Modified: trunk/lib/plugin/ListSubpages.php =================================================================== --- trunk/lib/plugin/ListSubpages.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/ListSubpages.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -30,11 +30,6 @@ class WikiPlugin_ListSubpages extends WikiPlugin { - function getName() - { - return _("ListSubpages"); - } - function getDescription() { return _("Lists the names of all SubPages of the current page."); Modified: trunk/lib/plugin/MediawikiTable.php =================================================================== --- trunk/lib/plugin/MediawikiTable.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/MediawikiTable.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -52,11 +52,6 @@ class WikiPlugin_MediawikiTable extends WikiPlugin { - function getName() - { - return _("MediawikiTable"); - } - function getDescription() { return _("Layout tables using a Mediawiki-like markup style."); Modified: trunk/lib/plugin/ModeratedPage.php =================================================================== --- trunk/lib/plugin/ModeratedPage.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/ModeratedPage.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -38,11 +38,6 @@ class WikiPlugin_ModeratedPage extends WikiPlugin { - function getName() - { - return _("ModeratedPage"); - } - function getDescription() { return _("Support moderated pages."); Modified: trunk/lib/plugin/MostPopular.php =================================================================== --- trunk/lib/plugin/MostPopular.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/MostPopular.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -26,11 +26,6 @@ class WikiPlugin_MostPopular extends WikiPlugin { - function getName() - { - return _("MostPopular"); - } - function getDescription() { return _("List the most popular pages."); Modified: trunk/lib/plugin/NewPagesPerUser.php =================================================================== --- trunk/lib/plugin/NewPagesPerUser.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/NewPagesPerUser.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -37,11 +37,6 @@ return $a['count'] < $b['count'] ? 1 : -1; } - function getName() - { - return _("NewPagesPerUser"); - } - function getDescription() { return _("List all new pages per month per user."); Modified: trunk/lib/plugin/NoCache.php =================================================================== --- trunk/lib/plugin/NoCache.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/NoCache.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -36,11 +36,6 @@ class WikiPlugin_NoCache extends WikiPlugin { - function getName() - { - return _("NoCache"); - } - function getDescription() { return _("Don't cache this page."); Modified: trunk/lib/plugin/OldStyleTable.php =================================================================== --- trunk/lib/plugin/OldStyleTable.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/OldStyleTable.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -46,11 +46,6 @@ class WikiPlugin_OldStyleTable extends WikiPlugin { - function getName() - { - return _("OldStyleTable"); - } - function getDescription() { return _("Layout tables using the old markup style."); Modified: trunk/lib/plugin/OrphanedPages.php =================================================================== --- trunk/lib/plugin/OrphanedPages.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/OrphanedPages.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -30,11 +30,6 @@ class WikiPlugin_OrphanedPages extends WikiPlugin { - function getName() - { - return _("OrphanedPages"); - } - function getDescription() { return _("List pages which are not linked to by any other page."); Modified: trunk/lib/plugin/PageDump.php =================================================================== --- trunk/lib/plugin/PageDump.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/PageDump.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -52,11 +52,6 @@ { public $MessageId; - function getName() - { - return _("PageDump"); - } - function getDescription() { return _("View a single page dump online."); Modified: trunk/lib/plugin/PageGroup.php =================================================================== --- trunk/lib/plugin/PageGroup.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/PageGroup.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -41,11 +41,6 @@ class WikiPlugin_PageGroup extends WikiPlugin { - function getName() - { - return _("PageGroup"); - } - function getDescription() { return sprintf(_("PageGroup for %s."), '[pagename]'); Modified: trunk/lib/plugin/PageHistory.php =================================================================== --- trunk/lib/plugin/PageHistory.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/PageHistory.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -273,11 +273,6 @@ class WikiPlugin_PageHistory extends WikiPlugin_RecentChanges { - function getName() - { - return _("PageHistory"); - } - function getDescription() { return sprintf(_("List PageHistory for %s."), '[pagename]'); Modified: trunk/lib/plugin/PageInfo.php =================================================================== --- trunk/lib/plugin/PageInfo.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/PageInfo.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -28,11 +28,6 @@ class WikiPlugin_PageInfo extends WikiPlugin { - function getName() - { - return _("PageInfo"); - } - function getDescription() { return sprintf(_("Show extra page Info and statistics for %s."), Modified: trunk/lib/plugin/PageTrail.php =================================================================== --- trunk/lib/plugin/PageTrail.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/PageTrail.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -40,11 +40,6 @@ { public $def_numberlinks = 5; - function getName() - { - return _("PageTrail"); - } - function getDescription() { return _("Display PageTrail."); Modified: trunk/lib/plugin/PasswordReset.php =================================================================== --- trunk/lib/plugin/PasswordReset.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/PasswordReset.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -38,11 +38,6 @@ class WikiPlugin_PasswordReset extends WikiPlugin { - function getName() - { - return _("PasswordReset"); - } - function getDescription() { return _("Allow admin to reset any users password, allow user to request his password by e-mail."); Modified: trunk/lib/plugin/PhotoAlbum.php =================================================================== --- trunk/lib/plugin/PhotoAlbum.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/PhotoAlbum.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -95,11 +95,6 @@ class WikiPlugin_PhotoAlbum extends WikiPlugin { - function getName() - { - return _("PhotoAlbum"); - } - function getDescription() { return _("Display a set of photos listed in a text file with optional descriptions."); Modified: trunk/lib/plugin/PhpHighlight.php =================================================================== --- trunk/lib/plugin/PhpHighlight.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/PhpHighlight.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -29,11 +29,6 @@ class WikiPlugin_PhpHighlight extends WikiPlugin { - function getName() - { - return _("PhpHighlight"); - } - function getDescription() { return _("PHP syntax highlighting."); Modified: trunk/lib/plugin/PhpWeather.php =================================================================== --- trunk/lib/plugin/PhpWeather.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/PhpWeather.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -59,11 +59,6 @@ class WikiPlugin_PhpWeather extends WikiPlugin { - function getName() - { - return _("PhpWeather"); - } - function getDescription() { return _("Provide weather reports from the Internet."); Modified: trunk/lib/plugin/Ploticus.php =================================================================== --- trunk/lib/plugin/Ploticus.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/Ploticus.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -90,11 +90,6 @@ return PLUGIN_CACHED_IMG_INLINE; // normal cached libgd image handles } - function getName() - { - return _("Ploticus"); - } - function getDescription() { return _("Ploticus image creation."); Modified: trunk/lib/plugin/PluginManager.php =================================================================== --- trunk/lib/plugin/PluginManager.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/PluginManager.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -28,11 +28,6 @@ class WikiPlugin_PluginManager extends WikiPlugin { - function getName() - { - return _("PluginManager"); - } - function getDescription() { return _("List of plugins on this wiki."); @@ -123,9 +118,9 @@ // This section was largely improved by Pierrick Meignen: // make a link if an actionpage exists $pluginNamelink = $pluginName; - $pluginDocPageName = _("Help") . "/" . $pluginName . "Plugin"; + $pluginDocPageName = "Help" . "/" . $pluginName . "Plugin"; if (defined('FUSIONFORGE') and FUSIONFORGE) { - $pluginDocPageName = _("Help") . ":" . $pluginName . "Plugin"; + $pluginDocPageName = "Help" . ":" . $pluginName . "Plugin"; } $pluginDocPageNamelink = false; Modified: trunk/lib/plugin/PopUp.php =================================================================== --- trunk/lib/plugin/PopUp.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/PopUp.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -46,11 +46,6 @@ class WikiPlugin_PopUp extends WikiPlugin { - function getName() - { - return _("PopUp"); - } - function getDescription() { return _("Create a clickable popup link."); Modified: trunk/lib/plugin/PopularNearby.php =================================================================== --- trunk/lib/plugin/PopularNearby.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/PopularNearby.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -39,11 +39,6 @@ class WikiPlugin_PopularNearby extends WikiPlugin { - function getName() - { - return _("PopularNearby"); - } - function getDescription() { return _("List the most popular pages nearby."); Modified: trunk/lib/plugin/PopularTags.php =================================================================== --- trunk/lib/plugin/PopularTags.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/PopularTags.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -36,11 +36,6 @@ return $a['count'] < $b['count'] ? 1 : -1; } - function getName() - { - return _("PopularTags"); - } - function getDescription() { return _("List the most popular tags."); Modified: trunk/lib/plugin/PreferenceApp.php =================================================================== --- trunk/lib/plugin/PreferenceApp.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/PreferenceApp.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -48,11 +48,6 @@ class WikiPlugin_PreferenceApp extends WikiPlugin { - function getName() - { - return _("PreferenceApp"); - } - function getDescription() { return _("Analyze preferences based on voting budget and ratings."); Modified: trunk/lib/plugin/PrevNext.php =================================================================== --- trunk/lib/plugin/PrevNext.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/PrevNext.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -29,11 +29,6 @@ class WikiPlugin_PrevNext extends WikiPlugin { - function getName() - { - return _("PrevNext"); - } - function getDescription() { return sprintf(_("Easy navigation buttons for %s."), '[pagename]'); Modified: trunk/lib/plugin/Processing.php =================================================================== --- trunk/lib/plugin/Processing.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/Processing.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -27,11 +27,6 @@ class WikiPlugin_Processing extends WikiPlugin { - function getName() - { - return _("Processing"); - } - function getDescription() { return _("Render inline Processing."); Modified: trunk/lib/plugin/RandomPage.php =================================================================== --- trunk/lib/plugin/RandomPage.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/RandomPage.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -29,11 +29,6 @@ class WikiPlugin_RandomPage extends WikiPlugin { - function getName() - { - return _("RandomPage"); - } - function getDescription() { return _("Display a list of randomly chosen pages or redirects to a random page."); Modified: trunk/lib/plugin/RateIt.php =================================================================== --- trunk/lib/plugin/RateIt.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/RateIt.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -87,11 +87,6 @@ static $toBeUniq = 1; public $idTop = ''; - function getName() - { - return _("RateIt"); - } - function getDescription() { return _("Rating system. Store user ratings per page."); Modified: trunk/lib/plugin/RawHtml.php =================================================================== --- trunk/lib/plugin/RawHtml.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/RawHtml.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -49,11 +49,6 @@ class WikiPlugin_RawHtml extends WikiPlugin { - function getName() - { - return "RawHtml"; - } - function getDescription() { return _("Provide for raw HTML within wiki pages."); Modified: trunk/lib/plugin/RecentChanges.php =================================================================== --- trunk/lib/plugin/RecentChanges.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/RecentChanges.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -1255,11 +1255,6 @@ class WikiPlugin_RecentChanges extends WikiPlugin { - function getName() - { - return _("RecentChanges"); - } - function getDescription() { return _("List all recent changes in this wiki."); Modified: trunk/lib/plugin/RecentChangesCached.php =================================================================== --- trunk/lib/plugin/RecentChangesCached.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/RecentChangesCached.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -39,11 +39,6 @@ return PLUGIN_CACHED_HTML; } - function getName() - { - return "RecentChangesCached"; - } - function getDescription() { return 'Cache output of RecentChanges called with default arguments.'; Modified: trunk/lib/plugin/RecentComments.php =================================================================== --- trunk/lib/plugin/RecentComments.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/RecentComments.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -32,11 +32,6 @@ class WikiPlugin_RecentComments extends WikiPlugin_RecentChanges { - function getName() - { - return _("RecentComments"); - } - function getDescription() { return _("List basepages with recently added comments."); Modified: trunk/lib/plugin/RecentEdits.php =================================================================== --- trunk/lib/plugin/RecentEdits.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/RecentEdits.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -25,11 +25,6 @@ class WikiPlugin_RecentEdits extends WikiPlugin_RecentChanges { - function getName() - { - return _("RecentEdits"); - } - function getDescription() { return _("List all recent edits in this wiki."); Modified: trunk/lib/plugin/RecentReferrers.php =================================================================== --- trunk/lib/plugin/RecentReferrers.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/RecentReferrers.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -29,11 +29,6 @@ class WikiPlugin_RecentReferrers extends WikiPlugin { - function getName() - { - return _("RecentReferrers"); - } - function getDescription() { return _("Analyse access log."); Modified: trunk/lib/plugin/RedirectTo.php =================================================================== --- trunk/lib/plugin/RedirectTo.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/RedirectTo.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -39,11 +39,6 @@ class WikiPlugin_RedirectTo extends WikiPlugin { - function getName() - { - return _("RedirectTo"); - } - function getDescription() { return _("Redirect to another URL or page."); Modified: trunk/lib/plugin/RelatedChanges.php =================================================================== --- trunk/lib/plugin/RelatedChanges.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/RelatedChanges.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -42,11 +42,6 @@ class WikiPlugin_RelatedChanges extends WikiPlugin_RecentChanges { - function getName() - { - return _("RecentEdits"); - } - function getDescription() { return _("List of changes on all pages which are linked to from this page."); Modified: trunk/lib/plugin/RichTable.php =================================================================== --- trunk/lib/plugin/RichTable.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/RichTable.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -30,11 +30,6 @@ class WikiPlugin_RichTable extends WikiPlugin { - function getName() - { - return _("RichTable"); - } - function getDescription() { return _("Layout tables using a very rich markup style."); Modified: trunk/lib/plugin/RssFeed.php =================================================================== --- trunk/lib/plugin/RssFeed.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/RssFeed.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -27,15 +27,9 @@ class WikiPlugin_RssFeed extends WikiPlugin { - function getName() - { - return _("RssFeed"); - } - function getDescription() { return _("Simple RSS Feed aggregator."); - } // Establish default values for each of this plugin's arguments. Modified: trunk/lib/plugin/SearchHighlight.php =================================================================== --- trunk/lib/plugin/SearchHighlight.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/SearchHighlight.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -35,11 +35,6 @@ class WikiPlugin_SearchHighlight extends WikiPlugin { - function getName() - { - return _("SearchHighlight"); - } - function getDescription() { return _("Hilight referred search terms."); Modified: trunk/lib/plugin/SemanticRelations.php =================================================================== --- trunk/lib/plugin/SemanticRelations.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/SemanticRelations.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -31,11 +31,6 @@ class WikiPlugin_SemanticRelations extends WikiPlugin { - function getName() - { - return _("SemanticRelations"); - } - function getDescription() { return _("Display the list of relations and attributes on this page."); Modified: trunk/lib/plugin/SemanticSearch.php =================================================================== --- trunk/lib/plugin/SemanticSearch.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/SemanticSearch.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -54,11 +54,6 @@ class WikiPlugin_SemanticSearch extends WikiPlugin { - function getName() - { - return _("SemanticSearch"); - } - function getDescription() { return _("Search relations and attributes."); Modified: trunk/lib/plugin/SemanticSearchAdvanced.php =================================================================== --- trunk/lib/plugin/SemanticSearchAdvanced.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/SemanticSearchAdvanced.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -58,11 +58,6 @@ class WikiPlugin_SemanticSearchAdvanced extends WikiPlugin_SemanticSearch { - function getName() - { - return _("SemanticSearchAdvanced"); - } - function getDescription() { return _("Parse and execute a full query expression."); Modified: trunk/lib/plugin/SiteMap.php =================================================================== --- trunk/lib/plugin/SiteMap.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/SiteMap.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -47,11 +47,6 @@ { public $_pagename; - function getName() - { - return _("SiteMap"); - } - function getDescription() { return _("Recursively get BackLinks or links."); Modified: trunk/lib/plugin/SpellCheck.php =================================================================== --- trunk/lib/plugin/SpellCheck.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/SpellCheck.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -64,11 +64,6 @@ class WikiPlugin_SpellCheck extends WikiPlugin { - function getName() - { - return _("Spell Checker"); - } - function getDescription() { return _("Check the spelling of a page and make suggestions."); Modified: trunk/lib/plugin/SqlResult.php =================================================================== --- trunk/lib/plugin/SqlResult.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/SqlResult.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -63,11 +63,6 @@ { public $_args; - function getName() - { - return _("SqlResult"); - } - function getDescription() { return _("Display arbitrary SQL result tables."); Modified: trunk/lib/plugin/SyncWiki.php =================================================================== --- trunk/lib/plugin/SyncWiki.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/SyncWiki.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -42,11 +42,6 @@ class WikiPlugin_SyncWiki extends WikiPlugin_WikiAdminUtils { - function getName() - { - return _("SyncWiki"); - } - function getDescription() { return _("Synchronize pages with external PhpWiki."); Modified: trunk/lib/plugin/SyntaxHighlighter.php =================================================================== --- trunk/lib/plugin/SyntaxHighlighter.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/SyntaxHighlighter.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -40,11 +40,6 @@ class WikiPlugin_SyntaxHighlighter extends WikiPlugin { - function getName() - { - return _("SyntaxHighlighter"); - } - function getDescription() { return _("Source code syntax highlighter (via http://www.andre-simon.de)."); Modified: trunk/lib/plugin/SystemInfo.php =================================================================== --- trunk/lib/plugin/SystemInfo.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/SystemInfo.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -50,11 +50,6 @@ return PLUGIN_CACHED_HTML; } - function getName() - { - return _("SystemInfo"); - } - function getDescription() { return _("Provide access to PhpWiki's lower level system information."); Modified: trunk/lib/plugin/TeX2png.php =================================================================== --- trunk/lib/plugin/TeX2png.php 2013-06-12 16:00:15 UTC (rev 8794) +++ trunk/lib/plugin/TeX2png.php 2013-06-12 16:04:29 UTC (rev 8795) @@ -41,11 +41,6 @@ public $dvipsbin = '/usr/bin/dvips'; public $pstoimgbin = '/usr/bin/pstoimg'; - function getName() - { - return _("TeX2png"); - } - function getDescription() { return _("Convert Tex mathematicals expressions to cached PNG files. This is for small text."); Modified: trunk/lib/plugin/Template.php ==========================... [truncated message content] |
From: <var...@us...> - 2013-06-13 14:36:33
|
Revision: 8799 http://sourceforge.net/p/phpwiki/code/8799 Author: vargenau Date: 2013-06-13 14:36:30 +0000 (Thu, 13 Jun 2013) Log Message: ----------- Upper case Modified Paths: -------------- trunk/lib/loadsave.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/loadsave.php =================================================================== --- trunk/lib/loadsave.php 2013-06-12 16:27:45 UTC (rev 8798) +++ trunk/lib/loadsave.php 2013-06-13 14:36:30 UTC (rev 8799) @@ -1120,7 +1120,7 @@ $rev = $page->getRevision($version); $content = $rev->getPackedContent(); $versiondata = $rev->_data; - $versiondata['summary'] = sprintf(_("revert to version %d"), $version); + $versiondata['summary'] = sprintf(_("Revert to version %d"), $version); $versiondata['mtime'] = time(); $versiondata['author'] = $request->getUser()->getId(); $new = $page->save($content, $currversion + 1, $versiondata); 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 2013-06-12 16:27:45 UTC (rev 8798) +++ trunk/locale/de/LC_MESSAGES/phpwiki.php 2013-06-13 14:36:30 UTC (rev 8799) @@ -876,6 +876,7 @@ $locale["Return to %s"] = "Zurück zu %s"; $locale["Revert"] = "Zurückspeichern"; $locale["Revert cancelled"] = "Zurückspeichern abgebrochen"; +$locale["Revert to version %d"] = "Speichere Version %d zurück."; $locale["Revert: %s"] = "Zurückspeichern: %s"; $locale["Revert: missing required version argument"] = "Zurückspeichern: Parameter version muß angegeben werden"; $locale["Reverting to a previous version of pages"] = "Zurückspeichern einer älteren Version"; @@ -1288,7 +1289,6 @@ $locale["renamed from %s"] = "umbenannt von %s"; $locale["reverse"] = "umdrehen"; $locale["revert to a previous version of this page"] = "Zurückspeichern einer älteren Version dieser Seite."; -$locale["revert to version %d"] = "Speichere Version %d zurück."; $locale["revision by previous author"] = "Revidierte Ausgabe des vorigen Autors"; $locale["same content"] = "gleiche Seiteninalt"; $locale["saved as "] = "gespeichert als "; 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 2013-06-12 16:27:45 UTC (rev 8798) +++ trunk/locale/es/LC_MESSAGES/phpwiki.php 2013-06-13 14:36:30 UTC (rev 8799) @@ -363,6 +363,7 @@ $locale["Restore Anyway"] = "Restore de todos modos"; $locale["Return to %s"] = "Vuelva a %s"; $locale["Revert"] = "Invierta"; +$locale["Revert to version %d"] = "Invierta a la versión %d"; $locale["Revert: %s"] = "Invierta: %s"; $locale["Revision Not Found"] = "Revisión No encontrada"; $locale["SandBox"] = "CajaDeArena"; @@ -550,7 +551,6 @@ $locale["renamed from %s"] = "retitulado de %s"; $locale["reverse"] = "invierta"; $locale["revert to a previous version of this page"] = "para invertir a una versión anterior de esta página"; -$locale["revert to version %d"] = "invierta a la versión %d"; $locale["revision by previous author"] = "revisión del autor anterior"; $locale["same content"] = "mismo contenido"; $locale["saved as "] = "ahorrado como "; 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 2013-06-12 16:27:45 UTC (rev 8798) +++ trunk/locale/fr/LC_MESSAGES/phpwiki.php 2013-06-13 14:36:30 UTC (rev 8799) @@ -926,6 +926,7 @@ $locale["Return to %s"] = "Retourner à %s"; $locale["Revert"] = "Révoquer"; $locale["Revert cancelled"] = "Révocation annulée"; +$locale["Revert to version %d"] = "Revenir à la version %d"; $locale["Revert: %s"] = "Révoquer : %s"; $locale["Revert: missing required version argument"] = "Révocation : argument de version obligatoire manquant"; $locale["Revision Not Found"] = "Version non trouvée"; @@ -1344,7 +1345,6 @@ $locale["renamed from %s"] = "renommée à partir de %s"; $locale["reverse"] = "inverser"; $locale["revert to a previous version of this page"] = "revenir à une version précédente de la page"; -$locale["revert to version %d"] = "revenir à la version %d"; $locale["revision by previous author"] = "version par l'auteur précédent"; $locale["same content"] = "même contenu"; $locale["saved as "] = "enregistré sous "; 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 2013-06-12 16:27:45 UTC (rev 8798) +++ trunk/locale/po/de.po 2013-06-13 14:36:30 UTC (rev 8799) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-12 18:26+0200\n" +"POT-Creation-Date: 2013-06-13 16:35+0200\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." @@ -682,7 +682,7 @@ msgstr "Abbrechen" #, php-format -msgid "revert to version %d" +msgid "Revert to version %d" msgstr "Speichere Version %d zurück." #, php-format Modified: trunk/locale/po/es.po =================================================================== --- trunk/locale/po/es.po 2013-06-12 16:27:45 UTC (rev 8798) +++ trunk/locale/po/es.po 2013-06-13 14:36:30 UTC (rev 8799) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-12 18:26+0200\n" +"POT-Creation-Date: 2013-06-13 16:35+0200\n" "PO-Revision-Date: 2000-02-01 00:50-0500\n" "Last-Translator: Pablo Roca <pr...@cl...>\n" "Language-Team: \n" @@ -667,8 +667,8 @@ msgstr "Cancelar" #, php-format -msgid "revert to version %d" -msgstr "invierta a la versión %d" +msgid "Revert to version %d" +msgstr "Invierta a la versión %d" #, php-format msgid "Revert: %s" Modified: trunk/locale/po/fr.po =================================================================== --- trunk/locale/po/fr.po 2013-06-12 16:27:45 UTC (rev 8798) +++ trunk/locale/po/fr.po 2013-06-13 14:36:30 UTC (rev 8799) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-12 18:26+0200\n" +"POT-Creation-Date: 2013-06-13 16:35+0200\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." @@ -663,8 +663,8 @@ msgstr "Annuler" #, php-format -msgid "revert to version %d" -msgstr "revenir à la version %d" +msgid "Revert to version %d" +msgstr "Revenir à la version %d" #, php-format msgid "Revert: %s" Modified: trunk/locale/po/it.po =================================================================== --- trunk/locale/po/it.po 2013-06-12 16:27:45 UTC (rev 8798) +++ trunk/locale/po/it.po 2013-06-13 14:36:30 UTC (rev 8799) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-12 18:26+0200\n" +"POT-Creation-Date: 2013-06-13 16:35+0200\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" @@ -653,7 +653,7 @@ msgstr "Annulla" #, php-format -msgid "revert to version %d" +msgid "Revert to version %d" msgstr "" #, php-format Modified: trunk/locale/po/ja.po =================================================================== --- trunk/locale/po/ja.po 2013-06-12 16:27:45 UTC (rev 8798) +++ trunk/locale/po/ja.po 2013-06-13 14:36:30 UTC (rev 8799) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-12 18:26+0200\n" +"POT-Creation-Date: 2013-06-13 16:35+0200\n" "PO-Revision-Date: 2003-06-07 09:01+0900\n" "Last-Translator: Tadashi Jokagi <web...@el...>\n" "Language-Team: LANGUAGE <LL...@li...>\n" @@ -642,7 +642,7 @@ msgstr "" #, fuzzy, php-format -msgid "revert to version %d" +msgid "Revert to version %d" msgstr "バージョン %d" #, php-format Modified: trunk/locale/po/nl.po =================================================================== --- trunk/locale/po/nl.po 2013-06-12 16:27:45 UTC (rev 8798) +++ trunk/locale/po/nl.po 2013-06-13 14:36:30 UTC (rev 8799) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-12 18:26+0200\n" +"POT-Creation-Date: 2013-06-13 16:35+0200\n" "PO-Revision-Date: 2000-09-30 02:23+0200\n" "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n" "Language-Team: Dutch <nl...@li...>\n" @@ -645,7 +645,7 @@ msgstr "Annuleer" #, php-format -msgid "revert to version %d" +msgid "Revert to version %d" msgstr "" #, php-format Modified: trunk/locale/po/phpwiki.pot =================================================================== --- trunk/locale/po/phpwiki.pot 2013-06-12 16:27:45 UTC (rev 8798) +++ trunk/locale/po/phpwiki.pot 2013-06-13 14:36:30 UTC (rev 8799) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki-1.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-12 18:26+0200\n" +"POT-Creation-Date: 2013-06-13 16:35+0200\n" "PO-Revision-Date: 2002-12-14 17:51-0500\n" "Last-Translator: Reini Urban <ru...@us...>\n" "Language-Team: LANGUAGE <LL...@li...>\n" @@ -637,7 +637,7 @@ msgstr "" #, php-format -msgid "revert to version %d" +msgid "Revert to version %d" msgstr "" #, php-format Modified: trunk/locale/po/sv.po =================================================================== --- trunk/locale/po/sv.po 2013-06-12 16:27:45 UTC (rev 8798) +++ trunk/locale/po/sv.po 2013-06-13 14:36:30 UTC (rev 8799) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-12 18:26+0200\n" +"POT-Creation-Date: 2013-06-13 16:35+0200\n" "PO-Revision-Date: 2001-01-27 01:58+0200\n" "Last-Translator: Jon Åslund <jo...@he...>\n" "Language-Team: \n" @@ -640,7 +640,7 @@ msgstr "Avbyrt" #, php-format -msgid "revert to version %d" +msgid "Revert to version %d" msgstr "" #, php-format Modified: trunk/locale/po/zh.po =================================================================== --- trunk/locale/po/zh.po 2013-06-12 16:27:45 UTC (rev 8798) +++ trunk/locale/po/zh.po 2013-06-13 14:36:30 UTC (rev 8799) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-12 18:26+0200\n" +"POT-Creation-Date: 2013-06-13 16:35+0200\n" "PO-Revision-Date: 2004-04-21 10:08+0800\n" "Last-Translator: DruryL <dr...@us...>\n" "Language-Team: DruryL <dr...@us...>\n" @@ -674,7 +674,7 @@ msgstr "取消" #, fuzzy, php-format -msgid "revert to version %d" +msgid "Revert to version %d" msgstr "版本 %d" #, fuzzy, php-format 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...> - 2013-06-13 15:19:09
|
Revision: 8800 http://sourceforge.net/p/phpwiki/code/8800 Author: vargenau Date: 2013-06-13 15:19:05 +0000 (Thu, 13 Jun 2013) Log Message: ----------- Remove chmod Modified Paths: -------------- trunk/locale/Makefile 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 Removed Paths: ------------- trunk/lib/plugin/WikiAdminChmod.php Deleted: trunk/lib/plugin/WikiAdminChmod.php =================================================================== --- trunk/lib/plugin/WikiAdminChmod.php 2013-06-13 14:36:30 UTC (rev 8799) +++ trunk/lib/plugin/WikiAdminChmod.php 2013-06-13 15:19:05 UTC (rev 8800) @@ -1,200 +0,0 @@ -<?php - -/* - * Copyright 2004 $ThePhpWikiProgrammingTeam - * Copyright 2008 Marc-Etienne Vargenau, Alcatel-Lucent - * - * This file is part of PhpWiki. - * - * PhpWiki is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * PhpWiki is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with PhpWiki; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -/** - * Set individual PagePermissions, simplifying effective ACLs to - * unix-like rwxr--r--+ permissions. (as in cygwin) - * - * Usage: <<WikiAdminChmod >> or called via WikiAdminSelect - * Author: Reini Urban <ru...@x-...> - * - */ -require_once 'lib/PageList.php'; -require_once 'lib/plugin/WikiAdminSelect.php'; - -class WikiPlugin_WikiAdminChmod - extends WikiPlugin_WikiAdminSelect -{ - function getDescription() - { - return _("Set individual page permissions."); - } - - function getDefaultArguments() - { - return array_merge - ( - PageList::supportedArgs(), - array( - 's' => false, - 'perm' => false, - /* Columns to include in listing */ - 'info' => 'pagename,perm,mtime,author', - )); - } - - // todo: change permstring to some kind of default ACL hash. - // See PagePermission class - function chmodHelper($permstring) - { - $perm = array(); - return $perm; - } - - function chmodPages(&$dbi, &$request, $pages, $permstring) - { - $ul = HTML::ul(); - $count = 0; - $acl = chmodHelper($permstring); - if ($perm = new PagePermission($acl)) { - foreach ($pages as $name) { - if ($perm->store($dbi->getPage($name))) { - $ul->pushContent(HTML::li(fmt("chmod page “%s” to “%s”.", $name, $permstring))); - $count++; - } else { - $ul->pushContent(HTML::li(fmt("Couldn't chmod page “%s” to “%s”.", $name, $permstring))); - } - } - } else { - $ul->pushContent(HTML::li(_("Invalid chmod string"))); - } - if ($count) { - $dbi->touch(); - return HTML($ul, - HTML::p(fmt("%d pages have been changed.", $count))); - } else { - return HTML($ul, - HTML::p(_("No pages changed."))); - } - } - - function run($dbi, $argstr, &$request, $basepage) - { - if (!DEBUG) { - return $this->disabled("WikiAdminChmod not yet enabled. Set DEBUG to try it."); - } - - $args = $this->getArgs($argstr, $request); - $this->_args = $args; - $this->preSelectS($args, $request); - - $p = $request->getArg('p'); - if (!$p) $p = $this->_list; - $post_args = $request->getArg('admin_chmod'); - $next_action = 'select'; - $pages = array(); - if ($p && !$request->isPost()) - $pages = $p; - if ($p && $request->isPost() && - !empty($post_args['chmod']) && empty($post_args['cancel']) - ) { - // without individual PagePermissions: - if (!ENABLE_PAGEPERM and !$request->_user->isAdmin()) { - $request->_notAuthorized(WIKIAUTH_ADMIN); - $this->disabled("! user->isAdmin"); - } - - if ($post_args['action'] == 'verify') { - // Real action - return $this->chmodPages($dbi, $request, array_keys($p), - $post_args['perm']); - } - if ($post_args['action'] == 'select') { - if (!empty($post_args['perm'])) - $next_action = 'verify'; - foreach ($p as $name => $c) { - $pages[$name] = 1; - } - } - } - if ($next_action == 'select' and empty($pages)) { - // List all pages to select from. - $pages = $this->collectPages($pages, $dbi, $args['sortby'], $args['limit'], $args['exclude']); - } - if ($next_action == 'verify') { - $args['info'] = "checkbox,pagename,perm,author,mtime"; - } - $args['types'] = array('perm' => new _PageList_Column_chmod_perm('perm', _("Permission"))); - $pagelist = new PageList_Selectable($args['info'], $args['exclude'], $args); - $pagelist->addPageList($pages); - - $header = HTML::p(); - if ($next_action == 'verify') { - $button_label = _("Yes"); - $header = $this->chmodForm($header, $post_args); - $header->pushContent( - HTML::p(HTML::strong( - _("Are you sure you want to permanently change the selected files?")))); - } else { - $button_label = _("Chmod"); - $header = $this->chmodForm($header, $post_args); - $header->pushContent(HTML::p(_("Select the pages to change:"))); - } - - $buttons = HTML::p(Button('submit:admin_chmod[chmod]', $button_label, 'wikiadmin'), - Button('submit:admin_chmod[cancel]', _("Cancel"), 'button')); - - return HTML::form(array('action' => $request->getPostURL(), - 'method' => 'post'), - $header, - $buttons, - $pagelist->getContent(), - HiddenInputs($request->getArgs(), - false, - array('admin_chmod')), - HiddenInputs(array('admin_chmod[action]' => $next_action)), - ENABLE_PAGEPERM - ? '' - : HiddenInputs(array('require_authority_for_post' => WIKIAUTH_ADMIN))); - } - - function chmodForm(&$header, $post_args) - { - $header->pushContent( - HTML::p(HTML::em( - _("This plugin is currently under development and does not work!")))); - $header->pushContent(_("Chmod to permission:")); - $header->pushContent(HTML::input(array('name' => 'admin_chmod[perm]', - 'value' => $post_args['perm']))); - $header->pushContent(' ' . _("(ugo : rwx)")); - $header->pushContent(HTML::p()); - $checkbox = HTML::input(array('type' => 'checkbox', - 'name' => 'admin_chmod[updatechildren]', - 'value' => 1)); - if (!empty($post_args['updatechildren'])) $checkbox->setAttr('checked', 'checked'); - $header->pushContent($checkbox, HTML::raw(" "), - _("Propagate new permissions to all subpages?"), - HTML::raw(" "), - HTML::em(_("(disable individual page permissions, enable inheritance)?"))); - $header->pushContent(HTML::hr(), HTML::p()); - return $header; - } -} - -// Local Variables: -// mode: php -// tab-width: 8 -// c-basic-offset: 4 -// c-hanging-comment-ender-p: nil -// indent-tabs-mode: nil -// End: Modified: trunk/locale/Makefile =================================================================== --- trunk/locale/Makefile 2013-06-13 14:36:30 UTC (rev 8799) +++ trunk/locale/Makefile 2013-06-13 15:19:05 UTC (rev 8800) @@ -97,6 +97,22 @@ ${POT_FILE}: ../lib/ErrorManager.php ${POT_FILE}: ../lib/ExternalReferrer.php ${POT_FILE}: ../lib/FileFinder.php +${POT_FILE}: ../lib/font/chinese.php +${POT_FILE}: ../lib/font/courierbi.php +${POT_FILE}: ../lib/font/courierb.php +${POT_FILE}: ../lib/font/courieri.php +${POT_FILE}: ../lib/font/courier.php +${POT_FILE}: ../lib/font/helveticabi.php +${POT_FILE}: ../lib/font/helveticab.php +${POT_FILE}: ../lib/font/helveticai.php +${POT_FILE}: ../lib/font/helvetica.php +${POT_FILE}: ../lib/font/japanese.php +${POT_FILE}: ../lib/font/symbol.php +${POT_FILE}: ../lib/font/timesbi.php +${POT_FILE}: ../lib/font/timesb.php +${POT_FILE}: ../lib/font/timesi.php +${POT_FILE}: ../lib/font/times.php +${POT_FILE}: ../lib/font/zapfdingbats.php ${POT_FILE}: ../lib/fortune.php ${POT_FILE}: ../lib/gif.php ${POT_FILE}: ../lib/Google.php @@ -238,7 +254,6 @@ ${POT_FILE}: ../lib/plugin/WantedPages.php ${POT_FILE}: ../lib/plugin/WatchPage.php ${POT_FILE}: ../lib/plugin/WhoIsOnline.php -${POT_FILE}: ../lib/plugin/WikiAdminChmod.php ${POT_FILE}: ../lib/plugin/WikiAdminChown.php ${POT_FILE}: ../lib/plugin/WikiAdminDeleteAcl.php ${POT_FILE}: ../lib/plugin/WikiAdminMarkup.php Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/de/LC_MESSAGES/phpwiki.php =================================================================== --- trunk/locale/de/LC_MESSAGES/phpwiki.php 2013-06-13 14:36:30 UTC (rev 8799) +++ trunk/locale/de/LC_MESSAGES/phpwiki.php 2013-06-13 15:19:05 UTC (rev 8800) @@ -158,7 +158,6 @@ $locale["Are you sure you want to change the markup type of the selected files?"] = "Sind Sie sicher, dass Sie die ausgewählen Seiten wirklich ändern wollen?"; $locale["Are you sure you want to change the owner of the selected pages?"] = "Sind Sie sicher, dass Sie die ausgewählen Seiten wirklich ändern wollen?"; $locale["Are you sure you want to permanently change access rights to the selected files?"] = "Sind Sie sicher, dass Sie die ausgewählen Seiten wirklich ändern wollen?"; -$locale["Are you sure you want to permanently change the selected files?"] = "Sind Sie sicher, dass Sie die ausgewählen Seiten wirklich ändern wollen?"; $locale["Are you sure you want to permanently purge the following files?"] = "Sind Sie sicher, dass Sie die ausgewählen Seiten wirklich löschen wollen?"; $locale["Are you sure you want to remove the selected files?"] = "Sind Sie sicher, dass Sie die ausgewählen Seiten wirklich löschen wollen?"; $locale["Are you sure you want to rename the selected pages?"] = "Sind Sie sicher, dass Sie die ausgewählen Seiten wirklich umbenennen wollen?"; @@ -252,8 +251,6 @@ $locale["Check menu items to display."] = "Klicken um anzuzeigen."; $locale["Check to add this ACL"] = "Anklicken um diese ACL hinzuzufügen"; $locale["Check you are logged in."] = "Sie sollten jetzt angemeldet sein."; -$locale["Chmod"] = "Chmod"; -$locale["Chmod to permission:"] = "Ändere auf Berechtigung:"; $locale["Click to authenticate as %s"] = "Hier klicken um sich anzumelden als %s"; $locale["Click to de-/select all pages"] = "Klicken Sie um alle/keine Seiten auszuwählen"; $locale["Click to display"] = "Klicken um anzuzeigen"; @@ -285,7 +282,6 @@ $locale["Could not change owner of page “%s” to “%s”."] = "Konnte den Besitzer der Seite »%s« nicht in »%s« ändern."; $locale["Could not connect to LDAP host %s"] = "Kann nicht zu LDAP host »%s« verbinden"; $locale["Couldn't change page “%s” to markup type “%s”."] = "Konnte die Formatierung der Seite »%s« nicht auf »%s« ändern."; -$locale["Couldn't chmod page “%s” to “%s”."] = "Konnte die Berechtigung der Seite »%s« nicht auf »%s« ändern."; $locale["Couldn't connect to %s"] = "Kann nicht zu »%s« verbinden"; $locale["Couldn't rename page “%s” to “%s”."] = "Konnte Seite »%s« nicht in »%s« umbenennen."; $locale["Couldn't start commandline “%s”"] = "Konnte Programm »%s« nicht starten"; @@ -525,7 +521,6 @@ $locale["Invalid argument %s"] = "Ungültiger Parameter %s"; $locale["Invalid argument: %s=%s"] = "Ungültiger Parameter: %s=%s"; $locale["Invalid attribute %s=%s for image %s"] = "Ungültiger Parameter %s=%s für Bild %s"; -$locale["Invalid chmod string"] = "Ungültiger CHMOD Befehl"; $locale["Invalid color: %s"] = "Ungültige Farbe: %s"; $locale["Invalid filename. File names may only contain alphanumeric characters and dot, underscore, space or dash."] = "Dateinamen dürfen nur folgende Zeichen enthalten: alphanumerische Zeichen, Punkt, Unterstrich, Leerzeichen und Bindestrich."; $locale["Invalid image size"] = "Ungültige Bildgröße"; @@ -909,7 +904,6 @@ $locale["Select the files to remove"] = "Wähle Seiten zum Umbenennen aus:"; $locale["Select the pages to change the markup type"] = "Wählen Sie die Seiten zum Ändern:"; $locale["Select the pages to change the owner"] = "Wählen Sie die Seiten zum Ändern"; -$locale["Select the pages to change:"] = "Wählen Sie die Seiten zum Ändern:"; $locale["Select the pages to rename:"] = "Wähle Seiten zum Umbenennen aus:"; $locale["Select the pages to search and replace"] = "Seiten auswählen:"; $locale["Select the pages where to change access rights"] = "Wählen Sie die Seiten zum Ändern:"; @@ -1217,7 +1211,6 @@ $locale["cached pagedata:"] = "Seitendaten in den Cachespeicher aufgenommen:"; $locale["cached versiondata:"] = "Versionendaten in den Cachespeicher aufgenommen:"; $locale["change page “%s” to markup type “%s”."] = "Formatierung der Seite »%s« auf »%s« geändert."; -$locale["chmod page “%s” to “%s”."] = "Berechtigung der Seite »%s« auf »%s« geändert."; $locale["comments"] = "Kommentare"; $locale["compare revisions"] = "Versionen vergleichen"; $locale["content is identical to current version %d - no new revision created"] = "Inhalt ist identisch mit der aktuellen Version %d - keine neue Version erzeugt"; 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 2013-06-13 14:36:30 UTC (rev 8799) +++ trunk/locale/fr/LC_MESSAGES/phpwiki.php 2013-06-13 15:19:05 UTC (rev 8800) @@ -86,7 +86,6 @@ $locale["(formatted for PhpWiki developers as pgsrc template, not for backing up)"] = "(format pour les développeurs, pas pour la sauvegarde)"; $locale["(formatted for backing up: all revisions)"] = "(format de sauvegarde : toutes les versions)"; $locale["(max. recursion level: %d)"] = "(niveau maximum de récursivité: %d)"; -$locale["(ugo : rwx)"] = "(ugo : rwx)"; $locale[", Memory: %s"] = ", mémoire : %s"; $locale["- saved to database as version %d"] = "- enregistrée dans la base de données sous la version %d"; $locale["- version %d saved to database as version %d"] = "- version %d sauvée dans la base de données sous la version %d"; @@ -166,7 +165,6 @@ $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 ?"; $locale["Are you sure you want to permanently change access rights to the selected files?"] = "Êtes-vous sûr de vouloir définitivement modifier l'accès aux fichiers sélectionnés ?"; -$locale["Are you sure you want to permanently change the selected files?"] = "Êtes-vous sûr de vouloir modifier de manière permanente les fichiers sélectionnés ?"; $locale["Are you sure you want to permanently purge the following files?"] = "Êtes-vous sûr de vouloir purger définitivement les pages suivantes ?"; $locale["Are you sure you want to remove the selected files?"] = "Êtes-vous certain de vouloir supprimer les fichiers sélectionnés ?"; $locale["Are you sure you want to rename the selected pages?"] = "Êtes-vous sûr de vouloir renommer les pages sélectionnées ?"; @@ -255,8 +253,6 @@ $locale["Check you are a member of the current project."] = "Vous êtes déjà membre de ce projet."; $locale["Check you are in the right project."] = "Vérifiez que vous êtes dans le bon projet."; $locale["Check you are logged in."] = "Vous devez vous identifier."; -$locale["Chmod"] = "Chmod"; -$locale["Chmod to permission:"] = "Changer le mode de permission à :"; $locale["Click a button to get an example text"] = "Cliquer sur un bouton pour obtenir une exemple de texte"; $locale["Click to authenticate as %s"] = "Cliquez pour vous identifier en tant que %s"; $locale["Click to de-/select all pages"] = "Cliquez pour (de)sélectionner toutes les pages"; @@ -293,7 +289,6 @@ $locale["Converts TeX to an image. May be used to embed formulas in PhpWiki."] = "Pour convertir des formules TeX en image."; $locale["Copyrights"] = "Copyrights"; $locale["Could not change owner of page “%s” to “%s”."] = "Impossible de changer le propriétaire “%s” à “%s”."; -$locale["Couldn't chmod page “%s” to “%s”."] = "Impossible de changer le mode “%s” à “%s”."; $locale["Couldn't connect to %s"] = "Impossible d'établir une connexion à la base de données : %s"; $locale["Couldn't rename page “%s” to “%s”."] = "Impossible de renommer la page « %s » en « %s »."; $locale["Couldn't start commandline “%s”"] = "Impossible de lancer la ligne de commande « %s »"; @@ -556,7 +551,6 @@ $locale["Invalid argument %s"] = "Argument non valable %s"; $locale["Invalid argument: %s=%s"] = "Argument non valable : %s=%s"; $locale["Invalid attribute %s=%s for image %s"] = "Attribut non valable %s=%s pour l'image %s"; -$locale["Invalid chmod string"] = "Chaîne de caractère invalide pour le changement de mode"; $locale["Invalid color: %s"] = "Couleur non valide : %s"; $locale["Invalid image size"] = "Taille d'image invalide"; $locale["Invalid password or userid."] = "Mot de passe ou utilisateur non valide."; @@ -956,7 +950,6 @@ $locale["Select pages"] = "Sélectionner les pages"; $locale["Select the files to purge"] = "Sélectionnez les fichiers à purger"; $locale["Select the pages to change the owner"] = "Sélectionnez les pages dont vous voulez changer le propriétaire"; -$locale["Select the pages to change:"] = "Sélectionnez les pages à modifier :"; $locale["Select the pages to rename:"] = "Sélectionnez les pages à renommer :"; $locale["Select the pages to search and replace"] = "Sélectionner ci-dessous les pages dans lesquelles la recherche sera effectuée :"; $locale["Select the pages where to delete access rights"] = "Sélectionnez les pages dont vous voulez supprimer les droits d'accès"; @@ -1080,7 +1073,6 @@ $locale["This page has been locked by the administrator so your changes can not be saved."] = "Cette page a été verrouillée par l'administrateur et vos changements n'ont pas pu être enregistrés."; $locale["This page is external."] = "Cette page est externe."; $locale["This plugin has no description."] = "Ce greffon n'a pas de description."; -$locale["This plugin is currently under development and does not work!"] = "Ce greffon est en cours de développement et ne marche pas !"; $locale["This project is shared with third-party users"] = "The projet est partagé avec des utilisateurs extérieurs"; $locale["This revision of the page does not exist."] = "Cette version de la page n'existe pas."; $locale["Time Zone"] = "Fuseau horaire"; @@ -1274,7 +1266,6 @@ $locale["by %s"] = "par %s"; $locale["cached pagedata:"] = "page bufferisée :"; $locale["cached versiondata:"] = "version bufferisée :"; -$locale["chmod page “%s” to “%s”."] = "Changement de mode %s à %s."; $locale["comments"] = "commentaires"; $locale["compare revisions"] = "comparer les versions"; $locale["content is identical to current version %d - no new revision created"] = "le contenu est identique à la version en cours %d - pas de nouvelle version"; 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 2013-06-13 14:36:30 UTC (rev 8799) +++ trunk/locale/po/de.po 2013-06-13 15:19:05 UTC (rev 8800) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-13 16:35+0200\n" +"POT-Creation-Date: 2013-06-13 17:17+0200\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." @@ -3442,52 +3442,6 @@ msgid "%d minutes" msgstr "%d Minuten" -msgid "Set individual page permissions." -msgstr "Setze individuelle Zugangsrechte." - -#, php-format -msgid "chmod page “%s” to “%s”." -msgstr "Berechtigung der Seite »%s« auf »%s« geändert." - -#, php-format -msgid "Couldn't chmod page “%s” to “%s”." -msgstr "Konnte die Berechtigung der Seite »%s« nicht auf »%s« ändern." - -msgid "Invalid chmod string" -msgstr "Ungültiger CHMOD Befehl" - -#, php-format -msgid "%d pages have been changed." -msgstr "%d Seiten wurden geändert." - -msgid "No pages changed." -msgstr "Keine Änderungen." - -msgid "Are you sure you want to permanently change the selected files?" -msgstr "" -"Sind Sie sicher, dass Sie die ausgewählen Seiten wirklich ändern wollen?" - -msgid "Chmod" -msgstr "Chmod" - -msgid "Select the pages to change:" -msgstr "Wählen Sie die Seiten zum Ändern:" - -msgid "This plugin is currently under development and does not work!" -msgstr "" - -msgid "Chmod to permission:" -msgstr "Ändere auf Berechtigung:" - -msgid "(ugo : rwx)" -msgstr "" - -msgid "Propagate new permissions to all subpages?" -msgstr "Aktiviere Vererbung dieser Zugriffsrechte auf alle Unterseiten?" - -msgid "(disable individual page permissions, enable inheritance)?" -msgstr "(deaktiviere individuelle Zugriffsrechte, aktiviere Vererbung)" - msgid "Change owner of selected pages." msgstr "Den Besitzer ausgewählte Seiten ändern." @@ -3510,6 +3464,9 @@ msgid "%d pages have been changed:" msgstr "%d Seiten wurden geändert:" +msgid "No pages changed." +msgstr "Keine Änderungen." + msgid "PhpWikiAdministration/Chown" msgstr "PhpWikiSystemverwalten/Chown" @@ -3534,6 +3491,10 @@ msgid "ACL deleted for page “%s”" msgstr "ACL für Seite »%s« gelöscht" +#, php-format +msgid "%d pages have been changed." +msgstr "%d Seiten wurden geändert." + # Any better translation? The locale/de/pgsrc/PhpWikiSystemverwalten # must also be renamed to match what is here. #, fuzzy @@ -3801,6 +3762,9 @@ msgid "Selected page “%s” passed to “%s”." msgstr "Ausgewählte Seite »%s« an »%s« übergeben." +msgid "Set individual page permissions." +msgstr "Setze individuelle Zugangsrechte." + #, php-format msgid "ACL not changed for page “%s”." msgstr "ACL für Seite »%s« nicht geändert." @@ -3852,6 +3816,12 @@ msgid "To add check 'Add' near the dropdown list." msgstr "Setze '+' um ACL Zeile hinzufügen." +msgid "Propagate new permissions to all subpages?" +msgstr "Aktiviere Vererbung dieser Zugriffsrechte auf alle Unterseiten?" + +msgid "(disable individual page permissions, enable inheritance)?" +msgstr "(deaktiviere individuelle Zugriffsrechte, aktiviere Vererbung)" + msgid "(Currently not working)" msgstr "(Funktioniert momentan nicht)" @@ -6269,6 +6239,28 @@ msgid "Edit this page" msgstr "Diese Seite bearbeiten" +#~ msgid "chmod page “%s” to “%s”." +#~ msgstr "Berechtigung der Seite »%s« auf »%s« geändert." + +#~ msgid "Couldn't chmod page “%s” to “%s”." +#~ msgstr "Konnte die Berechtigung der Seite »%s« nicht auf »%s« ändern." + +#~ msgid "Invalid chmod string" +#~ msgstr "Ungültiger CHMOD Befehl" + +#~ msgid "Are you sure you want to permanently change the selected files?" +#~ msgstr "" +#~ "Sind Sie sicher, dass Sie die ausgewählen Seiten wirklich ändern wollen?" + +#~ msgid "Chmod" +#~ msgstr "Chmod" + +#~ msgid "Select the pages to change:" +#~ msgstr "Wählen Sie die Seiten zum Ändern:" + +#~ msgid "Chmod to permission:" +#~ msgstr "Ändere auf Berechtigung:" + #, fuzzy #~ msgid "mode" #~ msgstr "Chmod" Modified: trunk/locale/po/es.po =================================================================== --- trunk/locale/po/es.po 2013-06-13 14:36:30 UTC (rev 8799) +++ trunk/locale/po/es.po 2013-06-13 15:19:05 UTC (rev 8800) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-13 16:35+0200\n" +"POT-Creation-Date: 2013-06-13 17:17+0200\n" "PO-Revision-Date: 2000-02-01 00:50-0500\n" "Last-Translator: Pablo Roca <pr...@cl...>\n" "Language-Team: \n" @@ -3340,51 +3340,6 @@ msgid "%d minutes" msgstr "%d minutas" -msgid "Set individual page permissions." -msgstr "" - -#, php-format -msgid "chmod page “%s” to “%s”." -msgstr "" - -#, php-format -msgid "Couldn't chmod page “%s” to “%s”." -msgstr "" - -msgid "Invalid chmod string" -msgstr "" - -#, php-format -msgid "%d pages have been changed." -msgstr "" - -msgid "No pages changed." -msgstr "" - -msgid "Are you sure you want to permanently change the selected files?" -msgstr "" - -msgid "Chmod" -msgstr "" - -msgid "Select the pages to change:" -msgstr "" - -msgid "This plugin is currently under development and does not work!" -msgstr "" - -msgid "Chmod to permission:" -msgstr "" - -msgid "(ugo : rwx)" -msgstr "" - -msgid "Propagate new permissions to all subpages?" -msgstr "" - -msgid "(disable individual page permissions, enable inheritance)?" -msgstr "" - msgid "Change owner of selected pages." msgstr "" @@ -3407,6 +3362,9 @@ msgid "%d pages have been changed:" msgstr "" +msgid "No pages changed." +msgstr "" + msgid "PhpWikiAdministration/Chown" msgstr "" @@ -3430,6 +3388,10 @@ msgid "ACL deleted for page “%s”" msgstr "" +#, php-format +msgid "%d pages have been changed." +msgstr "" + #, fuzzy msgid "PhpWikiAdministration/AdminAclDelete" msgstr "AdministraciónDePhpWiki" @@ -3680,6 +3642,9 @@ msgid "Selected page “%s” passed to “%s”." msgstr "" +msgid "Set individual page permissions." +msgstr "" + #, php-format msgid "ACL not changed for page “%s”." msgstr "" @@ -3726,6 +3691,12 @@ msgid "To add check 'Add' near the dropdown list." msgstr "" +msgid "Propagate new permissions to all subpages?" +msgstr "" + +msgid "(disable individual page permissions, enable inheritance)?" +msgstr "" + msgid "(Currently not working)" msgstr "" Modified: trunk/locale/po/fr.po =================================================================== --- trunk/locale/po/fr.po 2013-06-13 14:36:30 UTC (rev 8799) +++ trunk/locale/po/fr.po 2013-06-13 15:19:05 UTC (rev 8800) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-13 16:35+0200\n" +"POT-Creation-Date: 2013-06-13 17:17+0200\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." @@ -3378,54 +3378,6 @@ msgid "%d minutes" msgstr "%d minutes" -msgid "Set individual page permissions." -msgstr "Modifier les permissions individuelles de la page." - -#, php-format -msgid "chmod page “%s” to “%s”." -msgstr "Changement de mode %s à %s." - -#, php-format -msgid "Couldn't chmod page “%s” to “%s”." -msgstr "Impossible de changer le mode “%s” à “%s”." - -msgid "Invalid chmod string" -msgstr "Chaîne de caractère invalide pour le changement de mode" - -#, php-format -msgid "%d pages have been changed." -msgstr "%d pages ont été modifiées." - -msgid "No pages changed." -msgstr "Aucune page modifiée." - -msgid "Are you sure you want to permanently change the selected files?" -msgstr "" -"Êtes-vous sûr de vouloir modifier de manière permanente les fichiers " -"sélectionnés ?" - -msgid "Chmod" -msgstr "Chmod" - -msgid "Select the pages to change:" -msgstr "Sélectionnez les pages à modifier :" - -msgid "This plugin is currently under development and does not work!" -msgstr "Ce greffon est en cours de développement et ne marche pas !" - -msgid "Chmod to permission:" -msgstr "Changer le mode de permission à :" - -msgid "(ugo : rwx)" -msgstr "(ugo : rwx)" - -msgid "Propagate new permissions to all subpages?" -msgstr "Propager les nouvelles permissions aux sous-pages ?" - -msgid "(disable individual page permissions, enable inheritance)?" -msgstr "" -"(désactive les permissions individuelles par page, activer l'héritage) ?" - msgid "Change owner of selected pages." msgstr "Changer le propriétaire des pages sélectionnées." @@ -3448,6 +3400,9 @@ msgid "%d pages have been changed:" msgstr "%d pages ont été modifiées :" +msgid "No pages changed." +msgstr "Aucune page modifiée." + msgid "PhpWikiAdministration/Chown" msgstr "AdministrationDePhpWiki/Chown" @@ -3471,6 +3426,10 @@ msgid "ACL deleted for page “%s”" msgstr "ACL supprimée pour la page %s" +#, php-format +msgid "%d pages have been changed." +msgstr "%d pages ont été modifiées." + msgid "PhpWikiAdministration/AdminAclDelete" msgstr "" @@ -3725,6 +3684,9 @@ msgid "Selected page “%s” passed to “%s”." msgstr "" +msgid "Set individual page permissions." +msgstr "Modifier les permissions individuelles de la page." + #, php-format msgid "ACL not changed for page “%s”." msgstr "ACL inchangée pour la page %s." @@ -3773,6 +3735,13 @@ msgid "To add check 'Add' near the dropdown list." msgstr "Pour ajouter cocher 'Add' près de la liste déroulante." +msgid "Propagate new permissions to all subpages?" +msgstr "Propager les nouvelles permissions aux sous-pages ?" + +msgid "(disable individual page permissions, enable inheritance)?" +msgstr "" +"(désactive les permissions individuelles par page, activer l'héritage) ?" + msgid "(Currently not working)" msgstr "" @@ -6148,6 +6117,35 @@ msgid "Edit this page" msgstr "Modifier cette page" +#~ msgid "chmod page “%s” to “%s”." +#~ msgstr "Changement de mode %s à %s." + +#~ msgid "Couldn't chmod page “%s” to “%s”." +#~ msgstr "Impossible de changer le mode “%s” à “%s”." + +#~ msgid "Invalid chmod string" +#~ msgstr "Chaîne de caractère invalide pour le changement de mode" + +#~ msgid "Are you sure you want to permanently change the selected files?" +#~ msgstr "" +#~ "Êtes-vous sûr de vouloir modifier de manière permanente les fichiers " +#~ "sélectionnés ?" + +#~ msgid "Chmod" +#~ msgstr "Chmod" + +#~ msgid "Select the pages to change:" +#~ msgstr "Sélectionnez les pages à modifier :" + +#~ msgid "This plugin is currently under development and does not work!" +#~ msgstr "Ce greffon est en cours de développement et ne marche pas !" + +#~ msgid "Chmod to permission:" +#~ msgstr "Changer le mode de permission à :" + +#~ msgid "(ugo : rwx)" +#~ msgstr "(ugo : rwx)" + #, fuzzy #~ msgid "mode" #~ msgstr "Chmod" Modified: trunk/locale/po/it.po =================================================================== --- trunk/locale/po/it.po 2013-06-13 14:36:30 UTC (rev 8799) +++ trunk/locale/po/it.po 2013-06-13 15:19:05 UTC (rev 8800) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-13 16:35+0200\n" +"POT-Creation-Date: 2013-06-13 17:17+0200\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" @@ -3313,51 +3313,6 @@ msgid "%d minutes" msgstr "" -msgid "Set individual page permissions." -msgstr "" - -#, php-format -msgid "chmod page “%s” to “%s”." -msgstr "" - -#, php-format -msgid "Couldn't chmod page “%s” to “%s”." -msgstr "" - -msgid "Invalid chmod string" -msgstr "" - -#, php-format -msgid "%d pages have been changed." -msgstr "" - -msgid "No pages changed." -msgstr "" - -msgid "Are you sure you want to permanently change the selected files?" -msgstr "" - -msgid "Chmod" -msgstr "" - -msgid "Select the pages to change:" -msgstr "" - -msgid "This plugin is currently under development and does not work!" -msgstr "" - -msgid "Chmod to permission:" -msgstr "" - -msgid "(ugo : rwx)" -msgstr "" - -msgid "Propagate new permissions to all subpages?" -msgstr "" - -msgid "(disable individual page permissions, enable inheritance)?" -msgstr "" - msgid "Change owner of selected pages." msgstr "" @@ -3380,6 +3335,9 @@ msgid "%d pages have been changed:" msgstr "" +msgid "No pages changed." +msgstr "" + msgid "PhpWikiAdministration/Chown" msgstr "" @@ -3403,6 +3361,10 @@ msgid "ACL deleted for page “%s”" msgstr "" +#, php-format +msgid "%d pages have been changed." +msgstr "" + #, fuzzy msgid "PhpWikiAdministration/AdminAclDelete" msgstr "AmministrazioneDiPhpWiki/Rimuovi" @@ -3653,6 +3615,9 @@ msgid "Selected page “%s” passed to “%s”." msgstr "" +msgid "Set individual page permissions." +msgstr "" + #, php-format msgid "ACL not changed for page “%s”." msgstr "" @@ -3699,6 +3664,12 @@ msgid "To add check 'Add' near the dropdown list." msgstr "" +msgid "Propagate new permissions to all subpages?" +msgstr "" + +msgid "(disable individual page permissions, enable inheritance)?" +msgstr "" + msgid "(Currently not working)" msgstr "" Modified: trunk/locale/po/ja.po =================================================================== --- trunk/locale/po/ja.po 2013-06-13 14:36:30 UTC (rev 8799) +++ trunk/locale/po/ja.po 2013-06-13 15:19:05 UTC (rev 8800) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-13 16:35+0200\n" +"POT-Creation-Date: 2013-06-13 17:17+0200\n" "PO-Revision-Date: 2003-06-07 09:01+0900\n" "Last-Translator: Tadashi Jokagi <web...@el...>\n" "Language-Team: LANGUAGE <LL...@li...>\n" @@ -3371,54 +3371,7 @@ msgid "%d minutes" msgstr "" -msgid "Set individual page permissions." -msgstr "" - -#, php-format -msgid "chmod page “%s” to “%s”." -msgstr "" - -#, php-format -msgid "Couldn't chmod page “%s” to “%s”." -msgstr "" - -msgid "Invalid chmod string" -msgstr "" - -#, fuzzy, php-format -msgid "%d pages have been changed." -msgstr "変更しませんでした。" - #, fuzzy -msgid "No pages changed." -msgstr "変更しませんでした。" - -msgid "Are you sure you want to permanently change the selected files?" -msgstr "" - -msgid "Chmod" -msgstr "" - -#, fuzzy -msgid "Select the pages to change:" -msgstr "貴方個人の言語を選択" - -msgid "This plugin is currently under development and does not work!" -msgstr "" - -msgid "Chmod to permission:" -msgstr "" - -msgid "(ugo : rwx)" -msgstr "" - -msgid "Propagate new permissions to all subpages?" -msgstr "" - -msgid "(disable individual page permissions, enable inheritance)?" -msgstr "" - -#, fuzzy msgid "Change owner of selected pages." msgstr "選択ページを全て削除" @@ -3442,6 +3395,10 @@ msgid "%d pages have been changed:" msgstr "変更しませんでした。" +#, fuzzy +msgid "No pages changed." +msgstr "変更しませんでした。" + msgid "PhpWikiAdministration/Chown" msgstr "" @@ -3467,6 +3424,10 @@ msgid "ACL deleted for page “%s”" msgstr "全ページ一覧" +#, fuzzy, php-format +msgid "%d pages have been changed." +msgstr "変更しませんでした。" + msgid "PhpWikiAdministration/AdminAclDelete" msgstr "" @@ -3738,6 +3699,9 @@ msgid "Selected page “%s” passed to “%s”." msgstr "" +msgid "Set individual page permissions." +msgstr "" + #, fuzzy, php-format msgid "ACL not changed for page “%s”." msgstr "全ページ一覧" @@ -3786,6 +3750,12 @@ msgid "To add check 'Add' near the dropdown list." msgstr "" +msgid "Propagate new permissions to all subpages?" +msgstr "" + +msgid "(disable individual page permissions, enable inheritance)?" +msgstr "" + msgid "(Currently not working)" msgstr "" @@ -6206,6 +6176,10 @@ msgstr "ページを編集しています。" #, fuzzy +#~ msgid "Select the pages to change:" +#~ msgstr "貴方個人の言語を選択" + +#, fuzzy #~ msgid "period" #~ msgstr "バージョン %d" Modified: trunk/locale/po/nl.po =================================================================== --- trunk/locale/po/nl.po 2013-06-13 14:36:30 UTC (rev 8799) +++ trunk/locale/po/nl.po 2013-06-13 15:19:05 UTC (rev 8800) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-13 16:35+0200\n" +"POT-Creation-Date: 2013-06-13 17:17+0200\n" "PO-Revision-Date: 2000-09-30 02:23+0200\n" "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n" "Language-Team: Dutch <nl...@li...>\n" @@ -3303,51 +3303,6 @@ msgid "%d minutes" msgstr "" -msgid "Set individual page permissions." -msgstr "" - -#, php-format -msgid "chmod page “%s” to “%s”." -msgstr "" - -#, php-format -msgid "Couldn't chmod page “%s” to “%s”." -msgstr "" - -msgid "Invalid chmod string" -msgstr "" - -#, php-format -msgid "%d pages have been changed." -msgstr "" - -msgid "No pages changed." -msgstr "" - -msgid "Are you sure you want to permanently change the selected files?" -msgstr "" - -msgid "Chmod" -msgstr "" - -msgid "Select the pages to change:" -msgstr "" - -msgid "This plugin is currently under development and does not work!" -msgstr "" - -msgid "Chmod to permission:" -msgstr "" - -msgid "(ugo : rwx)" -msgstr "" - -msgid "Propagate new permissions to all subpages?" -msgstr "" - -msgid "(disable individual page permissions, enable inheritance)?" -msgstr "" - msgid "Change owner of selected pages." msgstr "" @@ -3370,6 +3325,9 @@ msgid "%d pages have been changed:" msgstr "" +msgid "No pages changed." +msgstr "" + msgid "PhpWikiAdministration/Chown" msgstr "" @@ -3392,6 +3350,10 @@ msgid "ACL deleted for page “%s”" msgstr "" +#, php-format +msgid "%d pages have been changed." +msgstr "" + #, fuzzy msgid "PhpWikiAdministration/AdminAclDelete" msgstr "PhpWikiBeheer/Vervangt" @@ -3640,6 +3602,9 @@ msgid "Selected page “%s” passed to “%s”." msgstr "" +msgid "Set individual page permissions." +msgstr "" + #, php-format msgid "ACL not changed for page “%s”." msgstr "" @@ -3686,6 +3651,12 @@ msgid "To add check 'Add' near the dropdown list." msgstr "" +msgid "Propagate new permissions to all subpages?" +msgstr "" + +msgid "(disable individual page permissions, enable inheritance)?" +msgstr "" + msgid "(Currently not working)" msgstr "" Modified: trunk/locale/po/phpwiki.pot =================================================================== --- trunk/locale/po/phpwiki.pot 2013-06-13 14:36:30 UTC (rev 8799) +++ trunk/locale/po/phpwiki.pot 2013-06-13 15:19:05 UTC (rev 8800) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki-1.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-13 16:35+0200\n" +"POT-Creation-Date: 2013-06-13 17:17+0200\n" "PO-Revision-Date: 2002-12-14 17:51-0500\n" "Last-Translator: Reini Urban <ru...@us...>\n" "Language-Team: LANGUAGE <LL...@li...>\n" @@ -3294,51 +3294,6 @@ msgid "%d minutes" msgstr "" -msgid "Set individual page permissions." -msgstr "" - -#, php-format -msgid "chmod page “%s” to “%s”." -msgstr "" - -#, php-format -msgid "Couldn't chmod page “%s” to “%s”." -msgstr "" - -msgid "Invalid chmod string" -msgstr "" - -#, php-format -msgid "%d pages have been changed." -msgstr "" - -msgid "No pages changed." -msgstr "" - -msgid "Are you sure you want to permanently change the selected files?" -msgstr "" - -msgid "Chmod" -msgstr "" - -msgid "Select the pages to change:" -msgstr "" - -msgid "This plugin is currently under development and does not work!" -msgstr "" - -msgid "Chmod to permission:" -msgstr "" - -msgid "(ugo : rwx)" -msgstr "" - -msgid "Propagate new permissions to all subpages?" -msgstr "" - -msgid "(disable individual page permissions, enable inheritance)?" -msgstr "" - msgid "Change owner of selected pages." msgstr "" @@ -3361,6 +3316,9 @@ msgid "%d pages have been changed:" msgstr "" +msgid "No pages changed." +msgstr "" + msgid "PhpWikiAdministration/Chown" msgstr "" @@ -3383,6 +3341,10 @@ msgid "ACL deleted for page “%s”" msgstr "" +#, php-format +msgid "%d pages have been changed." +msgstr "" + msgid "PhpWikiAdministration/AdminAclDelete" msgstr "" @@ -3630,6 +3592,9 @@ msgid "Selected page “%s” passed to “%s”." msgstr "" +msgid "Set individual page permissions." +msgstr "" + #, php-format msgid "ACL not changed for page “%s”." msgstr "" @@ -3676,6 +3641,12 @@ msgid "To add check 'Add' near the dropdown list." msgstr "" +msgid "Propagate new permissions to all subpages?" +msgstr "" + +msgid "(disable individual page permissions, enable inheritance)?" +msgstr "" + msgid "(Currently not working)" msgstr "" Modified: trunk/locale/po/sv.po =================================================================== --- trunk/locale/po/sv.po 2013-06-13 14:36:30 UTC (rev 8799) +++ trunk/locale/po/sv.po 2013-06-13 15:19:05 UTC (rev 8800) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-13 16:35+0200\n" +"POT-Creation-Date: 2013-06-13 17:17+0200\n" "PO-Revision-Date: 2001-01-27 01:58+0200\n" "Last-Translator: Jon Åslund <jo...@he...>\n" "Language-Team: \n" @@ -3297,51 +3297,6 @@ msgid "%d minutes" msgstr "" -msgid "Set individual page permissions." -msgstr "" - -#, php-format -msgid "chmod page “%s” to “%s”." -msgstr "" - -#, php-format -msgid "Couldn't chmod page “%s” to “%s”." -msgstr "" - -msgid "Invalid chmod string" -msgstr "" - -#, php-format -msgid "%d pages have been changed." -msgstr "" - -msgid "No pages changed." -msgstr "" - -msgid "Are you sure you want to permanently change the selected files?" -msgstr "" - -msgid "Chmod" -msgstr "" - -msgid "Select the pages to change:" -msgstr "" - -msgid "This plugin is currently under development and does not work!" -msgstr "" - -msgid "Chmod to permission:" -msgstr "" - -msgid "(ugo : rwx)" -msgstr "" - -msgid "Propagate new permissions to all subpages?" -msgstr "" - -msgid "(disable individual page permissions, enable inheritance)?" -msgstr "" - msgid "Change owner of selected pages." msgstr "" @@ -3364,6 +3319,9 @@ msgid "%d pages have been changed:" msgstr "" +msgid "No pages changed." +msgstr "" + msgid "PhpWikiAdministration/Chown" msgstr "" @@ -3386,6 +3344,10 @@ msgid "ACL deleted for page “%s”" msgstr "" +#, php-format +msgid "%d pages have been changed." +msgstr "" + msgid "PhpWikiAdministration/AdminAclDelete" msgstr "" @@ -3633,6 +3595,9 @@ msgid "Selected page “%s” passed to “%s”." msgstr "" +msgid "Set individual page permissions." +msgstr "" + #, php-format msgid "ACL not changed for page “%s”." msgstr "" @@ -3679,6 +3644,12 @@ msgid "To add check 'Add' near the dropdown list." msgstr "" +msgid "Propagate new permissions to all subpages?" +msgstr "" + +msgid "(disable individual page permissions, enable inheritance)?" +msgstr "" + msgid "(Currently not working)" msgstr "" Modified: trunk/locale/po/zh.po =================================================================== --- trunk/locale/po/zh.po 2013-06-13 14:36:30 UTC (rev 8799) +++ trunk/locale/po/zh.po 2013-06-13 15:19:05 UTC (rev 8800) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-13 16:35+0200\n" +"POT-Creation-Date: 2013-06-13 17:17+0200\n" "PO-Revision-Date: 2004-04-21 10:08+0800\n" "Last-Translator: DruryL <dr...@us...>\n" "Language-Team: DruryL <dr...@us...>\n" @@ -3471,51 +3471,6 @@ msgid "%d minutes" msgstr "%d 分鐘" -msgid "Set individual page permissions." -msgstr "設定個別頁面的權限." - -#, php-format -msgid "chmod page “%s” to “%s”." -msgstr "改變頁面 “%s” 權限為 “%s”." - -#, php-format -msgid "Couldn't chmod page “%s” to “%s”." -msgstr "無法為頁面 “%s” 變更權限為 “%s”." - -msgid "Invalid chmod string" -msgstr "錯誤的 chmod 字串" - -#, fuzzy, php-format -msgid "%d pages have been changed." -msgstr "%s 頁面已經變更." - -msgid "No pages changed." -msgstr "沒有頁面被變更." - -msgid "Are you sure you want to permanently change the selected files?" -msgstr "你確定你想要永久變更選定的檔案?" - -msgid "Chmod" -msgstr "" - -msgid "Select the pages to change:" -msgstr "選擇頁面以進行更名:" - -msgid "This plugin is currently under development and does not work!" -msgstr "此 plugin 正在開發還不能運作!" - -msgid "Chmod to permission:" -msgstr "改變權限為:" - -msgid "(ugo : rwx)" -msgstr "(ugo : rwx)" - -msgid "Propagate new permissions to all subpages?" -msgstr "要傳播新的權限到所有子頁面? " - -msgid "(disable individual page permissions, enable inheritance)?" -msgstr "(禁制個別網頁的權限,使用繼承)?" - #, fuzzy msgid "Change owner of selected pages." msgstr "更名選定的頁面." @@ -3540,6 +3495,9 @@ msgid "%d pages have been changed:" msgstr "%s 頁面已經變更." +msgid "No pages changed." +msgstr "沒有頁面被變更." + msgid "PhpWikiAdministration/Chown" msgstr "" @@ -3566,6 +3524,10 @@ msgid "ACL deleted for page “%s”" msgstr "為 page “%s” 設定 acl." +#, fuzzy, php-format +msgid "%d pages have been changed." +msgstr "%s 頁面已經變更." + msgid "PhpWikiAdministration/AdminAclDelete" msgstr "" @@ -3840,6 +3802,9 @@ msgid "Selected page “%s” passed to “%s”." msgstr "已選擇的頁面 “%s” 傳遞到 “%s”." +msgid "Set individual page permissions." +msgstr "設定個別頁面的權限." + #, fuzzy, php-format msgid "ACL not changed for page “%s”." msgstr "為 page “%s” 設定 acl." @@ -3890,6 +3855,12 @@ msgid "To add check 'Add' near the dropdown list." msgstr "" +msgid "Propagate new permissions to all subpages?" +msgstr "要傳播新的權限到所有子頁面? " + +msgid "(disable individual page permissions, enable inheritance)?" +msgstr "(禁制個別網頁的權限,使用繼承)?" + #, fuzzy msgid "(Currently not working)" msgstr "現在不建議使用!" @@ -6322,6 +6293,30 @@ msgid "Edit this page" msgstr "編輯此頁面" +#~ msgid "chmod page “%s” to “%s”." +#~ msgstr "改變頁面 “%s” 權限為 “%s”." + +#~ msgid "Couldn't chmod page “%s” to “%s”." +#~ msgstr "無法為頁面 “%s” 變更權限為 “%s”." + +#~ msgid "Invalid chmod string" +#~ msgstr "錯誤的 chmod 字串" + +#~ msgid "Are you sure you want to permanently change the selected files?" +#~ msgstr "你確定你想要永久變更選定的檔案?" + +#~ msgid "Select the pages to change:" +#~ msgstr "選擇頁面以進行更名:" + +#~ msgid "This plugin is currently under development and does not work!" +#~ msgstr "此 plugin 正在開發還不能運作!" + +#~ msgid "Chmod to permission:" +#~ msgstr "改變權限為:" + +#~ msgid "(ugo : rwx)" +#~ msgstr "(ugo : rwx)" + #, fuzzy #~ msgid "period" #~ msgstr "版本 %d" 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 2013-06-13 14:36:30 UTC (rev 8799) +++ trunk/locale/zh/LC_MESSAGES/phpwiki.php 2013-06-13 15:19:05 UTC (rev 8800) @@ -50,7 +50,6 @@ $locale["(diff)"] = "(差異)"; $locale["(disable individual page permissions, enable inheritance)?"] = "(禁制個別網頁的權限,使用繼承)?"; $locale["(max. recursion level: %d)"] = "(最大遞迴層級: %d)"; -$locale["(ugo : rwx)"] = "(ugo : rwx)"; $locale["- saved to database as version %d"] = "- 已經以版本 %d 存入資料庫中"; $locale["-???"] = "-???"; $locale["... copied to %s"] = "... 複製到 %s"; @@ -81,7 +80,6 @@ $locale["An unnamed PhpWiki"] = "未被命名的 PhpWiki"; $locale["Anonymous Users"] = "Anonymous 使用者"; $locale["Application name"] = "應用程式名稱"; -$locale["Are you sure you want to permanently change the selected files?"] = "你確定你想要永久變更選定的檔案?"; $locale["Arguments"] = "引數"; $locale["Attempting to use the directory “%s” instead."] = "試圖改用目錄 “%s”."; $locale["Auth Level"] = "認證層級"; @@ -118,7 +116,6 @@ $locale["Change pagename in all linked pages also?"] = "也在所有連結到的頁面裡變更頁面名稱?"; $locale["Check any two boxes then %s."] = "任找兩個空格打勾然後 %s."; $locale["Check any two boxes to compare revisions."] = "任找兩個空格打勾以進行比較修訂."; -$locale["Chmod to permission:"] = "改變權限為:"; $locale["Click to authenticate as %s"] = "點擊以 %s 進行驗證."; $locale["Click to de-/select all pages"] = "點擊以取消選擇或選擇所有頁面"; $locale["Click to display"] = "點擊以顯示"; @@ -135,7 +132,6 @@ $locale["Control characters not allowed"] = "控制字元是不被允許的"; $locale["Convert text into a PNG image using GD."] = "使用 GD 轉換文字為 PNG 圖片"; $locale["Converts TeX to an image. May be used to embed formulas in PhpWiki."] = "轉換 TeX 為圖片. 可以用來在 PhpWiki 嵌入方程式."; -$locale["Couldn't chmod page “%s” to “%s”."] = "無法為頁面 “%s” 變更權限為 “%s”."; $locale["Couldn't rename page “%s” to “%s”."] = "無法更名頁面 “%s” 為 “%s”."; $locale["Count"] = "計數"; $locale["Create a Wiki Category Page."] = "建立 Wiki Category 頁面"; @@ -243,7 +239,6 @@ $locale["Inline images"] = "Inline 圖片"; $locale["Insufficient permissions."] = "權限不足."; $locale["InterWiki Address"] = "InterWiki 位址"; -$locale["Invalid chmod string"] = "錯誤的 chmod 字串"; $locale["Invalid color: %s"] = "錯誤的顏色值: %s"; $locale["Invalid password or userid."] = "錯誤的密碼或使用者帳號."; $locale["Keep up to %d major edits, but keep them no longer than %d days."] = "保持 %d 份主要編輯,但不超過 %d 天."; @@ -407,7 +402,6 @@ $locale["See %s tips for editing."] = "參照編輯時的 %s 小秘訣."; $locale["See: %s"] = "參閱: %s"; $locale["Select pages"] = "選擇頁面"; -$locale["Select the pages to change:"] = "選擇頁面以進行更名:"; $locale["Select the pages to rename:"] = "選擇頁面以進行更名:"; $locale["Select: "] = "選擇"; $locale["Selected page “%s” passed to “%s”."] = "已選擇的頁面 “%s” 傳遞到 “%s”."; @@ -480,7 +474,6 @@ $locale["This internal action page cannot viewed."] = "內部動作頁面無法瀏覽."; $locale["This is a minor change."] = "這是次要變更."; $locale["This page has been locked by the administrator so your changes can not be saved."] = "此頁面已被管理者鎖定,所以你的更動無法儲存."; -$locale["This plugin is currently under development and does not work!"] = "此 plugin 正在開發還不能運作!"; $locale["Time Zone"] = "時區"; $locale["Title Search"] = "標題搜尋"; $locale["Title search results for “%s”"] = "以 “%s” 進行標題搜尋的結果"; @@ -578,7 +571,6 @@ $locale["by %s"] = "被 %s"; $locale["cached pagedata:"] = "已置於快取的頁面資料:"; $locale["cached versiondata:"] = "已快取的版本資料:"; -$locale["chmod page “%s” to “%s”."] = "改變頁面 “%s” 權限為 “%s”."; $locale["compare revisions"] = "比較修訂"; $locale["couldn't open file “%s” for writing"] = "無法寫入到 “%s”."; $locale["create this page"] = "建立此頁面"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |