From a29d31e9f6309314844f62c74786e6ab4cc5616c Mon Sep 17 00:00:00 2001 From: vargenau Date: Mon, 26 Nov 2012 14:35:56 +0000 Subject: [PATCH] 'on windows' --> 'on Windows' git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@8540 96ab9672-09ca-45d6-a79d-3d69d39ca109 --- lib/Units.php | 2 +- lib/WikiUserNew.php | 2 +- lib/upgrade.php | 8 ++++---- locale/de/LC_MESSAGES/phpwiki.mo | Bin 104325 -> 104325 bytes locale/de/LC_MESSAGES/phpwiki.php | 2 +- locale/po/de.po | 4 ++-- locale/po/es.po | 4 ++-- locale/po/fr.po | 4 ++-- locale/po/it.po | 4 ++-- locale/po/ja.po | 4 ++-- locale/po/nl.po | 4 ++-- locale/po/phpwiki.pot | 4 ++-- locale/po/sv.po | 4 ++-- locale/po/zh.po | 4 ++-- pgsrc/Help%2FPloticusPlugin | 2 +- pgsrc/ReleaseNotes | 2 +- 16 files changed, 27 insertions(+), 27 deletions(-) diff --git a/lib/Units.php b/lib/Units.php index e6e6694d9..2959addb0 100644 --- a/lib/Units.php +++ b/lib/Units.php @@ -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) diff --git a/lib/WikiUserNew.php b/lib/WikiUserNew.php index 24cd320b5..a5ea36806 100644 --- a/lib/WikiUserNew.php +++ b/lib/WikiUserNew.php @@ -1870,7 +1870,7 @@ function ValidateMail($email, $noconnect = false) 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 { diff --git a/lib/upgrade.php b/lib/upgrade.php index 27b7374a5..4bd9bf946 100644 --- a/lib/upgrade.php +++ b/lib/upgrade.php @@ -601,7 +601,7 @@ CREATE TABLE $log_tbl ( // 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 %s"), $mysql_version), " ", @@ -775,13 +775,13 @@ CREATE TABLE $log_tbl ( } } // 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 @@ CREATE TABLE $log_tbl ( 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"; diff --git a/locale/de/LC_MESSAGES/phpwiki.mo b/locale/de/LC_MESSAGES/phpwiki.mo index 5506400768ec18128e28db04752a5f257a0dfbc7..8ab6d4e8e853e6ed2b616e21b2adffb3d7d425a1 100644 GIT binary patch delta 20 bcmZo&&(^x0Z39aOV|X)b$9C2Z#s+=>PqhZ^ delta 20 bcmZo&&(^x0Z39aOV|g=c$9C2Z#s+=>Q1u55 diff --git a/locale/de/LC_MESSAGES/phpwiki.php b/locale/de/LC_MESSAGES/phpwiki.php index 8d4ca2dd8..f300c2e4f 100644 --- a/locale/de/LC_MESSAGES/phpwiki.php +++ b/locale/de/LC_MESSAGES/phpwiki.php @@ -253,7 +253,7 @@ $locale["Check any two boxes to compare revisions."] = "Wählen Sie zwei Version $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"; diff --git a/locale/po/de.po b/locale/po/de.po index 22c926106..726e0209b 100644 --- a/locale/po/de.po +++ b/locale/po/de.po @@ -6693,7 +6693,7 @@ msgid "Check for mysql page.id auto_increment flag" 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 @@ msgstr "" #: ../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 "" diff --git a/locale/po/es.po b/locale/po/es.po index 5dcfd1b6d..96e520b20 100644 --- a/locale/po/es.po +++ b/locale/po/es.po @@ -6523,7 +6523,7 @@ msgid "Check for mysql page.id auto_increment flag" 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 @@ msgstr "" #: ../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 "" diff --git a/locale/po/fr.po b/locale/po/fr.po index c1c543a85..684b90350 100644 --- a/locale/po/fr.po +++ b/locale/po/fr.po @@ -6602,7 +6602,7 @@ msgid "Check for mysql page.id auto_increment flag" 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 @@ msgstr "" #: ../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 "" diff --git a/locale/po/it.po b/locale/po/it.po index 605adb9e0..065348477 100644 --- a/locale/po/it.po +++ b/locale/po/it.po @@ -6498,7 +6498,7 @@ msgid "Check for mysql page.id auto_increment flag" 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 @@ msgstr "" #: ../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 "" diff --git a/locale/po/ja.po b/locale/po/ja.po index 7a9ec200b..b280f0ce9 100644 --- a/locale/po/ja.po +++ b/locale/po/ja.po @@ -6635,7 +6635,7 @@ msgid "Check for mysql page.id auto_increment flag" 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 @@ msgstr "" #: ../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 "" diff --git a/locale/po/nl.po b/locale/po/nl.po index d94095b2c..3bccb1ea7 100644 --- a/locale/po/nl.po +++ b/locale/po/nl.po @@ -6485,7 +6485,7 @@ msgid "Check for mysql page.id auto_increment flag" 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 @@ msgstr "" #: ../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 "" diff --git a/locale/po/phpwiki.pot b/locale/po/phpwiki.pot index 68c8b243e..e59f171c4 100644 --- a/locale/po/phpwiki.pot +++ b/locale/po/phpwiki.pot @@ -6476,7 +6476,7 @@ msgid "Check for mysql page.id auto_increment flag" 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 @@ msgstr "" #: ../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 "" diff --git a/locale/po/sv.po b/locale/po/sv.po index 8eb5cd694..a48ecb0ce 100644 --- a/locale/po/sv.po +++ b/locale/po/sv.po @@ -6479,7 +6479,7 @@ msgid "Check for mysql page.id auto_increment flag" 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 @@ msgstr "" #: ../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 "" diff --git a/locale/po/zh.po b/locale/po/zh.po index 59edd2d09..9aab52370 100644 --- a/locale/po/zh.po +++ b/locale/po/zh.po @@ -6774,7 +6774,7 @@ msgid "Check for mysql page.id auto_increment flag" 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 @@ msgstr "" #: ../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 "" diff --git a/pgsrc/Help%2FPloticusPlugin b/pgsrc/Help%2FPloticusPlugin index aff08f04b..00775dd69 100644 --- a/pgsrc/Help%2FPloticusPlugin +++ b/pgsrc/Help%2FPloticusPlugin @@ -81,7 +81,7 @@ build so far. == 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. diff --git a/pgsrc/ReleaseNotes b/pgsrc/ReleaseNotes index 3f140c7f4..b1475e671 100644 --- a/pgsrc/ReleaseNotes +++ b/pgsrc/ReleaseNotes @@ -207,7 +207,7 @@ more plugins and enhancements. UTF-8 should work. * 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 -- 2.45.0