X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;ds=sidebyside;f=languages%2FLanguage.php;h=8f19968637784ab00e7bbdaead80193e0bb6a7e1;hb=6418c776ac81779fd4a22266b553271042115dcc;hp=673076d3b77ef0feabc7a45efe2fef5c32115fe8;hpb=7af9934762c8b0b319f4a88069f87f7db08f1f7f;p=lhc%2Fweb%2Fwiklou.git
diff --git a/languages/Language.php b/languages/Language.php
index 673076d3b7..8f19968637 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -81,6 +81,8 @@ if(isset($wgExtraNamespaces)) {
'fancysig' => 0,
'externaleditor' => 0,
'externaldiff' => 0,
+ 'showjumplinks' => 1,
+ 'numberheadings' => 0,
);
/* private */ $wgQuickbarSettingsEn = array(
@@ -107,14 +109,24 @@ if(isset($wgExtraNamespaces)) {
MW_MATH_MATHML => 'mw_math_mathml'
);
-# Whether to use user or default setting in Language::date()
-
-/* private */ $wgDateFormatsEn = array(
- 'No preference',
- '16:12, January 15, 2001',
- '16:12, 15 January 2001',
- '16:12, 2001 January 15',
- 'ISO 8601' => '2001-01-15 16:12:34'
+/**
+ * Whether to use user or default setting in Language::date()
+ *
+ * NOTE: the array string values are no longer important!
+ * The actual date format functions are now called for the selection in
+ * Special:Preferences, and the 'datedefault' message for MW_DATE_DEFAULT.
+ *
+ * The array keys make up the set of formats which this language allows
+ * the user to select. It's exposed via Language::getDateFormats().
+ *
+ * @access private
+ */
+$wgDateFormatsEn = array(
+ MW_DATE_DEFAULT => 'No preference',
+ MW_DATE_DMY => '16:12, 15 January 2001',
+ MW_DATE_MDY => '16:12, January 15, 2001',
+ MW_DATE_YMD => '16:12, 2001 January 15',
+ MW_DATE_ISO => '2001-01-15 16:12:34'
);
/* private */ $wgUserTogglesEn = array(
@@ -143,6 +155,7 @@ if(isset($wgExtraNamespaces)) {
'fancysig',
'externaleditor',
'externaldiff',
+ 'showjumplinks',
);
/* private */ $wgBookstoreListEn = array(
@@ -188,7 +201,7 @@ $wgLanguageNamesEn =& $wgLanguageNames;
#
/* private */ $wgMagicWordsEn = array(
# ID CASE SYNONYMS
- MAG_REDIRECT => array( 0, '#redirect' ),
+ MAG_REDIRECT => array( 0, '#REDIRECT' ),
MAG_NOTOC => array( 0, '__NOTOC__' ),
MAG_FORCETOC => array( 0, '__FORCETOC__' ),
MAG_TOC => array( 0, '__TOC__' ),
@@ -207,6 +220,9 @@ $wgLanguageNamesEn =& $wgLanguageNames;
MAG_PAGENAME => array( 1, 'PAGENAME' ),
MAG_PAGENAMEE => array( 1, 'PAGENAMEE' ),
MAG_NAMESPACE => array( 1, 'NAMESPACE' ),
+ MAG_NAMESPACEE => array( 1, 'NAMESPACEE' ),
+ MAG_FULLPAGENAME => array( 1, 'FULLPAGENAME' ),
+ MAG_FULLPAGENAMEE => array( 1, 'FULLPAGENAMEE' ),
MAG_MSG => array( 0, 'MSG:' ),
MAG_SUBST => array( 0, 'SUBST:' ),
MAG_MSGNW => array( 0, 'MSGNW:' ),
@@ -233,6 +249,13 @@ $wgLanguageNamesEn =& $wgLanguageNames;
MAG_CURRENTWEEK => array( 1, 'CURRENTWEEK' ),
MAG_CURRENTDOW => array( 1, 'CURRENTDOW' ),
MAG_REVISIONID => array( 1, 'REVISIONID' ),
+ MAG_PLURAL => array( 0, 'PLURAL:' ),
+ MAG_FULLURL => array( 0, 'FULLURL:' ),
+ MAG_FULLURLE => array( 0, 'FULLURLE:' ),
+ MAG_LCFIRST => array( 0, 'LCFIRST:' ),
+ MAG_UCFIRST => array( 0, 'UCFIRST:' ),
+ MAG_LC => array( 0, 'LC:' ),
+ MAG_UC => array( 0, 'UC:' ),
);
#-------------------------------------------------------------------
@@ -246,10 +269,6 @@ $wgLanguageNamesEn =& $wgLanguageNames;
global $wgRightsText;
/* private */ $wgAllMessagesEn = array(
-
-# The navigation toolbar, int: is used here to make sure that the appropriate
-# messages are automatically pulled from the user-selected language file.
-
/*
The sidebar for MonoBook is generated from this message, lines that do not
begin with * or ** are discarded, furthermore lines that do begin with ** and
@@ -274,7 +293,7 @@ parent class in order maintain consistency across languages.
',
# User preference toggles
-'tog-underline' => 'Underline links',
+'tog-underline' => 'Underline links:',
'tog-highlightbroken' => 'Format broken links like this (alternative: like this?).',
'tog-justify' => 'Justify paragraphs',
'tog-hideminor' => 'Hide minor edits in recent changes',
@@ -292,14 +311,15 @@ parent class in order maintain consistency across languages.
'tog-previewontop' => 'Show preview before edit box',
'tog-previewonfirst' => 'Show preview on first edit',
'tog-nocache' => 'Disable page caching',
-'tog-enotifwatchlistpages' => 'Send me an email on page changes',
-'tog-enotifusertalkpages' => 'Send me an email when my user talk page is changed',
-'tog-enotifminoredits' => 'Send me an email also for minor edits of pages',
-'tog-enotifrevealaddr' => 'Reveal my email address in notification mails',
+'tog-enotifwatchlistpages' => 'E-mail me on page changes',
+'tog-enotifusertalkpages' => 'E-mail me when my user talk page is changed',
+'tog-enotifminoredits' => 'E-mail me also for minor edits of pages',
+'tog-enotifrevealaddr' => 'Reveal my e-mail address in notification mails',
'tog-shownumberswatching' => 'Show the number of watching users',
'tog-fancysig' => 'Raw signatures (without automatic link)',
'tog-externaleditor' => 'Use external editor by default',
'tog-externaldiff' => 'Use external diff by default',
+'tog-showjumplinks' => 'Enable "jump to" accessibility links',
'underline-always' => 'Always',
'underline-never' => 'Never',
@@ -341,6 +361,7 @@ parent class in order maintain consistency across languages.
'dec' => 'Dec',
# Bits of text used by many pages:
#
+'categories1' => 'Category',
'categories' => 'Categories',
'category' => 'category',
'category_header' => 'Articles in category "$1"',
@@ -393,6 +414,8 @@ parent class in order maintain consistency across languages.
'disclaimers' => 'Disclaimers',
'disclaimerpage' => 'Project:General_disclaimer',
+'privacy' => 'Privacy policy',
+'privacypage' => 'Project:Privacy_policy',
'errorpagetitle' => 'Error',
'returnto' => 'Return to $1.',
'tagline' => 'From {{SITENAME}}',
@@ -400,7 +423,7 @@ parent class in order maintain consistency across languages.
'help' => 'Help',
'search' => 'Search',
'go' => 'Go',
-"history" => 'Page history',
+'history' => 'Page history',
'history_short' => 'History',
'updatedmarker' => 'updated since my last visit',
'info_short' => 'Information',
@@ -434,6 +457,7 @@ parent class in order maintain consistency across languages.
'viewtalkpage' => 'View discussion',
'otherlanguages' => 'In other languages',
'redirectedfrom' => '(Redirected from $1)',
+'redirectpagesub' => 'Redirect page',
'lastmodified' => 'This page was last modified $1.',
'viewcount' => 'This page has been accessed $1 times.',
'copyright' => 'Content is available under $1.',
@@ -441,6 +465,9 @@ parent class in order maintain consistency across languages.
'printsubtitle' => '(From {{SERVER}})',
'protectedpage' => 'Protected page',
'administrators' => 'Project:Administrators',
+'jumpto' => 'Jump to:',
+'jumptonavigation' => 'navigation',
+'jumptosearch' => 'search',
'sysoptitle' => 'Sysop access required',
'sysoptext' => 'The action you have requested can only be
@@ -460,10 +487,13 @@ See $1.',
'versionrequiredtext' => 'Version $1 of MediaWiki is required to use this page. See [[Special:Version]]',
'nbytes' => '$1 bytes',
+'ncategories' => '$1 categories',
+'nrevisions' => '$1 revisions',
+'widthheight' => '$1x$2',
'ok' => 'OK',
'sitetitle' => '{{SITENAME}}',
'pagetitle' => '$1 - {{SITENAME}}',
-'sitesubtitle' => 'The Free Encyclopedia', # FIXME
+'sitesubtitle' => '',
'retrievedfrom' => 'Retrieved from "$1"',
'newmessages' => 'You have $1.',
'newmessageslink' => 'new messages',
@@ -512,7 +542,7 @@ MySQL returned error "$3: $4".',
The last attempted database query was:
"$1"
from within function "$2".
-MySQL returned error "$3: $4"'."\n",
+MySQL returned error "$3: $4"',
'noconnect' => 'Sorry! The wiki is experiencing some technical difficulties, and cannot contact the database server.
$1',
'nodb' => 'Could not select database $1',
@@ -560,11 +590,11 @@ You can view and copy the source of this page:',
# Login and logout pages
#
'logouttitle' => 'User logout',
-'logouttext' => "You are now logged out.
+'logouttext' => 'You are now logged out.
You can continue to use {{SITENAME}} anonymously, or you can log in
again as the same or as a different user. Note that some pages may
continue to be displayed as if you were still logged in, until you clear
-your browser cache.\n",
+your browser cache.',
'welcomecreation' => "== Welcome, $1! ==
@@ -579,66 +609,72 @@ Your account has been created. Don't forget to change your {{SITENAME}} preferen
'yourdomainname' => 'Your domain',
'externaldberror' => 'There was either an external authentication database error or you are not allowed to update your external account.',
'loginproblem' => 'There has been a problem with your login.
Try again!',
-'alreadyloggedin' => "User $1, you are already logged in!
\n",
+'alreadyloggedin' => "User $1, you are already logged in!
",
'login' => 'Log in',
'loginprompt' => 'You must have cookies enabled to log in to {{SITENAME}}.',
-'userlogin' => 'Create an account or log in',
+'userlogin' => 'Log in / create account',
'logout' => 'Log out',
'userlogout' => 'Log out',
'notloggedin' => 'Not logged in',
-'createaccount' => 'Create new account',
-'createaccountmail' => 'by email',
+'nologin' => 'Don\'t have a login? $1.',
+'nologinlink' => 'Create an account',
+'createaccount' => 'Create account',
+'gotaccount' => 'Already got an account? $1.',
+'gotaccountlink' => 'Log in',
+'createaccountmail' => 'by e-mail',
'badretype' => 'The passwords you entered do not match.',
-'userexists' => 'The user name you entered is already in use. Please choose a different name.',
-'youremail' => 'Email *',
+'userexists' => 'Username entered already in use. Please choose a different name.',
+'youremail' => 'E-mail *',
+'username' => 'Username: ',
+'uid' => 'User ID: ',
'yourrealname' => 'Real name *',
-'yourlanguage' => 'Language',
+'yourlanguage' => 'Language:',
'yourvariant' => 'Variant',
-'yournick' => 'Nickname',
-'email' => 'Email',
-'emailforlost' => "Fields marked with superscripts are optional. Storing an email address enables people to contact you through the website without you having to reveal your
-email address to them, and it can be used to send you a new password if you forget it.
Your real name, if you choose to provide it, will be used for giving you attribution for your work.",
-'prefs-help-email-enotif' => 'This address is also used to send you email notifications if you enabled the options.',
+'yournick' => 'Nickname:',
+'badsig' => 'Invalid raw signature; check HTML tags.',
+'email' => 'E-mail',
+'emailforlost' => '
You may contact $1 or one of the other
+'blockedtext' => 'Your user name or IP address has been blocked by $1.
+The reason given is this:
\'\'$2\'\'
You may contact $1 or one of the other
[[Project:Administrators|administrators]] to discuss the block.
-Note that you may not use the \"email this user\" feature unless you have a valid email address registered in your [[Special:Preferences|user preferences]].
+Note that you may not use the "e-mail this user" feature unless you have a valid e-mail address registered in your [[Special:Preferences|user preferences]].
Your IP address is $3. Please include this address in any queries you make.
-",
+',
'whitelistedittitle' => 'Login required to edit',
'whitelistedittext' => 'You have to [[Special:Userlogin|login]] to edit pages.',
'whitelistreadtitle' => 'Login required to read',
@@ -692,36 +728,40 @@ Your IP address is $3. Please include this address in any queries you make.
'loginreqlink' => 'login',
'loginreqpagetext' => 'You must $1 to view other pages.',
'accmailtitle' => 'Password sent.',
-'accmailtext' => "The password for '$1' has been sent to $2.",
+'accmailtext' => 'The password for "$1" has been sent to $2.',
'newarticle' => '(New)',
'newarticletext' =>
"You've followed a link to a page that doesn't exist yet.
To create the page, start typing in the box below
(see the [[Project:Help|help page]] for more info).
If you are here by mistake, just click your browser's '''back''' button.",
+'newarticletextanon' => '{{int:newarticletext}}',
'talkpagetext' => '',
'anontalkpagetext' => "----''This is the discussion page for an anonymous user who has not created an account yet or who does not use it. We therefore have to use the numerical [[IP address]] to identify him/her. Such an IP address can be shared by several users. If you are an anonymous user and feel that irrelevant comments have been directed at you, please [[Special:Userlogin|create an account or log in]] to avoid future confusion with other anonymous users.'' ",
-'noarticletext' => '(There is currently no text in this page)',
+'noarticletext' => 'There is currently no text in this page, you can [[{{ns:special}}:Search/{{PAGENAME}}|search for this page title]] in other pages or [{{fullurl:{{NAMESPACE}}:{{PAGENAME}}|action=edit}} edit this page].',
+'noarticletextanon' => '{{int:noarticletext}}',
'clearyourcache' => "'''Note:''' After saving, you may have to bypass your browser's cache to see the changes. '''Mozilla / Firefox / Safari:''' hold down ''Shift'' while clicking ''Reload'', or press ''Ctrl-Shift-R'' (''Cmd-Shift-R'' on Apple Mac); '''IE:''' hold ''Ctrl'' while clicking ''Refresh'', or press ''Ctrl-F5''; '''Konqueror:''': simply click the ''Reload'' button, or press ''F5''; '''Opera''' users may need to completely clear their cache in ''Tools→Preferences''.",
-'usercssjsyoucanpreview' => "Tip: Use the 'Show preview' button to test your new CSS/JS before saving.",
-'usercsspreview' => "'''Remember that you are only previewing your user CSS, it has not yet been saved!'''",
-'userjspreview' => "'''Remember that you are only testing/previewing your user JavaScript, it has not yet been saved!'''",
-'updated' => '(Updated)',
-'note' => 'Note: ',
-'previewnote' => 'Remember that this is only a preview, and has not yet been saved!',
+'usercssjsyoucanpreview' => 'Tip: Use the \'Show preview\' button to test your new CSS/JS before saving.',
+'usercsspreview' => '\'\'\'Remember that you are only previewing your user CSS, it has not yet been saved!\'\'\'',
+'userjspreview' => '\'\'\'Remember that you are only testing/previewing your user JavaScript, it has not yet been saved!\'\'\'',
+'updated' => '(Updated)',
+'note' => 'Note: ',
+'previewnote' => 'This is only a preview; changes have not yet been saved!',
+'session_fail_preview' => 'Sorry! We could not process your edit due to a loss of session data.
+Please try again. If it still doesn\'t work, try logging out and logging back in.',
'previewconflict' => 'This preview reflects the text in the upper
text editing area as it will appear if you choose to save.',
-'editing' => "Editing $1",
-'editingsection' => "Editing $1 (section)",
-'editingcomment' => "Editing $1 (comment)",
-'editconflict' => 'Edit conflict: $1',
-'explainconflict' => "Someone else has changed this page since you
-started editing it.
+'importing' => 'Importing $1',
+'editing' => 'Editing $1',
+'editingsection' => 'Editing $1 (section)',
+'editingcomment' => 'Editing $1 (comment)',
+'editconflict' => 'Edit conflict: $1',
+'explainconflict' => 'Someone else has changed this page since you started editing it.
The upper text area contains the page text as it currently exists.
Your changes are shown in the lower text area.
You will have to merge your changes into the existing text.
Only the text in the upper text area will be saved when you
-press \"Save page\".
",
+press "Save page".
',
'yourtext' => 'Your text',
'storedversion' => 'Stored version',
'nonunicodebrowser' => "WARNING: Your browser is not unicode compliant. A workaround is in place to allow you to safely edit articles: non-ASCII characters will appear in the edit box as hexadecimal codes.",
@@ -729,19 +769,13 @@ press \"Save page\".
",
revision of this page.
If you save it, any changes made since this revision will be lost.",
'yourdiff' => 'Differences',
-'copyrightwarning' => "Please note that all contributions to {{SITENAME}} are
-considered to be released under the $2 (see $1 for details).
-If you don't want your writing to be edited mercilessly and redistributed
-at will, then don't submit it here.
-You are also promising us that you wrote this yourself, or copied it from a
-public domain or similar free resource.
-DO NOT SUBMIT COPYRIGHTED WORK WITHOUT PERMISSION!",
-'copyrightwarning2' => "Please note that all contributions to {{SITENAME}}
-may be edited, altered, or removed by other contributors.
-If you don't want your writing to be edited mercilessly, then don't submit it here.
+'copyrightwarning' => 'Please note that all contributions to {{SITENAME}} are considered to be released under the $2 (see $1 for details). If you don\'t want your writing to be edited mercilessly and redistributed at will, then don\'t submit it here.
+You are also promising us that you wrote this yourself, or copied it from a public domain or similar free resource.
+DO NOT SUBMIT COPYRIGHTED WORK WITHOUT PERMISSION!',
+'copyrightwarning2' => 'Please note that all contributions to {{SITENAME}} may be edited, altered, or removed by other contributors. If you don\'t want your writing to be edited mercilessly, then don\'t submit it here.
You are also promising us that you wrote this yourself, or copied it from a
public domain or similar free resource (see $1 for details).
-DO NOT SUBMIT COPYRIGHTED WORK WITHOUT PERMISSION!",
+DO NOT SUBMIT COPYRIGHTED WORK WITHOUT PERMISSION!',
'longpagewarning' => "WARNING: This page is $1 kilobytes long; some
browsers may have problems editing pages approaching or longer than 32kb.
Please consider breaking the page into smaller sections.",
@@ -750,6 +784,10 @@ so you will not be able to save your edits right now. You may wish to cut-n-past
the text into a text file and save it for later.',
'protectedpagewarning' => "WARNING: This page has been locked so that only users with sysop privileges can edit it. Be sure you are following the [[Project:Protected_page_guidelines|protected page guidelines]].",
'templatesused' => 'Templates used on this page:',
+'edittools' => '',
+'nocreatetitle' => 'Page creation limited',
+'nocreatetext' => 'This site has restricted the ability to create new pages.
+You can go back and edit an existing page, or [[Special:Userlogin|log in or create an account]].',
# History pages
#
@@ -757,7 +795,7 @@ the text into a text file and save it for later.',
'nohistory' => 'There is no edit history for this page.',
'revnotfound' => 'Revision not found',
'revnotfoundtext' => "The old revision of the page you asked for could not be found.
-Please check the URL you used to access this page.\n",
+Please check the URL you used to access this page.",
'loadhist' => 'Loading page history',
'currentrev' => 'Current revision',
'revisionasof' => 'Revision as of $1',
@@ -820,7 +858,7 @@ containing all of the search terms will appear in the result).",
Search in namespaces :
$1
$2 List redirects Search for $3 $9",
-"searchdisabled" => '{{SITENAME}} search is disabled. You can search via Google in the meantime. Note that their indexes of {{SITENAME}} content may be out of date.',
+'searchdisabled' => '{{SITENAME}} search is disabled. You can search via Google in the meantime. Note that their indexes of {{SITENAME}} content may be out of date.',
'googlesearch' => '