From 9c29632dbf6867e5c3b3d7fb6977b6ee796477a8 Mon Sep 17 00:00:00 2001 From: vargenau Date: Fri, 11 Jan 2013 10:20:47 +0000 Subject: [PATCH] seperated --> separated git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@8711 96ab9672-09ca-45d6-a79d-3d69d39ca109 --- config/config-dist.ini | 2 +- configurator.php | 2 +- lib/InlineParser.php | 2 +- lib/PageList.php | 4 ++-- lib/WikiDB.php | 8 ++++---- lib/loadsave.php | 4 ++-- lib/plugin/FullTextSearch.php | 2 +- lib/plugin/PhotoAlbum.php | 2 +- lib/plugin/WikiAdminSelect.php | 2 +- lib/plugin/WikiFormRich.php | 2 +- locale/de/LC_MESSAGES/phpwiki.mo | Bin 104309 -> 104309 bytes locale/de/LC_MESSAGES/phpwiki.php | 2 +- locale/de/pgsrc/ModerierteSeite | 4 ++-- locale/es/LC_MESSAGES/phpwiki.mo | Bin 42243 -> 42243 bytes locale/fr/LC_MESSAGES/phpwiki.mo | Bin 108739 -> 108730 bytes locale/fr/LC_MESSAGES/phpwiki.php | 4 ++-- locale/it/LC_MESSAGES/phpwiki.mo | Bin 17714 -> 17714 bytes locale/ja/LC_MESSAGES/phpwiki.mo | Bin 14051 -> 14051 bytes locale/nl/LC_MESSAGES/phpwiki.mo | Bin 8851 -> 8851 bytes 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 ++-- locale/sv/LC_MESSAGES/phpwiki.mo | Bin 8313 -> 8313 bytes locale/zh/LC_MESSAGES/phpwiki.mo | Bin 54011 -> 54011 bytes locale/zh/LC_MESSAGES/phpwiki.php | 2 +- pgsrc/Help%2FFileInfoPlugin | 4 ++-- pgsrc/Help%2FFullTextSearchPlugin | 4 ++-- pgsrc/Help%2FLdapSearchPlugin | 6 +++--- pgsrc/Help%2FPageList | 6 +++--- pgsrc/Help%2FWikiFormRichPlugin | 4 ++-- pgsrc/Help%2FWikiPlugin | 4 ++-- themes/default/moacdropdown/js/acdropdown.js | 2 +- themes/default/moacdropdown/xmlrpc.txt | 2 +- themes/default/templates/userprefs.tmpl | 2 +- themes/fusionforge/templates/userprefs.tmpl | 2 +- 41 files changed, 57 insertions(+), 57 deletions(-) diff --git a/config/config-dist.ini b/config/config-dist.ini index 0192da089..ceee516cc 100644 --- a/config/config-dist.ini +++ b/config/config-dist.ini @@ -961,7 +961,7 @@ CHARSET = utf-8 ; 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" ;========================================================================= diff --git a/configurator.php b/configurator.php index b284148d4..69a8a1e59 100644 --- a/configurator.php +++ b/configurator.php @@ -1393,7 +1393,7 @@ DEFAULT_WIKI_PGSRC defines where the English pages reside. $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. "); /////////////////// diff --git a/lib/InlineParser.php b/lib/InlineParser.php index 6e23dd19c..2dd11b337 100644 --- a/lib/InlineParser.php +++ b/lib/InlineParser.php @@ -617,7 +617,7 @@ class Markup_interwiki extends SimpleMarkup 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. diff --git a/lib/PageList.php b/lib/PageList.php index ccbee616b..4115d5f01 100644 --- a/lib/PageList.php +++ b/lib/PageList.php @@ -725,7 +725,7 @@ class PageList return array( // Currently supported options: /* what columns, what pages */ 'info' => 'pagename', - 'exclude' => '', // also wildcards, comma-seperated lists + 'exclude' => '', // also wildcards, comma-separated lists // and arrays /* select pages by meta-data: */ 'author' => false, // current user by [] @@ -751,7 +751,7 @@ class PageList '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 diff --git a/lib/WikiDB.php b/lib/WikiDB.php index 1a9d0b2d0..6ff9f608f 100644 --- a/lib/WikiDB.php +++ b/lib/WikiDB.php @@ -281,7 +281,7 @@ class WikiDB * 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 @@ class WikiDB * @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 @@ class WikiDB * 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 @@ class WikiDB * 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 */ diff --git a/lib/loadsave.php b/lib/loadsave.php index f8249f2dd..cf9114858 100644 --- a/lib/loadsave.php +++ b/lib/loadsave.php @@ -443,9 +443,9 @@ function mkdir_p($pathname, $permission = 0777) * 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) { diff --git a/lib/plugin/FullTextSearch.php b/lib/plugin/FullTextSearch.php index ec6347d02..b6a78a1ce 100644 --- a/lib/plugin/FullTextSearch.php +++ b/lib/plugin/FullTextSearch.php @@ -63,7 +63,7 @@ class WikiPlugin_FullTextSearch '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 } diff --git a/lib/plugin/PhotoAlbum.php b/lib/plugin/PhotoAlbum.php index 6538f704c..39194d89b 100644 --- a/lib/plugin/PhotoAlbum.php +++ b/lib/plugin/PhotoAlbum.php @@ -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. * diff --git a/lib/plugin/WikiAdminSelect.php b/lib/plugin/WikiAdminSelect.php index f2281920c..8abb3ad68 100644 --- a/lib/plugin/WikiAdminSelect.php +++ b/lib/plugin/WikiAdminSelect.php @@ -80,7 +80,7 @@ class WikiPlugin_WikiAdminSelect /** * 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[] diff --git a/lib/plugin/WikiFormRich.php b/lib/plugin/WikiFormRich.php index 93337c65b..f7c3fa8e5 100644 --- a/lib/plugin/WikiFormRich.php +++ b/lib/plugin/WikiFormRich.php @@ -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 diff --git a/locale/de/LC_MESSAGES/phpwiki.mo b/locale/de/LC_MESSAGES/phpwiki.mo index 79e08b669969242c504487c54e60c4b06d54e724..1c4f2d28c5fe9a6b3ed33c49f38751b3e841b7e3 100644 GIT binary patch delta 69 zcmeymj_vC@whca!oJUv~7+it)#^%sSdse0?ESsmr74b3EGj8U})na5~VAyPy*QLss ZxcT7Z+i@I*h6;v;R)!XvmwdXo1OO;u7tR0x delta 69 zcmeymj_vC@whca!oD4wV%EG`fWpikxJu6c^> * requirelevel: one of 0, 1, 2 or 10 on which moderation is used. Default: false (use requireaccess instead) diff --git a/locale/es/LC_MESSAGES/phpwiki.mo b/locale/es/LC_MESSAGES/phpwiki.mo index 316f7b9e0619d1b47ba8c6da9f459c316d2b4bb8..0b46dba7169a23b99a1508da4c2ff2d14fe8fdfb 100644 GIT binary patch delta 23 ecmZoZ#ngO?X+wN6hoPZ@p`n$b#pd+nIgS8iod@~= delta 23 ecmZoZ#ngO?X+wN6hk=EHp{bRT>E`t0IgS8i{Rjd8 diff --git a/locale/fr/LC_MESSAGES/phpwiki.mo b/locale/fr/LC_MESSAGES/phpwiki.mo index fcdd680b313817fdb1af2b89c588eb4c46e95018..96610190d1bf0fe7b1bd571072a23a374e261134 100644 GIT binary patch delta 2120 zcmXZcYiv|S7{>9LEv%&=xD;p$>h3BOgi^Y-mIV?G6vQS536Q1u>@#;gfh8 z3-EUwj)5j?9>IIB$e`m*RE}4oBGQVwtv})un6cfO zLX4t9JRhfFGgjdxd=)3{u;vxqj6HZ2Ct=4VrO< zi-o(~Lhs?rdXL)JeXPKEn>EFlK%MwJ_Tc}h$o}z#OU)hBr5mx^n$=i@ULB47G*o`s zU%HTw$7MWE#U+@;XE2S*U4GJ)VF@ZVi%_X~9TnOd)a6=_D%Un7*QOIyJ?BxEy*Eky z>(<_(Ln*k2x=d+Q-Dd2uW+aY6O;~^$Snl^%pdwO(5$wPcypFm9!}hujMSY8LApK>i zYAWCBxw2VKhZd|w-SQ2noSnc3{)ze6j|DjHD_1QGP?z)_R0KalMW_{Z84sdPeiBut zofyCysEz#X(a?hbpvoriYZrl8IG*Qn)C8+gp1{P$_p2D10L z@589bm7>O#p*HF*q@j>k;|N@iT3|hD;cch^yHUA2hDyn=zP+f4(x}{L?RWo&F&O1J zA5}dsp-#RGHSY>!J#jk4 z*MKV51S&%3FoNBv4d26%>OXkUO_+;%F&VYP8K^r@hFYNBcaz`06Lq2ss8D~8xNBbcaw2okiv95~^OWp?`-*o!?)tbI$#pr|6loP}TD zUHCKJglV1DN-7ZZl$q_f!nYL)&Io*-~^`8zl2(F0%v2+4tLYVsGBT7 z&0mEnxCK*j8%D7MugAl_qp0ssdo*;iUojm+T`p7^zWJz>%tPJmanuc3Q1jxb)E&Yp z_ybnsd91~}oz_@vLZ!L|72(%W^Sv)=DAYfp7M|MeLRyTvc{SdTOR)sIQ8yX&J&nrw zcNoF*s8pC9Yucd*b+OM-2RM#O`57cqo=MVBF@6qjr~oG#&ry=N9DK)6_FuSwT|OVOn=jw zxfn%-_zA4UU09E2aV3`aS@Q^XV-hdmojCfIHC1>G%P|@!;_Po?G|F%rK8Pcz56s)v zEP(~6jXbQu5!As#{njkUYMhU8)QwMJ5~u8Pk^KcD^e0h8H}f59UcgH98fbh>L(eZ~ zw+nd*K0|*o*5NP~VQ|3Zt{C+U??t7i4wag9sL(c}imMg%-CiWuW(@UuPN8aIVu1Ir zs-0v&DX{OlVhW<(Z93kJxu^xpP!ntY@l~jZG-Cuuu@o<%Y9MRS9VqHsg+az^P_LaC=q_xl{qzzwJgt*DK6qbBS_Xl*-S&Z?Luwz5tidI_ksBnmCMw9uE?@c2c3Y`mcdwz=8%B#~IDMjE`TF!gkL~SSU9aw6tNTNN%wVEtZG9;4cOdac sV{g1HRL4-x=eI0sPx diff --git a/locale/ja/LC_MESSAGES/phpwiki.mo b/locale/ja/LC_MESSAGES/phpwiki.mo index d9a8a5a5ed7f7f51248baa12d2d66f1337f29da6..61b84bf762aeb0523e92718ebd4600f0d92e5300 100644 GIT binary patch delta 21 ccmaEy`#5*QdIb(cLj^-aD?^LT+ZA-g0Ad#hdjJ3c delta 21 ccmaEy`#5*QdIb&x3k5?{Dk diff --git a/locale/nl/LC_MESSAGES/phpwiki.mo b/locale/nl/LC_MESSAGES/phpwiki.mo index e7dd167269b66ed9729be8d56a8e67a737a1ef58..c0ce4fbf1a9117d3c4fd82e3f589b0a4416f8889 100644 GIT binary patch delta 21 dcmbR2I@xu@VlfUwLj^-aD?^LTtHoY$0{~BO2M_=N delta 21 dcmbR2I@xu@VlfT_3k5?{D, Carsten Klapp " ", Helmer Pardun \n" "Language-Team: \n" @@ -8076,7 +8076,7 @@ msgstr "" #: ../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 diff --git a/locale/po/fr.po b/locale/po/fr.po index 5fd658b71..e40dcd2f2 100644 --- a/locale/po/fr.po +++ b/locale/po/fr.po @@ -6,7 +6,7 @@ msgid "" 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 , Roland " "Trique , Stéphane Gourichon \n" "Language-Team: LANGUAGE \n" @@ -8192,7 +8192,7 @@ msgstr "" #: ../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 diff --git a/locale/po/nl.po b/locale/po/nl.po index a754847ef..7367c40a6 100644 --- a/locale/po/nl.po +++ b/locale/po/nl.po @@ -8,7 +8,7 @@ msgid "" 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 \n" "Language-Team: Dutch \n" @@ -8005,7 +8005,7 @@ msgstr "" #: ../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 diff --git a/locale/po/phpwiki.pot b/locale/po/phpwiki.pot index 2f67cb278..53f44c9bc 100644 --- a/locale/po/phpwiki.pot +++ b/locale/po/phpwiki.pot @@ -6,7 +6,7 @@ msgid "" 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 \n" "Language-Team: LANGUAGE \n" @@ -7993,7 +7993,7 @@ msgstr "" #: ../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 diff --git a/locale/po/sv.po b/locale/po/sv.po index bf11d70d3..a2ad097dc 100644 --- a/locale/po/sv.po +++ b/locale/po/sv.po @@ -7,7 +7,7 @@ msgid "" 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 \n" "Language-Team: \n" @@ -7996,7 +7996,7 @@ msgstr "" #: ../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 diff --git a/locale/po/zh.po b/locale/po/zh.po index 0faf47598..490300541 100644 --- a/locale/po/zh.po +++ b/locale/po/zh.po @@ -6,7 +6,7 @@ msgid "" 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 \n" "Language-Team: DruryL \n" @@ -8360,7 +8360,7 @@ msgstr "在變更下列頁面時取得 e-mail 通知:" #: ../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 diff --git a/locale/sv/LC_MESSAGES/phpwiki.mo b/locale/sv/LC_MESSAGES/phpwiki.mo index 768ab82beded35284adbf0ef665c498b0a297c64..a489efc75e7f54293cdc0dff17c94aafb2535a8b 100644 GIT binary patch delta 21 dcmezA@Y7+#bWsjNLj^-aD?^LT^F?oQ0RUZt2dMx6 delta 21 dcmezA@Y7+#bWsii3k5?{D