From: <var...@us...> - 2012-11-26 14:36:07
|
Revision: 8540 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8540&view=rev Author: vargenau Date: 2012-11-26 14:35:56 +0000 (Mon, 26 Nov 2012) Log Message: ----------- 'on windows' --> 'on Windows' Modified Paths: -------------- trunk/lib/Units.php trunk/lib/WikiUserNew.php trunk/lib/upgrade.php trunk/locale/de/LC_MESSAGES/phpwiki.mo trunk/locale/de/LC_MESSAGES/phpwiki.php trunk/locale/po/de.po trunk/locale/po/es.po trunk/locale/po/fr.po trunk/locale/po/it.po trunk/locale/po/ja.po trunk/locale/po/nl.po trunk/locale/po/phpwiki.pot trunk/locale/po/sv.po trunk/locale/po/zh.po trunk/pgsrc/Help%2FPloticusPlugin trunk/pgsrc/ReleaseNotes Modified: trunk/lib/Units.php =================================================================== --- trunk/lib/Units.php 2012-11-26 14:31:03 UTC (rev 8539) +++ trunk/lib/Units.php 2012-11-26 14:35:56 UTC (rev 8540) @@ -15,7 +15,7 @@ * Windows requires the cygwin /usr/bin/units. * All successfully parsed unit definitions are stored in the wikidb, * so that subsequent expansions will not require /usr/bin/units be called again. - * So far even on windows (cygwin) the process is fast enough. + * So far even on Windows (cygwin) the process is fast enough. * * TODO: understand dates and maybe times * YYYY-MM-DD, "CW"ww/yy (CalendarWeek) Modified: trunk/lib/WikiUserNew.php =================================================================== --- trunk/lib/WikiUserNew.php 2012-11-26 14:31:03 UTC (rev 8539) +++ trunk/lib/WikiUserNew.php 2012-11-26 14:35:56 UTC (rev 8540) @@ -1870,7 +1870,7 @@ return array(true, sprintf(_("E-mail address '%s' is properly formatted"), $email)); list ($Username, $Domain) = explode("@", $email); - //Todo: getmxrr workaround on windows or manual input field to verify it manually + //Todo: getmxrr workaround on Windows or manual input field to verify it manually if (!isWindows() and getmxrr($Domain, $MXHost)) { // avoid warning on Windows. $ConnectAddress = $MXHost[0]; } else { Modified: trunk/lib/upgrade.php =================================================================== --- trunk/lib/upgrade.php 2012-11-26 14:31:03 UTC (rev 8539) +++ trunk/lib/upgrade.php 2012-11-26 14:35:56 UTC (rev 8540) @@ -601,7 +601,7 @@ // Illegal mix of collations (latin1_bin,IMPLICIT) and // (utf8_general_ci, COERCIBLE) for operation '=']) if (isWindows() and substr($backend_type, 0, 5) == 'mysql') { - echo _("Check for mysql 4.1.x/5.0.0 binary search on windows problem"), " ..."; + echo _("Check for mysql 4.1.x/5.0.0 binary search on Windows problem"), " ..."; $mysql_version = $this->dbi->_backend->_serverinfo['version']; if ($mysql_version < 401.0) { echo sprintf(_("version <em>%s</em>"), $mysql_version), " ", @@ -775,13 +775,13 @@ } } // Check if the privileges are enough. Need CREATE and ALTER perms. - // And on windows: SELECT FROM mysql, possibly: UPDATE mysql. + // And on Windows: SELECT FROM mysql, possibly: UPDATE mysql. $form = HTML::form(array("method" => "post", "action" => $this->request->getPostURL(), "accept-charset" => $GLOBALS['charset']), HTML::p(_("Upgrade requires database privileges to CREATE and ALTER the phpwiki database."), HTML::br(), - _("And on windows at least the privilege to SELECT FROM mysql, and possibly UPDATE mysql")), + _("And on Windows at least the privilege to SELECT FROM mysql, and possibly UPDATE mysql")), HiddenInputs(array('action' => 'upgrade', 'overwrite' => $this->request->getArg('overwrite'))), HTML::table(array("cellspacing" => 4), @@ -979,7 +979,7 @@ if (isWindows()) $tmp = str_replace("/", "\\", $tmp); // Detect the existing linesep at first line. fgets strips it even if 'rb'. - // Before we simply assumed \r\n on windows local files. + // Before we simply assumed \r\n on Windows local files. $s = fread($in, 1024); rewind($in); $linesep = (substr_count($s, "\r\n") > substr_count($s, "\n")) ? "\r\n" : "\n"; Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/de/LC_MESSAGES/phpwiki.php =================================================================== --- trunk/locale/de/LC_MESSAGES/phpwiki.php 2012-11-26 14:31:03 UTC (rev 8539) +++ trunk/locale/de/LC_MESSAGES/phpwiki.php 2012-11-26 14:35:56 UTC (rev 8540) @@ -253,7 +253,7 @@ $locale["Check for %s"] = "Prüfe %s"; $locale["Check for ACCESS_LOG_SQL passwords in POST requests"] = "Prüfe auf ACCESS_LOG_SQL Passwörter in POST Requests"; $locale["Check for ACCESS_LOG_SQL remote_host varchar(50)"] = "Prüfe auf ACCESS_LOG_SQL Passwörter in POST Requests"; -$locale["Check for mysql 4.1.x/5.0.0 binary search on windows problem"] = "prüfe auf mysql 4.1.x/5.0.0 Binärsuch-Problem (nur Windows)"; +$locale["Check for mysql 4.1.x/5.0.0 binary search on Windows problem"] = "prüfe auf mysql 4.1.x/5.0.0 Binärsuch-Problem (nur Windows)"; $locale["Check for mysql LOCK TABLE privilege"] = "Prüfe mysql LOCK TABLE Rechte"; $locale["Check for mysql page.id auto_increment flag"] = "Prüfe auf mysql page.id auto_increment Flag"; $locale["Check for mysql session.sess_id sanity"] = "Prüfe auf mysql session.sess_id Korrektheit"; Modified: trunk/locale/po/de.po =================================================================== --- trunk/locale/po/de.po 2012-11-26 14:31:03 UTC (rev 8539) +++ trunk/locale/po/de.po 2012-11-26 14:35:56 UTC (rev 8540) @@ -6693,7 +6693,7 @@ msgstr "Prüfe auf mysql page.id auto_increment Flag" #: ../lib/upgrade.php:604 -msgid "Check for mysql 4.1.x/5.0.0 binary search on windows problem" +msgid "Check for mysql 4.1.x/5.0.0 binary search on Windows problem" msgstr "prüfe auf mysql 4.1.x/5.0.0 Binärsuch-Problem (nur Windows)" #: ../lib/upgrade.php:607 ../lib/upgrade.php:623 ../lib/upgrade.php:644 @@ -6730,7 +6730,7 @@ #: ../lib/upgrade.php:784 msgid "" -"And on windows at least the privilege to SELECT FROM mysql, and possibly " +"And on Windows at least the privilege to SELECT FROM mysql, and possibly " "UPDATE mysql" msgstr "" Modified: trunk/locale/po/es.po =================================================================== --- trunk/locale/po/es.po 2012-11-26 14:31:03 UTC (rev 8539) +++ trunk/locale/po/es.po 2012-11-26 14:35:56 UTC (rev 8540) @@ -6523,7 +6523,7 @@ msgstr "" #: ../lib/upgrade.php:604 -msgid "Check for mysql 4.1.x/5.0.0 binary search on windows problem" +msgid "Check for mysql 4.1.x/5.0.0 binary search on Windows problem" msgstr "" #: ../lib/upgrade.php:607 ../lib/upgrade.php:623 ../lib/upgrade.php:644 @@ -6560,7 +6560,7 @@ #: ../lib/upgrade.php:784 msgid "" -"And on windows at least the privilege to SELECT FROM mysql, and possibly " +"And on Windows at least the privilege to SELECT FROM mysql, and possibly " "UPDATE mysql" msgstr "" Modified: trunk/locale/po/fr.po =================================================================== --- trunk/locale/po/fr.po 2012-11-26 14:31:03 UTC (rev 8539) +++ trunk/locale/po/fr.po 2012-11-26 14:35:56 UTC (rev 8540) @@ -6602,7 +6602,7 @@ msgstr "" #: ../lib/upgrade.php:604 -msgid "Check for mysql 4.1.x/5.0.0 binary search on windows problem" +msgid "Check for mysql 4.1.x/5.0.0 binary search on Windows problem" msgstr "" #: ../lib/upgrade.php:607 ../lib/upgrade.php:623 ../lib/upgrade.php:644 @@ -6639,7 +6639,7 @@ #: ../lib/upgrade.php:784 msgid "" -"And on windows at least the privilege to SELECT FROM mysql, and possibly " +"And on Windows at least the privilege to SELECT FROM mysql, and possibly " "UPDATE mysql" msgstr "" Modified: trunk/locale/po/it.po =================================================================== --- trunk/locale/po/it.po 2012-11-26 14:31:03 UTC (rev 8539) +++ trunk/locale/po/it.po 2012-11-26 14:35:56 UTC (rev 8540) @@ -6498,7 +6498,7 @@ msgstr "" #: ../lib/upgrade.php:604 -msgid "Check for mysql 4.1.x/5.0.0 binary search on windows problem" +msgid "Check for mysql 4.1.x/5.0.0 binary search on Windows problem" msgstr "" #: ../lib/upgrade.php:607 ../lib/upgrade.php:623 ../lib/upgrade.php:644 @@ -6535,7 +6535,7 @@ #: ../lib/upgrade.php:784 msgid "" -"And on windows at least the privilege to SELECT FROM mysql, and possibly " +"And on Windows at least the privilege to SELECT FROM mysql, and possibly " "UPDATE mysql" msgstr "" Modified: trunk/locale/po/ja.po =================================================================== --- trunk/locale/po/ja.po 2012-11-26 14:31:03 UTC (rev 8539) +++ trunk/locale/po/ja.po 2012-11-26 14:35:56 UTC (rev 8540) @@ -6635,7 +6635,7 @@ msgstr "" #: ../lib/upgrade.php:604 -msgid "Check for mysql 4.1.x/5.0.0 binary search on windows problem" +msgid "Check for mysql 4.1.x/5.0.0 binary search on Windows problem" msgstr "" #: ../lib/upgrade.php:607 ../lib/upgrade.php:623 ../lib/upgrade.php:644 @@ -6672,7 +6672,7 @@ #: ../lib/upgrade.php:784 msgid "" -"And on windows at least the privilege to SELECT FROM mysql, and possibly " +"And on Windows at least the privilege to SELECT FROM mysql, and possibly " "UPDATE mysql" msgstr "" Modified: trunk/locale/po/nl.po =================================================================== --- trunk/locale/po/nl.po 2012-11-26 14:31:03 UTC (rev 8539) +++ trunk/locale/po/nl.po 2012-11-26 14:35:56 UTC (rev 8540) @@ -6485,7 +6485,7 @@ msgstr "" #: ../lib/upgrade.php:604 -msgid "Check for mysql 4.1.x/5.0.0 binary search on windows problem" +msgid "Check for mysql 4.1.x/5.0.0 binary search on Windows problem" msgstr "" #: ../lib/upgrade.php:607 ../lib/upgrade.php:623 ../lib/upgrade.php:644 @@ -6522,7 +6522,7 @@ #: ../lib/upgrade.php:784 msgid "" -"And on windows at least the privilege to SELECT FROM mysql, and possibly " +"And on Windows at least the privilege to SELECT FROM mysql, and possibly " "UPDATE mysql" msgstr "" Modified: trunk/locale/po/phpwiki.pot =================================================================== --- trunk/locale/po/phpwiki.pot 2012-11-26 14:31:03 UTC (rev 8539) +++ trunk/locale/po/phpwiki.pot 2012-11-26 14:35:56 UTC (rev 8540) @@ -6476,7 +6476,7 @@ msgstr "" #: ../lib/upgrade.php:604 -msgid "Check for mysql 4.1.x/5.0.0 binary search on windows problem" +msgid "Check for mysql 4.1.x/5.0.0 binary search on Windows problem" msgstr "" #: ../lib/upgrade.php:607 ../lib/upgrade.php:623 ../lib/upgrade.php:644 @@ -6513,7 +6513,7 @@ #: ../lib/upgrade.php:784 msgid "" -"And on windows at least the privilege to SELECT FROM mysql, and possibly " +"And on Windows at least the privilege to SELECT FROM mysql, and possibly " "UPDATE mysql" msgstr "" Modified: trunk/locale/po/sv.po =================================================================== --- trunk/locale/po/sv.po 2012-11-26 14:31:03 UTC (rev 8539) +++ trunk/locale/po/sv.po 2012-11-26 14:35:56 UTC (rev 8540) @@ -6479,7 +6479,7 @@ msgstr "" #: ../lib/upgrade.php:604 -msgid "Check for mysql 4.1.x/5.0.0 binary search on windows problem" +msgid "Check for mysql 4.1.x/5.0.0 binary search on Windows problem" msgstr "" #: ../lib/upgrade.php:607 ../lib/upgrade.php:623 ../lib/upgrade.php:644 @@ -6516,7 +6516,7 @@ #: ../lib/upgrade.php:784 msgid "" -"And on windows at least the privilege to SELECT FROM mysql, and possibly " +"And on Windows at least the privilege to SELECT FROM mysql, and possibly " "UPDATE mysql" msgstr "" Modified: trunk/locale/po/zh.po =================================================================== --- trunk/locale/po/zh.po 2012-11-26 14:31:03 UTC (rev 8539) +++ trunk/locale/po/zh.po 2012-11-26 14:35:56 UTC (rev 8540) @@ -6774,7 +6774,7 @@ msgstr "" #: ../lib/upgrade.php:604 -msgid "Check for mysql 4.1.x/5.0.0 binary search on windows problem" +msgid "Check for mysql 4.1.x/5.0.0 binary search on Windows problem" msgstr "" #: ../lib/upgrade.php:607 ../lib/upgrade.php:623 ../lib/upgrade.php:644 @@ -6812,7 +6812,7 @@ #: ../lib/upgrade.php:784 msgid "" -"And on windows at least the privilege to SELECT FROM mysql, and possibly " +"And on Windows at least the privilege to SELECT FROM mysql, and possibly " "UPDATE mysql" msgstr "" Modified: trunk/pgsrc/Help%2FPloticusPlugin =================================================================== --- trunk/pgsrc/Help%2FPloticusPlugin 2012-11-26 14:31:03 UTC (rev 8539) +++ trunk/pgsrc/Help%2FPloticusPlugin 2012-11-26 14:35:56 UTC (rev 8540) @@ -81,7 +81,7 @@ == Optional Configuration == config.ini: - PLOTICUS_EXE = pl.exe (on windows) + PLOTICUS_EXE = pl.exe (on Windows) PLOTICUS_EXE = /usr/local/bin/pl (elsewhere) prefabs need the environment variable PLOTICUS_PREFABS. Default: /usr/share/ploticus. Modified: trunk/pgsrc/ReleaseNotes =================================================================== --- trunk/pgsrc/ReleaseNotes 2012-11-26 14:31:03 UTC (rev 8539) +++ trunk/pgsrc/ReleaseNotes 2012-11-26 14:35:56 UTC (rev 8540) @@ -207,7 +207,7 @@ * fixed fortune error handling * fixed limit handling with multiple pagelists: don't overwrite request arg * change PageDump Content-Type header for download to application/octet-stream to avoid - pesty .txt suffixes on windows clients + pesty .txt suffixes on Windows clients * fixed wikilens with dba and RATING_STORAGE=SQL. RATING_STORAGE=WIKIPAGE not yet fixed. * fixed action=diff error with external links This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |