X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/banques/?a=blobdiff_plain;f=languages%2FLanguage.php;h=7c927e17c9e5f0d6f980f12bd700870adcdc4020;hb=4e7f77a00255043a098d3324c4c0f83d2f5dbe50;hp=40db87cae30d985b0c29b3584312f96da645a9f5;hpb=a7054a9cd820aa0a7b2307591c21a83a36582358;p=lhc%2Fweb%2Fwiklou.git diff --git a/languages/Language.php b/languages/Language.php index 40db87cae3..7c927e17c9 100644 --- a/languages/Language.php +++ b/languages/Language.php @@ -78,13 +78,11 @@ if(isset($wgExtraNamespaces)) { 'imagesize' => 2, 'thumbsize' => 2, 'rememberpassword' => 0, - 'enotifwatchlistpages' => 1, + 'enotifwatchlistpages' => 0, 'enotifusertalkpages' => 1, 'enotifminoredits' => 0, 'enotifrevealaddr' => 0, 'shownumberswatching' => 1, - 'rcusemodstyle' => 1, - 'showupdated' => 1, 'fancysig' => 0, 'externaleditor' => 0, 'externaldiff' => 0, @@ -105,16 +103,6 @@ if(isset($wgExtraNamespaces)) { 'chick' => 'Chick' ); -# Validation types -$wgValidationTypesEn = array ( - '0' => "Style|Awful|Awesome|5", - '1' => "Legal|Illegal|Legal|5", - '2' => "Completeness|Stub|Extensive|5", - '3' => "Facts|Wild guesses|Solid as a rock|5", - '4' => "Suitable for 1.0 (paper)|No|Yes|2", - '5' => "Suitable for 1.0 (CD)|No|Yes|2" -); - /* private */ $wgMathNamesEn = array( MW_MATH_PNG => 'mw_math_png', MW_MATH_SIMPLE => 'mw_math_simple', @@ -127,7 +115,7 @@ $wgValidationTypesEn = array ( # Whether to use user or default setting in Language::date() /* private */ $wgDateFormatsEn = array( - 'Default', + 'No preference', '16:12, January 15, 2001', '16:12, 15 January 2001', '16:12, 2001 January 15', @@ -158,8 +146,6 @@ $wgValidationTypesEn = array ( 'enotifminoredits', 'enotifrevealaddr', 'shownumberswatching', - 'rcusemodstyle', - 'showupdated', 'fancysig', 'externaleditor', 'externaldiff', @@ -222,9 +208,11 @@ $wgLanguageNamesEn =& $wgLanguageNames; MAG_CURRENTYEAR => array( 1, 'CURRENTYEAR' ), MAG_CURRENTTIME => array( 1, 'CURRENTTIME' ), MAG_NUMBEROFARTICLES => array( 1, 'NUMBEROFARTICLES' ), + MAG_NUMBEROFFILES => array( 1, 'NUMBEROFFILES' ), MAG_PAGENAME => array( 1, 'PAGENAME' ), MAG_PAGENAMEE => array( 1, 'PAGENAMEE' ), MAG_NAMESPACE => array( 1, 'NAMESPACE' ), + MAG_MSG => array( 0, 'MSG:' ), MAG_SUBST => array( 0, 'SUBST:' ), MAG_MSGNW => array( 0, 'MSGNW:' ), MAG_END => array( 0, '__END__' ), @@ -241,6 +229,8 @@ $wgLanguageNamesEn =& $wgLanguageNames; MAG_LOCALURL => array( 0, 'LOCALURL:' ), MAG_LOCALURLE => array( 0, 'LOCALURLE:' ), MAG_SERVER => array( 0, 'SERVER' ), + MAG_SERVERNAME => array( 0, 'SERVERNAME' ), + MAG_SCRIPTPATH => array( 0, 'SCRIPTPATH' ), MAG_GRAMMAR => array( 0, 'GRAMMAR:' ), MAG_NOTITLECONVERT => array( 0, '__NOTITLECONVERT__', '__NOTC__'), MAG_NOCONTENTCONVERT => array( 0, '__NOCONTENTCONVERT__', '__NOCC__'), @@ -260,6 +250,33 @@ $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 +do not contain | are also discarded, but don't depend on this behaviour for +future releases. Also note that since each list value is wrapped in a unique +XHTML id it should only appear once and include characters that are legal +XHTML id names. + +Note to translators: Do not include this message in the language files you +submit for inclusion in MediaWiki, it should always be inherited from the +parent class in order maintain consistency across languages. +*/ +'sidebar' => ' +* navigation +** mainpage|mainpage +** portal-url|portal +** currentevents-url|currentevents +** recentchanges-url|recentchanges +** randompage-url|randompage +** helppage|help +** sitesupport-url|sitesupport +', + # User preference toggles 'tog-underline' => 'Underline links', 'tog-highlightbroken' => 'Format broken links like this (alternative: like this?).', @@ -279,13 +296,11 @@ global $wgRightsText; '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 (remark: existing notification flags need to be cleared manually in the watchlist)', -'tog-enotifusertalkpages' => 'Send me an email when my user talk page is changed (remark: existing notification flags need to be cleared manually in the watchlist)', -'tog-enotifminoredits' => 'Send me an email also for minor edits of pages (which usually do not trigger notification mails)', -'tog-enotifrevealaddr' => 'Reveal my email address in notification mails (when I change a page, it allows watching users to reply quickly to me)', -'tog-shownumberswatching' => 'Show the number of watching users (in recent changes view, watchlist and article page footers)', -'tog-rcusemodstyle' => 'Show recent changes in UseMod style: only the most recent change of any page is listed.', -'tog-showupdated' => 'Show update marker ', +'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-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', @@ -336,9 +351,6 @@ global $wgRightsText; "mainpagedocfooter" => "Please see [http://meta.wikipedia.org/wiki/MediaWiki_i18n documentation on customizing the interface] and the [http://meta.wikipedia.org/wiki/MediaWiki_User%27s_Guide User's Guide] for usage and configuration help.", -# NOTE: To turn off "Community portal" in the title links, -# set "portal" => "-" - 'portal' => 'Community portal', 'portal-url' => 'Project:Community Portal', 'about' => 'About', @@ -350,7 +362,7 @@ and the [http://meta.wikipedia.org/wiki/MediaWiki_User%27s_Guide User's Guide] f 'wikititlesuffix' => '{{SITENAME}}', 'bugreports' => 'Bug reports', 'bugreportspage' => 'Project:Bug_reports', -'sitesupport' => '-', # To enable, something like 'Donations', +'sitesupport' => 'Donations', 'sitesupport-url' => 'Project:Site support', 'faq' => 'FAQ', 'faqpage' => 'Project:FAQ', @@ -375,15 +387,9 @@ and the [http://meta.wikipedia.org/wiki/MediaWiki_User%27s_Guide User's Guide] f 'metadata' => 'Metadata (for an explanation see here)', 'metadata_page' => 'Wikipedia:Metadata', -# NOTE: To turn off "Current Events" in the sidebar, -# set "currentevents" => "-" - 'currentevents' => 'Current events', 'currentevents-url' => 'Current events', -# NOTE: To turn off "Disclaimers" in the title links, -# set "disclaimers" => "-" - 'disclaimers' => 'Disclaimers', 'disclaimerpage' => "Project:General_disclaimer", 'errorpagetitle' => "Error", @@ -397,6 +403,7 @@ and the [http://meta.wikipedia.org/wiki/MediaWiki_User%27s_Guide User's Guide] f 'history_short' => 'History', 'info_short' => 'Information', 'printableversion' => 'Printable version', +'print' => 'Print', 'edit' => 'Edit', 'editthispage' => 'Edit this page', 'delete' => 'Delete', @@ -416,6 +423,7 @@ and the [http://meta.wikipedia.org/wiki/MediaWiki_User%27s_Guide User's Guide] f 'articlepage' => 'View content page', 'subjectpage' => 'View subject', # For compatibility 'talk' => 'Discussion', +'views' => 'Views', 'toolbox' => 'Toolbox', 'userpage' => 'View user page', 'wikipediapage' => 'View project page', @@ -430,6 +438,7 @@ and the [http://meta.wikipedia.org/wiki/MediaWiki_User%27s_Guide User's Guide] f 'printsubtitle' => "(From {{SERVER}})", 'protectedpage' => 'Protected page', 'administrators' => "Project:Administrators", + 'sysoptitle' => 'Sysop access required', 'sysoptext' => "The action you have requested can only be performed by users with \"sysop\" status. @@ -438,9 +447,15 @@ See $1.", 'developertext' => "The action you have requested can only be performed by users with \"developer\" status. See $1.", -'bureaucrattitle' => 'Bureaucrat access required', -"bureaucrattext" => "The action you have requested can only be -performed by sysops with \"bureaucrat\" status.", + +'badaccess' => 'Permission error', +'badaccesstext' => 'The action you have requested is limited +to users with the "$2" permission assigned. +See $1.', + +'versionrequired' => 'Version $1 of MediaWiki required', +'versionrequiredtext' => 'Version $1 of MediaWiki is required to use this page. See [[Special:Version]]', + 'nbytes' => '$1 bytes', 'ok' => 'OK', 'sitetitle' => "{{SITENAME}}", @@ -476,8 +491,7 @@ performed by sysops with \"bureaucrat\" status.", 'nosuchactiontext' => 'The action specified by the URL is not recognized by the wiki', 'nosuchspecialpage' => 'No such special page', -'nospecialpagetext' => 'You have requested a special page that is not -recognized by the wiki.', +'nospecialpagetext' => 'You have requested an invalid special page, a list of valid special pages may be found at [[{{ns:special}}:Specialpages]].', # General errors # @@ -515,6 +529,7 @@ page that has been deleted.
If this is not the case, you may have found a bug in the software.
Please report this to an administrator, making note of the URL.",
+'readonly_lag' => "The database has been automatically locked while the slave database servers catch up to the master",
'internalerror' => 'Internal error',
'filecopyerror' => "Could not copy file \"$1\" to \"$2\".",
'filerenameerror' => "Could not rename file \"$1\" to \"$2\".",
@@ -542,7 +557,6 @@ a number of reasons why this may be so, please see
[[Project:Protected page]].
You can view and copy the source of this page:",
-'seriousxhtmlerrors' => 'There were serious xhtml markup errors detected by tidy.',
'sqlhidden' => '(SQL query hidden)',
# Login and logout pages
@@ -564,6 +578,8 @@ Your account has been created. Don't forget to change your {{SITENAME}} preferen
'yourpasswordagain' => 'Retype password',
'newusersonly' => ' (new users only)',
'remembermypassword' => 'Remember my password across sessions.',
+'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",
@@ -598,36 +614,30 @@ email address to them, and it can be used to send you a new password if you forg
Check your spelling, or use the form below to create a new user account.",
'nosuchusershort' => "There is no user by the name \"$1\". Check your spelling.",
'wrongpassword' => 'The password you entered is incorrect (or missing). Please try again.',
-'mailmypassword' => 'Mail me a temporary password',
-'mailmypasswordauthent' => 'Mail me a temporary password',
-'passwordremindermailsubject' => "Email address authentication and temporary login password from {{SITENAME}}",
-'passwordremindermailbody' => "Someone, probably you from IP address $1,
-requested that we send you a temporary one-time login password for {{SITENAME}}.
-
-This mail is also be sent for the purpose of authentication of your email address.
-The password for user \"$2\" is now \"$4\".
-
-You can now log in with this temporary password, which is valid for only one login.
-You may wish to keep using your old password if you remember it or to set a new one.
-
-{{SERVER}}{{localurl:Special:Userlogin|wpName=$3&wpPassword=$4&returnto=Special:Preferences}}",
-'noemail' => "There is no e-mail address recorded for user \"$1\".",
-'passwordsent' => "A temporary password has been sent to the e-mail address
+'mailmypassword' => 'Mail me a new password',
+'passwordremindertitle' => "Password reminder from {{SITENAME}}",
+'passwordremindertext' => "Someone (probably you, from IP address $1)
+requested that we send you a new {{SITENAME}} login password.
+The password for user \"$2\" is now \"$3\".
+You should log in and change your password now.",
+'noemail' => "There is no e-mail address recorded for user \"$1\".",
+'passwordsent' => "A new password has been sent to the e-mail address
registered for \"$1\".
Please log in again after you receive it.",
-'passwordsentforemailauthentication'
- => "A temporary password has been sent to the e-mail address newly
-registered for \"$1\".
-Please re-login with that for authentication purposes.",
-'loginend' => ' ',
-'mailerror' => "Error sending mail: $1",
+'eauthentsent' => "A confirmation email has been sent to the nominated email address.
+Before any other mail is sent to the account, you will have to follow the instructions in the email,
+to confirm that the account is actually yours.",
+'loginend' => ' ',
+'mailerror' => "Error sending mail: $1",
'acct_creation_throttle_hit' => 'Sorry, you have already created $1 accounts. You can\'t make any more.',
-'emailauthenticated' => 'Your email address was authenticated on $1.',
-'emailnotauthenticated' => 'Your email address is not yet authenticated and the advanced email features are disabled until authentication (d.u.a.).',
+'emailauthenticated' => 'Your email address was authenticated on $1.',
+'emailnotauthenticated' => 'Your email address is not yet authenticated. No email
+will be sent for any of the following features.',
+'noemailprefs' => 'No email address has been specified, the following
+features will not work.',
'emailconfirmlink' => 'Confirm your e-mail address',
-'invalidemailaddress' => 'The email address cannot be accepted as it appears to have an invalid format. Please enter a well-formatted address or empty that field.',
-'disableduntilauthent' => '(d.u.a.)',
-'disablednoemail' => '(disabled; no email address)',
+'invalidemailaddress' => 'The email address cannot be accepted as it appears to have an invalid
+format. Please enter a well-formatted address or empty that field.',
# Edit page toolbar
'bold_sample'=>'Bold text',
@@ -918,6 +928,7 @@ using the MediaWiki namespace',
'userrights-groupsavailable' => 'Available groups:',
'userrights-groupshelp' => 'Select groups you want the user to be removed from or added to.
Unselected groups will not be changed. You can deselect a group with CTRL + Left Click',
+'userrights-logcomment' => 'Changed group membership from $1 to $2',
# Default group names and descriptions
#
@@ -1019,7 +1030,9 @@ created and by whom, and anything else you may know about it. If this is an imag
'savefile' => 'Save file',
'uploadedimage' => "uploaded \"[[$1]]\"",
'uploaddisabled' => 'Sorry, uploading is disabled.',
+'uploadscripted' => 'This file contains HTML or script code that my be erroneously be interpreted by a web browser.',
'uploadcorrupt' => 'The file is corrupt or has an incorrect extension. Please check the file and upload again.',
+'uploadvirus' => 'The file contains a virus! Details: $1',
'sourcefilename' => 'Source filename',
'destfilename' => 'Destination filename',
@@ -1065,8 +1078,8 @@ content pages.
There have been a total of '''$3''' page views, and '''$4''' page edits
since the wiki was setup.
That comes to '''$5''' average edits per page, and '''$6''' views per edit.",
-'userstatstext' => "There are '''$1''' registered users.
-'''$2''' of these are administrators (see $3).",
+'userstatstext' => "There are '''$1''' registered users, of which
+'''$2''' (or '''$4%''') are administrators (see $3).",
# Maintenance Page
#
@@ -1105,7 +1118,7 @@ That comes to '''$5''' average edits per page, and '''$6''' views per edit.",
'nlinks' => '$1 links',
'allpages' => 'All pages',
'randompage' => 'Random page',
-'randompage-url'=> 'Special:Randompage',
+'randompage-url'=> 'Special:Random',
'shortpages' => 'Short pages',
'longpages' => 'Long pages',
'deadendpages' => 'Dead-end pages',
@@ -1114,7 +1127,6 @@ That comes to '''$5''' average edits per page, and '''$6''' views per edit.",
'specialpages' => 'Special pages',
'spheading' => 'Special pages for all users',
'restrictedpheading' => 'Restricted special pages',
-'asksqlpheading' => 'asksql level',
'blockpheading' => 'block level',
'createaccountpheading' => 'createaccount level',
'deletepheading' => 'delete level',
@@ -1219,10 +1231,12 @@ make it easier to pick out.
'unwatchthispage' => 'Stop watching',
'notanarticle' => 'Not a content page',
'watchnochange' => 'None of your watched items were edited in the time period displayed.',
-'watchdetails' => "($1 pages watched not counting talk pages;
-$2 total pages edited since cutoff;
-$3...
-show and edit complete list.)",
+'watchdetails' => "* $1 pages watched not counting talk pages, $2 total pages edited in the specified period
+* Query method: $3
+* [[Special:Watchlist/edit|Show and edit complete watchlist]]
+",
+'wlheader-enotif' => "* Email notification is enabled.",
+'wlheader-showupdated' => "* Pages which have been changed since you last visited them are shown in '''bold'''",
'watchmethod-recent'=> 'checking recent edits for watched pages',
'watchmethod-list' => 'checking watched pages for recent edits',
'removechecked' => 'Remove checked items from watchlist',
@@ -1240,24 +1254,22 @@ at the bottom of the screen (deleting a content page also deletes the accompanyi
'wlshow' => 'Show',
'wlhide' => 'Hide',
-'updatedmarker' => ' updated (since my last visit) ',
-
-'email_notification_mailer' => '{{SITENAME}} Notification Mailer',
-'email_notification_infotext' => "Email notification is on.
-You will be notified by email when someone changes a page which is listed in your watchlist.",
-'email_notification_reset' => 'Reset all notification flags (set their status to "visited")',
-'email_notification_newpagetext'=> 'This is a new page.',
-'email_notification_to' => '$WATCHINGUSERNAME_QP <$WATCHINGUSEREMAILADDR>',
-'email_notification_subject' => '{{SITENAME}} page $PAGETITLE has been changed by $PAGEEDITOR',
-'email_notification_lastvisitedrevisiontext' => 'See {{SERVER}}{{localurl:$PAGETITLE_RAWURL|diff=0&oldid=$OLDID}} for all changes since your last visit.',
-'email_notification_body' => 'Dear $WATCHINGUSERNAME,
+'enotif_mailer' => '{{SITENAME}} Notification Mailer',
+'enotif_reset' => 'Mark all pages visited',
+'enotif_newpagetext'=> 'This is a new page.',
+'changed' => 'changed',
+'created' => 'created',
+'enotif_subject' => '{{SITENAME}} page $PAGETITLE has been $CHANGEDORCREATED by $PAGEEDITOR',
+'enotif_lastvisited' => 'See {{SERVER}}{{localurl:$PAGETITLE_RAWURL|diff=0&oldid=$OLDID}} for all changes since your last visit.',
+'enotif_body' => 'Dear $WATCHINGUSERNAME,
-the {{SITENAME}} page $PAGETITLE has been changed on $PAGEEDITDATE by $PAGEEDITOR,
+the {{SITENAME}} page $PAGETITLE has been $CHANGEDORCREATED on $PAGEEDITDATE by $PAGEEDITOR,
see {{SERVER}}{{localurl:$PAGETITLE_RAWURL}} for the current version.
$NEWPAGE
Editor\'s summary: $PAGESUMMARY $PAGEMINOREDIT
+
Contact the editor:
mail {{SERVER}}{{localurl:Special:Emailuser|target=$PAGEEDITOR_RAWURL}}
wiki {{SERVER}}{{localurl:User:$PAGEEDITOR_RAWURL}}
@@ -1269,17 +1281,18 @@ You could also reset the notification flags for all your watched pages on your w
--
To change your watchlist settings, visit
-{{SERVER}}{{localurl:Special:Watchlist|magic=yes}}
+{{SERVER}}{{localurl:Special:Watchlist|edit=yes}}
Feedback and further assistance:
-{{SERVER}}{{localurl:WikiHelpdesk}}',
+{{SERVER}}{{localurl:Help:Contents}}',
# Delete/protect/revert
#
'deletepage' => 'Delete page',
'confirm' => 'Confirm',
-'excontent' => 'content was:',
-'exbeforeblank' => 'content before blanking was:',
+'excontent' => "content was: '$1'",
+'excontentauthor' => "content was: '$1' (and the only contributor was '$2')",
+'exbeforeblank' => "content before blanking was: '$1'",
'exblank' => 'page was empty',
'confirmdelete' => 'Confirm delete',
'deletesub' => "(Deleting \"$1\")",
@@ -1443,20 +1456,6 @@ Please confirm that this is what you intend to do.',
Remember to remove the lock after your maintenance is complete.',
'unlockdbsuccesstext' => 'The database has been unlocked.',
-# SQL query
-#
-'asksql' => 'SQL query',
-'asksqltext' => "Use the form below to make a direct query of the
-database.
-Use single quotes ('like this') to delimit string literals.
-This can often add considerable load to the server, so please use
-this function sparingly.",
-'sqlislogged' => 'Please note that all queries are logged.',
-'sqlquery' => 'Enter query',
-'querybtn' => 'Submit query',
-'selectonly' => 'Only read-only queries are allowed.',
-'querysuccessful' => 'Query successful',
-
# Make sysop
'makesysoptitle' => 'Make a user into a sysop',
'makesysoptext' => 'This form is used by bureaucrats to turn ordinary users into administrators.
@@ -1466,9 +1465,10 @@ Type the name of the user in the box and press the button to make the user an ad
'makesysopok' => "User \"$1\" is now a sysop",
'makesysopfail' => "User \"$1\" could not be made into a sysop. (Did you enter the name correctly?)",
'setbureaucratflag' => 'Set bureaucrat flag',
+'setstewardflag' => 'Set steward flag',
'bureaucratlog' => 'Bureaucrat_log',
'rightslogtext' => 'This is a log of changes to user rights.',
-'bureaucratlogentry' => "Rights for user \"$1\" set \"$2\"",
+'bureaucratlogentry' => "Changed group membership for $1 from $2 to $3",
'rights' => 'Rights:',
'set_user_rights' => 'Set user rights',
'user_rights_set' => "User rights for \"$1\" updated",
@@ -1476,29 +1476,37 @@ Type the name of the user in the box and press the button to make the user an ad
'makesysop' => 'Make a user into a sysop',
'already_sysop' => 'This user is already an administrator',
'already_bureaucrat' => 'This user is already a bureaucrat',
+'already_steward' => 'This user is already a steward',
# Validation
'val_yes' => 'Yes',
'val_no' => 'No',
+'val_of' => '$1 of $2',
'val_revision' => 'Revision',
'val_time' => 'Time',
+'val_user_stats_title' => 'Validation overview of user $1',
+'val_my_stats_title' => 'My validation overview',
'val_list_header' => '
$2
',
+
# Metadata
'metadata' => 'Metadata',
@@ -1825,8 +1839,8 @@ ta[\'ca-nstab-category\'] = new Array(\'c\',\'View the category page\');
'exif-makernote' =>'Manufacturer notes',
'exif-usercomment' =>'User comments',
'exif-relatedsoundfile' =>'Related audio file',
-'exif-datetimeoriginal' =>'Date and time of original data generation',
-'exif-datetimedigitized' =>'Date and time of original data generation',
+'exif-datetimeoriginal' =>'Date and time of data generation',
+'exif-datetimedigitized' =>'Date and time of digitizing',
'exif-subsectime' =>'DateTime subseconds',
'exif-subsectimeoriginal' =>'DateTimeOriginal subseconds',
'exif-subsectimedigitized' =>'DateTimeDigitized subseconds',
@@ -1861,14 +1875,14 @@ ta[\'ca-nstab-category\'] = new Array(\'c\',\'View the category page\');
'exif-customrendered' =>'Custom image processing',
'exif-exposuremode' =>'Exposure mode',
'exif-whitebalance' =>'White Balance',
-'exif-digitalzoomratio' =>'Digital zoom ration',
+'exif-digitalzoomratio' =>'Digital zoom ratio',
'exif-focallengthin35mmfilm' =>'Focal length in 35 mm film',
'exif-scenecapturetype' =>'Scene capture type',
'exif-gaincontrol' =>'Scene control',
'exif-contrast' =>'Contrast',
'exif-saturation' =>'Saturation',
'exif-sharpness' =>'Sharpness',
-'exif-devicesettingdescription' =>'Desice settings description',
+'exif-devicesettingdescription' =>'Device settings description',
'exif-subjectdistancerange' =>'Subject distance range',
'exif-imageuniqueid' =>'Unique image ID',
'exif-gpsversionid' =>'GPS tag version',
@@ -2029,16 +2043,18 @@ ta[\'ca-nstab-category\'] = new Array(\'c\',\'View the category page\');
'exif-sharpness-1' => 'Soft',
'exif-sharpness-2' => 'Hard',
-'exif-sharpness-0' => 'Unknown',
-'exif-sharpness-1' => 'Macro',
-'exif-sharpness-2' => 'Close view',
-'exif-sharpness-3' => 'Distant view',
+'exif-subjectdistancerange-0' => 'Unknown',
+'exif-subjectdistancerange-1' => 'Macro',
+'exif-subjectdistancerange-2' => 'Close view',
+'exif-subjectdistancerange-3' => 'Distant view',
-'exif-gpslatituderef-n' => 'North latitude',
-'exif-gpslatituderef-s' => 'South latitude',
+// Pseudotags used for GPSLatitudeRef and GPSDestLatitudeRef
+'exif-gpslatitude-n' => 'North latitude',
+'exif-gpslatitude-s' => 'South latitude',
-'exif-gpslongituderef-e' => 'East longitude',
-'exif-gpslongituderef-w' => 'West longitude',
+// Pseudotags used for GPSLongitudeRef and GPSDestLongitudeRef
+'exif-gpslongitude-e' => 'East longitude',
+'exif-gpslongitude-w' => 'West longitude',
'exif-gpsstatus-a' => 'Measurement in progress',
'exif-gpsstatus-v' => 'Measurement interoperability',
@@ -2046,28 +2062,14 @@ ta[\'ca-nstab-category\'] = new Array(\'c\',\'View the category page\');
'exif-gpsmeasuremode-2' => '2-dimensional measurement',
'exif-gpsmeasuremode-3' => '3-dimensional measurement',
-'exif-gpsspeedref-k' => 'Kilometres per hour',
-'exif-gpsspeedref-m' => 'Miles per hour',
-'exif-gpsspeedref-n' => 'Knots',
-
-'exif-gpstrackref-t' => 'True direction',
-'exif-gpstrackref-m' => 'Magnetic direction',
-
-'exif-gpsimgdirectionref-t' => 'True direction',
-'exif-gpsimgdirectionref-m' => 'Magnetic direction',
-
-'exif-gpsdestlatituderef-n' => 'North latitude',
-'exif-gpsdestlatituderef-s' => 'South latitude',
-
-'exif-gpsdestlongituderef-e' => 'East longitude',
-'exif-gpsdestlongituderef-w' => 'West longitude',
+// Pseudotags used for GPSSpeedRef and GPSDestDistanceRef
+'exif-gpsspeed-k' => 'Kilometres per hour',
+'exif-gpsspeed-m' => 'Miles per hour',
+'exif-gpsspeed-n' => 'Knots',
-'exif-gpsdestbearingref-t' => 'True direction',
-'exif-gpsdestbearingref-m' => 'Magnetic direction',
-
-'exif-gpsdestdistanceref-k' => 'Kilometres per hour',
-'exif-gpsdestdistanceref-m' => 'Miles per hour',
-'exif-gpsdestdistanceref-n' => 'Knots',
+// Pseudotags used for GPSTrackRef, GPSImgDirectionRef and GPSDestBearingRef
+'exif-gpsdirection-t' => 'True direction',
+'exif-gpsdirection-m' => 'Magnetic direction',
# external editor support
'edit-externally' => 'Edit this file using an external application',
@@ -2205,12 +2207,13 @@ class Language {
*
*
* @param int $index the array key of the namespace to return
- * @return string
+ * @return mixed, string if the namespace value exists, otherwise false
*/
function getNsText( $index ) {
- global $wgNamespaceNamesEn;
- return $wgNamespaceNamesEn[$index];
+ $ns = $this->getNamespaces();
+ return isset( $ns[$index] ) ? $ns[$index] : false;
}
+
/**
* A convenience function that returns the same thing as
* getNsText() except with '_' changed to ' ', useful for
@@ -2224,16 +2227,17 @@ class Language {
}
/**
- * Get a namespace key by value
+ * Get a namespace key by value, case insensetive.
*
* @param string $text
* @return mixed An integer if $text is a valid value otherwise false
*/
function getNsIndex( $text ) {
- global $wgNamespaceNamesEn;
-
- foreach ( $wgNamespaceNamesEn as $i => $n ) {
- if ( 0 == strcasecmp( $n, $text ) ) { return $i; }
+ $ns = $this->getNamespaces();
+
+ foreach ( $ns as $i => $n ) {
+ if ( strcasecmp( $n, $text ) == 0)
+ return $i;
}
return false;
}
@@ -2855,9 +2859,7 @@ class Language {
* @access public
*/
function linkTrail() {
- $trail = $this->getMessage( 'linktrail' );
- if( empty( $trail ) ) $trail = Language::linkTrail();
- return $trail;
+ return $this->getMessage( 'linktrail' );
}
function getLangObj() {