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. |